1.弹框优化

创维盒子/双子星云手机/AppDelegate/SceneDelegate.m

@@ -819,7 +819,7 @@
         return;
     }
     
-    NSString *linkErrTip = NSLocalizedString(@"player_link_fail_couldPhone_Tips",nil);
+    NSString *linkErrTip = NSLocalizedString(@"player_link_fail_tip_type9",nil);
     if([AFNetworkReachabilityManager sharedManager].networkReachabilityStatus == AFNetworkReachabilityStatusNotReachable){
         linkErrTip = NSLocalizedString(@"player_link_fail_phone_Tips",nil);
         _isNeedToStopWork = YES;
@@ -829,7 +829,7 @@
     
     linkErrTip = [[NSString alloc] initWithFormat:@"[9]%@",linkErrTip];
     
-    ComontAlretViewController *linkFailAlretVC= [[ComontAlretViewController alloc] initWithTiTle:NSLocalizedString(@"player_link_fail_title",nil)
+    ComontAlretViewController *linkFailAlretVC= [[ComontAlretViewController alloc] initWithTiTle:nil
                                                                                       msg:linkErrTip
                                                                                  imageStr:nil
                                                                               cancelTitle:NSLocalizedString(@"single_sign_on_exit",nil)

创维盒子/双子星云手机/Class/ComontAlretType2ViewController.h

@@ -0,0 +1,16 @@
+//
+//  ComontAlretType2ViewController.h
+//  双子星云手机
+//
+//  Created by xd h on 2024/4/15.
+//
+
+#import "BaseViewController.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface ComontAlretType2ViewController : BaseViewController
+
+@end
+
+NS_ASSUME_NONNULL_END

创维盒子/双子星云手机/Class/ComontAlretType2ViewController.m

@@ -0,0 +1,31 @@
+//
+//  ComontAlretType2ViewController.m
+//  双子星云手机
+//
+//  Created by xd h on 2024/4/15.
+//
+
+#import "ComontAlretType2ViewController.h"
+
+@interface ComontAlretType2ViewController ()
+
+@end
+
+@implementation ComontAlretType2ViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    // Do any additional setup after loading the view.
+}
+
+/*
+#pragma mark - Navigation
+
+// In a storyboard-based application, you will often want to do a little preparation before navigation
+- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+    // Get the new view controller using [segue destinationViewController].
+    // Pass the selected object to the new view controller.
+}
+*/
+
+@end

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

@@ -29,6 +29,7 @@
 #import "ComontAlretViewController.h"
 #import "AudioSessionObject.h"
 #import "addLogObject.h"
+#import "ComontAlretType2ViewController.h"
 
 @protocol PlayerViewControllerDelegate <NSObject>
 

创维盒子/双子星云手机/CloudPlayer/PlayerViewController.mm

@@ -120,6 +120,7 @@ ComontAlretViewControllerDelegate>
   
     /*弹窗提示链接失败 网络或者云机*/
     ComontAlretViewController *linkFailAlretVC;
+    ComontAlretType2ViewController * linkFailAlretType2VC;
     
     NSTimer *forceStartTimer;//请知重启timer
     
@@ -2229,7 +2230,7 @@ NSDate *lastVideoTome;/*上一帧数据时间*/
     if(linkFailAlretVC
        ||[connectDeviceManager shareInstance].isReInitType//瑞云重新init 耗时2-7s 他们说的
        ||(ksharedAppDelegate.isWebSockLinkOKAginType && type == 2) //重连上了但是延时消息来了
-       ){
+       ||linkFailAlretType2VC){
         return;
     }
     
@@ -2262,32 +2263,75 @@ NSDate *lastVideoTome;/*上一帧数据时间*/
         type = 1;
     }
     
-    NSString *linkErrTip = NSLocalizedString(@"player_link_fail_couldPhone_Tips",nil);
+    BOOL isPhoneNetWorkWrongType = NO;
+    NSString *linkErrTip = NSLocalizedString(@"player_link_fail_tip_type11",nil);
     if([AFNetworkReachabilityManager sharedManager].networkReachabilityStatus == AFNetworkReachabilityStatusNotReachable){
-        linkErrTip = NSLocalizedString(@"player_link_fail_phone_Tips",nil);
+        linkErrTip = NSLocalizedString(@"netWork_error_tip_content",nil);
+        isPhoneNetWorkWrongType = YES;
     }
     
-    linkErrTip = [[NSString alloc] initWithFormat:@"[%ld]%@",type,linkErrTip];
-    
-    KWeakSelf
-    linkFailAlretVC= [[ComontAlretViewController alloc] initWithTiTle:NSLocalizedString(@"player_link_fail_title",nil)
-                                                                                      msg:linkErrTip
-                                                                                 imageStr:nil
-                                                                              cancelTitle:NSLocalizedString(@"single_sign_on_exit",nil)
-                                                                                  okTitle:NSLocalizedString(@"player_link_fail_tryAgain",nil) isOkBtnHighlight:YES
-                                                                               didClickOk:^{
-        [weakSelf tryAgainInLinkFailFun];
-        [cachesFileManager writeLogsWithMsg:@"click tryAgain"];
+    if(type == 11 && !isPhoneNetWorkWrongType){
+        NSString* linkErrTitle = NSLocalizedString(@"player_link_fail_title_type11",nil);
+        linkErrTitle = [[NSString alloc] initWithFormat:@"[%ld]%@",type,linkErrTitle];
+        
+        KWeakSelf
+        linkFailAlretType2VC  = [[ComontAlretType2ViewController alloc] initWithTitle:linkErrTitle msg:linkErrTip imageStr:nil cancelTitle:NSLocalizedString(@"single_sign_on_exit",nil) okTitle:NSLocalizedString(@"player_link_fail_tryAgain",nil) otherTitle:NSLocalizedString(@"my_set_no_restart_phone",nil) isOkBtnHighlight:YES didClickOk:^{
+            [weakSelf tryAgainInLinkFailFun];
+            [cachesFileManager writeLogsWithMsg:@"click tryAgain"];
+        } didClickCancel:^{
+            exit(0);
+        } didClickOther:^{//硬重启
+            [weakSelf needToRebootFun];
+        }];
+                 
          
-     } didClickCancel:^{
-         exit(0);
-     }];
-    
-     linkFailAlretVC.modalPresentationStyle = UIModalPresentationCustom;
-     
-     [self presentViewController:linkFailAlretVC animated:YES completion:^{
-         self->linkFailAlretVC.view.superview.backgroundColor = [UIColor clearColor];
-     }];
+        linkFailAlretType2VC.modalPresentationStyle = UIModalPresentationCustom;
+         
+         [self presentViewController:linkFailAlretType2VC animated:YES completion:^{
+             self->linkFailAlretType2VC.view.superview.backgroundColor = [UIColor clearColor];
+         }];
+        
+    }
+    else{
+        NSString* linkErrTitle = @"";
+        if(type == 2
+           ||type==5
+           ||type==1
+           ||type==12){
+            linkErrTitle = NSLocalizedString(@"player_link_fail_title_type2",nil);
+            linkErrTip = NSLocalizedString(@"player_link_fail_tip_type2",nil);
+        }
+        else{
+            linkErrTitle = NSLocalizedString(@"player_link_fail_title_type3",nil);
+            linkErrTip = NSLocalizedString(@"player_link_fail_tip_type2",nil);
+        }
+        
+        if([AFNetworkReachabilityManager sharedManager].networkReachabilityStatus == AFNetworkReachabilityStatusNotReachable){
+            linkErrTip = NSLocalizedString(@"netWork_error_tip_content",nil);
+        }
+        
+        linkErrTitle = [[NSString alloc] initWithFormat:@"[%ld]%@",type,linkErrTitle];
+        
+        KWeakSelf
+        linkFailAlretVC= [[ComontAlretViewController alloc] initWithTiTle:linkErrTitle
+                                                                                          msg:linkErrTip
+                                                                                     imageStr:nil
+                                                                                  cancelTitle:NSLocalizedString(@"single_sign_on_exit",nil)
+                                                                                      okTitle:NSLocalizedString(@"player_link_fail_tryAgain",nil) isOkBtnHighlight:YES
+                                                                                   didClickOk:^{
+            [weakSelf tryAgainInLinkFailFun];
+            [cachesFileManager writeLogsWithMsg:@"click tryAgain"];
+             
+         } didClickCancel:^{
+             exit(0);
+         }];
+        
+         linkFailAlretVC.modalPresentationStyle = UIModalPresentationCustom;
+         [linkFailAlretVC setMsgTextAlignment:NSTextAlignmentLeft];
+         [self presentViewController:linkFailAlretVC animated:YES completion:^{
+             self->linkFailAlretVC.view.superview.backgroundColor = [UIColor clearColor];
+         }];
+    }
     
     linkFailAlretVC.view.tag = type;
 }
