Przeglądaj źródła

1.镜像版本升级弹框

huangxiaodong 1 rok temu
rodzic
commit
21f38d9cbc
22 zmienionych plików z 343 dodań i 22 usunięć
  1. 10 2
      创维盒子/双子星云手机.xcodeproj/project.pbxproj
  2. 3 0
      创维盒子/双子星云手机/AppDelegate/Config/Const.h
  3. 3 0
      创维盒子/双子星云手机/AppDelegate/Config/Const.m
  4. 2 2
      创维盒子/双子星云手机/AppDelegate/PrefixHeader.pch
  5. 22 0
      创维盒子/双子星云手机/Assets.xcassets/Other/imageVersionTipBg.imageset/Contents.json
  6. BIN
      创维盒子/双子星云手机/Assets.xcassets/Other/imageVersionTipBg.imageset/imageVersionTipBg@2x.png
  7. BIN
      创维盒子/双子星云手机/Assets.xcassets/Other/imageVersionTipBg.imageset/imageVersionTipBg@3x.png
  8. 22 0
      创维盒子/双子星云手机/Assets.xcassets/common/common_del_white.imageset/Contents.json
  9. BIN
      创维盒子/双子星云手机/Assets.xcassets/common/common_del_white.imageset/common_del_white@2x.png
  10. BIN
      创维盒子/双子星云手机/Assets.xcassets/common/common_del_white.imageset/common_del_white@3x.png
  11. 15 5
      创维盒子/双子星云手机/Class/Set/view/allVersionView.m
  12. 2 0
      创维盒子/双子星云手机/CloudPlayer/Model/couldphoneSysInfoModel.h
  13. 47 0
      创维盒子/双子星云手机/CloudPlayer/PlayerViewController+otherDelegate.mm
  14. 1 0
      创维盒子/双子星云手机/CloudPlayer/PlayerViewController.h
  15. 7 7
      创维盒子/双子星云手机/CloudPlayer/PlayerViewController.mm
  16. 17 0
      创维盒子/双子星云手机/CloudPlayer/View/imageVersionRenewTipView.h
  17. 153 0
      创维盒子/双子星云手机/CloudPlayer/View/imageVersionRenewTipView.m
  18. 9 0
      创维盒子/双子星云手机/connectDeviceManager/model/DeviceThirdIdModel.h
  19. 7 1
      创维盒子/双子星云手机/en.lproj/Localizable.strings
  20. 8 2
      创维盒子/双子星云手机/ja.lproj/Localizable.strings
  21. 8 2
      创维盒子/双子星云手机/zh-Hans.lproj/Localizable.strings
  22. 7 1
      创维盒子/双子星云手机/zh-Hant.lproj/Localizable.strings

+ 10 - 2
创维盒子/双子星云手机.xcodeproj/project.pbxproj

@@ -178,6 +178,8 @@
 		6B3F96342AD2A15A008E349E /* netWorkManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B3F96322AD2A15A008E349E /* netWorkManager.h */; };
 		6B3F96352AD2A15A008E349E /* netWorkManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B3F96332AD2A15A008E349E /* netWorkManager.m */; };
 		6B3F963A2AD2AD0B008E349E /* newWorkInterface.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B3F96392AD2AD0B008E349E /* newWorkInterface.h */; };
+		6B4D23B12B33DDBC005B718A /* imageVersionRenewTipView.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B4D23AF2B33DDBB005B718A /* imageVersionRenewTipView.h */; };
+		6B4D23B22B33DDBC005B718A /* imageVersionRenewTipView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B4D23B02B33DDBB005B718A /* imageVersionRenewTipView.m */; };
 		6B72724B2B0AF59200C03F87 /* uploadFileRecordTableViewHeadView.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B7272492B0AF59200C03F87 /* uploadFileRecordTableViewHeadView.h */; };
 		6B72724C2B0AF59200C03F87 /* uploadFileRecordTableViewHeadView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B72724A2B0AF59200C03F87 /* uploadFileRecordTableViewHeadView.m */; };
 		6B72724F2B0B58E500C03F87 /* uploadFileRecordEditBottomView.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B72724D2B0B58E500C03F87 /* uploadFileRecordEditBottomView.h */; };
