1.新需求 201=不在白名单；202=盒子未上报 已经文案修改

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

@@ -10,7 +10,7 @@
 NS_ASSUME_NONNULL_BEGIN
 
 @interface QRCodeScanViewController : BaseViewController
-@property (nonatomic,copy) void (^didScanErrorFun)(void);
+@property (nonatomic,copy) void (^didScanErrorFun)(NSInteger code);
 @end
 
 NS_ASSUME_NONNULL_END

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

@@ -326,7 +326,7 @@ bool isDownType = YES;
 //                [[iToast makeText:NSLocalizedString(@"guide_qrcoede_tips_get_SdnID_fail",nil)] show];
 //            }
             if(self->_didScanErrorFun){
-                self->_didScanErrorFun();
+                self->_didScanErrorFun(didSuc);
             }
             dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
                 [self.navigationController popViewControllerAnimated:YES];

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

@@ -11,6 +11,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface TipsQRCodeViewController : BaseViewController
 @property(nonatomic,assign)BOOL isNeedToShowAleatType;
+@property(nonatomic,assign)NSInteger getSNMsgcode;
 @end
 
 NS_ASSUME_NONNULL_END

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

@@ -199,8 +199,9 @@
     QRCodeScanViewController *nextVC = [[QRCodeScanViewController alloc] init];
     [self.navigationController pushViewController:nextVC animated:YES];
     
-    nextVC.didScanErrorFun = ^{
+    nextVC.didScanErrorFun = ^(NSInteger code) {
         self->_isNeedToShowAleatType = YES;
+        self->_getSNMsgcode = code;
     };
 }
 
@@ -229,6 +230,14 @@
     NSString *linkErrTitle = NSLocalizedString(@"scan_sn_data_error_title",nil);
     NSString *linkErrTip = NSLocalizedString(@"scan_sn_data_error_content",nil);
     
