Browse Source

1.开启和关闭云手机模式 加入toast
2.去掉任务检测上传和下载nas任务

huangxiaodong 7 months ago
parent
commit
83b68a542f

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

@@ -6159,7 +6159,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 20;
+				CURRENT_PROJECT_VERSION = 16;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -6241,7 +6241,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 20;
+				CURRENT_PROJECT_VERSION = 16;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (

+ 5 - 4
创维盒子/双子星云手机/NAS/nasUploadManager/nasUploadFileManager.m

@@ -697,12 +697,13 @@
         //1.修改状态从失败改为上传中
         for (uploadFileDataModel * model in _netWorkFailSaveArr) {
             model.curUploadStateType = uploadStateUploading;
+            model.bg_tableName = nasUpLoadFile_tableName;
         }
         
-        //2、保存到数控库
-        [uploadFileDataModel bg_saveOrUpdateArrayAsync:_netWorkFailSaveArr complete:^(BOOL isSuccess) {
-            
-        }];
+//        //2、保存到数控库
+//        [uploadFileDataModel bg_saveOrUpdateArrayAsync:_netWorkFailSaveArr complete:^(BOOL isSuccess) {
+//            
+//        }];
         
         //重新开始上传
         [[nasMixUploadManager shareManager] addUploadWithModels:_netWorkFailSaveArr];

+ 7 - 4
创维盒子/双子星云手机/cloudPhone/cloudPhoneViewController.m

@@ -513,9 +513,12 @@
 #pragma mark 输入密码完成
 - (void)didInpuPwdOkFun
 {
-    if(ksharedAppDelegate.isCloudPhoneModeAndPrivacyModeOpenType){
-        [self queryWebRtcMsgFun:YES];
-        ksharedAppDelegate.isCloudPhoneModeAndPrivacyModeOpenType = NO;
-    }
+    KWeakSelf
+    mainBlock(^{
+        if(ksharedAppDelegate.isCloudPhoneModeAndPrivacyModeOpenType){
+            [weakSelf queryWebRtcMsgFun:YES];
+            ksharedAppDelegate.isCloudPhoneModeAndPrivacyModeOpenType = NO;
+        }
+    });
 }
 @end

+ 2 - 0
创维盒子/双子星云手机/en.lproj/Localizable.strings

@@ -639,3 +639,5 @@
 "mine_cloudPhone_Model_title"   = "Cloud Phone Mode";
 "cloudPhone_Model_tip"   = "If enabled, the app will open directly to the cloud phone page; if disabled, it will go to the NAS page.";
 "go_setting_title" = "Go to Settings";
+"cloudPhone_Model_open_tip"   = "Cloud phone mode has been enabled, next time you launch the app, you will directly enter the cloud phone";
+"cloudPhone_Model_close_tip"   = "Cloud phone mode has been turned off. Next time you launch the app, you will directly enter the NAS";

+ 8 - 0
创维盒子/双子星云手机/mine/cloudPhoneModelViewController.m

@@ -154,6 +154,14 @@
 - (void)maskSwitchPressed:(UISwitch *)maskSwitch{
     
     [HWDataManager setBoolWithKey:Const_cloudPhone_Model_Open value:maskSwitch.on];
+    
+    if (maskSwitch.on) {
+        [[iToast makeText:NSLocalizedString(@"cloudPhone_Model_open_tip",nil)] show];
+    }
+    else{
+        [[iToast makeText:NSLocalizedString(@"cloudPhone_Model_close_tip",nil)] show];
+    }
+    
 }
 
 @end

+ 2 - 6
创维盒子/双子星云手机/webRtc/webRtcManager/webRtcManager.m

@@ -617,13 +617,9 @@
     //处理相册备份
     [[nasBackupsManager shareInstance] checkReBackupsFileFun];
     
-    //[[uploadFileManager shareInstance] checkReUploadFileFun];
-    //[[downloadManager shareInstance] checkReDownloadFileFun];
-        
     //处理上传失败的重新上传
-    [[nasUploadFileManager shareInstance] reUploadFileFunByNetWork];
-    
-    [[nasDownloadFileManager shareInstance] reDownloadloadFileFunByNetWork];
+    //[[nasUploadFileManager shareInstance] reUploadFileFunByNetWork];
+    //[[nasDownloadFileManager shareInstance] reDownloadloadFileFunByNetWork];
     
     if([AudioSessionObject shareManager].isBackgroundType){
         [self checkFileTransfeTaskFun];

+ 2 - 0
创维盒子/双子星云手机/zh-Hans.lproj/Localizable.strings

@@ -635,3 +635,5 @@
 "mine_cloudPhone_Model_title"   = "云手机模式";
 "cloudPhone_Model_tip"   = "开启后打开APP默认直接进入云手机页面,关闭则进入NAS页面";
 "go_setting_title" = "去设置>";
+"cloudPhone_Model_open_tip"   = "云手机模式已开启,下次启动APP直接进入云手机";
+"cloudPhone_Model_close_tip"   = "云手机模式已关闭,下次启动APP直接进入NAS";

+ 2 - 0
创维盒子/双子星云手机/zh-Hant.lproj/Localizable.strings

@@ -640,3 +640,5 @@
 "mine_cloudPhone_Model_title"   = "雲手機模式";
 "cloudPhone_Model_tip"   = "開啟後打開APP默認直接進入雲手機頁面,關閉則進入NAS頁面";
 "go_setting_title" = "去設定>";
+"cloudPhone_Model_open_tip"   = "雲手機模式已開啟,下次啟動APP直接進入雲手機";
+"cloudPhone_Model_close_tip"   = "雲手機模式已關閉,下次啟動APP直接進入NAS";