@@ -557,6 +559,8 @@
 		6B3F96322AD2A15A008E349E /* netWorkManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = netWorkManager.h; sourceTree = "<group>"; };
 		6B3F96332AD2A15A008E349E /* netWorkManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = netWorkManager.m; sourceTree = "<group>"; };
 		6B3F96392AD2AD0B008E349E /* newWorkInterface.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = newWorkInterface.h; sourceTree = "<group>"; };
+		6B4D23AF2B33DDBB005B718A /* imageVersionRenewTipView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = imageVersionRenewTipView.h; sourceTree = "<group>"; };
+		6B4D23B02B33DDBB005B718A /* imageVersionRenewTipView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = imageVersionRenewTipView.m; sourceTree = "<group>"; };
 		6B7272492B0AF59200C03F87 /* uploadFileRecordTableViewHeadView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = uploadFileRecordTableViewHeadView.h; sourceTree = "<group>"; };
 		6B72724A2B0AF59200C03F87 /* uploadFileRecordTableViewHeadView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = uploadFileRecordTableViewHeadView.m; sourceTree = "<group>"; };
 		6B72724D2B0B58E500C03F87 /* uploadFileRecordEditBottomView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = uploadFileRecordEditBottomView.h; sourceTree = "<group>"; };
@@ -1057,6 +1061,8 @@
 				6BF52CAC2AD82EA500A617DB /* PlayerControlButTipView.m */,
 				6BFF26862AF8949F00FCB4F7 /* playerShowSecretkeyView.h */,
 				6BFF26872AF8949F00FCB4F7 /* playerShowSecretkeyView.m */,
+				6B4D23AF2B33DDBB005B718A /* imageVersionRenewTipView.h */,
+				6B4D23B02B33DDBB005B718A /* imageVersionRenewTipView.m */,
 			);
 			path = View;
 			sourceTree = "<group>";
@@ -1740,6 +1746,7 @@
 				18FCE53E2AD136670020F623 /* PlayerViewController+AdjustBtnFrame.h in Headers */,
 				6B05815B2AFC851E00D37290 /* mySetHeadView.h in Headers */,
 				6BF52CAD2AD82EA500A617DB /* PlayerControlButTipView.h in Headers */,
+				6B4D23B12B33DDBC005B718A /* imageVersionRenewTipView.h in Headers */,
 				6B8FF6BD2B04EB7100800981 /* uploadFileRecordBodyView.h in Headers */,
 				6B0582892B045E0B00D37290 /* uploadFileDataModel.h in Headers */,
 				6BF52C972AD5546500A617DB /* SimplePing.h in Headers */,
@@ -2222,6 +2229,7 @@
 				183AE60A2A89CE3C00B11CB0 /* JSONModel+networking.m in Sources */,
 				A0951D9427ED61F5000E6AC4 /* HWAboutViewController.m in Sources */,
 				183AE5E12A89CD3C00B11CB0 /* SuperModel.m in Sources */,
+				6B4D23B22B33DDBC005B718A /* imageVersionRenewTipView.m in Sources */,
 				6B7272502B0B58E500C03F87 /* uploadFileRecordEditBottomView.m in Sources */,
 				A003F6A927D841C800715CBF /* BaseTabBarController.m in Sources */,
 				A003F6C027D841FF00715CBF /* FLAnimatedImage.m in Sources */,
@@ -2544,7 +2552,7 @@
 					"$(PROJECT_DIR)/双子星云手机/Vendor/UDP/RayProxy",
 					"$(PROJECT_DIR)/RayProxy",
 				);
-				MARKETING_VERSION = 1.1.0;
+				MARKETING_VERSION = 1.2.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.armcloud.privacy.x.box;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2623,7 +2631,7 @@
 					"$(PROJECT_DIR)/双子星云手机/Vendor/UDP/RayProxy",
 					"$(PROJECT_DIR)/RayProxy",
 				);
