1. 1.2.3 改计算器

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

@@ -2527,7 +2527,7 @@
 					"\"$(SRCROOT)/CloudPlayer/RCCloudPhoneSDK/RCHWDecode\"",
 				);
 				INFOPLIST_FILE = "双子星云手机/Info.plist";
-				INFOPLIST_KEY_CFBundleDisplayName = "Private-X";
+				INFOPLIST_KEY_CFBundleDisplayName = "计算器";
 				INFOPLIST_KEY_NSCameraUsageDescription = "Private-X将需要使用您的摄像头用于头像拍照";
 				INFOPLIST_KEY_NSLocationAlwaysAndWhenInUseUsageDescription = "Private-X将需要使用您的地址信息以便于为您提供更准确的服务。";
 				INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "Private-X将需要使用您的地址信息以便于为您提供更准确的服务。";
@@ -2552,7 +2552,7 @@
 					"$(PROJECT_DIR)/双子星云手机/Vendor/UDP/RayProxy",
 					"$(PROJECT_DIR)/RayProxy",
 				);
-				MARKETING_VERSION = 1.2.2;
+				MARKETING_VERSION = 1.2.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.armcloud.privacy.x.box;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2606,7 +2606,7 @@
 					"\"$(SRCROOT)/CloudPlayer/RCCloudPhoneSDK/RCHWDecode\"",
 				);
 				INFOPLIST_FILE = "双子星云手机/Info.plist";
-				INFOPLIST_KEY_CFBundleDisplayName = "Private-X";
+				INFOPLIST_KEY_CFBundleDisplayName = "计算器";
 				INFOPLIST_KEY_NSCameraUsageDescription = "Private-X将需要使用您的摄像头用于头像拍照";
 				INFOPLIST_KEY_NSLocationAlwaysAndWhenInUseUsageDescription = "Private-X将需要使用您的地址信息以便于为您提供更准确的服务。";
 				INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "Private-X将需要使用您的地址信息以便于为您提供更准确的服务。";
@@ -2631,7 +2631,7 @@
 					"$(PROJECT_DIR)/双子星云手机/Vendor/UDP/RayProxy",
 					"$(PROJECT_DIR)/RayProxy",
 				);
-				MARKETING_VERSION = 1.2.2;
+				MARKETING_VERSION = 1.2.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.armcloud.privacy.x.box;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

创维盒子/双子星云手机/AppDelegate/SceneDelegate.m

@@ -154,7 +154,7 @@
         });
         
         //BOOL haveOpenMask = [HWDataManager getBoolWithKey:Const_Mask_View_Open];
-        NSInteger maskModel =  [HWDataManager getIntegerWithKey:Const_Mask_View_Model];
+        NSInteger maskModel =  1;//[HWDataManager getIntegerWithKey:Const_Mask_View_Model];
         //添加默认启动图片
         if(!_customLaunchV && maskModel == 0){
             _customLaunchV = [[customLaunchView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_W, SCREEN_H)];
@@ -496,7 +496,7 @@
         return;
     }
     
