1.多国语言和心跳弹框检测等

创维盒子/code/AppDelegate/SceneDelegate.m

@@ -62,6 +62,7 @@
 #import "UpgradeInfoModel.h"
 #import "imageVersionUpdateDoneView.h"
 #import "imageVersionUpdateFailView.h"
+#import "privacyModeTipViewController.h"
 
 @interface SceneDelegate ()<SetUsePWDViewControllerDelegate,GuideViewControllerDelegate,UITabBarControllerDelegate>
 {
@@ -1630,7 +1631,7 @@
 #pragma mark 弹框流程 1 强制盒子更新弹窗
 - (void)handelUpgradeInfoFun
 {
-    //self.otaUpgradeInfoModel.data.status = 6;
+    //self.otaUpgradeInfoModel.data.status = 1;
     if(self.otaUpgradeInfoModel.data.status < 1){  //-1=没有更新 0=下载中
         //2. APP版本更新弹窗
         [self checkVersionFun];

创维盒子/code/Class/Set/privacyMode/privacyModeTipViewController.m

@@ -78,7 +78,7 @@
         make.left.mas_equalTo(30);
         make.right.mas_equalTo(-30);
         make.top.mas_equalTo(topLab.mas_bottom).offset(15);
-        make.height.mas_equalTo(40);
+        make.height.mas_equalTo(60);
     }];
     
     
@@ -94,7 +94,7 @@
         make.left.mas_equalTo(30);
         make.right.mas_equalTo(-30);
         make.top.mas_equalTo(tipLab1.mas_bottom).offset(10);
-        make.height.mas_equalTo(40);
+        //make.height.mas_equalTo(40);
     }];
     
     //跳过

创维盒子/code/CloudPlayer/View/imageVersionRenewTipView.m

@@ -30,7 +30,7 @@
     _whiteBgView.backgroundColor = [UIColor whiteColor];
     [self addSubview:_whiteBgView];
     
-    CGFloat curWhiteBgHeight = 369.f;
+    CGFloat curWhiteBgHeight = 320.f;
     
     ///获取设备当前地区的代码和APP语言环境
     NSString *languageCode = [NSLocale preferredLanguages][0];
@@ -43,7 +43,7 @@
     {
     }
     else{
-        curWhiteBgHeight = 400;
+        curWhiteBgHeight = 360;
     }
     
     [_whiteBgView mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -192,7 +192,7 @@
         return;
     }
     
-    CGFloat curWhiteBgHeight = 470.f;
+    CGFloat curWhiteBgHeight = 400.f;
     
     ///获取设备当前地区的代码和APP语言环境
     NSString *languageCode = [NSLocale preferredLanguages][0];

创维盒子/code/CloudPlayer/View/playerSetView.m

@@ -409,7 +409,8 @@
     
     
     NSArray *titleArr = @[NSLocalizedString(@"cloudPhone_set_screenshot_tip",nil),
-                          NSLocalizedString(@"my_set_no_TV_p2p",nil),//my_set_no_close_TV_p2p
+                          NSLocalizedString(@"my_set_no_TV_p2p",nil),
+                          //NSLocalizedString(@"my_set_no_close_TV_p2p",nil),
                           NSLocalizedString(@"my_set_no_restart_phone",nil),
                           //NSLocalizedString(@"cloudPhone_set_exit_tip",nil),
     ];

创维盒子/code/NAS/NASViewController.m

@@ -688,12 +688,12 @@
     }
     else{
         
-        tryLinkFrpNum ++;
-        
-        if(tryLinkFrpNum == 3){
-            tryLinkFrpNum = 0;
-            [self checkBoxHeartbeatFun];
-        }
+//        tryLinkFrpNum ++;
+//        
+//        if(tryLinkFrpNum == 3){
+//            tryLinkFrpNum = 0;
+//            [self checkBoxHeartbeatFun];
+//        }
         
         dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
             //[self setMySpaceDataFun];
@@ -1060,7 +1060,7 @@
     }
     else if (heartbeatMod.data.hostAgentStatus
             //&& !heartbeatMod.data.frpStatus
-            && heartbeatMod.data.containerAgentStatus) {//frp异常
+            && !heartbeatMod.data.containerAgentStatus) {//frp异常
         [[BoxHeartbeatAlertTool shareInstance] showBoxHeartbeatAlertFun:2 didClickBut:^(NSInteger tag) {
                     
         }];

创维盒子/code/en.lproj/Localizable.strings

@@ -299,7 +299,7 @@
 "logo_select_login"   = "Please select Login disguise";
 "logo_change_login_tip" = "The app will be changed to the one you choose.";
 "logo_did_change_login" = "Setup successful";
-"my_set_no_close_TV_p2p"   = "Turn off screencasting";
+"my_set_no_close_TV_p2p"   = "Stop TV Casting";
 "my_set_no_close_TV_p2p_tip"   = "Screencasting in progress, confirm to close screencasting";
 "common_save_suc"   = "Saved";
 "common_save_fail"   = "Saving failed";
@@ -645,8 +645,8 @@
 
 //1.4.4
 "cloudPhone_player_set_resolution"   = "Resolution";
-"image_version_pop_144_tip1"   = "The device is not updated to the latest version. Please update it quickly. This process may take a while, so please be patient and careful!";
-"image_version_pop_144_tip1_2"   = "Keep the box's network connection stable during the upgrade to prevent interruptions.";
+"image_version_pop_144_tip1"   = "The box device needs to be upgraded to the latest version. Please be patient and ensure network stability to avoid upgrade interruptions.";
+"image_version_pop_144_tip1_2"   = "";
 "image_version_pop_144_tip2_1"   = "The upgrade takes time. Avoid turning off or unplugging to prevent system damage. Post-upgrade, the box restarts automatically, with the TV showing the restart, which is normal.";
 "image_version_pop_144_tip2_2"   = "If the upgrade isn't done in 15 minutes, manually restart the device for another upgrade attempt. If it still fails, provide the device's serial number and contact our customer service team.";
 "image_version_Update_Now"   = "Update immediately";

创维盒子/code/webRtc/webRtcManager/webRtcManager.m

@@ -216,6 +216,8 @@
     
     [self getTvStatusFun];
     
+    [self closeBoxHeartbeatReStartViewFun];
+    
     if(ksharedAppDelegate.needToShowReStratSucType){
         ksharedAppDelegate.needToShowReStratSucType = NO;
         dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
@@ -1156,14 +1158,7 @@
         return;
     }
     
-    NSArray * subViews = ksharedAppDelegate.window.subviews;
-    
-    for (BoxHeartbeatReStartView*view in subViews) {
-        if([view isKindOfClass:[BoxHeartbeatReStartView class]]){
-            [view colseFun];
-            break;
-        }
-    }
+    [self closeBoxHeartbeatReStartViewFun];
     
     
     BoxHeartbeatReStartSucView *view = [[BoxHeartbeatReStartSucView alloc] init];
@@ -1176,4 +1171,17 @@
         make.top.mas_equalTo(0.f);
     }];
 }
