开启全面屏再开启TV投屏时，全面屏关闭分辨率未显示

创维盒子/双子星云手机/CloudPlayer/View/imageVersionUpdateFailView.m

@@ -24,7 +24,7 @@
     [self addSubview:whiteBgView];
     
     [whiteBgView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.height.mas_equalTo(343.f);
+        make.height.mas_equalTo(400.f);
         make.width.mas_equalTo(300.f);
         make.centerY.mas_equalTo(-40.f);
         make.centerX.mas_equalTo(0.f);
@@ -58,12 +58,17 @@
     }];
     
     NSString *tip1Str = NSLocalizedString(@"image_version_update_fail_tip1",nil);
+    NSString *tip2Str = [[NSString alloc] initWithFormat:@"(%@)",ksharedAppDelegate.DeviceThirdIdMod.data.changeSn];
+    NSString *tip3Str = NSLocalizedString(@"image_version_update_fail_tip2",nil);
+    
+    NSString*allTipStr = [[NSString alloc] initWithFormat:@"%@%@%@",tip1Str,tip2Str,tip3Str];
+    
     UILabel *tipaLab = [[UILabel alloc] init];
-    tipaLab.text = tip1Str;
+    tipaLab.text = allTipStr;
     tipaLab.numberOfLines = 0;
     tipaLab.textColor = [UIColor hwColor:@"#666666"];
     tipaLab.font = [UIFont systemFontOfSize:14.0];
-    tipaLab.textAlignment = NSTextAlignmentCenter;
+    //tipaLab.textAlignment = NSTextAlignmentCenter;
     [whiteBgView addSubview:tipaLab];
     
     [tipaLab mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -73,21 +78,21 @@
         make.top.equalTo(titleLab.mas_bottom).offset(10);
     }];
     
-    NSString *tip2Str = [[NSString alloc] initWithFormat:@"SN:%@",ksharedAppDelegate.DeviceThirdIdMod.data.changeSn];
-    UILabel *tip2Lab = [[UILabel alloc] init];
-    tip2Lab.text = tip2Str;
-    tip2Lab.numberOfLines = 0;
-    tip2Lab.textColor = [UIColor hwColor:@"#666666"];
-    tip2Lab.font = [UIFont systemFontOfSize:14.0];
-    tip2Lab.textAlignment = NSTextAlignmentCenter;
-    [whiteBgView addSubview:tip2Lab];
-    
-    [tip2Lab mas_makeConstraints:^(MASConstraintMaker *make) {
-        //make.height.mas_equalTo(60);
-        make.right.mas_equalTo(-20.f);
-        make.left.mas_equalTo(20.f);
-        make.top.equalTo(tipaLab.mas_bottom).offset(5);
-    }];
+   // NSString *tip2Str = [[NSString alloc] initWithFormat:@"SN:%@",ksharedAppDelegate.DeviceThirdIdMod.data.changeSn];
+//    UILabel *tip2Lab = [[UILabel alloc] init];
+//    tip2Lab.text = tip2Str;
+//    tip2Lab.numberOfLines = 0;
+//    tip2Lab.textColor = [UIColor hwColor:@"#666666"];
+//    tip2Lab.font = [UIFont systemFontOfSize:14.0];
+//    tip2Lab.textAlignment = NSTextAlignmentCenter;
+//    [whiteBgView addSubview:tip2Lab];
+//    
+//    [tip2Lab mas_makeConstraints:^(MASConstraintMaker *make) {
+//        //make.height.mas_equalTo(60);
+//        make.right.mas_equalTo(-20.f);
+//        make.left.mas_equalTo(20.f);
+//        make.top.equalTo(tipaLab.mas_bottom).offset(5);
+//    }];
     
     
     UIButton *knowBut = [[UIButton alloc] init];

创维盒子/双子星云手机/CloudPlayer/View/playerSetView.h

@@ -15,6 +15,9 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)setWebRctMsgBydelayed:(NSInteger)delayedMS withPacketLoss:(double)PacketLoss withSpeed:(NSString*)speedStr withFPS:(NSString*)fpsStr;
 
 - (void)setAllSwitchFun;
+
+#pragma mark 是否要显示设置分辨率（全面屏要隐藏）
+- (void)handleResolutionUIFun;
 @end
 
 NS_ASSUME_NONNULL_END

创维盒子/双子星云手机/NAS/NASViewController.m

@@ -949,7 +949,7 @@
 #pragma mark 弹框流程 1 强制盒子更新弹窗
 - (void)handelUpgradeInfoFun
 {
-    //self.otaUpgradeInfoModel.data.status = 1;
+    //self.otaUpgradeInfoModel.data.status = 201;
     if(self.otaUpgradeInfoModel.data.status < 1){  //-1=没有更新 0=下载中
         //2. APP版本更新弹窗
         [self checkVersionFun];

创维盒子/双子星云手机/webRtc/webRtcPlayerViewController.m

@@ -686,6 +686,9 @@
         //关闭全屏屏
         [HWDataManager setBoolWithKey:Consn_player_full_screen_show value:NO];
         [self setPlayerFullScreenNotFun];
+        
+        [self->_playerSetV handleResolutionUIFun];
+        
     } didClickCancel:^{
         
     }];
@@ -1327,10 +1330,10 @@
     //网速 传输数据速度
     NSString *netDataSpeedStr = @"";
     if(preReceive/1024.0 > 1024){
-        netDataSpeedStr = [NSString stringWithFormat:@"%.01fMB/S",preReceive/1024.0/1024.0];
+        netDataSpeedStr = [NSString stringWithFormat:@"%.01fMB/s",preReceive/1024.0/1024.0];
     }
     else{
-        netDataSpeedStr = [NSString stringWithFormat:@"%ldkB/S",preReceive/1024];
+        netDataSpeedStr = [NSString stringWithFormat:@"%ldkB/s",preReceive/1024];
     }
     
     mainBlock(^{

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

@@ -648,5 +648,6 @@
 "image_version_Update_ing"   = "正在升级中…";
 "image_version_update_suc_title"   = "盒子设备升级成功";
 "common_I_know" = "我知道了";
-"image_version_update_fail_title"   = "盒子设备升级失败";
-"image_version_update_fail_tip1"   = "升级失败暂时无法使用客户端功能。请截取当前的升级提示窗口联系客服。";
+"image_version_update_fail_title"   = "设备升级异常";
+"image_version_update_fail_tip1"   = "1、请检查您的盒子与手机网络连接是否正常。\n2、您可以尝试断电重启盒子来进行升级，并在升级完成后确认是否成功。\n3、如果仍未能成功升级，请提供设备的序列号";
+"image_version_update_fail_tip2"   = "并联系我们的客服团队获取帮助";