-				MARKETING_VERSION = 1.1.0;
+				MARKETING_VERSION = 1.2.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.armcloud.privacy.x.box;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

+ 3 - 0
创维盒子/双子星云手机/AppDelegate/Config/Const.h

@@ -82,6 +82,9 @@ UIKIT_EXTERN NSString *const Const_did_Show_playView_controlBtn_Tip;
 
 /*标记是否要要调用改机接口*/
 UIKIT_EXTERN NSString *const Const_need_random_Change_Params;
+
+/*标记是否镜像版本更新日期*/
+UIKIT_EXTERN NSString *const Const_did_show_image_version_date;
 @end
 
 NS_ASSUME_NONNULL_END

+ 3 - 0
创维盒子/双子星云手机/AppDelegate/Config/Const.m

@@ -78,4 +78,7 @@ NSString *const Const_did_Show_playView_controlBtn_Tip  = @"Const_did_Show_playV
 
 /*标记是否要要调用改机接口*/
 NSString *const Const_need_random_Change_Params  = @"need_random_Change_Params";
+
+/*标记是否镜像版本更新日期*/
+NSString *const Const_did_show_image_version_date  = @"did_show_image_version_date";
 @end

+ 2 - 2
创维盒子/双子星云手机/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"

+ 22 - 0
创维盒子/双子星云手机/Assets.xcassets/Other/imageVersionTipBg.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "imageVersionTipBg@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "imageVersionTipBg@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

BIN
创维盒子/双子星云手机/Assets.xcassets/Other/imageVersionTipBg.imageset/imageVersionTipBg@2x.png


BIN
创维盒子/双子星云手机/Assets.xcassets/Other/imageVersionTipBg.imageset/imageVersionTipBg@3x.png


+ 22 - 0
创维盒子/双子星云手机/Assets.xcassets/common/common_del_white.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "common_del_white@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "common_del_white@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

BIN
创维盒子/双子星云手机/Assets.xcassets/common/common_del_white.imageset/common_del_white@2x.png


BIN
创维盒子/双子星云手机/Assets.xcassets/common/common_del_white.imageset/common_del_white@3x.png


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

@@ -36,6 +36,8 @@
     dataArr = [NSMutableArray new];
     
     NSString *str1 = NSLocalizedString(@"my_set_about_version_tap_jingxiang",nil);
+    NSString *str1_1 = NSLocalizedString(@"my_set_about_version_tap_jingxiang_v",nil);
+    NSString *str1_2 = NSLocalizedString(@"my_set_about_version_tap_shuzhu",nil);
     NSString *str2 = NSLocalizedString(@"my_set_about_version_tap_daili",nil);
     NSString *str3 = NSLocalizedString(@"my_set_about_version_tap_TV",nil);
     NSString *str4 = NSLocalizedString(@"my_set_about_version_tap_app",nil);
@@ -43,6 +45,8 @@
     NSString *str6 = NSLocalizedString(@"my_set_about_version_tap_av",nil);
     
     [dataArr addObject:str1];
+    [dataArr addObject:str1_1];
+    [dataArr addObject:str1_2];
     [dataArr addObject:str2];
     [dataArr addObject:str3];
     [dataArr addObject:str4];
@@ -59,7 +63,7 @@
     [_whiteBgView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.mas_equalTo(20);
         make.right.mas_equalTo(-20);
-        make.height.mas_equalTo(380);
+        make.height.mas_equalTo(460);
         make.centerY.mas_equalTo(self.center).offset(-20);
     }];
     
@@ -166,21 +170,27 @@
             }
                 break;
             case 1:
-                cell.detailTextLabel.text = _couldphoneSysInfoMod.data.data.AgentVersion.versionName;
+                cell.detailTextLabel.text = _couldphoneSysInfoMod.data.data.hostImgVer;
                 break;
             case 2:
+                cell.detailTextLabel.text = _couldphoneSysInfoMod.data.data.hostAgentVer;
+                break;
+            case 3:
+                cell.detailTextLabel.text = _couldphoneSysInfoMod.data.data.AgentVersion.versionName;
+                break;
+            case 4:
                 cell.detailTextLabel.text = _couldphoneSysInfoMod.data.data.privateTV.versionName;
                 break;
