Selaa lähdekoodia

1.上传和备份完成发送完成标志给代理

huangxiaodong 1 vuosi sitten
vanhempi
commit
f5ff876c28

+ 2 - 0
创维盒子/双子星云手机/CloudPlayer/PlayerViewController+backupsFile.m

@@ -371,6 +371,8 @@
     }
     else{
         HLog(@"备份完成");
+        NSString *commandStr = [RCCommandHelp uploadOrBackupsDoneBy:self.backupsTaskUid withFileName:self.backupsFileName withType:NO];
+        [self.commandChannelManager rc_sendData:commandStr];
         
         [[backupsFileManager shareInstance] backupsFileDoneFun];
     }

+ 6 - 0
创维盒子/双子星云手机/CloudPlayer/PlayerViewController+upLoadFile.m

@@ -375,6 +375,12 @@
     else{
         HLog(@"上传完成");
         
+        //告诉代理 完成了
+        NSString *commandStr = [RCCommandHelp uploadOrBackupsDoneBy:self.taskUid withFileName:self.fileName withType:YES];
+       
+        
+        [self.commandChannelManager rc_sendData:commandStr];
+        
         [self clearUploadFileDataFun];
         [[uploadFileManager shareInstance] uploadFileDoneFun];
     }

+ 10 - 0
创维盒子/双子星云手机/CloudPlayer/RCCommandHelp.h

@@ -239,6 +239,16 @@ NS_ASSUME_NONNULL_BEGIN
  */
 + (NSString *)getExtraFilesList;
 
+/**
+ * @brief 上传和备份文件完成
+ *
+ * @param taskUid
+ *
+ * @param fileName
+ * @param isUploadType
+ */
++ (NSString *)uploadOrBackupsDoneBy:(NSString *)taskUid withFileName:(NSString *)fileName
+                           withType:(BOOL)isUploadType;
 @end
 
 NS_ASSUME_NONNULL_END

+ 47 - 0
创维盒子/双子星云手机/CloudPlayer/RCCommandHelp.m

@@ -1110,4 +1110,51 @@
     return dataStr;
 }
 
++ (NSString *)uploadOrBackupsDoneBy:(NSString *)taskUid withFileName:(NSString *)fileName
+withType:(BOOL)isUploadType
+{
+    NSString *savePath = nil;
+    if(isUploadType){
+        NSString * uploadDefaultPath = [HWDataManager getStringWithKey:stringKeyAddSn(Const_photo_upload_default_path)];
+        if(!uploadDefaultPath || uploadDefaultPath.length == 0){
+            [HWDataManager setStringWithKey:stringKeyAddSn(Const_photo_upload_default_path) value:Const_default_upload_path];
+            uploadDefaultPath = Const_default_upload_path;
+        }
+        
+        //判断最后一个是否是/
+        NSString *lastStr= [uploadDefaultPath substringFromIndex:uploadDefaultPath.length-1];
+        if(![lastStr isEqualToString:@"/"]){
+            uploadDefaultPath = [[NSString alloc] initWithFormat:@"%@/",uploadDefaultPath];
+        }
+        
+        savePath = [[NSString alloc] initWithFormat:@"%@%@",uploadDefaultPath,fileName];
+    }
+    else{
+        NSString * backupsDefaultPath = [HWDataManager getStringWithKey:stringKeyAddSn(Const_photo_backups_default_path)];
+        
+        if(!backupsDefaultPath || backupsDefaultPath.length == 0){
+            backupsDefaultPath = Const_default_backups_path;
+            [HWDataManager setStringWithKey:stringKeyAddSn(Const_photo_backups_default_path) value:backupsDefaultPath];
+        }
+        
+        NSString *lastStr= [backupsDefaultPath substringFromIndex:backupsDefaultPath.length-1];
+        if(![lastStr isEqualToString:@"/"]){
+            backupsDefaultPath = [[NSString alloc] initWithFormat:@"%@/",backupsDefaultPath];
+        }
+        savePath = [[NSString alloc] initWithFormat:@"%@%@",backupsDefaultPath,fileName];
+    }
+    
+    NSString *dataStr =[NSString stringWithFormat:@"{\"data\":{\"taskUid\":\"%@\",\"filePath\":\"%@\"},\"type\":\"fileFinish\"}",taskUid,savePath];
+    
+    if (USENEWCONTROLLCOMMONDNO500)
+    {
+//        dataStr = [self commondAppendingHeadAndEndStrWithSourStr:dataStr];
+    }
+    else
+    {
+        dataStr = [self commandAppending00StringWithSourStr:dataStr];
+    }
+    
+    return dataStr;
+}
 @end