0.3.3我的首页卡顿问题修复

yanglingyu
1 parent ff44f426
Showing 5 changed files with 23 additions and 75 deletions
CNLiveCMineModule.podspec
CNLiveCMineModule/Classes/CNCMine/Present/CNMinePresent.h
CNLiveCMineModule/Classes/CNCMine/Present/CNMinePresent.m
CNLiveCMineModule/Classes/CNCMine/ViewController/CNLiveMineVC.m
CNLiveCMineModule/Classes/CNWallet/Present/CNWalletPresent.m
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLiveCMineModule'
-  s.version          = '0.3.2'
+  s.version          = '0.3.3'
   s.summary          = '网家家C端个人中心'
 # This description is used to generate tags and improve search results.
@@ -47,7 +47,7 @@ NS_ASSUME_NONNULL_BEGIN
 /// 返回我的工具内容
 + (CNMineModel *)datasourceToolModel:(CNToolDatasourceType)type carNum:(NSString *)carNum;
-+ (void)requestMineDataSourceWithBlock:(void (^)(NSArray *activities,CNScoreModel *model))completerBlock;
++ (void)requestMineDataSourceWithBlock:(void (^)(CNScoreModel *model))completerBlock;
 /// 改版评价提交
 /// @param message 评价内容
@@ -347,82 +347,26 @@
     CNMineModel *toolsModel = [CNMineModel mj_objectWithKeyValues:toolDic];
     return toolsModel;
 }
