1.暂时屏蔽分页功能

创维盒子/双子星云手机/Class/Set/previewFile/previewAudioOrDocumentViewController.m

@@ -275,13 +275,13 @@
         _tableView.emptyDataSetDelegate = self;
         
         // 下拉追加
-        MJRefreshAutoNormalFooter *footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
-            [self getMoreNetWorkData];
-        }];
-        
-        NSString *text =  NSLocalizedString(@"NAS_bottom_tip",nil);
-        [footer setTitle:text forState:MJRefreshStateNoMoreData];
-        _tableView.mj_footer = footer;
+ //       MJRefreshAutoNormalFooter *footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
+//            [self getMoreNetWorkData];
+//        }];
+//        
+//        NSString *text =  NSLocalizedString(@"NAS_bottom_tip",nil);
+//        [footer setTitle:text forState:MJRefreshStateNoMoreData];
+//        _tableView.mj_footer = footer;
 
     }
     
@@ -873,15 +873,15 @@
         [paraDict setValue:@"file" forKey:@"type"];
     }
     
-    if(!isMoreDataType){
-        self.pageIndex = 0;
-    }
-    else{
-        self.pageIndex ++;
-    }
-    
-    [paraDict setValue:[NSNumber numberWithInteger:self.pageIndex] forKey:@"index"];
-    [paraDict setValue:[NSNumber numberWithInteger:pageSizeNum] forKey:@"pageSize"];
+//    if(!isMoreDataType){
+//        self.pageIndex = 0;
+//    }
+//    else{
+//        self.pageIndex ++;
+//    }
+//    
+//    [paraDict setValue:[NSNumber numberWithInteger:self.pageIndex] forKey:@"index"];
+//    [paraDict setValue:[NSNumber numberWithInteger:pageSizeNum] forKey:@"pageSize"];
 
     NSArray *diskNameArr = [_defaultDiskPath componentsSeparatedByString:@"/"];
     if(diskNameArr && diskNameArr.count >= 2){
@@ -900,13 +900,13 @@
     KWeakSelf
     [[netWorkManager shareInstance] cloudPhoneGETCallBackCode:@"getFileList" Parameters:paraDict success:^(id  _Nonnull responseObject) {
         [weakSelf removeNewIndicatorHaveStr];
-        [weakSelf.tableView.mj_footer endRefreshing];
+        //[weakSelf.tableView.mj_footer endRefreshing];
 
         NASFileAudioModel*NASFileAudioMod = [[NASFileAudioModel alloc] initWithDictionary:responseObject error:nil];
         
-        if(NASFileAudioMod.data.list.count < pageSizeNum){
-            [weakSelf.tableView.mj_footer endRefreshingWithNoMoreData];
-        }
+//        if(NASFileAudioMod.data.list.count < pageSizeNum){
+//            [weakSelf.tableView.mj_footer endRefreshingWithNoMoreData];
+//        }
         
         [weakSelf handelNetDataAfterFilterDataBy:NASFileAudioMod];
 
@@ -916,7 +916,7 @@
         
     } failure:^(NSError * _Nonnull error) {
         [weakSelf removeNewIndicatorHaveStr];
-        [weakSelf.tableView.mj_footer endRefreshing];
+        //[weakSelf.tableView.mj_footer endRefreshing];
 
         if([AFNetworkReachabilityManager sharedManager].networkReachabilityStatus == AFNetworkReachabilityStatusNotReachable)
         {
@@ -948,12 +948,12 @@
         _curNASFileAudioMod = NASFileAudioMod;
     }
     
-    if(_curNASFileAudioMod.data.list.count == 0 ){
-        self.tableView.mj_footer.hidden = YES;
-    }
-    else{
-        self.tableView.mj_footer.hidden = NO;
-    }
+//    if(_curNASFileAudioMod.data.list.count == 0 ){
+//        self.tableView.mj_footer.hidden = YES;
+//    }
+//    else{
+//        self.tableView.mj_footer.hidden = NO;
+//    }
 }
 
 

创维盒子/双子星云手机/Class/Set/previewFile/previewFileAndFolderViewController.m

@@ -278,13 +278,13 @@
         
         
         // 下拉追加
-        MJRefreshAutoNormalFooter *footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
-            [self getMoreNetWorkData];
-        }];
-        
-        NSString *text =  NSLocalizedString(@"NAS_bottom_tip",nil);
-        [footer setTitle:text forState:MJRefreshStateNoMoreData];
-        _tableView.mj_footer = footer;
+//        MJRefreshAutoNormalFooter *footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
+//            [self getMoreNetWorkData];
+//        }];
+//        
+//        NSString *text =  NSLocalizedString(@"NAS_bottom_tip",nil);
+//        [footer setTitle:text forState:MJRefreshStateNoMoreData];
+//        _tableView.mj_footer = footer;
 
     }
     
@@ -926,13 +926,13 @@
         [paraDict setValue:_defaultDiskPath forKey:@"path"];
     }
     
