Explorar el Código

1.默认文件夹重复问题

huangxiaodong hace 1 año
padre
commit
f2d67254cd

+ 17 - 17
创维盒子/双子星云手机/Class/Set/uploadFile/fileTransfeSet/fileTransferPathCheckViewController.m

@@ -283,23 +283,23 @@
         
         [_folderListArr addObjectsFromArray:model.data];
         
-        NSString * backupsDefaultPath = [HWDataManager getStringWithKey:Const_photo_backups_default_path];
-        
-        BOOL needAddHadDefaultPath = YES;
-        
-        for (int i=0; i<_folderListArr.count; i++) {
-            NSString * curPathStr = _folderListArr[i];
-            if([curPathStr isEqualToString:backupsDefaultPath]){
-                needAddHadDefaultPath = NO;
-                _selectIndex = i;
-                break;
-            }
-        }
-        
-        if(needAddHadDefaultPath){
-            [_folderListArr insertObject:backupsDefaultPath atIndex:0];
-            _selectIndex = 0;
-        }
+//        NSString * backupsDefaultPath = [HWDataManager getStringWithKey:Const_photo_backups_default_path];
+//        
+//        BOOL needAddHadDefaultPath = YES;
+//        
+//        for (int i=0; i<_folderListArr.count; i++) {
+//            NSString * curPathStr = _folderListArr[i];
+//            if([curPathStr isEqualToString:backupsDefaultPath]){
+//                needAddHadDefaultPath = NO;
+//                _selectIndex = i;
+//                break;
+//            }
+//        }
+//        
+//        if(needAddHadDefaultPath){
+//            [_folderListArr insertObject:backupsDefaultPath atIndex:0];
+//            _selectIndex = 0;
+//        }
         
     }
     

+ 2 - 1
创维盒子/双子星云手机/Class/Set/uploadFile/uploadFileManager/downloadManager.m

@@ -168,6 +168,7 @@ static downloadManager * cur_downloadManager = nil;
 {
     if(_downLoadFileModelDataArr.count == 0)
     {
+        _curDownloadFileModel = nil;
         return;
     }
     
@@ -384,7 +385,7 @@ static downloadManager * cur_downloadManager = nil;
         return;
     }
     
-    if(_curDownloadFileModel.curDownloadStateType != downloadStateUploading){
+    if(_isSuspendType){
         return;
     }
     

+ 1 - 1
创维盒子/双子星云手机/Class/Set/uploadFile/uploadFileManager/uploadFileManager.m

@@ -762,7 +762,7 @@ static uploadFileManager * cur_uploadFileShareInstance = nil;
         return;
     }
     
-    if(_curUploadFileDataModel.curUploadStateType != uploadStateUploading){
+    if(_isSuspendType){
         return;
     }