-            case 3:{
+            case 5:{
                 NSString *vers = [iPhone appVersion];
                 cell.detailTextLabel.text = [NSString stringWithFormat:@"V%@",vers];
             }
                 break;
-            case 4:
+            case 6:
                 //cell.detailTextLabel.text = _couldphoneSysInfoMod.data.data.sn;
                 cell.detailTextLabel.text = [connectDeviceManager shareInstance].DeviceThirdIdMod.data.sn;
                 break;
-            case 5:{
+            case 7:{
                 cell.detailTextLabel.text = _couldphoneSysInfoMod.data.data.AVVersion;
             }
                 break;

+ 2 - 0
创维盒子/双子星云手机/CloudPlayer/Model/couldphoneSysInfoModel.h

@@ -44,6 +44,8 @@ NS_ASSUME_NONNULL_BEGIN
 @interface couldphoneSysInfoDataDataModel : SuperModel
 @property (nonatomic, copy) NSString* AVVersion;
 @property (nonatomic, copy) NSString* ImageVersion;
+@property (nonatomic, copy) NSString* hostImgVer;//宿主机镜像版本号
+@property (nonatomic, copy) NSString* hostAgentVer;//宿主机代理版本号
 @property (nonatomic, copy) NSString* sn;
 @property(nonatomic, strong)AgentVersionModel *AgentVersion;
 @property(nonatomic, strong)privateTVModel *privateTV;

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

@@ -147,12 +147,59 @@
 - (void)getCouldPhoneSysInfoResponseFun:(NSDictionary *)dataDict{
     couldphoneSysInfoModel *model = [[couldphoneSysInfoModel alloc] initWithDictionary:dataDict error:nil];
     [[NSNotificationCenter defaultCenter] postNotificationName:getCouldPhoneSysInfoNotification object:model];
+    
+    NSString * predatestr = [HWDataManager getObjectWithKey:Const_did_show_image_version_date];
+    
+    NSString *datestr = [iTools getNowDateString];
+    
+//    if(predatestr && [predatestr isEqualToString:datestr]){
+//        return;
+//    }
+    
+    NSString *hostImgVer = model.data.data.hostImgVer;
+    
+    if (!hostImgVer || hostImgVer.length < 3) {
+        //[self showImageViewRenewTipViewFun];
+        return;
+    }
+    
+    NSArray *versionArr = [hostImgVer componentsSeparatedByString:@"."];
+    
+    if(versionArr.count >= 2)
+    {
+        NSString * oneStr = versionArr[0];
+        NSString * twoStr = versionArr[1];
+        
+        if(oneStr.integerValue >=1 && twoStr.integerValue >=2){
+            return;
+        }
+    }
+    
+    
+    [self showImageViewRenewTipViewFun];
 }
 
 - (void)getCouldPhoneTvStatusResponseFun:(NSDictionary *)dataDict
 {
     TvStatusModel *model = [[TvStatusModel alloc] initWithDictionary:dataDict error:nil];
     [[NSNotificationCenter defaultCenter] postNotificationName:getCouldPhoneTvStatusNotification object:model];
+    
+    if(![model.msg containsString:@"PushStreamBActivity"])
+    {
+        return;
+    }
+    
+    UIViewController*topVc = self.navigationController.viewControllers.lastObject;
+    if([topVc isKindOfClass:[PlayerViewController class]]){
+        [[iToast makeText:NSLocalizedString(@"tv_p2p_ing",nil)] show];
+    }
+}
+
+- (void)showImageViewRenewTipViewFun
+{
+    imageVersionRenewTipView * RenewTipView = [[imageVersionRenewTipView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_W, SCREEN_H)];
+    [self.view addSubview:RenewTipView];
+    [self.view bringSubviewToFront:RenewTipView];
 }
 
 #pragma mark 监听文件开始的的通知

+ 1 - 0
创维盒子/双子星云手机/CloudPlayer/PlayerViewController.h

@@ -19,6 +19,7 @@
 #import <RCCloudPhoneSDK/RCRecordManager.h>
 //#import <RCCloudPhoneSDK/RCCommandChannel.h>
 #import <RCCloudPhoneSDK/RCLiveSteamManager.h>
+#import "imageVersionRenewTipView.h"
 
 @protocol PlayerViewControllerDelegate <NSObject>
 

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

@@ -1624,7 +1624,13 @@ NSDate *lastVideoTome;/*上一帧数据时间*/
         
         [self getPreferredLanguage];
         
-        //[self showImageViewRenewTipViewFun];
+        
+        NSString *commondStr2  = @"{\"type\":\"TvStatus\"}";
+        [self send_data:commondStr2];
+        
+        NSString *commondStr3  = @"{\"type\":\"getSysInfo\"}";
+        [self send_data:commondStr3];
+        
         
         //test code
         //[self LogoutByOtherFun];
@@ -3038,11 +3044,5 @@ static int  couneeee = 0;
     return YES;
 }
 
-- (void)showImageViewRenewTipViewFun
-{
-    imageVersionRenewTipView * RenewTipView = [[imageVersionRenewTipView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_W, SCREEN_H)];
-    [self.view addSubview:RenewTipView];
-    [self.view bringSubviewToFront:RenewTipView];
-}
 
 @end

+ 17 - 0
创维盒子/双子星云手机/CloudPlayer/View/imageVersionRenewTipView.h

@@ -0,0 +1,17 @@
+//
+//  imageVersionRenewTipView.h
+//  隐私保护
+//
+//  Created by xd h on 2023/12/21.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface imageVersionRenewTipView : UIView
+
+
+@end
+
+NS_ASSUME_NONNULL_END

+ 153 - 0
创维盒子/双子星云手机/CloudPlayer/View/imageVersionRenewTipView.m

@@ -0,0 +1,153 @@
+//
+//  imageVersionRenewTipView.m
+//  隐私保护
+//
+//  Created by xd h on 2023/12/21.
+//
+
+#import "imageVersionRenewTipView.h"
+@interface imageVersionRenewTipView ()
+@property (nonatomic,strong) UIView* whiteBgView;
+@end
+
+@implementation imageVersionRenewTipView
+
+- (id)initWithFrame:(CGRect)frame{
+    self = [super initWithFrame:frame];
+    self.backgroundColor = [UIColor hwColor:@"000000" alpha:0.6];
+    [self drawAnyView];
+    
+    return self;
+}
+
+- (void)drawAnyView{
+    _whiteBgView = [UIView new];
+    _whiteBgView.layer.cornerRadius = 8;
+    _whiteBgView.backgroundColor = [UIColor whiteColor];
+    [self addSubview:_whiteBgView];
+    
+    [_whiteBgView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.height.mas_equalTo(332);
+        make.width.mas_equalTo(300.f);
+        make.centerY.mas_equalTo(-50.f);
+        make.centerX.mas_equalTo(0.f);
+    }];
+    
+    UIImageView *topImage = [[UIImageView alloc] init];
+    topImage.image = [UIImage imageNamed:@"imageVersionTipBg"];
+    [_whiteBgView addSubview:topImage];
+    
+    [topImage mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.height.mas_equalTo(160);
+        make.width.mas_equalTo(300.f);
+        make.left.mas_equalTo(0.f);
+        make.top.mas_equalTo(-40.f);
+    }];
+    
+    NSString *curTitleStr = NSLocalizedString(@"image_version_pop_title",nil);
+    UILabel *titleLab = [[UILabel alloc] init];
+    titleLab.text = curTitleStr;
+    titleLab.numberOfLines = 0;
+    titleLab.textColor = [UIColor whiteColor];
+    titleLab.font = [UIFont boldSystemFontOfSize:22.0];
+    [topImage addSubview:titleLab];
+    
+    [titleLab mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.height.mas_equalTo(60);
+        make.right.mas_equalTo(0.f);
+        make.left.mas_equalTo(25.f);
+        make.top.mas_equalTo(55.f);
+    }];
+    
+    NSString *curTip1Str = NSLocalizedString(@"image_version_pop_tip1",nil);
+    UILabel *tip1Lab = [[UILabel alloc] init];
+    tip1Lab.text = curTip1Str;
+    tip1Lab.numberOfLines = 0;
+    tip1Lab.textAlignment = NSTextAlignmentCenter;
+    tip1Lab.textColor = [UIColor hwColor:@"#151515" alpha:1.0];
+    tip1Lab.font = [UIFont systemFontOfSize:16.0];
+    [_whiteBgView addSubview:tip1Lab];
+    
+    CGFloat curHeight = [curTip1Str boundingRectWithSize:CGSizeMake(280, 1000) options:(NSStringDrawingUsesLineFragmentOrigin) attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:16.0]} context:nil].size.height;
+    
+    curHeight += 15;
+    
+    [tip1Lab mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.height.mas_equalTo(curHeight);
+        make.right.mas_equalTo(-10.f);
+        make.left.mas_equalTo(10.f);
+        make.top.mas_equalTo(topImage.mas_bottom).offset(20.f);
+    }];
+    
+    NSString *curTip2Str = NSLocalizedString(@"image_version_pop_tip2",nil);
+    
+    CGFloat curHeight2 = [curTip2Str boundingRectWithSize:CGSizeMake(280, 1000) options:(NSStringDrawingUsesLineFragmentOrigin) attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:16.0]} context:nil].size.height;
+    
+    curHeight2 += 5;
+    
+    UILabel *tip2Lab = [[UILabel alloc] init];
+    tip2Lab.text = curTip2Str;
+    tip2Lab.numberOfLines = 0;
+    tip2Lab.textAlignment = NSTextAlignmentCenter;
+    tip2Lab.textColor = [UIColor hwColor:@"#151515" alpha:0.5];
+    tip2Lab.font = [UIFont systemFontOfSize:14.0];
+    [_whiteBgView addSubview:tip2Lab];
+    //tip2Lab.backgroundColor = [UIColor greenColor];
+    
+    [tip2Lab mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.height.mas_equalTo(curHeight2);
+        make.right.mas_equalTo(-10.f);
+        make.left.mas_equalTo(10.f);
+        make.top.mas_equalTo(tip1Lab.mas_bottom).offset(10.f);
+    }];
+    
+    [_whiteBgView mas_remakeConstraints:^(MASConstraintMaker *make) {
+        make.height.mas_equalTo(240 + curHeight + curHeight2);
+        make.width.mas_equalTo(300.f);
+        make.centerY.mas_equalTo(-50.f);
+        make.centerX.mas_equalTo(0.f);
+    }];
+    
+    UIButton *konwBut = [[UIButton alloc] init];
+    [konwBut setTitle:NSLocalizedString(@"guide_set_pwd_guide_know",nil) forState:UIControlStateNormal];
+    konwBut.layer.cornerRadius = 8;
+    konwBut.layer.masksToBounds = YES;
+    [konwBut addTarget:self action:@selector(colseFun) forControlEvents:UIControlEventTouchUpInside];
+    [_whiteBgView addSubview:konwBut];
+    
+    CAGradientLayer *gradientLayer = [CAGradientLayer layer];
+    gradientLayer.frame = CGRectMake(0, 0, 160, 48);
+    gradientLayer.colors = @[(__bridge NSString *)[UIColor hwColor:@"#0CDEFD" alpha:1.0].CGColor, (__bridge NSString *)[UIColor hwColor:@"#058DFB" alpha:1.0].CGColor];
+    gradientLayer.locations = @[@(0), @(1.0f)];
+    [konwBut.layer addSublayer:gradientLayer];
+    
+    [konwBut mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.height.mas_equalTo(48);
+        make.width.mas_equalTo(160.f);
+        make.centerX.mas_equalTo(0.f);
+        make.bottom.mas_equalTo(-30);
+    }];
+    
+    
+    UIButton *colseBut = [[UIButton alloc] init];
+    [colseBut setImage:[UIImage imageNamed:@"common_del_white"] forState:UIControlStateNormal];
+    [colseBut addTarget:self action:@selector(colseFun) forControlEvents:UIControlEventTouchUpInside];
+    [self addSubview:colseBut];
+    
+    [colseBut mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.height.mas_equalTo(48);
+        make.width.mas_equalTo(48.f);
+        make.centerX.mas_equalTo(0.f);
+        make.top.mas_equalTo(_whiteBgView.mas_bottom).offset(30);
+    }];
+}
+
+
+- (void)colseFun
+{
+    NSString *datestr = [iTools getNowDateString];
+    [HWDataManager setObjectWithKey:Const_did_show_image_version_date value:datestr];
+    [self removeFromSuperview];
+}
+
+@end

