Просмотр исходного кода

1.文件传输禁用根据镜像更新提示分两种:未更新和已更新

huangxiaodong 1 год назад
Родитель
Сommit
77cfee477b

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

@@ -3508,7 +3508,7 @@
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 17;
+				CURRENT_PROJECT_VERSION = 34;
 				DEVELOPMENT_TEAM = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -3592,7 +3592,7 @@
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 17;
+				CURRENT_PROJECT_VERSION = 34;
 				DEVELOPMENT_TEAM = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -3790,7 +3790,7 @@
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 25;
+				CURRENT_PROJECT_VERSION = 35;
 				DEVELOPMENT_TEAM = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -3867,7 +3867,7 @@
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 25;
+				CURRENT_PROJECT_VERSION = 35;
 				DEVELOPMENT_TEAM = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",

+ 1 - 0
创维盒子/双子星云手机/AppDelegate/AppDelegate.h

@@ -19,6 +19,7 @@
 //@property (nonatomic, strong)couldPhoneBaseInfoModel *couldPhoneBaseInfoMod;
 @property (nonatomic, assign)BOOL getSystemPermissType;//主动获取权限进入后台
 @property (nonatomic, assign)BOOL DisabledFileTransferType;//禁用文件传输
+@property (nonatomic, assign)BOOL isImageNewFor130;//1.3.0的镜像是否待更新
 @property (nonatomic, assign)BOOL isWebSockLinkOKAginType;//WebSock断开后或者链接上了
 +(AppDelegate*)sharedAppDelegate;
 @end

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

@@ -174,7 +174,12 @@
         case 3:
         {
             if(ksharedAppDelegate.DisabledFileTransferType){
-                [[iToast makeText:NSLocalizedString(@"File_Transfer_Disable_tip",nil)] show];
+                if(ksharedAppDelegate.isImageNewFor130){
+                    [[iToast makeText:NSLocalizedString(@"File_Transfer_Disable_tip",nil)] show];
+                }
+                else{
+                    [[iToast makeText:NSLocalizedString(@"File_Transfer_Disable_tip2",nil)] show];
+                }
                 return;
             }
             

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

@@ -103,7 +103,12 @@ static downloadManager * cur_downloadManager = nil;
     }
     
     if(ksharedAppDelegate.DisabledFileTransferType){
-        [[iToast makeText:NSLocalizedString(@"File_Transfer_Disable_tip",nil)] show];
+        if(ksharedAppDelegate.isImageNewFor130){
+            [[iToast makeText:NSLocalizedString(@"File_Transfer_Disable_tip",nil)] show];
+        }
+        else{
+            [[iToast makeText:NSLocalizedString(@"File_Transfer_Disable_tip2",nil)] show];
+        }
         complete(_databaseArr);
         return;
     }
@@ -219,7 +224,12 @@ static downloadManager * cur_downloadManager = nil;
     }
     
     if(ksharedAppDelegate.DisabledFileTransferType){
-        [[iToast makeText:NSLocalizedString(@"File_Transfer_Disable_tip",nil)] show];
+        if(ksharedAppDelegate.isImageNewFor130){
+            [[iToast makeText:NSLocalizedString(@"File_Transfer_Disable_tip",nil)] show];
+        }
+        else{
+            [[iToast makeText:NSLocalizedString(@"File_Transfer_Disable_tip2",nil)] show];
+        }
         return;
     }
     

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

@@ -114,7 +114,13 @@ static uploadFileManager * cur_uploadFileShareInstance = nil;
     }
     
     if(ksharedAppDelegate.DisabledFileTransferType){
-        [[iToast makeText:NSLocalizedString(@"File_Transfer_Disable_tip",nil)] show];
+        if(ksharedAppDelegate.isImageNewFor130){
+            [[iToast makeText:NSLocalizedString(@"File_Transfer_Disable_tip",nil)] show];
+        }
+        else{
+            [[iToast makeText:NSLocalizedString(@"File_Transfer_Disable_tip2",nil)] show];
+        }
+        
         complete(_databaseArr);
         return;
     }
@@ -258,7 +264,12 @@ static uploadFileManager * cur_uploadFileShareInstance = nil;
     }
     
     if(ksharedAppDelegate.DisabledFileTransferType){
-        [[iToast makeText:NSLocalizedString(@"File_Transfer_Disable_tip",nil)] show];
+        if(ksharedAppDelegate.isImageNewFor130){
+            [[iToast makeText:NSLocalizedString(@"File_Transfer_Disable_tip",nil)] show];
+        }
+        else{
+            [[iToast makeText:NSLocalizedString(@"File_Transfer_Disable_tip2",nil)] show];
+        }
         return;
     }
     

+ 6 - 1
创维盒子/双子星云手机/Class/Set/view/mySetHeadView.m