-    if(!isMoreDataType){
-        self.pageIndex = 0;
-    }
-    else{
-        self.pageIndex ++;
-    }
-    
+//    if(!isMoreDataType){
+//        self.pageIndex = 0;
+//    }
+//    else{
+//        self.pageIndex ++;
+//    }
+//    
 //    [paraDict setValue:[NSNumber numberWithInteger:self.pageIndex] forKey:@"index"];
 //    [paraDict setValue:[NSNumber numberWithInteger:pageSizeNum] forKey:@"pageSize"];
 
@@ -942,12 +942,12 @@
     KWeakSelf
     [[netWorkManager shareInstance] cloudPhoneGETCallBackCode:@"getFileListByFolder" Parameters:paraDict success:^(id  _Nonnull responseObject) {
         [weakSelf removeNewIndicatorHaveStr];
-        [weakSelf.tableView.mj_footer endRefreshing];
+        //[weakSelf.tableView.mj_footer endRefreshing];
         NASFileAndFolderModel*NASFileAudioMod = [[NASFileAndFolderModel alloc] initWithDictionary:responseObject error:nil];
         
-        if(NASFileAudioMod.data.list.count < pageSizeNum){
-            [weakSelf.tableView.mj_footer endRefreshingWithNoMoreData];
-        }
+//        if(NASFileAudioMod.data.list.count < pageSizeNum){
+//            [weakSelf.tableView.mj_footer endRefreshingWithNoMoreData];
+//        }
         
         [weakSelf handelNetDataAfterFilterDataBy:NASFileAudioMod];
 
@@ -957,7 +957,7 @@
         
     } failure:^(NSError * _Nonnull error) {
         [weakSelf removeNewIndicatorHaveStr];
-        [weakSelf.tableView.mj_footer endRefreshing];
+        //[weakSelf.tableView.mj_footer endRefreshing];
 
         if([AFNetworkReachabilityManager sharedManager].networkReachabilityStatus == AFNetworkReachabilityStatusNotReachable)
         {
@@ -989,12 +989,12 @@
         _curNASFileAudioMod = NASFileAudioMod;
     }
     
-    if(_curNASFileAudioMod.data.list.count == 0 ){
-        self.tableView.mj_footer.hidden = YES;
-    }
-    else{
-        self.tableView.mj_footer.hidden = NO;
-    }
+//    if(_curNASFileAudioMod.data.list.count == 0 ){
+//        self.tableView.mj_footer.hidden = YES;
+//    }
+//    else{
+//        self.tableView.mj_footer.hidden = NO;
+//    }
 }
 
 

创维盒子/双子星云手机/Class/Set/previewFile/previewImageOrVideoViewController.m

@@ -295,14 +295,13 @@
         _dataCollectionView.emptyDataSetDelegate = self;
         
         // 下拉追加
-        MJRefreshAutoNormalFooter *footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
-            [self getMoreNetWorkData];
-        }];
-        
-        NSString *text =  NSLocalizedString(@"NAS_bottom_tip",nil);
-        [footer setTitle:text forState:MJRefreshStateNoMoreData];
-        _dataCollectionView.mj_footer = footer;
-        //_dataCollectionView.mj_footer.hidden = YES;
+//        MJRefreshAutoNormalFooter *footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
+//            [self getMoreNetWorkData];
+//        }];
+//        
+//        NSString *text =  NSLocalizedString(@"NAS_bottom_tip",nil);
+//        [footer setTitle:text forState:MJRefreshStateNoMoreData];
+//        _dataCollectionView.mj_footer = footer;
     }
     
     return _dataCollectionView;
@@ -949,15 +948,15 @@
         [paraDict setValue:@"video" forKey:@"type"];
     }
     