-+ (void)requestMineDataSourceWithBlock:(void (^)(NSArray * _Nonnull, CNScoreModel * _Nonnull))completerBlock
++ (void)requestMineDataSourceWithBlock:(void (^)( CNScoreModel * _Nonnull))completerBlock
 {
     if (![CNLiveNetworking isNetworking]) {
         [QMUITips showWithText:@"无法连接网络" inView:AppKeyWindow hideAfterDelay:1.5];
         return;
     }
     NSDictionary *params = @{@"uid":[CNUserInfoManager manager].userInfoModel.uid?[CNUserInfoManager manager].userInfoModel.uid:@""};
-    NSDictionary *params1 = @{
-                            @"blockId": @"9",
-                            @"userId":CNUserShareModel.uid?CNUserShareModel.uid:@"",
-                            @"type":@"1",
-                            @"page":@"1",
-                            @"pageSize":@"10"
-    };
-    __block CNLiveNetworking *orderCountNetworking = [CNLiveNetworking createBatchOrChainNetworkWithMethod:CNLiveRequestMethodPOST URLString:cn_API_Manageshop(@"/Api/Index3/myOrderCount") Param:params];
-    orderCountNetworking.tag = 1001;
-    orderCountNetworking.isShowDataResult = YES;
-    orderCountNetworking.allowRequestDefaultArgument = YES;
-    orderCountNetworking.isDSRequest = YES;
-    orderCountNetworking.resultResponseAsynchronously = NO;
-    __block CNLiveNetworking *blockNetworking = [CNLiveNetworking createBatchOrChainNetworkWithMethod:CNLiveRequestMethodGET URLString:cn_API_Classify(@"/contentApi/getBlockContents") Param:params1];
-    blockNetworking.tag = 1002;
-    blockNetworking.isShowDataResult = YES;
-    blockNetworking.isDSRequest = NO;
-    blockNetworking.allowRequestDefaultArgument = YES;
-    blockNetworking.resultResponseAsynchronously = NO;
-    [CNLiveNetworkManager requestBatchWithArray:@[orderCountNetworking,blockNetworking] CompletionBlock:^(NSArray *resultArray) {
-        @try {
-            CNScoreModel *model = nil;
-            NSMutableArray *activityListArr = [[NSMutableArray alloc] init];
-            for (CNLiveNetworking *networking in resultArray) {
-                if (networking .tag == 1001) {
-                    if (!networking.error) {
-                        model = [CNScoreModel mj_objectWithKeyValues:networking.responseObject];
-                    }else{
-                        [QMUITips showWithText:@"接口请求错误" inView:AppKeyWindow hideAfterDelay:1.5];
-                    }
-                }
-                if (networking.tag == 1002) {
-                    if (!networking.error) {
-                        NSDictionary *data = networking.responseObject;
-                        
-                        if (data && [data isKindOfClass:[NSDictionary class]]) {
-                            
-                            
-                            NSArray *dataArr = data[@"list"];
-                            
-                            if (dataArr.count>0) {
-                                
-                                for (NSDictionary *dic in dataArr)
-                                {
-                                    if ([dic isKindOfClass:[NSDictionary class]])
-                                    {
-                                        NSDictionary *dictionary = @{
-                                            @"imgName":dic[@"transverseImg"],
-                                            @"url":dic[@"thirdUrl"],
-                                            @"title":dic[@"title"]
-                                        };
-                                        CNActivityListModel *model = [CNActivityListModel mj_objectWithKeyValues:dictionary];
-                                        [activityListArr addObject:model];
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-                if (completerBlock) {
-                    completerBlock(activityListArr.copy,model);
-                }
-            }
-                
-        } @catch (NSException *exception) {
-            NSLog(@"异常了");
+    [CNLiveNetworking setAllowRequestDefaultArgument:YES];
+    [CNLiveNetworking setupDSRequest:YES];
+    [CNLiveNetworking setupShowDataResult:YES];
+    [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];
+            return;
+        }
+        CNScoreModel *model = [CNScoreModel mj_objectWithKeyValues:responseObject];
+        if (completerBlock) {
+            completerBlock(model);
         }
     }];
-    
 }
 + (void)requestFeedback:(NSString *)message secceedBlock:(void(^)(void))responseBlock
 {
@@ -17,6 +17,7 @@
 #import "CNRevisionInstructionView.h"
 #import <CNLiveBaseTools/UIImage+EditIcon.h>
 #import <DSBaseModule/DSBaseModule.h>
+#import "CNWalletPresent.h"
 //有新客服消息
@@ -42,9 +43,8 @@ static NSString *const CNSobotNotification_NewMessage = @&quot;CNSobotNotification_Ne
 @implementation CNLiveMineVC
 - (void)loadData{
-    [CNMinePresent requestMineDataSourceWithBlock:^(NSArray * _Nonnull activities, CNScoreModel * _Nonnull model) {
+    [CNMinePresent requestMineDataSourceWithBlock:^(CNScoreModel * _Nonnull model) {
         [self.bgScrollView.mj_header endRefreshing];
-        self.activityView.dataSource = activities;
         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;
@@ -52,6 +52,9 @@ static NSString *const CNSobotNotification_NewMessage = @&quot;CNSobotNotification_Ne
         self.packageView.model = [CNMinePresent dataSourceWalletModel:model.integral couponNum:model.coupon_count balance:model.money];
         self.toolView.model = [CNMinePresent datasourceToolModel:CNToolDatasourceTypeFirst carNum:model.cart_count];
     }];
+    [CNWalletPresent requestActivityListBlock:^(NSArray * _Nonnull activities) {
+        self.activityView.dataSource = activities;
+    }];
 }
 - (void)viewDidLoad {
@@ -76,16 +76,17 @@
                             @"pageSize":@"10"
     };
     [CNLiveNetworking setAllowRequestDefaultArgument:YES];
-    [CNLiveNetworking setupShowDataResult:YES];
+    [CNLiveNetworking setupShowDataResult:NO];
     [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodGET URLString:cn_API_Classify(@"/contentApi/getBlockContents") Param:params CacheType:NO CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
         if (error) {
             [QMUITips showError:error.localizedDescription inView:AppKeyWindow hideAfterDelay:1.5];
+            responseBlock(@[]);
             return;
         }
-            if (responseObject && [responseObject isKindOfClass:[NSDictionary class]]) {
+            if (responseObject[@"data"] && [responseObject[@"data"] isKindOfClass:[NSDictionary class]]) {
-                NSArray *dataArr = responseObject[@"list"];
+                NSArray *dataArr = responseObject[@"data"][@"list"];
                 if (dataArr.count>0) {
                     NSMutableArray *activityListArr = [[NSMutableArray alloc] init];