0.0.4

yanglingyu
1 parent 0a4eaeb4
Showing 14 changed files with 103 additions and 83 deletions
CNLiveCServiceModule.podspec
CNLiveCServiceModule/Classes/Manager/CNLiveCServiceManagerBridge.h
CNLiveCServiceModule/Classes/Manager/CNLiveCServiceManagerBridge.m
CNLiveCServiceModule/Classes/Model/CNLiveServiceModel.h
CNLiveCServiceModule/Classes/Present/CNLiveServicePresent.h
CNLiveCServiceModule/Classes/Present/CNLiveServicePresent.m
CNLiveCServiceModule/Classes/View/CNLiveCycleActiveCell.m
CNLiveCServiceModule/Classes/View/CNLiveCycleCell.m
CNLiveCServiceModule/Classes/View/CNLiveRecommendCell.m
CNLiveCServiceModule/Classes/View/CNLiveServiceEpiCell.m
CNLiveCServiceModule/Classes/ViewController/CNLiveAllServiceVC.m
CNLiveCServiceModule/Classes/ViewController/CNLiveMyServicesVC.m
CNLiveCServiceModule/Classes/ViewController/CNLiveServiceSearchVC.m
CNLiveCServiceModule/Classes/ViewController/CNLiveServiceVC.m
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLiveCServiceModule'
-  s.version          = '0.0.3'
+  s.version          = '0.0.4'
   s.summary          = '我的服务内容'
 # This description is used to generate tags and improve search results.
@@ -9,8 +9,7 @@
 typedef NS_ENUM(NSInteger , CNCServiceJumpType) {
     CNCServiceJumpTypeService,      //服务内容跳转逻辑
-    CNCServiceJumpTypeGoods,        //商品详情页
-    CNCServiceJumpTypeVideo ,        //音频文件
+   CNCServiceJumpTypeGetPage,       //getpage获取内容
     CNCServiceJumpTypeWebVC         //电商h5页面
 };
 @protocol CNLiveCServiceProtocol <NSObject>
@@ -55,17 +54,7 @@ NS_ASSUME_NONNULL_BEGIN
 + (void)jumpViewControllerType:(CNCServiceJumpType)type
                          param:(NSDictionary *)param
                     controller:(UIViewController *)controller;
-/**
- *服务号跳转
- *@param goodsId    商品id
- */
-+ (void)jumpGoodsViewController:(NSString *)goodsId
-                     controller:(UIViewController *)controller;
-/**
- *服务号跳转
- *@param contentId    服务id
- */
-+ (void)jumpGetPageOtherVC:(NSString *)contentId controller:(UIViewController *)controller;
+
 /**
  *服务号跳转
  *@param urlStr    网页地址
@@ -30,6 +30,7 @@
 + (void)jumpServiceController:(NSString *)serviceId type:(NSString *)type to:(NSString *)to shopType:(NSString *)shopType controller:(UIViewController *)controller
 {
+    [CNLiveServicePresent usedServiceWithServingId:serviceId];
     [CNLiveCServiceManagerBridge jumpServiceType:CNCServiceJumpTypeService service:serviceId type:type to:to shopType:shopType controller:controller];
 }
 + (void)jumpServiceType:(CNCServiceJumpType)jumpType service:(NSString *)serviceId type:(NSString *)type to:(NSString *)to shopType:(NSString *)shopType controller:(UIViewController *)controller{
@@ -41,22 +42,6 @@
     };
     [CNLiveCServiceManagerBridge jumpViewControllerType:jumpType param:param controller:controller];
 }
-+ (void)jumpGoodsViewController:(NSString *)goodsId controller:(UIViewController *)controller
-{
-    NSDictionary *param = @{
-        @"goodsId":goodsId?goodsId:@"",
-    };
-    [CNLiveCServiceManagerBridge jumpViewControllerType:CNCServiceJumpTypeGoods param:param controller:controller];
-}
-+ (void)jumpGetPageOtherVC:(NSString *)contentId controller:(UIViewController *)controller{
-    [QMUITips showLoadingInView:controller.view];
-    [CNLiveServicePresent loadServiceInfoServiceId:contentId result:^(CNLiveSearchModel * _Nonnull model) {
-        [QMUITips hideAllTips];
-        [CNLiveCServiceManagerBridge jumpServiceController:model.id type:model.type to:model.to shopType:model.shopType controller:controller];
-    } error:^{
-        [QMUITips hideAllTips];
-    }];
-}
 + (void)jumpWebVCWithUrl:(NSString *)urlStr controller:(UIViewController *)controller{
     NSDictionary *param = @{
@@ -98,7 +98,7 @@ NS_ASSUME_NONNULL_BEGIN
 ///布局
 @property (nonatomic, strong) CNLiveLayoutModel *layout;
 @property (nonatomic, assign) CGFloat cellHeight;
-@property (nonatomic, strong) NSArray <CnLivePageContentModel *> *rightLists;
+@property (nonatomic, strong) NSArray *rightLists;
 @property (nonatomic, copy) NSString *blockId;
 @property (nonatomic, copy) NSString *blockName;
@@ -38,7 +38,7 @@ NS_ASSUME_NONNULL_BEGIN
 /**
  请求我的服务数据
  */
