1.从主干（1.4.3.1代码已合并）重新拉分钟做GBOX 1.0.1

创维盒子/jiSuanQi_Info.plist

@@ -104,6 +104,24 @@
 		<true/>
 		<key>NSExceptionDomains</key>
 		<dict>
+			<key>dns.sgbox.ai</key>
+			<dict>
+				<key>NSExceptionRequiresForwardSecrecy</key>
+				<false/>
+				<key>NSExceptionAllowsInsecureHTTPLoads</key>
+				<true/>
+				<key>NSIncludesSubdomains</key>
+				<true/>
+			</dict>
+			<key>cloud.sgbox.ai</key>
+			<dict>
+				<key>NSExceptionRequiresForwardSecrecy</key>
+				<false/>
+				<key>NSExceptionAllowsInsecureHTTPLoads</key>
+				<true/>
+				<key>NSIncludesSubdomains</key>
+				<true/>
+			</dict>
 			<key>web-hz3.phone.androidscloud.com</key>
 			<dict>
 				<key>NSExceptionRequiresForwardSecrecy</key>

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

@@ -6158,7 +6158,7 @@
 				CODE_SIGN_ENTITLEMENTS = "隐私保护.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -6192,7 +6192,7 @@
 					"\"$(SRCROOT)/CloudPlayer/RCCloudPhoneSDK/RCHWDecode\"",
 				);
 				INFOPLIST_FILE = "双子星云手机/Info.plist";
-				INFOPLIST_KEY_CFBundleDisplayName = "Private-X";
+				INFOPLIST_KEY_CFBundleDisplayName = GBOX;
 				INFOPLIST_KEY_NSCameraUsageDescription = "app need to use Camera ";
 				INFOPLIST_KEY_NSLocationAlwaysAndWhenInUseUsageDescription = "Private-X将需要使用您的地址信息以便于为您提供更准确的服务。";
 				INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "Private-X将需要使用您的地址信息以便于为您提供更准确的服务。";
@@ -6215,8 +6215,8 @@
 					"$(PROJECT_DIR)/双子星云手机/Vendor/UDP/RayProxy",
 					"$(PROJECT_DIR)/RayProxy",
 				);
-				MARKETING_VERSION = 1.4.3.1;
-				PRODUCT_BUNDLE_IDENTIFIER = com.armcloud.privacy.x.box;
+				MARKETING_VERSION = 1.0.1;
+				PRODUCT_BUNDLE_IDENTIFIER = com.gbox.privacy.zj;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -6237,7 +6237,7 @@
 				CODE_SIGN_ENTITLEMENTS = "隐私保护.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -6271,7 +6271,7 @@
 					"\"$(SRCROOT)/CloudPlayer/RCCloudPhoneSDK/RCHWDecode\"",
 				);
 				INFOPLIST_FILE = "双子星云手机/Info.plist";
-				INFOPLIST_KEY_CFBundleDisplayName = "Private-X";
+				INFOPLIST_KEY_CFBundleDisplayName = GBOX;
 				INFOPLIST_KEY_NSCameraUsageDescription = "app need to use Camera ";
 				INFOPLIST_KEY_NSLocationAlwaysAndWhenInUseUsageDescription = "Private-X将需要使用您的地址信息以便于为您提供更准确的服务。";
 				INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "Private-X将需要使用您的地址信息以便于为您提供更准确的服务。";
@@ -6294,8 +6294,8 @@
 					"$(PROJECT_DIR)/双子星云手机/Vendor/UDP/RayProxy",
 					"$(PROJECT_DIR)/RayProxy",
 				);
-				MARKETING_VERSION = 1.4.3.1;
-				PRODUCT_BUNDLE_IDENTIFIER = com.armcloud.privacy.x.box;
+				MARKETING_VERSION = 1.0.1;
+				PRODUCT_BUNDLE_IDENTIFIER = com.gbox.privacy.zj;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";

创维盒子/双子星云手机/AppDelegate/Config/ColorDefine.h

@@ -52,6 +52,10 @@
 #define HW111111Color [UIColor hwColor:@"#111111"]
 #define HWECECECColor [UIColor hwColor:@"#ECECEC"]
 #define HW9D9D9DColor [UIColor hwColor:@"#9D9D9D"]
+#define HWFFD315Color [UIColor hwColor:@"#FFD315"]
+//GBOX 按钮渐变色
+#define HWFFE10FColor [UIColor hwColor:@"#FFE10F"]
+#define HWFFE411Color [UIColor hwColor:@"#FFE411"]
 
 #define COLOR_DISABLE_BTN         RGBACOLOR(0x08,0x86,0xF5,0.3)
 #define COLOR_ENABLE_BTN          RGBACOLOR(36,99,251,1)

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

