1.心跳相关bug修复

创维盒子/code/AppDelegate/AppDelegate.h

@@ -57,7 +57,7 @@
 @property(nonatomic,strong) RTCFileLogger *WebRtcLogger;//webRTC日志
 
 @property (nonatomic, assign)  BOOL needToShowReStratSucType;//是否要显示从前成功
-
+@property (nonatomic, assign)  BOOL didShowBoxHeartbeatAlertType;//心跳异常弹框是否显示过
 +(AppDelegate*)sharedAppDelegate;
 
 #pragma mark 更换设备 重新设置地址

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

@@ -671,6 +671,8 @@
 - (void)sceneDidEnterBackground:(UIScene *)scene  API_AVAILABLE(ios(13.0)){
     HLog(@"sceneDidEnterBackground")
     
+    ksharedAppDelegate.didShowBoxHeartbeatAlertType = NO;
+    
     BOOL isPrivacyMode = [HWDataManager getBoolWithKey:Const_Have_Add_Device_Privacy_Mode];
     
     if(ksharedAppDelegate.DeviceThirdIdMod){

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

@@ -62,6 +62,8 @@ static BoxHeartbeatAlertTool *shareInstance = nil;
 -(void)showBoxHeartbeatAlertFun:(NSInteger)type didClickBut:(BoxHeartbeat_DidClickButFun)didClickBut
 {
     curDidClickButFun = didClickBut;
+    
+    ksharedAppDelegate.didShowBoxHeartbeatAlertType = YES;
     KWeakSelf
     mainBlock(^{
         [weakSelf showNetErrorAlertFunInMain:type];

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

@@ -1003,6 +1003,11 @@
 #pragma mark 检测盒子的心跳情况
 - (void)checkBoxHeartbeatFun
 {
+    
+    if(ksharedAppDelegate.didShowBoxHeartbeatAlertType){
+        return;
+    }
+    
     //1.隐私模式密码界面 3秒检测一次是否输入完成密码了
     if(ksharedAppDelegate.isDidShowPwdType){
         KWeakSelf
@@ -1046,7 +1051,6 @@
     if (!heartbeatMod.data.frpStatus
         &&!heartbeatMod.data.hostAgentStatus
         &&!heartbeatMod.data.containerAgentStatus) {//全部异常
-        
         [[BoxHeartbeatAlertTool shareInstance] showBoxHeartbeatAlertFun:1 didClickBut:^(NSInteger tag) {
                     
         }];

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

@@ -656,3 +656,13 @@
 "image_version_update_fail_title"   = "Device upgrade failed";
 "image_version_update_fail_tip1"   = "1、Please check if your device's connection to the mobile network is normal.\n2、You can try powering off and restarting the device for the upgrade, and confirm whether it was successful after the upgrade.\n3、If the upgrade still fails, please provide the device's serial number";
 "image_version_update_fail_tip2"   = "contact our customer service team for assistance";
+
+"Heartbeat_box_all_fail_title"   = "Abnormal device status";
+"Heartbeat_box_all_fail_tip"   = "The connection to the cloud phone failed due to abnormal device status. Please check if the device power and network are connected properly. If it still can't connect, please provide the SN and contact official customer service for help.";
+
+"Heartbeat_box_part_fail_title"   = "Cloud phone connection failed";
+"Heartbeat_box_part_fail_tip"   = "The connection failed due to abnormal cloud phone network. Please restart the cloud phone immediately to fix the network. If it still can't connect after fixing, please manually restart the device. If the restart is ineffective, please provide the SN and contact official customer service for help";
+"Heartbeat_box_restart_phone" = "Restart";
+"Heartbeat_box_restarting_phone" = "Restarting the cloud phone...";
+"Heartbeat_box_restarting_phone_tip" = "The cloud phone restart is expected to take 90 seconds. Please try again later.";
+"Heartbeat_box_restart_Suc_phone" = "The cloud phone restart was successful";

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

@@ -198,10 +198,10 @@
     
     if(ksharedAppDelegate.bestWebrtcServerModel){
         
-        NSString * turnMsg = [[NSString alloc] initWithFormat:@"%@:%@",ksharedAppDelegate.bestWebrtcServerModel.turnIp,ksharedAppDelegate.bestWebrtcServerModel.turnPort];
+        NSString * turnMsg = [[NSString alloc] initWithFormat:@"%@",ksharedAppDelegate.bestWebrtcServerModel.turnIp];
         [paraDict setValue:turnMsg forKey:@"coturnIp"];
         
-        NSString * signalMsg = [[NSString alloc] initWithFormat:@"%@:%@",ksharedAppDelegate.bestWebrtcServerModel.signallingIp,ksharedAppDelegate.bestWebrtcServerModel.signallingPort];
+        NSString * signalMsg = [[NSString alloc] initWithFormat:@"%@",ksharedAppDelegate.bestWebrtcServerModel.signallingIp];
         [paraDict setValue:signalMsg forKey:@"signalingIp"];
     }
     

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

@@ -1079,6 +1079,10 @@
 #pragma mark 检测盒子的心跳情况
 - (void)checkBoxHeartbeatFun
 {
+    if(ksharedAppDelegate.didShowBoxHeartbeatAlertType){
+        return;
+    }
+    
     //1.隐私模式密码界面 3秒检测一次是否输入完成密码了
     if(ksharedAppDelegate.isDidShowPwdType){
         KWeakSelf

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

@@ -1477,6 +1477,10 @@
 #pragma mark 检测盒子的心跳情况
 - (void)checkBoxHeartbeatFun
 {
+    if(ksharedAppDelegate.didShowBoxHeartbeatAlertType){
+        return;
+    }
+    
     //1.隐私模式密码界面 3秒检测一次是否输入完成密码了
     if(ksharedAppDelegate.isDidShowPwdType){
         KWeakSelf

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

@@ -656,7 +656,7 @@
 "Heartbeat_box_all_fail_tip"   = "检测到设备状态异常导致云手机连接失败，请检查设备电源和网络是否连接正常。若还无法连接请提供SN联系官方客服获取帮助。";
 
 "Heartbeat_box_part_fail_title"   = "云手机连接失败";
-"Heartbeat_box_part_fail_tip"   = "检测到设备状态异常导致云手机连接失败，请检查设备电源和网络是否连接正常。若还无法连接请提供SN联系官方客服获取帮助。";
+"Heartbeat_box_part_fail_tip"   = "检测到云手机网络异常导致连接失败，请立即重启云手机修复网络，若修复后还无法连接，请手动重启设备，重启无效请提供SN联系官方客服获取帮助。";
 "Heartbeat_box_restart_phone" = "重启云手机";
 "Heartbeat_box_restarting_phone" = "云手机重启中...";
 "Heartbeat_box_restarting_phone_tip" = "云手机重启预计需要90秒，请稍后重试。";

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

@@ -656,3 +656,12 @@
 "image_version_update_fail_title"   = "設備升級失敗";
 "image_version_update_fail_tip1"   = "1、請檢查您的盒子與手機網絡連接是否正常。\n2、您可以嘗試斷電重啟盒子來進行升級，並在升級完成後確認是否成功。\n3、如果仍未能成功升級，請提供設備的序號\n";
 "image_version_update_fail_tip2"   = "並聯系我們的客服團隊獲取幫助";
+"Heartbeat_box_all_fail_title"   = "設備狀態异常";
+"Heartbeat_box_all_fail_tip"   = "檢測到設備狀態异常導致雲手機連接失敗，請檢查設備電源和網絡是否連接正常。 若還無法連接請提供SN聯系官方客服獲取幫助。";
+
+"Heartbeat_box_part_fail_title"   = "雲手機連接失敗";
+"Heartbeat_box_part_fail_tip"   = "檢測到雲手機網絡异常導致連接失敗，請立即重啓雲手機修復網絡，若修復後還無法連接，請手動重啓設備，重啓無效請提供SN聯系官方客服獲取幫助。";
+"Heartbeat_box_restart_phone" = "重啓雲手機";
+"Heartbeat_box_restarting_phone" = "雲手機重啓中…";
+"Heartbeat_box_restarting_phone_tip" = "雲手機重啓預計需要90秒，請稍後重試。";
+"Heartbeat_box_restart_Suc_phone" = "雲手機重啓成功";

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

@@ -6052,7 +6052,7 @@
 				CODE_SIGN_ENTITLEMENTS = "隐私保护.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 21;
+				CURRENT_PROJECT_VERSION = 24;
 				DEVELOPMENT_TEAM = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -6131,7 +6131,7 @@
 				CODE_SIGN_ENTITLEMENTS = "隐私保护.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 21;
+				CURRENT_PROJECT_VERSION = 24;
 				DEVELOPMENT_TEAM = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",