修复bug

KuDianProject.xcodeproj/project.pbxproj

@@ -1596,7 +1596,7 @@
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CODE_SIGN_ENTITLEMENTS = KuDianProject/KuDianProject.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
-				CODE_SIGN_STYLE = Manual;
+				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = WV23VEMQV8;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -1679,7 +1679,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.KuDianProject.eight;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE_SPECIFIER = dev;
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				TARGETED_DEVICE_FAMILY = 1;
 			};
 			name = Debug;
@@ -1691,8 +1691,8 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CODE_SIGN_ENTITLEMENTS = KuDianProject/KuDianProject.entitlements;
-				CODE_SIGN_IDENTITY = "iPhone Distribution";
-				CODE_SIGN_STYLE = Manual;
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = WV23VEMQV8;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -1775,7 +1775,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.KuDianProject.eight;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE_SPECIFIER = dis;
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				TARGETED_DEVICE_FAMILY = 1;
 			};
 			name = Release;

KuDianProject.xcworkspace/xcuserdata/kaipeng.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -2,16 +2,4 @@
 <Bucket
    type = "0"
    version = "2.0">
-   <Breakpoints>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.ExceptionBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            scope = "0"
-            stopOnStyle = "0">
-         </BreakpointContent>
-      </BreakpointProxy>
-   </Breakpoints>
 </Bucket>

KuDianProject/AppDelegate.m

@@ -19,18 +19,22 @@
 
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
+    [self setUpKeyWindow];
+    [IQKeyboardManager sharedManager].shouldResignOnTouchOutside = YES;
+    [self setUpUM];
+    [self setUpMiPush];
+    return YES;
+}
+
+- (void)setUpKeyWindow{
     self.window=[[UIWindow alloc]initWithFrame:[UIScreen mainScreen].bounds];
     self.window.backgroundColor=[UIColor whiteColor];
     self.window.rootViewController=[[KDPTabBarVC alloc]init];
     [self.window makeKeyAndVisible];
-    [IQKeyboardManager sharedManager].shouldResignOnTouchOutside = YES;
-    [self setUpUM];
-    [self setUpMiPush];
-    if (![KDPAccountTool isLogin]) {
-         [self.window.rootViewController presentViewController:[[UINavigationController alloc]initWithRootViewController:[[KDPWelcomePageViewController alloc]init]] animated:YES completion:nil];
+    KDPAccountModel *accountModel = [KDPAccountTool account];
+    if (![KDPAccountTool isLogin] || [accountModel.has_kwai integerValue] != 1) {
+        [self.window.rootViewController presentViewController:[[UINavigationController alloc]initWithRootViewController:[[KDPWelcomePageViewController alloc]init]] animated:YES completion:nil];
     }
-
-    return YES;
 }
 
 #pragma mark - 推送

KuDianProject/LiveData/Controller/KDPLiveLeftViewController.m

@@ -27,14 +27,14 @@
     // Do any additional setup after loading the view.
     self.navBar.hidden = YES;
     [self setUpUI];
+    self.page = 1;
+    [self requestData];
 }
 
 - (void)requestData{
     NSDictionary *params = @{@"page":@(self.page)};
     NSString *liveListUrl = [NSString stringWithFormat:@"%@api/onlive/liveList",KDURL];
-    [LoadingView showInView:self.view];
     [KDPNetworkRequestHTTP postURL:liveListUrl params:params success:^(id  _Nonnull json) {
-        [LoadingView dismiss];
         NSArray *liveDataArr = [NSArray yy_modelArrayWithClass:[KDPLiveListModel class] json:json[@"data"]];
         if (self.page == 1) {
             [self.dataSource removeAllObjects];
@@ -48,7 +48,6 @@
         [self.tableView.mj_header endRefreshing];
         [self.tableView reloadData];
     } failure:^(NSError * _Nonnull error) {
-        [LoadingView dismiss];
         [self.tableView.mj_footer endRefreshing];
         [self.tableView.mj_header endRefreshing];
     }];
@@ -56,7 +55,7 @@
 
 - (void)viewWillAppear:(BOOL)animated{
     [super viewWillAppear:animated];
-    [self.tableView.mj_header beginRefreshing];
+    [self requestData];
 }
 
 - (void)setUpUI{
@@ -95,7 +94,6 @@
             self.page ++;
             [self requestData];
         }];
-        [_tableView.mj_header beginRefreshing];
     }
     return _tableView;
 }

KuDianProject/LiveData/Controller/KDPLiveRightViewController.m

@@ -37,14 +37,14 @@
     [self.view addSubview:self.tableView];
     self.view.backgroundColor = [UIColor colorWithHex:0xF9F9F9];
     self.tableView.tableHeaderView = self.headerView;
+    self.page = 1;
+    [self requestTotalData];
 }
 
 - (void)requestTotalData{
     NSDictionary *params = @{@"type":self.type,@"page":@(self.page)};
-    [LoadingView show];
     NSString *statisticsUrl = [NSString stringWithFormat:@"%@api/onlive/statistics",KDURL];
     [KDPNetworkRequestHTTP postURL:statisticsUrl params:params success:^(id  _Nonnull json) {
-        [LoadingView dismiss];
         NSArray *liveDataArr = [NSArray yy_modelArrayWithClass:[KDPLiveStatisticsModel class] json:json[@"data"]];
         NSDictionary *headerDict = json[@"total"];
         [self.headerView reloadHeaderData:headerDict];
@@ -68,7 +68,7 @@
 
 - (void)viewWillAppear:(BOOL)animated{
     [super viewWillAppear:animated];
-    [self.tableView.mj_header beginRefreshing];
+    [self requestTotalData];
 }
 
 - (UITableView *)tableView{
@@ -98,7 +98,6 @@
             self.page ++;
             [self requestTotalData];
         }];
-        [_tableView.mj_header beginRefreshing];
     }
     return _tableView;
 }

KuDianProject/SupplyGood/Controller/KDPSupplyContentViewController.m

@@ -40,6 +40,8 @@
     if ([self.classModel.type isEqualToString:@"cate"]) {
         [self requestTopListWithGoodId:self.classModel.Id];
     }
+    self.page = 1;
+    [self requestGoodlistData];
 }
 
 - (void)setUpUI{
@@ -115,7 +117,6 @@
             self.page ++;
             [self requestGoodlistData];
         }];
-        [_collectionView.mj_header beginRefreshing];
     }
     return _collectionView;
 }

KuDianProject/SupplyGood/Controller/KDPSupplyListViewController.m

@@ -135,6 +135,8 @@
     KDPSupplyContentReusableView *reusAbleView;
     if (kind == UICollectionElementKindSectionHeader) {
         reusAbleView = [collectionView dequeueReusableSupplementaryViewOfKind:UICollectionElementKindSectionHeader withReuseIdentifier:NSStringFromClass([KDPSupplyContentReusableView class]) forIndexPath:indexPath];
+        reusAbleView.layer.borderColor = [UIColor colorWithHex:0xf4f4f4].CGColor;
+        reusAbleView.layer.borderWidth = 0.5;
         WeakSelf(weakSelf);
         __weak KDPSupplyContentReusableView *weakReusAbleView = reusAbleView;
         reusAbleView.changeBlock = ^(BOOL isPrice) {