首页网络请求调整

yanglingyu
1 parent 7e2ee220
Showing 5 changed files with 24 additions and 11 deletions
CNLiveCMineModule/Classes/CNCMine/Present/CNMinePresent.m
CNLiveCMineModule/Classes/CNCMine/View/CNListCollectionView.m
CNLiveCMineModule/Classes/CNCMine/ViewController/CNLiveMineVC.m
CNLiveCMineModule/Classes/CNWallet/Present/CNWalletPresent.m
Example/CNLiveCMineModule/CNLIVEAppDelegate.m
@@ -347,7 +347,7 @@
     CNMineModel *toolsModel = [CNMineModel mj_objectWithKeyValues:toolDic];
     return toolsModel;
 }
-+ (void)requestMineDataSourceWithBlock:(void (^)( CNScoreModel * _Nonnull))completerBlock
++ (void)requestMineDataSourceWithBlock:(void (^)( CNScoreModel *))completerBlock
 {
     if (![CNLiveNetworking isNetworking]) {
         [QMUITips showWithText:@"无法连接网络" inView:AppKeyWindow hideAfterDelay:1.5];
@@ -360,6 +360,9 @@
     [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodPOST URLString:cn_API_Manageshop(@"/Api/Index3/myOrderCount") Param:params CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
         if (error) {
             [QMUITips showWithText:@"接口请求错误" inView:AppKeyWindow hideAfterDelay:1.5];
+            if (completerBlock) {
+                completerBlock(nil);
+            }
             return;
         }
         CNScoreModel *model = [CNScoreModel mj_objectWithKeyValues:responseObject];
@@ -269,7 +269,7 @@ static NSString *CNWalletCellID = @&quot;CNWalletCellID&quot;;
     weakself
     view.secretBlock = ^(BOOL isSecret) {
-        weakSelf.model = [CNMinePresent dataSourceWalletModel:self.integral couponNum:weakSelf.model.lists[1][@"number"] balance:self.money];
+        weakSelf.model = [CNMinePresent dataSourceWalletModel:weakSelf.integral couponNum:weakSelf.model.lists[1][@"number"] balance:weakSelf.money];
     };
     return view;
 }
@@ -43,17 +43,25 @@ static NSString *const CNSobotNotification_NewMessage = @&quot;CNSobotNotification_Ne
 @implementation CNLiveMineVC
 - (void)loadData{
+    
+    weakself
     [CNMinePresent requestMineDataSourceWithBlock:^(CNScoreModel * _Nonnull model) {
-        [self.bgScrollView.mj_header endRefreshing];
-        self.carCount = model.cart_count;
-        self.orderView.model = [CNMinePresent dataSourceOrdersModel:model.pay_order_count willShip:model.send_order_count willReceipt:model.confirm_order_count];
-        self.packageView.integral = model.integral;
-        self.packageView.money = model.money;
-        self.packageView.model = [CNMinePresent dataSourceWalletModel:model.integral couponNum:model.coupon_count balance:model.money];
-        self.toolView.model = [CNMinePresent datasourceToolModel:CNToolDatasourceTypeFirst carNum:model.cart_count];
+        [weakSelf.bgScrollView.mj_header endRefreshing];
+        if (model) {
+            weakSelf.carCount = model.cart_count;
+            weakSelf.orderView.model = [CNMinePresent dataSourceOrdersModel:model.pay_order_count willShip:model.send_order_count willReceipt:model.confirm_order_count];
+            weakSelf.packageView.integral = model.integral;
+            weakSelf.toolView.model = [CNMinePresent datasourceToolModel:CNToolDatasourceTypeFirst carNum:model.cart_count];
+        }
+        [CNWalletPresent requestBalanceWithType:@"1" responseBlock:^(NSString * _Nonnull balance) {
+            weakSelf.packageView.money = balance;
+            weakSelf.packageView.model = [CNMinePresent dataSourceWalletModel:weakSelf.packageView.integral couponNum:model.coupon_count balance:weakSelf.packageView.money];
+        }];
     }];
+   
+   
     [CNWalletPresent requestActivityListBlock:^(NSArray * _Nonnull activities) {
-        self.activityView.dataSource = activities;
+        weakSelf.activityView.dataSource = activities;
     }];
 }
@@ -53,12 +53,14 @@
         [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodPOST URLString:CNGetBalanceUrl Param:params CacheType:NO CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
             if (error) {
                 [QMUITips showError:error.localizedDescription inView:AppKeyWindow hideAfterDelay:1.5];
+                if(responseBlock)responseBlock(@"0");
                 return;
             }
             if (responseObject[@"data"][@"balance"]) {
                 if(responseBlock)responseBlock(responseObject[@"data"][@"balance"]);
             }else{
+                if(responseBlock)responseBlock(@"0");
                 [QMUITips showError:responseObject[@"errorMessage"] inView:AppKeyWindow hideAfterDelay:1.5];
             }
@@ -28,7 +28,7 @@
     [super application:application didFinishLaunchingWithOptions:launchOptions];
-    [CNUserInfoManager manager].userInfoModel.uid = @"12857262";//@"10510277";//11174272//12857262
+    [CNUserInfoManager manager].userInfoModel.uid = @"10510277";//@"10510277";//11174272//12857262
     self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
     self.window.backgroundColor = [UIColor whiteColor];