1.3.3 代码封版本

创维盒子/双子星云手机.xcodeproj/project.pbxproj

@@ -3604,7 +3604,7 @@
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 31;
 				DEVELOPMENT_TEAM = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -3666,7 +3666,7 @@
 					"$(PROJECT_DIR)/RayProxy",
 				);
 				MARKETING_VERSION = 1.3.3;
-				PRODUCT_BUNDLE_IDENTIFIER = com.armcloud.privacy.x.box;
+				PRODUCT_BUNDLE_IDENTIFIER = com.wjkxly.wujiCloudPhone;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -3686,7 +3686,7 @@
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 31;
 				DEVELOPMENT_TEAM = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -3748,7 +3748,7 @@
 					"$(PROJECT_DIR)/RayProxy",
 				);
 				MARKETING_VERSION = 1.3.3;
-				PRODUCT_BUNDLE_IDENTIFIER = com.armcloud.privacy.x.box;
+				PRODUCT_BUNDLE_IDENTIFIER = com.wjkxly.wujiCloudPhone;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -3882,7 +3882,7 @@
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 9;
+				CURRENT_PROJECT_VERSION = 24;
 				DEVELOPMENT_TEAM = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -3959,7 +3959,7 @@
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 9;
+				CURRENT_PROJECT_VERSION = 24;
 				DEVELOPMENT_TEAM = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",

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

@@ -88,8 +88,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/appUpdate/HaveNewVersionView.m

@@ -176,22 +176,34 @@ static HaveNewVersionView * _instance;
 //        make.bottom.mas_equalTo(-92);
 //    }];
     
-//    /*确定按钮*/
-//    UIButton *okBtn = [[UIButton alloc] init];
-//    [okBtn setBackgroundImage:[UIImage imageNamed:@"login_select_corner"] forState:(UIControlStateNormal)];
-//    [okBtn setTitle:@"更新" forState:(UIControlStateNormal)];
-//    [okBtn.titleLabel setFont:[UIFont systemFontOfSize:14.f]];
-//    [okBtn addTarget:self action:@selector(updateBtnPressed) forControlEvents:(UIControlEventTouchUpInside)];
-//    [okBtn.layer setCornerRadius:20.f];
-//    okBtn.layer.masksToBounds = YES;
-//    [bgView addSubview:okBtn];
-//
-//    [okBtn mas_makeConstraints:^(MASConstraintMaker *make) {
-//        make.height.mas_equalTo(40.f);
-//        make.width.mas_equalTo(168.f);
-//        make.centerX.equalTo(bgView.mas_centerX);
-//        make.bottom.mas_equalTo(-20.f);
-//    }];
+    // gradient
+    CAGradientLayer *gl = [CAGradientLayer layer];
+    gl.frame = CGRectMake(0,0,160.f,40.f);
+    gl.startPoint = CGPointMake(0, 0.5);
+    gl.endPoint = CGPointMake(1, 0.5);
+    gl.colors = @[(__bridge id)HW0CDEFDColor.CGColor, (__bridge id)HW058DFBColor.CGColor];
+    gl.locations = @[@(0), @(1.0f)];
+    
+    if(_versionModel.necessary){
+        UIButton *updatekBtn = [[UIButton alloc] init];
+        updatekBtn.frame = CGRectMake(0, 0, 160.f, 40.f);
+
+        [updatekBtn.layer addSublayer:gl];
+        [updatekBtn addTarget:self action:@selector(updateBtnPressed) forControlEvents:(UIControlEventTouchUpInside)];
+        [updatekBtn setTitle:NSLocalizedString(@"app_update_update",nil) forState:(UIControlStateNormal)];
+        [updatekBtn setTitleColor:[UIColor whiteColor] forState:(UIControlStateNormal)];
+        [updatekBtn.titleLabel setFont:[UIFont systemFontOfSize:16.f]];
+        [updatekBtn.layer setCornerRadius:8.f];
+        updatekBtn.clipsToBounds = YES;
+        [bgView addSubview:updatekBtn];
+        [updatekBtn mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.centerX.equalTo(bgView.mas_centerX);
+            make.width.mas_equalTo(160.f);
+            make.bottom.mas_equalTo(-30.f);
+            make.height.mas_equalTo(40.f);
+        }];
+    }
+    else{
     
     /*稍后再说 按钮 app_update_wait*/
     UIButton *waitBtn = [[UIButton alloc] init];
@@ -209,16 +221,8 @@ static HaveNewVersionView * _instance;
     }];
     
     UIButton *updatekBtn = [[UIButton alloc] init];
-    updatekBtn.frame = CGRectMake(0, 0, 160.f, 48.f);
+    updatekBtn.frame = CGRectMake(0, 0, 160.f, 40.f);
 
-    // gradient
-    CAGradientLayer *gl = [CAGradientLayer layer];
-    gl.frame = CGRectMake(0,0,160.f,48.f);
-    gl.startPoint = CGPointMake(0, 0.5);
-    gl.endPoint = CGPointMake(1, 0.5);
-    gl.colors = @[(__bridge id)HW0CDEFDColor.CGColor, (__bridge id)HW058DFBColor.CGColor];
-    gl.locations = @[@(0), @(1.0f)];
-    
     [updatekBtn.layer addSublayer:gl];
     [updatekBtn addTarget:self action:@selector(updateBtnPressed) forControlEvents:(UIControlEventTouchUpInside)];
     [updatekBtn setTitle:NSLocalizedString(@"app_update_update",nil) forState:(UIControlStateNormal)];
@@ -234,7 +238,7 @@ static HaveNewVersionView * _instance;
         make.height.mas_equalTo(40.f);
     }];
     
-   
+    }
 }
 
 - (void)waitBtnPressed