-    if(!isMoreDataType){
-        self.pageIndex = 0;
-    }
-    else{
-        self.pageIndex ++;
-    }
-    
-    [paraDict setValue:[NSNumber numberWithInteger:self.pageIndex] forKey:@"index"];
-    [paraDict setValue:[NSNumber numberWithInteger:pageSizeNum] forKey:@"pageSize"];
+//    if(!isMoreDataType){
+//        self.pageIndex = 0;
+//    }
+//    else{
+//        self.pageIndex ++;
+//    }
+//    
+//    [paraDict setValue:[NSNumber numberWithInteger:self.pageIndex] forKey:@"index"];
+//    [paraDict setValue:[NSNumber numberWithInteger:pageSizeNum] forKey:@"pageSize"];
     
     NSArray *diskNameArr = [_defaultDiskPath componentsSeparatedByString:@"/"];
     if(diskNameArr && diskNameArr.count >= 2){
@@ -977,19 +976,19 @@
     KWeakSelf
     [[netWorkManager shareInstance] cloudPhoneGETCallBackCode:@"getFileListByDay" Parameters:paraDict success:^(id  _Nonnull responseObject) {
         
-        [weakSelf.dataCollectionView.mj_footer endRefreshing];
+        //[weakSelf.dataCollectionView.mj_footer endRefreshing];
         [weakSelf removeNewIndicatorHaveStr];
         NASFilePicModel*NASFilePicMod = [[NASFilePicModel alloc] initWithDictionary:responseObject error:nil];
         
-        if(NASFilePicMod.data.fileList.count < pageSizeNum){
-            [weakSelf.dataCollectionView.mj_footer endRefreshingWithNoMoreData];
-        }
+//        if(NASFilePicMod.data.fileList.count < pageSizeNum){
+//            [weakSelf.dataCollectionView.mj_footer endRefreshingWithNoMoreData];
+//        }
         
         [weakSelf filterDataFun:NASFilePicMod];
         [weakSelf.dataCollectionView    reloadData];
     } failure:^(NSError * _Nonnull error) {
         [weakSelf removeNewIndicatorHaveStr];
-        [weakSelf.dataCollectionView.mj_footer endRefreshing];
+        //[weakSelf.dataCollectionView.mj_footer endRefreshing];
         if([AFNetworkReachabilityManager sharedManager].networkReachabilityStatus == AFNetworkReachabilityStatusNotReachable)
         {
             [[iToast makeText:NSLocalizedString(@"phone_network_fail_Tips",nil)] show];
@@ -1076,12 +1075,12 @@
     
     _curNASFilePicModel.data.fileList = (NSArray<NASFilePicTimeArrModel> *)handelDataArr;
     
-    if(handelDataArr.count == 0 ){
-        _dataCollectionView.mj_footer.hidden = YES;
-    }
-    else{
-        _dataCollectionView.mj_footer.hidden = NO;
-    }
+//    if(handelDataArr.count == 0 ){
+//        _dataCollectionView.mj_footer.hidden = YES;
+//    }
+//    else{
+//        _dataCollectionView.mj_footer.hidden = NO;
+//    }
 }
 
 

创维盒子/双子星云手机/NAS/NasPreviewVideoViewController.m

@@ -275,13 +275,13 @@
         _tableView.emptyDataSetDelegate = self;
         
         // 下拉追加
-        MJRefreshAutoNormalFooter *footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
-            [self getMoreNetWorkData];
-        }];
-        
-        NSString *text =  NSLocalizedString(@"NAS_bottom_tip",nil);
-        [footer setTitle:text forState:MJRefreshStateNoMoreData];
-        _tableView.mj_footer = footer;
+//        MJRefreshAutoNormalFooter *footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
+//            [self getMoreNetWorkData];
+//        }];
+//        
+//        NSString *text =  NSLocalizedString(@"NAS_bottom_tip",nil);
+//        [footer setTitle:text forState:MJRefreshStateNoMoreData];
+//        _tableView.mj_footer = footer;
     }
     
     return _tableView;
@@ -861,27 +861,27 @@
         [paraDict setValue:name forKey:@"path"];
     }
     
-    if(!isMoreDataType){
-        self.pageIndex = 0;
-    }
-    else{
-        self.pageIndex ++;
-    }
-    
-    [paraDict setValue:[NSNumber numberWithInteger:self.pageIndex] forKey:@"index"];
-    [paraDict setValue:[NSNumber numberWithInteger:pageSizeNum] forKey:@"pageSize"];
+//    if(!isMoreDataType){
+//        self.pageIndex = 0;
+//    }
+//    else{
+//        self.pageIndex ++;
+//    }
+//    
+//    [paraDict setValue:[NSNumber numberWithInteger:self.pageIndex] forKey:@"index"];
+//    [paraDict setValue:[NSNumber numberWithInteger:pageSizeNum] forKey:@"pageSize"];
     
     [self showNewIndicatorHaveStrWithCanBack:YES canTouch:NO showText:NSLocalizedString(@"common_loading_tip",nil)];
     
     KWeakSelf
     [[netWorkManager shareInstance] cloudPhoneGETCallBackCode:@"getFileList" Parameters:paraDict success:^(id  _Nonnull responseObject) {
-        [weakSelf.tableView.mj_footer endRefreshing];
+        //[weakSelf.tableView.mj_footer endRefreshing];
         [weakSelf removeNewIndicatorHaveStr];
         NASFileAudioModel*NASFileAudioMod = [[NASFileAudioModel alloc] initWithDictionary:responseObject error:nil];
         
-        if(NASFileAudioMod.data.list.count < pageSizeNum){
-            [weakSelf.tableView.mj_footer endRefreshingWithNoMoreData];
-        }
+//        if(NASFileAudioMod.data.list.count < pageSizeNum){
+//            [weakSelf.tableView.mj_footer endRefreshingWithNoMoreData];
+//        }
         
         [weakSelf handelNetDataAfterFilterDataBy:NASFileAudioMod];
         if(weakSelf.curNASFileAudioMod && weakSelf.curNASFileAudioMod.status == 0){
@@ -889,7 +889,7 @@
         }
         
     } failure:^(NSError * _Nonnull error) {
-        [weakSelf.tableView.mj_footer endRefreshing];
+        //[weakSelf.tableView.mj_footer endRefreshing];
         [weakSelf removeNewIndicatorHaveStr];
         if([AFNetworkReachabilityManager sharedManager].networkReachabilityStatus == AFNetworkReachabilityStatusNotReachable)
         {