+ 9 - 0
创维盒子/双子星云手机/connectDeviceManager/model/DeviceThirdIdModel.h

@@ -33,6 +33,15 @@ NS_ASSUME_NONNULL_BEGIN
 /***/
 @property (nonatomic,assign) BOOL isPrivacyMode; //是否为隐私模式
 
+/** */
+//@property(nonatomic,copy) NSString  *hostAgentVersionNumber;//
+//@property(nonatomic,copy) NSString  *hostVersionNumber;//
+//@property(nonatomic,copy) NSString  *imageNumber;//
+//@property(nonatomic,copy) NSString  *agentVersionNumber;//
+//@property(nonatomic,copy) NSString  *tvVersionNumber;//
+//@property(nonatomic,copy) NSString  *avVersionNumber;//
+//@property(nonatomic,copy) NSString  *clientVersionNumber;//
+
 /**自定义字段 是否为局域网*/
 @property (nonatomic,assign) bool isPingOk; //
 @end

+ 7 - 1
创维盒子/双子星云手机/en.lproj/Localizable.strings

@@ -281,7 +281,9 @@
 "File_upload_success"   = "File uploaded successfully";
 "File_upload_file_already_exists"   = "File already exists";
 "my_set_about_version_tap_tip"   = "Detailed version information";