@@ -101,28 +101,18 @@ isBangsScreen; \
 #define WAUTOSCALE ([[UIScreen mainScreen] bounds].size.width / 375)
 #define HAUTOSCALE ([[UIScreen mainScreen] bounds].size.height / 667)
 
-//#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 shareService   @"http://testprivacy.phone.armclouding.com:1801/h5/#/pages/fileSharing/index?productType=Private-X&token="
-
-//创维盒子 测试地址 正在使用
-//#define CloudService   @"http://testprivacy.phone.androidscloud.com:1801"
-//#define shareService   @"http://testprivacy.phone.androidscloud.com:1801/h5/#/pages/fileSharing/index?productType=Private-X&token="
+//测试地址 正在使用
+//#define CloudService   @"http://testprivacy.phone.androidscloud.com:5200/"
 
 //预生产环境
-//#define CloudService   @"http://testprivacy.phone.androidscloud.com:10900"
-//#define shareService   @"http://testprivacy.phone.androidscloud.com:10900/h5/#/pages/fileSharing/index?productType=Private-X&token="
-
-//生产环境 弃用
-//弃用 #define CloudService   @"http://hiboxde.armclouding.com:7780"
-//弃用 #define shareService   @"http://hiboxde.armclouding.com:7780/h5/#/pages/fileSharing/index?productType=Private-X&token="
+//#define CloudService   @"http://testprivacy.phone.androidscloud.com:10900/"
 
 //生产环境 1.4.3 开始使用
-#define CloudService   @"http://hiboxde.androidscloud.com:7780"
-#define shareService   @"http://hiboxde.androidscloud.com:7780/h5/#/pages/fileSharing/index?productType=Private-X&token="
+#define CloudService   @"http://cloud.sgbox.ai/"
+
+
 
+#define shareService @""
 
 #define AESCODEKEEYY @"fvO8gAfNSr1tbdQe"
 

创维盒子/双子星云手机/Assets.xcassets/Base/yindao1.imageset/Contents.json

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

创维盒子/双子星云手机/Assets.xcassets/Base/yindao2.imageset/Contents.json

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

创维盒子/双子星云手机/Assets.xcassets/Buy/Contents.json

@@ -1,6 +0,0 @@
-{
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

创维盒子/双子星云手机/Assets.xcassets/Buy/buy_copy.imageset/Contents.json

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

创维盒子/双子星云手机/Assets.xcassets/Buy/buy_home_bj.imageset/Contents.json

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

创维盒子/双子星云手机/Assets.xcassets/Buy/buy_home_flag_fun.imageset/Contents.json

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

创维盒子/双子星云手机/Assets.xcassets/Buy/buy_home_fun_bg.imageset/Contents.json

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

创维盒子/双子星云手机/Assets.xcassets/Buy/buy_home_fun_up_flag.imageset/Contents.json

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

创维盒子/双子星云手机/Assets.xcassets/Buy/buy_home_right_up.imageset/Contents.json

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

创维盒子/双子星云手机/Assets.xcassets/Buy/buy_pay_faile.imageset/Contents.json

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

创维盒子/双子星云手机/Assets.xcassets/Buy/buy_pay_success.imageset/Contents.json

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

创维盒子/双子星云手机/Assets.xcassets/Buy/buy_paying.imageset/Contents.json

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

创维盒子/双子星云手机/Assets.xcassets/Buy/buy_type_disselect.imageset/Contents.json

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

创维盒子/双子星云手机/Assets.xcassets/Buy/buy_type_selected.imageset/Contents.json

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

创维盒子/双子星云手机/Assets.xcassets/Buy/buy_vip_top_bj.imageset/Contents.json

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

创维盒子/双子星云手机/Assets.xcassets/Buy/icon_air_pay.imageset/Contents.json

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

创维盒子/双子星云手机/Assets.xcassets/Buy/icon_wechat_pay.imageset/Contents.json

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

创维盒子/双子星云手机/Assets.xcassets/Buy/right_up_set.imageset/Contents.json

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

创维盒子/双子星云手机/Assets.xcassets/Guide/gongzhonghao.imageset/Contents.json

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

创维盒子/双子星云手机/Assets.xcassets/Guide/guide_last_middle_icon.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "编组 26@2x.png",
+      "filename" : "编组 2@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "编组 26@3x.png",
+      "filename" : "编组 2@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

创维盒子/双子星云手机/Assets.xcassets/Guide/guide_up_icon.imageset/Contents.json

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

创维盒子/双子星云手机/Assets.xcassets/Guide/scan_tip/scan_tip_Hans.imageset/Contents.json

@@ -10,7 +10,6 @@
       "scale" : "2x"
     },
     {
-      "filename" : "scan_tip_Hans@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

创维盒子/双子星云手机/Assets.xcassets/Guide/scan_tip/scan_tip_ja.imageset/Contents.json

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

创维盒子/双子星云手机/Assets.xcassets/Player/new_people_welfare_bg.imageset/Contents.json

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