@@ -565,7 +565,12 @@
         if(!haveOpenBackups){
             
             if(ksharedAppDelegate.DisabledFileTransferType){
-                [[iToast makeText:NSLocalizedString(@"File_Transfer_Disable_tip",nil)] show];
+                if(ksharedAppDelegate.isImageNewFor130){
+                    [[iToast makeText:NSLocalizedString(@"File_Transfer_Disable_tip",nil)] show];
+                }
+                else{
+                    [[iToast makeText:NSLocalizedString(@"File_Transfer_Disable_tip2",nil)] show];
+                }
                 return;
             }
             

+ 16 - 2
创维盒子/双子星云手机/CloudPlayer/PlayerViewController+otherDelegate.mm

@@ -171,8 +171,10 @@
     
     NSString *hostImgVer = model.data.data.hostImgVer;
     NSString *MyNewVersion = model.data.data.MyNewVersion;
-//    NSString *hostImgVer = @"1.2.3";
-//    NSString *MyNewVersion = @"1.3.0";
+
+    //test code
+//    hostImgVer = @"1.2.3";
+//    MyNewVersion = @"1.2.0";
     
     //判断当前版本号 待更新版本
     if (!hostImgVer || hostImgVer.length < 3
@@ -215,6 +217,18 @@
 
         if(oneStr.integerValue <=1 && twoStr.integerValue <=2){//禁用
             ksharedAppDelegate.DisabledFileTransferType = YES;
+            
+            if(MyNewVersionArr.count >= 2)
+            {
+                NSString * newOneStr = MyNewVersionArr[0];
+                NSString * newtTwoStr = MyNewVersionArr[1];
+                if(newOneStr.integerValue >=1 && newtTwoStr.integerValue >=3){
+                    ksharedAppDelegate.isImageNewFor130 = YES;
+                }
+                else{
+                    ksharedAppDelegate.isImageNewFor130 = NO;
+                }
+            }
         }
         else{
             ksharedAppDelegate.DisabledFileTransferType = NO;

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

@@ -406,6 +406,7 @@
 2. Remember to keep the app running in the foreground while backing up files, as exiting may result in interrupted transfers.
 3. Backing up files may affect the cloud phone operation experience; it is recommended to finish file transfers before using cloud phone operations.";
 "File_Transfer_Disable_tip"   = "This feature is currently unavailable. Please plug and unplug the power to update the device. After restoring power and network connection, it is estimated to take 15 minutes to complete the update, during which cloud services will be unavailable.";
+"File_Transfer_Disable_tip2"   = "This feature is currently unavailable. Please wait for the latest version update of the cloud server.";
 "check_could_phone_state"   = "Please enter the cloud machine first before proceeding with the operation!";
 "download_video_disable_state"   = "iOS system only supports video formats MP4, MOV, 3GP, M4V for download. Other formats are not supported.";
 "download_image_disable_state"   = "IOS system only supports image formats JPG, PNG, GIF, TIFF, BMP,heic,jpeg,heif for download. Other formats cannot be downloaded.";

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

@@ -405,6 +405,7 @@
 2. ファイルをバックアップする際は、アプリを前面で実行しておいてください。終了すると転送が中断される可能性があります。
 3. ファイルのバックアップはクラウドフォンの操作体験に影響を与える場合があります。クラウドフォンの操作を行う前にファイル転送を完了することをお勧めします。";
 "File_Transfer_Disable_tip"   = "この機能は現在利用できません。デバイスを更新するために電源を抜き差ししてください。電源とネットワークを復旧させた後、更新には15分ほどかかる見込みであり、更新中はクラウドサービスを利用できません。";
+"File_Transfer_Disable_tip2"   = "この機能は現在利用できません。デバイスをアップデートするために電源を抜いてください。電源とネットワークを復旧した後、更新は15分以内に完了する予定です。更新中はクラウドサーバーを利用できません";
 "check_could_phone_state"   = "先にクラウド機に入ってから操作してください!";
 "download_video_disable_state"   = "iOSシステムは、MP4、MOV、3GP、M4Vのビデオ形式のみをサポートしており、他の形式はダウンロードできません";
 "download_image_disable_state"   = "IOS システムは、JPG、PNG、GIF、TIFF、BMP,heic,jpeg,heif の画像形式のみをサポートしており、他の形式はダウンロードできません";

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

@@ -405,6 +405,7 @@
 2、备份文件时,请保持APP前台运行,退出将会导致传输中断;\n
 3、备份文件时,可能会影响云机操作体验,建议先完成文件传输再进行云机操作;";
 "File_Transfer_Disable_tip"   = "此功能暂时无法使用,请插拔电源更新设备。恢复电源和网络后,预计需要15分钟完成更新,更新期间将无法使用云机。";
+"File_Transfer_Disable_tip2"   = "此功能不可用,敬请等待云机最新版本更新";
 "check_could_phone_state"   = "请先进入云机后再进行操作!";
 "download_video_disable_state"   = "IOS系统仅支持MP4、MOV、3GP、M4V 的视频格式,其他格式无法下载";
 "download_image_disable_state"   = "IOS系统仅支持JPG 、PNG、GIF、TIFF、BMP,heic,jpeg,heif的图片格式,其他格式无法下载";

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

@@ -407,6 +407,7 @@
 2. 備份文件時,請保持APP在前台運行,退出將導致傳輸中斷;
 3. 備份文件時,可能會影響雲機操作體驗,建議先完成文件傳輸再進行雲機操作;";
 "File_Transfer_Disable_tip"   = "此功能暫時無法使用,請插拔電源更新設備。恢復電源和網路後,預計需要15分鐘完成更新,更新期間將無法使用雲端機";
+"File_Transfer_Disable_tip2"   = "此功能暫時無法使用,敬請等待雲機的最新版本更新。";
 "check_could_phone_state"   = "請先進入雲機後再進行操作!";
 "download_video_disable_state"   = "iOS 系統僅支持 MP4、MOV、3GP、M4V 的視頻格式,其他格式無法下載。";
 "download_image_disable_state"   = "IOS 系統僅支持 JPG、PNG、GIF、TIFF、BMP,heic,jpeg,heif 的圖片格式,其他格式無法下載";