-"my_set_about_version_tap_jingxiang"   = "Image version number";
+"my_set_about_version_tap_jingxiang"   = "Image number";
+"my_set_about_version_tap_jingxiang_v"   = "Image version number";
+"my_set_about_version_tap_shuzhu"   = "Host Agent version number";
 "my_set_about_version_tap_daili"   = "Agent version number";
 "my_set_about_version_tap_app"   = "Mobile version number";
 "my_set_about_version_tap_TV"   = "TV version number";
@@ -303,3 +305,7 @@
 "common_save_fail"   = "Saving failed";
 "player_Tip_ios_no_wifi_Sync"   = "The local parameters have been synchronized.(iOS can't be synchronized.)";
 "input_8_secret_key"   = "Please enter an 8-digit key";
+"image_version_pop_title"   = "New version \n Please experience it first";
+"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";

+ 8 - 2
创维盒子/双子星云手机/ja.lproj/Localizable.strings

@@ -279,12 +279,14 @@
 "File_upload_success"   = "ファイルをアップロードしました";
 "File_upload_file_already_exists"   = "既に同じファイルが保存されています。";
 "my_set_about_version_tap_tip"   = "バージョン情報の詳細";
-"my_set_about_version_tap_jingxiang"   = "アプリケーションのバージョン番号";
+"my_set_about_version_tap_jingxiang"   = "ミラー番号";
+"my_set_about_version_tap_jingxiang_v"   = "アプリケーションのバージョン番号";
+"my_set_about_version_tap_shuzhu"   = "ホストエージェントのバージョン番号";
 "my_set_about_version_tap_daili"   = "プロキシのバージョン番号";
 "my_set_about_version_tap_app"   = "携帯のバージョン番号";
 "my_set_about_version_tap_TV"   = "テレビのバージョン番号";
 "my_set_about_version_tap_sn"   = "シリアルナンバー";