+
+#pragma mark 关闭心跳弹框
+- (void)closeBoxHeartbeatReStartViewFun
+{
+    NSArray * subViews = ksharedAppDelegate.window.subviews;
+    
+    for (BoxHeartbeatReStartView*view in subViews) {
+        if([view isKindOfClass:[BoxHeartbeatReStartView class]]){
+            [view colseFun];
+            break;
+        }
+    }
+}
 @end

创维盒子/code/zh-Hans.lproj/Localizable.strings

@@ -640,10 +640,10 @@
 
 //1.4.4
 "cloudPhone_player_set_resolution"   = "分辨率";
-"image_version_pop_144_tip1"   = "盒子设备目前未升级到最新版本，请尽快升级。此过程可能耗时较长，请耐心等待并谨慎操作！";
-"image_version_pop_144_tip1_2"   = "升级过程中确保盒子与手机网络连接稳定，以避免升级中断。";
-"image_version_pop_144_tip2_1"   = "升级过程需要较长时间，请在此期间不要关闭设备或拔掉电源，否则可能会导致系统损坏。升级完成后，盒子设备会自动重启，电视屏幕上也会显示重启操作，这是正常现象。";
-"image_version_pop_144_tip2_2"   = "如果超过15分钟升级仍未完成，请手动断电重启设备重新升级。若设备未能成功升级至最新版本，请提供设备的序列号（SN）并联系我们的客服团队获取帮助。";
+"image_version_pop_144_tip1"   = "盒子设备需升级至最新版本，请耐心等待并确保网络稳定，避免升级中断。";
+"image_version_pop_144_tip1_2"   = "";
+"image_version_pop_144_tip2_1"   = "升级需较长时间，请保持设备正常通电通网。升级完成后设备将自动重启，电视屏幕显示重启提示属正常现象。";
+"image_version_pop_144_tip2_2"   = "若超15分鐘未完成，請手動斷電重啓陞級； 如失敗則提供設備序號（SN）聯系客服。";
 "image_version_Update_Now"   = "立即更新";
 "image_version_Update_ing"   = "正在升级中…";
 "image_version_update_suc_title"   = "盒子设备升级成功";

创维盒子/code/zh-Hant.lproj/Localizable.strings

@@ -645,9 +645,9 @@
 
 //1.4.4
 "cloudPhone_player_set_resolution"   = "解析度";
-"image_version_pop_144_tip1"   = "盒子設備目前未升級到最新版本，請盡快升級。此過程可能耗時較長，請耐心等待並謹慎操作！";
-"image_version_pop_144_tip1_2"   = "升級過程中確保盒子與手機網絡連接穩定，以避免升級中斷。";
-"image_version_pop_144_tip2_1"   = "升級過程需要較長時間，請在此時不要關閉設備或拔掉電源，否則可能會導致系統損壞。升級完成後，盒子設備會自動重啟，電視螢幕上也會顯示重啟操作，這是正常現象。";
+"image_version_pop_144_tip1"   = "盒子設備需陞級至最新版本，請耐心等待並確保網絡穩定，避免陞級中斷。";
+"image_version_pop_144_tip1_2"   = "";
+"image_version_pop_144_tip2_1"   = "陞級需較長時間，請保持設備正常通電通網。 陞級完成後設備將自動重啟，電視螢幕顯示重啓提示屬正常現象。";
 "image_version_pop_144_tip2_2"   = "如果超過15分鐘升級仍未完成，請手動斷電重啟設備重新升級。若設備未能成功升級至最新版本，請提供設備的序號（SN）並聯系我們的客服團隊獲取幫助。";
 "image_version_Update_Now"   = "立即更新";
 "image_version_Update_ing"   = "正在升級中...";

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

@@ -5770,7 +5770,7 @@
 				CODE_SIGN_ENTITLEMENTS = "计算器.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 26;
+				CURRENT_PROJECT_VERSION = 28;
 				DEVELOPMENT_TEAM = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -5854,7 +5854,7 @@
 				CODE_SIGN_ENTITLEMENTS = "计算器.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 26;
+				CURRENT_PROJECT_VERSION = 28;
 				DEVELOPMENT_TEAM = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",