-    NSInteger maskModel = [HWDataManager getIntegerWithKey:Const_Mask_View_Model];
+    NSInteger maskModel = 1;//[HWDataManager getIntegerWithKey:Const_Mask_View_Model];
     if (maskModel == 0){
         //输入密码界面
         [self closeCalculatorVC];
@@ -710,7 +710,7 @@
 #pragma mark 网络异常弹框
 -(void)showNetErrorAlertFun
 {
-    NSInteger maskModel = [HWDataManager getIntegerWithKey:Const_Mask_View_Model];
+    NSInteger maskModel = 1;//[HWDataManager getIntegerWithKey:Const_Mask_View_Model];
     
     if(maskModel !=0){
         return;

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

@@ -136,7 +136,8 @@
 }
 
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
-    return 3;
+    //return 3;
+    return 2;
 }
 
 - (MineViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{
@@ -172,13 +173,13 @@
         cell.bgViewLayer = maskLayer;
         cell.cellBgView.layer.mask = cell.bgViewLayer;
     }else if (row == 1){
-        [cell.titleLabel setText:NSLocalizedString(@"my_set_no_change_login",nil)];
-        [cell.mImageView setImage:[UIImage imageNamed:@"icon_change_logo"]];
-        //    }else if (row == 2){
-        //        [cell.titleLabel setText:NSLocalizedString(@"mask_view_hiden_set_hiden",nil)];
-        //        [cell.mImageView setImage:[UIImage imageNamed:@"icon-jincheng"]];
-        //    }else if (row == 3){
-    }else if (row == 2){
+//        [cell.titleLabel setText:NSLocalizedString(@"my_set_no_change_login",nil)];
+//        [cell.mImageView setImage:[UIImage imageNamed:@"icon_change_logo"]];
+//        //    }else if (row == 2){
+//        //        [cell.titleLabel setText:NSLocalizedString(@"mask_view_hiden_set_hiden",nil)];
+//        //        [cell.mImageView setImage:[UIImage imageNamed:@"icon-jincheng"]];
+//        //    }else if (row == 3){
+//    }else if (row == 2){
         [cell.titleLabel setText:NSLocalizedString(@"my_set_no_fanzhuan_exit",nil)];
         [cell.mImageView setImage:[UIImage imageNamed:@"fanzhuan"]];
         [cell.rightImage setHidden:YES];
@@ -216,18 +217,19 @@
         /*修改密码*/
         ModifyPWDFirstViewController *nextVC = [[ModifyPWDFirstViewController alloc] init];
         [self.navigationController pushViewController:nextVC animated:YES];
-    }else if (1 == row){
-        /*更换图标*/
-        ChangeLogoViewController *nextVC = [[ChangeLogoViewController alloc] init];
-        [self.navigationController pushViewController:nextVC animated:YES];
     }
-//    else if (1 == row){/*进城隐藏*/
-//        HidenMaskSetViewController *nextVC = [[HidenMaskSetViewController alloc] init];
+//    else if (1 == row){
+//        /*更换图标*/
+//        ChangeLogoViewController *nextVC = [[ChangeLogoViewController alloc] init];
 //        [self.navigationController pushViewController:nextVC animated:YES];
 //    }
-    else if (2 == row){/*设备翻转*/
-        ;
-    }
+////    else if (1 == row){/*进城隐藏*/
+////        HidenMaskSetViewController *nextVC = [[HidenMaskSetViewController alloc] init];
+////        [self.navigationController pushViewController:nextVC animated:YES];
+////    }
+//    else if (2 == row){/*设备翻转*/
+//        ;
+//    }
    
 }
 

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

@@ -141,7 +141,9 @@
     if(!_availableStorage){
         _availableStorage = @"--";
     }
-    NSString *curStr1 = [NSString stringWithFormat:@"已选%ld项",_indexPathsForSelectedItems.count];
+    
+    NSString *didSelectTip =NSLocalizedString(@"upload_did_select_num_tip",nil);
+    NSString *curStr1 = [NSString stringWithFormat:@"%@%ld项",didSelectTip,_indexPathsForSelectedItems.count];
     NSString *curStr2 = [NSString stringWithFormat:@"(%@%@，%@)",byteStr,unitStr,_availableStorage];
     NSString *totalStr = [[NSString alloc] initWithFormat:@"%@\n%@",curStr1,curStr2];
     

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

@@ -42,7 +42,7 @@
     _uploadFileRoutelabel = [[UILabel alloc] init];
     _uploadFileRoutelabel.font = [UIFont systemFontOfSize:14.0];
     _uploadFileRoutelabel.textColor = [UIColor hwColor:@"#959799" alpha:1.0];
-    _uploadFileRoutelabel.text = @"上传路径：/sdcard/Download/";
+    _uploadFileRoutelabel.text = [[NSString alloc] initWithFormat:@"%@ %@",NSLocalizedString(@"upload_path_way_tip",nil),@"：/sdcard/Download/"];
     [self addSubview:_uploadFileRoutelabel];
     
     [_uploadFileRoutelabel mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -142,7 +142,8 @@
         _availableStorage = @"--";
     }
     
-    NSString *curStr1 = [NSString stringWithFormat:@"已选%ld项",_indexPathsForSelectedItems.count];
+    NSString*didSelectTip =NSLocalizedString(@"upload_did_select_num_tip",nil);
+    NSString *curStr1 = [NSString stringWithFormat:@"%@%ld",didSelectTip,_indexPathsForSelectedItems.count];
     NSString *curStr2 = [NSString stringWithFormat:@"(%@%@，%@)",byteStr,unitStr,_availableStorage];
     NSString *totalStr = [[NSString alloc] initWithFormat:@"%@ %@",curStr1,curStr2];
     

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

@@ -310,3 +310,7 @@
 "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";
+
+//1.2.3 新增
+"upload_did_select_num_tip"   = "selected";
+"upload_path_way_tip"   = "Upload Path";

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

@@ -308,3 +308,7 @@
 "image_version_pop_tip2"   = "設備更新中は操作しないでください、15分かかる予定です";
 "tv_p2p_ing"   = "ミラーリング中";
 "my_set_about_version_tap_newVersion"   = "更新されるミラーバージョン";
+
+//1.2.3 新增
+"upload_did_select_num_tip"   = "選択済み";
+"upload_path_way_tip"   = "アップロードパス";

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

@@ -308,3 +308,6 @@
 "tv_p2p_ing"   = "正在投屏中";
 "my_set_about_version_tap_newVersion"   = "待更新镜像版本";
 
+//1.2.3 新增
+"upload_did_select_num_tip"   = "已选";
+"upload_path_way_tip"   = "上传路径";

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

@@ -309,3 +309,7 @@
 "image_version_pop_tip2"   = "設備更新期間請勿操作，預計需15分鐘";
 "tv_p2p_ing"   = "正在投屏中";
 "my_set_about_version_tap_newVersion"   = "待更新鏡像版本";
+
+//1.2.3 新增
+"upload_did_select_num_tip"   = "已選";
+"upload_path_way_tip"   = "上傳路徑";