1.更新镜像弹框条件变更 （添加待更新版本号）

创维盒子/双子星云手机/AppDelegate/PrefixHeader.pch

@@ -82,8 +82,8 @@ isBangsScreen; \
 //#define CloudService           @"http://14.18.190.141:11180"
 //#define CloudService           @"http://14.18.190.141:1280"
 //创维盒子 测试地址
-//#define CloudService   @"http://14.18.190.141:1801"
-#define CloudService   @"http://hiboxde.armclouding.com:7780"
+#define CloudService   @"http://14.18.190.141:1801"
+//#define CloudService   @"http://hiboxde.armclouding.com:7780"
 
 
 #define AESCODEKEEYY @"fvO8gAfNSr1tbdQe"

创维盒子/双子星云手机/Class/Set/view/allVersionView.m

@@ -43,6 +43,7 @@
     NSString *str4 = NSLocalizedString(@"my_set_about_version_tap_app",nil);
     NSString *str5 = NSLocalizedString(@"my_set_about_version_tap_sn",nil);
     NSString *str6 = NSLocalizedString(@"my_set_about_version_tap_av",nil);
+    NSString *str7 = NSLocalizedString(@"my_set_about_version_tap_newVersion",nil);
     
     [dataArr addObject:str1];
     [dataArr addObject:str1_1];
@@ -52,6 +53,7 @@
     [dataArr addObject:str4];
     [dataArr addObject:str5];
     [dataArr addObject:str6];
+    [dataArr addObject:str7];
     
     self.backgroundColor = [UIColor hwColor:@"#000000" alpha:0.6];
     
@@ -63,7 +65,7 @@
     [_whiteBgView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.mas_equalTo(20);
         make.right.mas_equalTo(-20);
-        make.height.mas_equalTo(460);
+        make.height.mas_equalTo(500);
         make.centerY.mas_equalTo(self.center).offset(-20);
     }];
     
@@ -193,6 +195,9 @@
             case 7:{
                 cell.detailTextLabel.text = _couldphoneSysInfoMod.data.data.AVVersion;
             }
+            case 8:{
+                cell.detailTextLabel.text = _couldphoneSysInfoMod.data.data.MyNewVersion;
+            }
                 break;
         }
     }

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

@@ -45,6 +45,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, copy) NSString* AVVersion;
 @property (nonatomic, copy) NSString* ImageVersion;
 @property (nonatomic, copy) NSString* hostImgVer;//宿主机镜像版本号
+@property (nonatomic, copy) NSString* MyNewVersion;//待更新镜像版本号（已下载 未更新）
 @property (nonatomic, copy) NSString* hostAgentVer;//宿主机代理版本号
 @property (nonatomic, copy) NSString* sn;
 @property(nonatomic, strong)AgentVersionModel *AgentVersion;

创维盒子/双子星云手机/CloudPlayer/Model/couldphoneSysInfoModel.m

@@ -15,7 +15,11 @@
 @end
 
 @implementation couldphoneSysInfoDataDataModel
++ (JSONKeyMapper *)keyMapper {
 
+return [[JSONKeyMapper alloc] initWithDictionary:@{@"newVersion":@"MyNewVersion"}];
+
+}
 @end
 
 @implementation couldphoneSysInfoDataModel

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

@@ -157,26 +157,43 @@
     }
     
     NSString *hostImgVer = model.data.data.hostImgVer;
+    NSString *newVersion = model.data.data.MyNewVersion;
     
     if (!hostImgVer || hostImgVer.length < 3) {
-        //[self showImageViewRenewTipViewFun];
         return;
     }
     
-    NSArray *versionArr = [hostImgVer componentsSeparatedByString:@"."];
+    if (!newVersion || newVersion.length < 3) {
+        return;
+    }
     
-    if(versionArr.count >= 2)
-    {
-        NSString * oneStr = versionArr[0];
-        NSString * twoStr = versionArr[1];
+    NSArray *hostImgVerArr = [hostImgVer componentsSeparatedByString:@"."];
+    NSArray *newVersionArr = [newVersion componentsSeparatedByString:@"."];
+    
+    if(!hostImgVerArr || !newVersionArr){
+        return;
+    }
+    
+    NSInteger curMaxCount = hostImgVerArr.count > newVersionArr.count ? newVersionArr.count : hostImgVerArr.count;
+    
+    BOOL isNeedShow = NO;
+    
+    for(int i=0;i<curMaxCount;i++){
         
-        if(oneStr.integerValue >=1 && twoStr.integerValue >=2){
-            return;
+        NSString * verNum = newVersionArr[i];
+        NSString * hostNum = hostImgVerArr[i];
+        
+        if(verNum.integerValue > hostNum.integerValue){
+            isNeedShow = YES;
+            break;
         }
     }
     
     
-    [self showImageViewRenewTipViewFun];
+    if(isNeedShow){
+        [self showImageViewRenewTipViewFun];
+    }
+    
 }
 
 - (void)getCouldPhoneTvStatusResponseFun:(NSDictionary *)dataDict

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

@@ -440,8 +440,14 @@ ComontAlretViewControllerDelegate>
 
 - (void)opencommandChannelManagerrc_openURL
 {
+    if((!ip || ip.length ==0)
+       ||(!internetVideoPort || internetVideoPort.length ==0)){
+        return;
+    }
     
     if(self.commandChannelManager){
+        
+        HLog(@"WebSocket 链接时已经存在");
         [self.commandChannelManager rc_close];
         
         self.commandChannelManager = nil;

创维盒子/双子星云手机/en.lproj/Localizable.strings

@@ -309,3 +309,4 @@
 "image_version_pop_tip1"   = "The box device has not been updated to the latest version yet. Please power off and restart to update the box device";
 "image_version_pop_tip2"   = "Do not operate during device update, estimated to take 15 minutes";
 "tv_p2p_ing"   = "Casting";
+"my_set_about_version_tap_newVersion"   = "Image version to be updated";

创维盒子/双子星云手机/ja.lproj/Localizable.strings

@@ -307,3 +307,4 @@
 "image_version_pop_tip1"   = "ボックスデバイスはまだ最新バージョンに更新されていません。電源を切って再起動してボックスデバイスの更新を行ってください。";
 "image_version_pop_tip2"   = "設備更新中は操作しないでください、15分かかる予定です";
 "tv_p2p_ing"   = "ミラーリング中";
+"my_set_about_version_tap_newVersion"   = "更新されるミラーバージョン";

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

@@ -306,3 +306,5 @@
 "image_version_pop_tip1"   = "盒子设备目前还未更新到最新版本 \n 请断电重启进行盒子设备更新";
 "image_version_pop_tip2"   = "设备更新期间请勿操作，预计需15分钟";
 "tv_p2p_ing"   = "正在投屏中";
+"my_set_about_version_tap_newVersion"   = "待更新镜像版本";
+

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

@@ -308,3 +308,4 @@
 "image_version_pop_tip1"   = "盒子設備現時還未更新到最新版本\n請斷電重啓進行盒子設備更新";
 "image_version_pop_tip2"   = "設備更新期間請勿操作，預計需15分鐘";
 "tv_p2p_ing"   = "正在投屏中";
+"my_set_about_version_tap_newVersion"   = "待更新鏡像版本";