Sfoglia il codice sorgente

1.还原上传列表上面全部开启 逻辑

huangxiaodong 7 mesi fa
parent
commit
5921f0660b

+ 4 - 4
创维盒子/双子星云手机/AppDelegate/PrefixHeader.pch

@@ -108,12 +108,12 @@ isBangsScreen; \
 //弃用 #define shareService   @"http://testprivacy.phone.armclouding.com:1801/h5/#/pages/fileSharing/index?productType=Private-X&token="
 
 //创维盒子 测试地址 正在使用
-#define CloudService   @"http://testprivacy.phone.androidscloud.com:1801"
-#define shareService   @"http://testprivacy.phone.androidscloud.com:1801/h5/#/pages/fileSharing/index?productType=Private-X&token="
+//#define CloudService   @"http://testprivacy.phone.androidscloud.com:1801"
+//#define shareService   @"http://testprivacy.phone.androidscloud.com:1801/h5/#/pages/fileSharing/index?productType=Private-X&token="
 
 //预生产环境
-//#define CloudService   @"http://testprivacy.phone.androidscloud.com:10900"
-//#define shareService   @"http://testprivacy.phone.androidscloud.com:10900/h5/#/pages/fileSharing/index?productType=Private-X&token="
+#define CloudService   @"http://testprivacy.phone.androidscloud.com:10900"
+#define shareService   @"http://testprivacy.phone.androidscloud.com:10900/h5/#/pages/fileSharing/index?productType=Private-X&token="
 
 //生产环境 弃用
 //弃用 #define CloudService   @"http://hiboxde.armclouding.com:7780"

+ 15 - 18
创维盒子/双子星云手机/Class/Set/uploadFile/uploadFileView/uploadFileRecordTableView.m

@@ -362,27 +362,24 @@
             if(_isfirstRefreshType){
                 BOOL isAllUploadingType = NO;
                 
-                if([nasMixUploadManager shareManager].isUploadIngType){
-                    isAllUploadingType = YES;
-                }
-                
-//                NSArray *copyArr = @[];
-//                if(_uploadingArr){
-//                    copyArr = [NSArray arrayWithArray:_uploadingArr];
-//                }
-//                
-//                HLog(@"上传刷新头部按钮 开始遍历")
-//                for (uploadFileDataModel*model in copyArr) {
-//                    if(model.curUploadStateType != uploadStateUploading){
-//                        isAllUploadingType = YES;
-//                        break;
-//                    }
+//                if([nasMixUploadManager shareManager].isUploadIngType){
+//                    isAllUploadingType = YES;
 //                }
-                HLog(@"上传刷新头部按钮 结束遍历")
                 
-                _uploadingHeadView.rightButton.selected = isAllUploadingType;
+                HLog(@"上传刷新头部按钮 开始遍历")
+                @synchronized (self) {
+                    for (uploadFileDataModel*model in _uploadingArr) {
+                        if(model.curUploadStateType != uploadStateUploading){
+                            isAllUploadingType = YES;
+                            break;
+                        }
+                    }
+                    _uploadingHeadView.rightButton.selected = isAllUploadingType;
+                    
+                    _isfirstRefreshType = NO;
+                }
                 
-                _isfirstRefreshType = NO;
+                HLog(@"上传刷新头部按钮 结束遍历")
             }
         }
     }