-+ (void)loadMyServicepage:(NSString *)page result:(void (^) (NSArray * dataArray)) succeed error:(void(^)(void))failure;
++ (void)loadMyServicepage:(NSString *)page result:(void (^) (NSArray * dataArray , BOOL isLastPage)) succeed error:(void(^)(void))failure;
 /**
  *  添加最近使用服务号
@@ -258,7 +258,7 @@ static const CGFloat margin = 15;
     }];
 }
-+ (void)loadMyServicepage:(NSString *)page result:(void (^)(NSArray * _Nonnull))succeed error:(void (^)(void))failure{
++ (void)loadMyServicepage:(NSString *)page result:(nonnull void (^)(NSArray * _Nonnull, BOOL))succeed error:(nonnull void (^)(void))failure{
     NSDictionary * params = @{@"sid": CNUserShareModelUid ? CNUserShareModelUid : @"",
                               @"pageSize":@"10",
                               @"type":@"2",
@@ -271,15 +271,18 @@ static const CGFloat margin = 15;
     [CNLiveNetworking setupShowResult:YES];
     [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodGET URLString:cn_API_Classify(@"/servingApi/servingList") Param:params CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
-        CNLiveServiceModel * model = [CNLiveServiceModel mj_objectWithKeyValues:responseObject[@"data"]];
+        NSDictionary * dic = responseObject[@"data"];
         NSMutableArray *array = [NSMutableArray array];
-        for (NSDictionary *dic in model.categories) {
-            CNLiveSearchModel *searchModel = [CNLiveSearchModel mj_objectWithKeyValues:dic];
-            [array addObject:searchModel];
+        if (dic[@"list"]&&[dic[@"list"] isKindOfClass:[NSArray class]]) {
+            NSArray *list = dic[@"list"];
+            for (NSDictionary *dict in list) {
+                CNLiveSearchModel *searchModel = [CNLiveSearchModel mj_objectWithKeyValues:dict];
+                [array addObject:searchModel];
+            }
         }
-        
-            if (model) {
-                !succeed?:succeed(array.copy);
+            if (dic) {
+                NSString *lastPage = dic[@"isLastPage"];
+                !succeed?:succeed(array.copy,lastPage);
             }else{
                 [QMUITips showError:error.localizedDescription inView:AppKeyWindow hideAfterDelay:3];
                 !failure?:failure();
@@ -300,13 +303,15 @@ static const CGFloat margin = 15;
 }
 + (void)removeMyServiceResult:(void (^) (void)) succeed{
-    NSDictionary * params = @{@"sid": CNUserShareModelUid ? CNUserShareModelUid : @""};
+    NSDictionary * params = @{@"sid": CNUserShareModelUid ? CNUserShareModelUid : @"",
+                              @"id":@""
+    };
     [CNLiveNetworking setAllowRequestDefaultArgument:YES];
     [CNLiveNetworking setupShowDataResult:NO];
     [CNLiveNetworking setupShowResult:YES];
-    [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodGET URLString:cn_API_Classify(@"/servingApi/removeMyNewest") Param:params CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
+    [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodPOST URLString:cn_API_Classify(@"/servingApi/removeMyNewest") Param:params CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
         if (!error) {
             succeed();
         }else{
@@ -331,10 +336,10 @@ static const CGFloat margin = 15;
         if (dic[@"list"]&&[dic[@"list"] isKindOfClass:[NSArray class]]) {
             NSArray *list = dic[@"list"];
-            for (NSDictionary *dic in list) {
+            for (NSDictionary *dict in list) {
                 NSDictionary *dictionary = @{
-                    @"title":dic[@"title"],
-                    @"lists":dic[@"list"],
+                    @"title":dict[@"title"],
+                    @"lists":dict[@"list"],
                     @"layout":@{
                         @"width":@((SCREEN_WIDTH-4*margin-3*margin)/4.0),
                         @"height":@(70)
@@ -370,7 +375,7 @@ static const CGFloat margin = 15;
         if (model) {
             !succeed?:succeed(model);
         }else{
-            [QMUITips showError:error.localizedDescription inView:AppKeyWindow hideAfterDelay:3];
+            [QMUITips showError:error.localizedDescription inView:AppKeyWindow hideAfterDelay:2];
             !failure?:failure();
         }
     }];
@@ -42,8 +42,7 @@
 }
 #pragma mark - SDCycleScrollViewDelegate
 - (void)cycleScrollView:(SDCycleScrollView *)cycleScrollView didSelectItemAtIndex:(NSInteger)index{
-    CnLivePageContentModel *pageModel = [CnLivePageContentModel mj_objectWithKeyValues:_model.contents[index]];
-    [CNLiveCServiceManagerBridge jumpGetPageOtherVC:pageModel.contentId controller:[CNLiveCServiceManagerBridge viewControllerFromView:self]];
+    [CNLiveCServiceManagerBridge  jumpViewControllerType:CNCServiceJumpTypeGetPage param:_model.contents[index] controller:[CNLiveCServiceManagerBridge viewControllerFromView:self]];
 }
 #pragma mark - Setting&&Getting
@@ -55,8 +55,7 @@ static NSString *CNServiceOrLookID = @&quot;CNLiveServiceOrLookCell&quot;;
             [CNLiveCServiceManagerBridge jumpServiceController:searchModel.id type:searchModel.type to:searchModel.to shopType:searchModel.shopType controller:[CNLiveCServiceManagerBridge viewControllerFromView:self]];
         }
         if ([model isKindOfClass:[CnLivePageContentModel class]]) {
-            CnLivePageContentModel *pageModel = (CnLivePageContentModel *)model;
-            [CNLiveCServiceManagerBridge jumpGetPageOtherVC:pageModel.contentId controller:[CNLiveCServiceManagerBridge viewControllerFromView:self]];
+            [CNLiveCServiceManagerBridge jumpViewControllerType:CNCServiceJumpTypeGetPage param:[model mj_keyValues] controller:[CNLiveCServiceManagerBridge viewControllerFromView:self]];
         }
     }
@@ -133,8 +132,6 @@ static NSString *CNServiceOrLookID = @&quot;CNLiveServiceOrLookCell&quot;;
 {
     if (!_listCollectionView) {
         UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init];
-        layout.sectionFootersPinToVisibleBounds = YES;
-        layout.sectionHeadersPinToVisibleBounds = YES;
         _listCollectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout];
         _listCollectionView.scrollEnabled = NO;
         _listCollectionView.backgroundColor = kWhiteColor;
@@ -29,12 +29,8 @@ static NSString *CNVideoRecommendCellID =   @&quot;CNLiveVideoRecommendCell&quot;;
 }
 #pragma mark - UICollectionViewDelegate
 - (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath{
-    if ([_model.blockName isEqualToString:@"精品音频"]){
-        [CNLiveCServiceManagerBridge jumpViewControllerType:CNCServiceJumpTypeVideo param:self.model.contents[indexPath.row] controller:[CNLiveCServiceManagerBridge viewControllerFromView:self]];
-    }else{
-        CnLivePageContentModel *model = [CnLivePageContentModel mj_objectWithKeyValues:self.model.contents[indexPath.row]];
-        [CNLiveCServiceManagerBridge jumpGoodsViewController:model.contentId controller:[CNLiveCServiceManagerBridge viewControllerFromView:self]];
-    }
+        [CNLiveCServiceManagerBridge jumpViewControllerType:CNCServiceJumpTypeGetPage param:self.model.contents[indexPath.row] controller:[CNLiveCServiceManagerBridge viewControllerFromView:self]];
+   
 }
 #pragma mark - UICollectionViewDataSource
 - (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section{
@@ -75,8 +71,6 @@ static NSString *CNVideoRecommendCellID =   @&quot;CNLiveVideoRecommendCell&quot;;
 {
     if (!_listCollectionView) {
         UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init];
-        layout.sectionFootersPinToVisibleBounds = NO;
-        layout.sectionHeadersPinToVisibleBounds = NO;
         _listCollectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout];
         _listCollectionView.backgroundColor = kWhiteColor;
         _listCollectionView.collectionViewLayout = layout;
@@ -68,13 +68,11 @@ static NSString *CNServiceOrLookID = @&quot;CNLiveServiceOrLookCell&quot;;
 #pragma mark - Action
 - (void)ButtonClick:(UIButton *)sender
 {
-    CnLivePageContentModel *pageModel = [CnLivePageContentModel mj_objectWithKeyValues:_model.rightLists[sender.tag - 1000]];
-    [CNLiveCServiceManagerBridge jumpGetPageOtherVC:pageModel.contentId controller:[CNLiveCServiceManagerBridge viewControllerFromView:self]];
+    [CNLiveCServiceManagerBridge jumpViewControllerType:CNCServiceJumpTypeGetPage param:_model.rightLists[sender.tag - 1000] controller:[CNLiveCServiceManagerBridge viewControllerFromView:self]];
 }
 #pragma mark - UICollectionViewDelegate
 - (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath{
-    CnLivePageContentModel *model = [CnLivePageContentModel mj_objectWithKeyValues:self.model.contents[indexPath.row]];
-    [CNLiveCServiceManagerBridge jumpGetPageOtherVC:model.contentId controller:[CNLiveCServiceManagerBridge viewControllerFromView:self]];
+    [CNLiveCServiceManagerBridge jumpViewControllerType:CNCServiceJumpTypeGetPage param:self.model.contents[indexPath.row] controller:[CNLiveCServiceManagerBridge viewControllerFromView:self]];
 }
 #pragma mark - UICollectionViewDataSource
 - (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section{
@@ -149,8 +147,6 @@ static NSString *CNServiceOrLookID = @&quot;CNLiveServiceOrLookCell&quot;;
 {
     if (!_listCollectionView) {
         UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init];
-        layout.sectionFootersPinToVisibleBounds = YES;
-        layout.sectionHeadersPinToVisibleBounds = YES;
         _listCollectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout];
         _listCollectionView.backgroundColor = kWhiteColor;
         _listCollectionView.collectionViewLayout = layout;
@@ -36,16 +36,25 @@ static NSString *HistoryFootID       =   @&quot;UICollectionFooterView&quot;;
     return vc;
 }
 - (void)requestService{
+    if (self.page == 1) {
+        self.dataSource = @[];
+        [self.listCollectionView reloadData];
+    }
     if (![CNLiveNetworking isNetworking]) {
         self.listCollectionView.mj_footer.hidden = YES;
+        if (self.dataSource.count>0) {
+            return;
+        }
         [self showEmptyViewWithImage:[UIImage loadCServiceBundle:@"service_noNet"] text:@"网络开小差了，刷新试试" detailText:nil buttonTitle:@"     刷新     " buttonAction:@selector(requestService)];
         self.emptyView.frame = CGRectMake(0, NavigationContentTop, SCREEN_WIDTH, SCREEN_HEIGHT-NavigationContentTop);
         [self setCNAPIErrorEmptyView];
         return;
     }
+    [QMUITips showLoadingInView:self.view];
     weakself
     [CNLiveServicePresent loadAllServiceWithServiceId:_serviceId page:[NSString stringWithFormat:@"%ld",_page] result:^(NSArray * _Nonnull dataArray, BOOL isLastPage) {
         strongself
+        [QMUITips hideAllTipsInView:self.view];
         [self.listCollectionView.mj_footer endRefreshing];
         self.listCollectionView.mj_footer.hidden = NO;
@@ -53,10 +62,19 @@ static NSString *HistoryFootID       =   @&quot;UICollectionFooterView&quot;;
             [self.listCollectionView.mj_footer endRefreshingWithNoMoreData];
         }
         [self removeEmptyView];
-        self.dataSource = dataArray;
+        NSMutableArray *array = [[NSMutableArray alloc] initWithArray:self.dataSource];
+        for (id object in dataArray) {
+            [array addObject:object];
+        }
+        
+        self.dataSource = array.copy;
         [self.listCollectionView reloadData];
     }error:^{
         strongself
+        [QMUITips hideAllTipsInView:self.view];
+        if (self.dataSource.count > 0) {
+            return;
+        }
         [self.listCollectionView.mj_footer endRefreshing];
         self.listCollectionView.mj_footer.hidden = YES;
         [self showEmptyViewWithImage:[UIImage loadCServiceBundle:@"service_failure"] text:@"加载失败，请点击重试" detailText:nil buttonTitle:@"     重试     " buttonAction:@selector(requestService)];
@@ -172,8 +190,6 @@ static NSString *HistoryFootID       =   @&quot;UICollectionFooterView&quot;;
 {
     if (!_listCollectionView) {
         UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init];
-        layout.sectionFootersPinToVisibleBounds = YES;
-        layout.sectionHeadersPinToVisibleBounds = YES;
         _listCollectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout];
         _listCollectionView.backgroundColor = kWhiteColor;
         _listCollectionView.collectionViewLayout = layout;
@@ -27,18 +27,30 @@ static NSString *HotListCellID = @&quot;HotListCellID&quot;;
     return myService;
 }
 - (void)myServiceData{
+    if (self.page == 1) {
+        self.dataSource = @[];
+        [self.listCollectionView reloadData];
+    }
     if (![CNLiveNetworking isNetworking]) {
         self.listCollectionView.mj_footer.hidden = YES;
+        if (self.dataSource.count > 0) {
+            return;
+        }
         [self showEmptyViewWithImage:[UIImage loadCServiceBundle:@"service_noNet"] text:@"网络开小差了，刷新试试" detailText:nil buttonTitle:@"     刷新     " buttonAction:@selector(myServiceData)];
         self.emptyView.frame = CGRectMake(0, NavigationContentTop, SCREEN_WIDTH, SCREEN_HEIGHT-NavigationContentTop);
         [self setCNAPIErrorEmptyView];
         return;
     }
+    [QMUITips showLoadingInView:self.view];
     weakself
-    [CNLiveServicePresent loadMyServicepage:[NSString stringWithFormat:@"%ld",_page] result:^(NSArray * _Nonnull dataArray) {
+    [CNLiveServicePresent loadMyServicepage:[NSString stringWithFormat:@"%ld",_page] result:^(NSArray * _Nonnull dataArray, BOOL isLastPage) {
         strongself
         [self.listCollectionView.mj_footer endRefreshing];
+        [QMUITips hideAllTipsInView:self.view];
         if (!dataArray||dataArray.count <= 0) {
+            if (self.dataSource.count > 0) {
+                return;
+            }
             self.listCollectionView.mj_footer.hidden = YES;
             self.navigationBar.right.hidden = YES;
             [self showEmptyViewWithImage:[UIImage loadCServiceBundle:@"service_noMsg"] text:@"暂无内容" detailText:nil buttonTitle:NULL buttonAction:NULL];
@@ -47,15 +59,21 @@ static NSString *HotListCellID = @&quot;HotListCellID&quot;;
         }else{
             self.listCollectionView.mj_footer.hidden = NO;
             [self removeEmptyView];
-            if (dataArray.count < 10) {
+            if (isLastPage) {
                 [self.listCollectionView.mj_footer endRefreshingWithNoMoreData];
-                
+            }else{
+                [self.listCollectionView.mj_footer endRefreshing];
             }
             self.navigationBar.right.hidden = NO;
-            self.dataSource = dataArray;
+            NSMutableArray *array = [[NSMutableArray alloc] initWithArray:self.dataSource];
+            for (id object in dataArray) {
+                [array addObject:object];
+            }
+            self.dataSource = array.copy;
             [self.listCollectionView reloadData];
         }
     } error:^{
+        [QMUITips hideAllTipsInView:self.view];
         [self.listCollectionView.mj_footer endRefreshing];
         self.listCollectionView.mj_footer.hidden = YES;
         strongself
@@ -120,8 +138,6 @@ static NSString *HotListCellID = @&quot;HotListCellID&quot;;
 {
     if (!_listCollectionView) {
         UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init];
-        layout.sectionFootersPinToVisibleBounds = YES;
-        layout.sectionHeadersPinToVisibleBounds = YES;
         layout.itemSize = CGSizeMake((SCREEN_WIDTH-4*15-3*15)/4.0, 80);
         layout.sectionInset = UIEdgeInsetsMake(15, 15, 15, 15);
         _listCollectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout];
@@ -16,7 +16,7 @@
 #import "CNLiveSearchHotsFooterView.h"
 #import "CNLiveSearchHeaderView.h"
-@interface CNLiveServiceSearchVC ()<UITableViewDelegate,UITableViewDataSource, UICollectionViewDelegate,UICollectionViewDataSource,UICollectionViewDelegateFlowLayout>
+@interface CNLiveServiceSearchVC ()<UITableViewDelegate,UITableViewDataSource, UICollectionViewDelegate,UICollectionViewDataSource,UICollectionViewDelegateFlowLayout,UIScrollViewDelegate>
 @property (nonatomic, strong) CNLiveMainSearch *searchView;//搜索框
 @property (nonatomic, strong) UIButton *cancelBtn; //取消按钮
@@ -45,32 +45,48 @@ static NSString *HistoryFootID = @&quot;HistoryFootID&quot;;
     return search;
 }
 - (void)searchRequese{
+    if (self.page == 1) {
+        self.dataListArr = @[];
+        [self.listTableView reloadData];
+    }
     if (![CNLiveNetworking isNetworking]) {
+        if (self.dataListArr.count > 0) {
+            return;
+        }
         self.listCollectionView.mj_footer.hidden = YES;
         [self showEmptyViewWithImage:[UIImage loadCServiceBundle:@"service_noNet"] text:@"网络开小差了，刷新试试" detailText:nil buttonTitle:@"     刷新     " buttonAction:@selector(searchRequese)];
         self.emptyView.frame = CGRectMake(0, NavigationContentTop, SCREEN_WIDTH, SCREEN_HEIGHT-NavigationContentTop);
         [self setCNAPIErrorEmptyView];
         return;
     }
+    [QMUITips showLoadingInView:self.view];
     weakself
     [CNLiveServicePresent searchServiceList:_searchStr page:[NSString stringWithFormat:@"%ld",_page] result:^(NSArray<CNLiveSearchModel *> * _Nonnull dataArray, BOOL isLastPage) {
         weakSelf.listCollectionView.hidden = YES;
+        [QMUITips hideAllTipsInView:self.view];
         strongself
         if (!dataArray||dataArray.count <= 0) {
+            if (self.dataListArr.count > 0) {
+                return;
+            }
             [self showEmptyViewWithImage:[UIImage loadCServiceBundle:@"service_noMsg"] text:@"暂无内容" detailText:nil buttonTitle:NULL buttonAction:@selector(searchRequese)];
             self.emptyView.frame = CGRectMake(0, NavigationContentTop, SCREEN_WIDTH, SCREEN_HEIGHT-NavigationContentTop);
             [self setCNAPIErrorEmptyView];
         }else{
+            [QMUITips hideAllTipsInView:self.view];
             [self removeEmptyView];
             self.listTableView.mj_footer.hidden = NO;
             if (isLastPage) {
                 [self.listTableView.mj_footer endRefreshingWithNoMoreData];
             }else{
-                self.page ++;
+                [self.listTableView.mj_footer endRefreshing];
             }
             self.listTableView.hidden = NO;
-            
-            self.dataListArr = dataArray;
+            NSMutableArray *array = [[NSMutableArray alloc] initWithArray:self.dataListArr];
+            for (id object in dataArray) {
+                [array addObject:object];
+            }
+            self.dataListArr = array.copy;
             [self.listTableView reloadData];
         }
     } error:^{
@@ -156,9 +172,13 @@ static NSString *HistoryFootID = @&quot;HistoryFootID&quot;;
     [self.navigationController popViewControllerAnimated:YES];
 }
 #pragma mark - UIScrollViewDelegate
-- (void)scrollViewDidScroll:(UIScrollView *)scrollView{
+- (void)scrollViewWillBeginDragging:(UIScrollView *)scrollView{
     [self.view endEditing:YES];
 }
+- (BOOL)shouldHideKeyboardWhenTouchInView:(UIView *)view
+{
+    return YES;
+}
 #pragma mark - UITableViewDelegate
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath{
     return 75;
@@ -305,7 +325,12 @@ static NSString *HistoryFootID = @&quot;HistoryFootID&quot;;
         _listTableView.dataSource = self;
         _listTableView.delegate = self;
         [_listTableView registerClass:[CNLiveSearchListCell class] forCellReuseIdentifier:SearchListCellID];
-        _listTableView.mj_footer = [MJRefreshBackNormalFooter footerWithRefreshingTarget:self refreshingAction:@selector(searchRequese)];
+        weakself
+        _listTableView.mj_footer = [MJRefreshBackNormalFooter footerWithRefreshingBlock:^{
+            strongself
+            self.page ++;
+            [self searchRequese];
+        }];
         _listTableView.hidden = YES;
     }
     return _listTableView;
@@ -246,8 +246,6 @@ static NSString *CNGoodsOrVideoheaderID =   @&quot;CNLiveGoodsOrVideoHeaderView&quot;;
 {
     if (!_listCollectionView) {
         UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init];
-        layout.sectionFootersPinToVisibleBounds = YES;
-        layout.sectionHeadersPinToVisibleBounds = YES;
         _listCollectionView = [[UICollectionView alloc] initWithFrame:CGRectZero collectionViewLayout:layout];
         _listCollectionView.backgroundColor = kWhiteColor;
         _listCollectionView.collectionViewLayout = layout;