-"my_set_about_version_tap_av"   = "アンチウイルスソフトのバージョン番号";
+"my_set_about_version_tap_av"   = "AV番号";
 "my_set_Privacy_Model"   = "プライベートモード";
 "my_set_Privacy_Model_tip"   = "「プライベートモード」では、パスワード設定、アイコン変更、反転終了や使用中のアプリ非表示など、個人情報を安全に保護する機能が搭載されています。";
 "my_set_Privacy_Mode_set"   = "プライベートモードの設定";
@@ -301,3 +303,7 @@
 "common_save_fail"   = "保存できませんでした";
 "player_Tip_ios_no_wifi_Sync"   = "アプリケーションの設定はバックアップされましたが、iOSではまだこの機能はサポートされていません";
 "input_8_secret_key"   = "8ビットキーを入力してください";
+"image_version_pop_title"   = "新しいバージョン \nまず体験してください";
+"image_version_pop_tip1"   = "ボックスデバイスはまだ最新バージョンに更新されていません。電源を切って再起動してボックスデバイスの更新を行ってください。";
+"image_version_pop_tip2"   = "設備更新中は操作しないでください、15分かかる予定です";
+"tv_p2p_ing"   = "ミラーリング中";

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

@@ -278,9 +278,11 @@
 "File_upload_success"   = "文件上传成功";
 "File_upload_file_already_exists"   = "文件已存在";
 "my_set_about_version_tap_tip"   = "详细版本信息";