@@ -2295,6 +2339,7 @@ NSDate *lastVideoTome;/*上一帧数据时间*/
 - (void)tryAgainInLinkFailFun
 {
     linkFailAlretVC = nil;
+    linkFailAlretType2VC = nil;
     
     if([[connectDeviceManager shareInstance] curConnectDeviceState] <= 3)
     {

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

@@ -433,3 +433,10 @@
 "backups_cur_task_done_numbers"   = "本次更新备份";
 "scan_sn_data_error_title"   = "设备信息不存在，请检查您的设备";
 "scan_sn_data_error_content"   = "检查步骤：\n1、检查盒子是否通电通网；\n2、检查设备与网络是否均处于国内大陆环境；\n\n解决步骤：\n1、确保盒子通电通网，呼吸灯蓝色。\n2、非国内大陆环境需提供SN给客服处理。";
+"player_link_fail_title_type11" = "连接失败,盒子状态异常";
+"player_link_fail_tip_type11" = "1、请检查盒子电源和网络是否正常，若正常请使用【重启空间】功能或插拔电源重启盒子，若问题仍然存在，请联系客服寻求帮助!\n2、重启空间需等待3分钟，期间请勿操作；";
+"player_link_fail_title_type3" = "网络异常,请检查盒子网络";
+"player_link_fail_title_type2" = "网络异常,请检查手机网络";
+"player_link_fail_tip_type2" = "检查步骤：\n当前手机网络是否可以正常访问浏览器；\n\n解决步骤：\n1、点击重试，重新连接APP；\n2、切换其他网络或使用流量，杀掉APP后在进入云机；\n3、拔插电源后等待3-5分钟后进入云机；\n4、拔插路由网络等待3-5分钟后进入云机；\n5、TV进行问题反馈，并将SN给到客服；";
+"player_link_fail_tip_type3" = "检查步骤：\n1、检查盒子是否通电电网；\n2、检查路由网络是否正常；\n3、TV打开Private-X应用看能否进入推流；\n\n解决步骤：\n1、切换盒子网络后进入云机；\n2、拔插电源后等待3-5分钟后进入云机；\n3、拔插路由网络等待3-5分钟后进入云机；\n4、TV进行问题反馈，并将SN给到客服";
+"player_link_fail_tip_type9" = "网络异常，请联系Private-X公众号客服寻求帮助!";