소스 검색

1.添加传输列表页 底部删除闪退保护
2、磁盘为0时不给上传

huangxiaodong 1 년 전
부모
커밋
5450691bb5

+ 2 - 2
创维盒子/双子星云手机.xcodeproj/project.pbxproj

@@ -2790,7 +2790,7 @@
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 9;
+				CURRENT_PROJECT_VERSION = 11;
 				DEVELOPMENT_TEAM = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -2869,7 +2869,7 @@
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 9;
+				CURRENT_PROJECT_VERSION = 11;
 				DEVELOPMENT_TEAM = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",

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

@@ -85,8 +85,8 @@ isBangsScreen; \
 //#define CloudService           @"http://14.18.190.141:11180"
 //#define CloudService           @"http://14.18.190.141:1280"
 //创维盒子 测试地址
-#define CloudService   @"http://14.18.190.141:1801"
-//#define CloudService   @"http://hiboxde.armclouding.com:7780"
+//#define CloudService   @"http://14.18.190.141:1801"
+#define CloudService   @"http://hiboxde.armclouding.com:7780"
 
 
 #define AESCODEKEEYY @"fvO8gAfNSr1tbdQe"

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

@@ -138,7 +138,7 @@
         
     }
     
-    if(allImageData > self.available && self.available > 1024){
+    if(self.available <= 0 || allImageData > self.available){
         isCanUpload = NO;
     }
     

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

@@ -295,6 +295,8 @@ static downloadManager * cur_downloadManager = nil;
 
 - (void)handleDatabaseArrDeleteObjectInDownloading:(couldPhoneFileModel*)model
 {
+    NSLock *lock = [NSLock new];
+    [lock lock];
     if(_databaseArr && _databaseArr.count == 3 ){
         
         NSMutableArray *ingArr = _databaseArr[0];
@@ -320,22 +322,29 @@ static downloadManager * cur_downloadManager = nil;
         }
         
     }
+    [lock unlock];
 }
 
 - (void)handleDatabaseArrAddObjectInDone:(couldPhoneFileModel*)model
 {
+    NSLock *lock = [NSLock new];
+    [lock lock];
     if(_databaseArr && _databaseArr.count == 3 ){
         NSMutableArray *doneArr = _databaseArr[1];
         [doneArr insertObject:model atIndex:0];
     }
+    [lock unlock];
 }
 
 - (void)handleDatabaseArrAddObjectInFail:(couldPhoneFileModel*)model
 {
+    NSLock *lock = [NSLock new];
+    [lock lock];
     if(_databaseArr && _databaseArr.count == 3 ){
         NSMutableArray *failArr = _databaseArr[2];
         [failArr insertObject:model atIndex:0];
     }
+    [lock unlock];
 }
 
 - (void)suspendDownloadFileFun:(BOOL)isSuspendAll

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

@@ -509,7 +509,10 @@ static uploadFileManager * cur_uploadFileShareInstance = nil;
 
 - (void)handleDatabaseArrDeteleInUploading:(uploadFileDataModel*)uploadmodel
 {
+    NSLock *lock = [NSLock new];
+    [lock lock];
     if(!uploadmodel){
+        [lock unlock];
         return;
     }
     
@@ -535,30 +538,41 @@ static uploadFileManager * cur_uploadFileShareInstance = nil;
             //HLog(@"\n\n\nerror:上传中的任务没有删除掉database\n\n\n\n");
         }
     }
+    
+    [lock unlock];
 }
 
 - (void)handleDatabaseArrByInDone:(uploadFileDataModel*)uploadmodel
 {
+    NSLock *lock = [NSLock new];
+    [lock lock];
     if(_databaseArr && _databaseArr.count == 3 ){
         NSMutableArray *uploadDoneArr = _databaseArr[1];
         [uploadDoneArr insertObject:uploadmodel atIndex:0];
     }
+    [lock unlock];
 }
 
 - (void)handleDatabaseArrByInFail:(uploadFileDataModel*)uploadmodel
 {
+    NSLock *lock = [NSLock new];
+    [lock lock];
     if(_databaseArr && _databaseArr.count == 3 ){
         NSMutableArray *uploadFailArr = _databaseArr[2];
         [uploadFailArr insertObject:uploadmodel atIndex:0];
     }
+    [lock unlock];
 }
 
 - (void)handleDatabaseArrAddModelInUploading:(uploadFileDataModel*)uploadmodel
 {
+    NSLock *lock = [NSLock new];
+    [lock lock];
     if(_databaseArr && _databaseArr.count == 3 ){
         NSMutableArray *uploadlingArr = _databaseArr[0];
         [uploadlingArr insertObject:uploadmodel atIndex:0];
     }
+    [lock unlock];
 }
 
 //暂停上传完成

+ 1 - 1
创维盒子/双子星云手机/CloudPlayer/PlayerViewController+AppDelegate.m

@@ -144,7 +144,7 @@
         /*发送数据*/
         NSString *dataStr = [RCCommandHelp commandCuttingWithContent:str];
         [self.commandChannelManager rc_sendData:dataStr];
-        pasteboard.string = @"";
+        //pasteboard.string = @"";
     }
     
 }