1.2.3.1 bug同步

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

@@ -2494,7 +2494,7 @@
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -2552,7 +2552,7 @@
 					"$(PROJECT_DIR)/双子星云手机/Vendor/UDP/RayProxy",
 					"$(PROJECT_DIR)/RayProxy",
 				);
-				MARKETING_VERSION = 1.2.3;
+				MARKETING_VERSION = 1.2.3.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.armcloud.privacy.x.box;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2573,7 +2573,7 @@
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -2631,7 +2631,7 @@
 					"$(PROJECT_DIR)/双子星云手机/Vendor/UDP/RayProxy",
 					"$(PROJECT_DIR)/RayProxy",
 				);
-				MARKETING_VERSION = 1.2.3;
+				MARKETING_VERSION = 1.2.3.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.armcloud.privacy.x.box;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

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

@@ -52,6 +52,7 @@
 - (void)viewWillAppear:(BOOL)animated
 {
     [super viewWillAppear:animated];
+    [[UIApplication sharedApplication] setStatusBarHidden:NO];
     
     if(_getTvStatus){
         _getTvStatus();

创维盒子/双子星云手机/Class/Set/uploadFile/photoView/AJPhotoGroupCell.m

@@ -37,6 +37,7 @@
         textLabel.font = [UIFont boldSystemFontOfSize:16];
         textLabel.backgroundColor = [UIColor clearColor];
         textLabel.numberOfLines = 0;
+        textLabel.textColor = [UIColor blackColor];
         [self.contentView addSubview:textLabel];
         self.groupTextLabel = textLabel;
     }

创维盒子/双子星云手机/Class/Set/uploadFile/photoView/uploadFileBottomView.m

@@ -27,6 +27,7 @@
 - (void)drawAnyView{
     _selectNumLabel = [[UILabel alloc] init];
     _selectNumLabel.font = [UIFont boldSystemFontOfSize:16.0];
+    _selectNumLabel.textColor = [UIColor blackColor];
     [self addSubview:_selectNumLabel];
     
     [_selectNumLabel mas_makeConstraints:^(MASConstraintMaker *make) {

创维盒子/双子星云手机/Class/Set/uploadFile/photoView/uploadFileRecordCell.m

@@ -122,6 +122,7 @@
     
     _fileNamelabel = [[UILabel alloc] init];
     _fileNamelabel.font = [UIFont boldSystemFontOfSize:16.0];
+    _fileNamelabel.textColor = [UIColor blackColor];
     //_fileNamelabel.backgroundColor = [UIColor greenColor];
     [self.contentView addSubview:_fileNamelabel];
     

创维盒子/双子星云手机/Class/Set/uploadFile/uploadImageOrVideoViewController.m

@@ -87,6 +87,7 @@
     UILabel *titleLabel = [[UILabel alloc] init];
     titleLabel.textAlignment = NSTextAlignmentCenter;
     titleLabel.font = [UIFont boldSystemFontOfSize:18.0];
+    titleLabel.textColor = [UIColor blackColor];
     titleLabel.translatesAutoresizingMaskIntoConstraints = NO;
     [self.navBarBGView addSubview:titleLabel];
 

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

@@ -85,6 +85,7 @@
     versionTipLabel.text = NSLocalizedString(@"my_set_about_version_tap_tip",nil) ;
     versionTipLabel.textAlignment = NSTextAlignmentCenter;
     versionTipLabel.font = [UIFont boldSystemFontOfSize:16.0];
+    versionTipLabel.textColor = [UIColor blackColor];
     [_whiteBgView addSubview:versionTipLabel];
     
     [versionTipLabel mas_makeConstraints:^(MASConstraintMaker *make) {

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

@@ -24,6 +24,7 @@
     UILabel *titleLabel = [[UILabel alloc] init];
     titleLabel.text = NSLocalizedString(@"my_set_no_File_upload",nil) ;
     titleLabel.font = [UIFont boldSystemFontOfSize:16.0];
+    titleLabel.textColor = [UIColor blackColor];
     [self addSubview:titleLabel];
     
     [titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {

创维盒子/双子星云手机/CloudPlayer/View/playerShowSecretkeyView.m

@@ -44,6 +44,7 @@
     titleLab.text = NSLocalizedString(@"player_Secret_key_title",nil);
     titleLab.textAlignment = NSTextAlignmentCenter;
     titleLab.font = [UIFont boldSystemFontOfSize:18];
+    titleLab.textColor = [UIColor blackColor];
     [_whiteBgView addSubview:titleLab];
     
     [titleLab mas_makeConstraints:^(MASConstraintMaker *make) {