-"my_set_about_version_tap_jingxiang"   = "镜像版本号";
+"my_set_about_version_tap_jingxiang"   = "镜像号";
+"my_set_about_version_tap_jingxiang_v"   = "镜像版本号";
+"my_set_about_version_tap_shuzhu"   = "宿主机代理版本号";
 "my_set_about_version_tap_daili"   = "代理版本号";
-"my_set_about_version_tap_app"   = "手机版本号";
+"my_set_about_version_tap_app"   = "客户端版本号";
 "my_set_about_version_tap_TV"   = "TV版本号";
 "my_set_about_version_tap_sn"   = "SN号";
 "my_set_about_version_tap_av"   = "AV版本号";
@@ -300,3 +302,7 @@
 "common_save_fail"   = "保存失败";
 "player_Tip_ios_no_wifi_Sync"   = "本机参数已同步完成,IOS无法同步wifi";
 "input_8_secret_key"   = "请输入8位密钥";
+"image_version_pop_title"   = "新版本\n请先体验";
+"image_version_pop_tip1"   = "盒盒子设备目前还未更新到最新版本 \n 请断电重启进行盒子设备更新";
+"image_version_pop_tip2"   = "设备更新期间请勿操作,预计需15分钟";
+"tv_p2p_ing"   = "正在投屏中";

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

@@ -280,7 +280,9 @@
 "File_upload_success"   = "文件上傳成功";
 "File_upload_file_already_exists"   = "檔案已存在";
 "my_set_about_version_tap_tip"   = "詳細版本資訊";
-"my_set_about_version_tap_jingxiang"   = "鏡像版本號";
+"my_set_about_version_tap_jingxiang"   = "鏡像號";
+"my_set_about_version_tap_jingxiang_v"   = "鏡像版本號";
+"my_set_about_version_tap_shuzhu"   = "宿主機代理版本號";
 "my_set_about_version_tap_daili"   = "代理版本號";
 "my_set_about_version_tap_app"   = "手機版本號";
 "my_set_about_version_tap_TV"   = "TV版本號";
@@ -302,3 +304,7 @@
 "common_save_fail"   = "保存失敗";
 "player_Tip_ios_no_wifi_Sync"   = "本機參數已同步完成,IOS無法同步wifi";
 "input_8_secret_key"   = "請輸入8位密鑰";
+"image_version_pop_title"   = "新版本\n請先體驗";
+"image_version_pop_tip1"   = "盒盒子設備現時還未更新到最新版本\n請斷電重啓進行盒子設備更新";
+"image_version_pop_tip2"   = "設備更新期間請勿操作,預計需15分鐘";
+"tv_p2p_ing"   = "正在投屏中";