+    if(_getSNMsgcode == 202){
+         linkErrTitle = NSLocalizedString(@"get_sn_msg_202_title",nil);
+         linkErrTip = NSLocalizedString(@"get_sn_msg_202_content",nil);
+    }else if (_getSNMsgcode == 201){
+        linkErrTitle = NSLocalizedString(@"get_sn_msg_201_title",nil);
+        linkErrTip = NSLocalizedString(@"get_sn_msg_201_content",nil);
+    }
+    
     ComontAlretViewController *linkFailAlretVC= [[ComontAlretViewController alloc] initWithTiTle:linkErrTitle
                                                                                       msg:linkErrTip
                                                                                  imageStr:nil
@@ -243,7 +252,7 @@
     
      linkFailAlretVC.modalPresentationStyle = UIModalPresentationCustom;
      
-     [linkFailAlretVC setMsgTextAlignment:NSTextAlignmentLeft];
+     //[linkFailAlretVC setMsgTextAlignment:NSTextAlignmentLeft];
      [self presentViewController:linkFailAlretVC animated:YES completion:^{
          linkFailAlretVC.view.superview.backgroundColor = [UIColor clearColor];
      }];

创维盒子/双子星云手机/Class/Set/ChangeDevice/QRCodeScanForChangeDeviceViewController.h

@@ -10,7 +10,7 @@
 NS_ASSUME_NONNULL_BEGIN
 
 @interface QRCodeScanForChangeDeviceViewController : BaseViewController
-@property (nonatomic,copy) void (^didScanErrorFun)(void);
+@property (nonatomic,copy) void (^didScanErrorFun)(NSInteger code);
 @end
 
 NS_ASSUME_NONNULL_END

创维盒子/双子星云手机/Class/Set/ChangeDevice/QRCodeScanForChangeDeviceViewController.m

@@ -359,7 +359,7 @@ bool isDownType22 = YES;
 //                }
                 
                 if(self->_didScanErrorFun){
-                    self->_didScanErrorFun();
+                    self->_didScanErrorFun(didSuc);
                 }
                 dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
                     mainBlock(^{

创维盒子/双子星云手机/Class/Set/ChangeDevice/TipsQRCodeForChangeDeviceViewController.h

@@ -12,6 +12,7 @@ NS_ASSUME_NONNULL_BEGIN
 @interface TipsQRCodeForChangeDeviceViewController : BaseViewController
 @property(nonatomic,assign)BOOL isRootVCType;
 @property(nonatomic,assign)BOOL isNeedToShowAleatType;
+@property(nonatomic,assign)NSInteger getSNMsgcode;
 @end
 
 NS_ASSUME_NONNULL_END

创维盒子/双子星云手机/Class/Set/ChangeDevice/TipsQRCodeForChangeDeviceViewController.m

@@ -212,8 +212,9 @@
 - (void)qrcodeBtnPressed{
     QRCodeScanForChangeDeviceViewController *nextVC = [[QRCodeScanForChangeDeviceViewController alloc] init];
     [self.navigationController pushViewController:nextVC animated:YES];
-    nextVC.didScanErrorFun = ^{
+    nextVC.didScanErrorFun = ^(NSInteger code) {
         self->_isNeedToShowAleatType = YES;
+        self->_getSNMsgcode = code;
     };
 }
 
@@ -242,6 +243,14 @@
     NSString *linkErrTitle = NSLocalizedString(@"scan_sn_data_error_title",nil);
     NSString *linkErrTip = NSLocalizedString(@"scan_sn_data_error_content",nil);
     
+    if(_getSNMsgcode == 202){
+         linkErrTitle = NSLocalizedString(@"get_sn_msg_202_title",nil);
+         linkErrTip = NSLocalizedString(@"get_sn_msg_202_content",nil);
+    }else if (_getSNMsgcode == 201){
+        linkErrTitle = NSLocalizedString(@"get_sn_msg_201_title",nil);
+        linkErrTip = NSLocalizedString(@"get_sn_msg_201_content",nil);
+    }
+    
     ComontAlretViewController *linkFailAlretVC= [[ComontAlretViewController alloc] initWithTiTle:linkErrTitle
                                                                                       msg:linkErrTip
                                                                                  imageStr:nil
@@ -256,7 +265,7 @@
     
      linkFailAlretVC.modalPresentationStyle = UIModalPresentationCustom;
      
-     [linkFailAlretVC setMsgTextAlignment:NSTextAlignmentLeft];
+     //[linkFailAlretVC setMsgTextAlignment:NSTextAlignmentLeft];
      [self presentViewController:linkFailAlretVC animated:YES completion:^{
          linkFailAlretVC.view.superview.backgroundColor = [UIColor clearColor];
      }];

创维盒子/双子星云手机/Class/Set/previewFile/videoPlayByAVPlayerViewController.m

@@ -82,9 +82,10 @@
     if(!self.playerManager.assetURL){
         NSString *filePath = _VideoDataMode.path;
         NSString *urlStr = ksharedAppDelegate.NASFileService;
+        //NSString *urlStr = ksharedAppDelegate.NASFileByBoxService;
         NSString *fileUrl = [[NSString alloc] initWithFormat:@"%@getFile?path=%@",urlStr,filePath];
         NSString *showUrl = [[NSString alloc] initWithFormat:@"%@getThumbnail?path=%@",urlStr,filePath];
-        //HLog(@"%@",fileUrl);
+        HLog(@"%@",fileUrl);
         //fileUrl = @"http://transfertest.armclouding.com:10010/getFile?path=/sdcard/bb.mp4";
         //fileUrl = @"http://m10.music.126.net/20240527160012/d3f165dc686ac01afd4497400b2c2c58/ymusic/5353/0f0f/0358/d99739615f8e5153d77042092f07fd77.mp3";
         fileUrl = [fileUrl  stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];

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

@@ -520,3 +520,7 @@
 "share_expiration_date_forever"   = "永久有效";
 "box_receive_delete_msg"   = "确认后仅删除记录不会删除文件，\n是否删除所选的文件记录?";
 "netWork_title" = "网络";
+"get_sn_msg_201_title" = "设备信息不存在";
+"get_sn_msg_201_content" = "请提供SN联系客服查询设备信息！";
+"get_sn_msg_202_title" = "设备激活失败";
+"get_sn_msg_202_content" = "检查盒子是否通电通网，若还不能解决，请提供SN联系客服处理！";