no message

zhangxiaowen
1 parent d0838c4b
Showing 3 changed files with 74 additions and 49 deletions
CNLiveCollectionModule/Classes/Controller/CNLiveCollectionController.m
CNLiveCollectionModule/Classes/Model/CNLiveCollectionRequest.h
CNLiveCollectionModule/Classes/Model/CNLiveCollectionRequest.m
@@ -40,55 +40,51 @@ static const CGFloat timeValue = 1.5;
 #pragma mark - 数据
 - (void)loadData{
-    NSDictionary *params = @{
-                             @"pageSize":@"10",
-                             @"pageNo":[NSString stringWithFormat:@"%ld",_pageNo],
-                             @"appId":AppId,
-                             @"plat":@"i",
-                             @"sid":CNUserShareModel.uid};
-    [CNLiveNetworking setAllowRequestDefaultArgument:YES];
     [QMUITips showLoadingInView:self.view];
-    [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodGET URLString:CNDarenCollectListDataSourceUrl Param:params CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
-        if(_pageNo == 1 && self.data.count > 0){
-            [self.data removeAllObjects];
-        }
-        [QMUITips hideAllTipsInView:self.view];
-        [self hideEmptyView];
+    __weak typeof(self) weakSelf = self;
+    [CNLiveCollectionRequest getCollectionList:CNUserShareModel.uid pageNo:[NSString stringWithFormat:@"%ld",_pageNo] block:^(BOOL isSuccess, NSArray * _Nonnull array, NSError * _Nonnull error) {
+        __strong typeof(weakSelf) strongSelf = weakSelf;
+        if(!strongSelf) return ;
+        [QMUITips hideAllTipsInView:strongSelf.view];
+        [strongSelf hideEmptyView];
+        
+        [strongSelf.tableView.mj_header endRefreshing];
+        [strongSelf.tableView.mj_footer endRefreshing];
         if (error) {
-            if (self.data.count == 0) {
+            if (strongSelf.data.count == 0) {
                 if (error.code == -1001||error.code == -1003||error.code == -1009) {
-                    [self showEmptyViewWithImage:[UIImage imageNamed:@"dd_wlcw"] text:@"无法连接网络" detailText:@"别紧张，试试看刷新页面~" buttonTitle:@"     重试     " buttonAction:@selector(loadData)];
-                    [self setCNAPIErrorEmptyView];
-                    self.tableView.mj_footer.hidden = self.data.count == 0;
+                    [strongSelf showEmptyViewWithImage:[UIImage imageNamed:@"dd_wlcw"] text:@"无法连接网络" detailText:@"别紧张，试试看刷新页面~" buttonTitle:@"     重试     " buttonAction:@selector(loadData)];
+                    [strongSelf setCNAPIErrorEmptyView];
+                    strongSelf.tableView.mj_footer.hidden = strongSelf.data.count == 0;
                 }
             }
             return;
         }
-        [self.tableView.mj_header endRefreshing];
-        [self.tableView.mj_footer endRefreshing];
-        if ([responseObject isKindOfClass:[NSDictionary class]] && [responseObject[@"errorCode"] isEqualToString:@"0"]) {
-            _isRefreshing = NO;
-            _pageNo++;
-            NSArray *arr = [CNLiveCollectionModel mj_objectArrayWithKeyValuesArray:responseObject[@"data"][@"list"]];
-            [self.data addObjectsFromArray:arr];
-            if (arr.count < 10) {
-                [self.tableView.mj_footer endRefreshingWithNoMoreData];
+        
+        if (isSuccess) {
+            if(strongSelf.pageNo == 1 && strongSelf.data.count > 0){
+                 [strongSelf.data removeAllObjects];
+             }
+            strongSelf.isRefreshing = NO;
+            strongSelf.pageNo++;
+            [strongSelf.data addObjectsFromArray:array];
+            if (array.count < 10) {
+                [strongSelf.tableView.mj_footer endRefreshingWithNoMoreData];
             } else {
-                [self.tableView.mj_footer endRefreshing];
+                [strongSelf.tableView.mj_footer endRefreshing];
             }
         }
-
-        if (self.data.count == 0) {//显示empty
-//            [self showEmptyViewWithImage:[UIImage imageNamed:@"zhuangtai_kong"] text:@"您现在没有相关内容哦" detailText:@"" buttonTitle:@"" buttonAction:nil];
-            [self setCNNoDataEmptyView];
-            self.tableView.tableFooterView = nil;
+        
+        if (strongSelf.data.count == 0) {//显示empty
+            [strongSelf showEmptyViewWithImage:[UIImage imageNamed:@"zhuangtai_kong"] text:@"您现在没有相关内容哦" detailText:@"" buttonTitle:@"" buttonAction:nil];
+            [strongSelf setCNNoDataEmptyView];
+            strongSelf.tableView.tableFooterView = nil;
         }
-        self.tableView.mj_footer.hidden = self.data.count == 0;
-        [self.tableView reloadData];
-
+        strongSelf.tableView.mj_footer.hidden = self.data.count == 0;
+        [strongSelf.tableView reloadData];
     }];
 }
@@ -133,7 +129,6 @@ static const CGFloat timeValue = 1.5;
 - (void)goBack {
     if (self.presentingViewController != nil) {
         [self dismissViewControllerAnimated:YES completion:nil];
-        
     }
     else {
         [self.navigationController popViewControllerAnimated:YES];
@@ -169,21 +164,23 @@ static const CGFloat timeValue = 1.5;
     [QMUITips showLoadingInView:self.view];
     __weak typeof(self) weakSelf = self;
     [CNLiveCollectionRequest cancelCollection:cell.model.collectionId block:^(BOOL isSuccess, NSError * _Nonnull error) {
-        [QMUITips hideAllToastInView:weakSelf.view animated:YES];
+        __strong typeof(weakSelf) strongSelf = weakSelf;
+        if(!strongSelf) return ;
+        [QMUITips hideAllToastInView:strongSelf.view animated:YES];
         if (error) {
-            [QMUITips showError:error.localizedDescription inView:weakSelf.view hideAfterDelay:timeValue];
+            [QMUITips showError:error.localizedDescription inView:strongSelf.view hideAfterDelay:timeValue];
             return;
         }
         if (isSuccess) {
-            [weakSelf.data removeObject:cell.model];
-            [weakSelf.tableView reloadData];
-            [QMUITips showSucceed:@"取消收藏成功" inView:weakSelf.view hideAfterDelay:timeValue];
-            if (weakSelf.data.count == 0) {
-                [weakSelf showEmptyViewWithImage:[UIImage imageNamed:@"zhuangtai_kong"] text:@"您现在没有相关内容哦" detailText:@"" buttonTitle:@"" buttonAction:nil];
-                [weakSelf setCNNoDataEmptyView];
-                weakSelf.tableView.tableFooterView = nil;
+            [strongSelf.data removeObject:cell.model];
+            [strongSelf.tableView reloadData];
+            [QMUITips showSucceed:@"取消收藏成功" inView:strongSelf.view hideAfterDelay:timeValue];
+            if (strongSelf.data.count == 0) {
+                [strongSelf showEmptyViewWithImage:[UIImage imageNamed:@"zhuangtai_kong"] text:@"您现在没有相关内容哦" detailText:@"" buttonTitle:@"" buttonAction:nil];
+                [strongSelf setCNNoDataEmptyView];
+                strongSelf.tableView.tableFooterView = nil;
             }
-            weakSelf.tableView.mj_footer.hidden = weakSelf.data.count == 0;
+            strongSelf.tableView.mj_footer.hidden = strongSelf.data.count == 0;
         }
     }];
 }
@@ -9,11 +9,15 @@
 #import <Foundation/Foundation.h>
 NS_ASSUME_NONNULL_BEGIN
-typedef void(^Block)(BOOL isSuccess, NSError *error);
+
+typedef void(^CollectionListBlock)(BOOL isSuccess, NSArray *array, NSError *error);
+typedef void(^CancelCollectionBlock)(BOOL isSuccess, NSError *error);
 @interface CNLiveCollectionRequest : NSObject
-+ (void)cancelCollection:(NSString *)ID block:(Block)block;
++ (void)getCollectionList:(NSString *)ID pageNo:(NSString *)pageNo block:(CollectionListBlock)block;
+
++ (void)cancelCollection:(NSString *)ID block:(CancelCollectionBlock)block;
 @end
@@ -12,9 +12,33 @@
 #import "CNLiveEnvironment.h"
 #import "CNUserInfoManager.h"
+#import "CNLiveCollectionModel.h"
+#import "MJExtension.h"
+
 @implementation CNLiveCollectionRequest
-+ (void)cancelCollection:(NSString *)ID block:(Block)block{
++ (void)getCollectionList:(NSString *)ID pageNo:(NSString *)pageNo block:(CollectionListBlock)block{
+    NSDictionary *params = @{
+                             @"pageSize":@"10",
+                             @"pageNo":pageNo,
+                             @"appId":AppId,
+                             @"plat":@"i",
+                             @"sid":ID};
+    [CNLiveNetworking setAllowRequestDefaultArgument:YES];
+    [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodGET URLString:CNDarenCollectListDataSourceUrl Param:params CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
+        if (responseObject&&[responseObject isKindOfClass:[NSDictionary class]]) {
+            NSString *errorCode = [NSString stringWithFormat:@"%@", responseObject[@"errorCode"]];
+            NSArray *arr = [CNLiveCollectionModel mj_objectArrayWithKeyValuesArray:responseObject[@"data"][@"list"]];
+            block?block([errorCode isEqualToString:@"0"], arr, error):@"";
+        }else{
+            block?block(NO, nil, error):@"";
+        }
+
+    }];
+    
+}
+
++ (void)cancelCollection:(NSString *)ID block:(CancelCollectionBlock)block{
     NSDictionary *params = @{@"appId":AppId,
                              @"plat":@"i",
                              @"sid":CNUserShareModel.uid,