Browse Source

1.0 改为计算器

huangxiaodong 1 year ago
parent
commit
10d203ebe4

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

@@ -2191,7 +2191,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将需要使用您的地址信息以便于为您提供更准确的服务。";
@@ -2270,7 +2270,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将需要使用您的地址信息以便于为您提供更准确的服务。";

+ 1 - 0
创维盒子/双子星云手机/AppDelegate/Base.lproj/LaunchScreen.storyboard

@@ -19,6 +19,7 @@
                         <subviews>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="HKe-L5-548">
                                 <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
+                                <color key="backgroundColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             </imageView>
                         </subviews>
                         <viewLayoutGuide key="safeArea" id="Twj-Da-sSB"/>

+ 5 - 2
创维盒子/双子星云手机/AppDelegate/SceneDelegate.m

@@ -46,6 +46,7 @@
         UIWindowScene *windowScene = (UIWindowScene *)scene;
         self.window = [[UIWindow alloc] initWithWindowScene:windowScene];
         self.window.frame = CGRectMake(0, 0, [UIScreen mainScreen].bounds.size.width, [UIScreen mainScreen].bounds.size.height);
+       
         // 初始化数据库
         [self initBrowserWindow];
         // 加载主页面
@@ -125,7 +126,7 @@
             _checkSNDataTimer = [NSTimer scheduledTimerWithTimeInterval:0.5 target:self selector:@selector(enterMainVCFromScene) userInfo:nil repeats:YES];
             
             //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)];
@@ -423,7 +424,9 @@
         return;
     }
     
-    NSInteger maskModel = [HWDataManager getIntegerWithKey:Const_Mask_View_Model];
+  
+    
+    NSInteger maskModel = 1;//[HWDataManager getIntegerWithKey:Const_Mask_View_Model];
     if (maskModel == 0){
         //输入密码界面
         [self closeCalculatorVC];

+ 1 - 1
创维盒子/双子星云手机/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "浏览器.png",
+      "filename" : "编组 9备份.png",
       "idiom" : "universal",
       "platform" : "ios",
       "size" : "1024x1024"

BIN
创维盒子/双子星云手机/Assets.xcassets/AppIcon.appiconset/浏览器.png


创维盒子/双子星云手机/Assets.xcassets/AppIconJSJ.appiconset/编组 9备份.png → 创维盒子/双子星云手机/Assets.xcassets/AppIcon.appiconset/编组 9备份.png


+ 0 - 14
创维盒子/双子星云手机/Assets.xcassets/AppIcon111.appiconset/Contents.json

@@ -1,14 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "隐私.png",
-      "idiom" : "universal",
-      "platform" : "ios",
-      "size" : "1024x1024"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

BIN
创维盒子/双子星云手机/Assets.xcassets/AppIcon111.appiconset/隐私.png


+ 0 - 14
创维盒子/双子星云手机/Assets.xcassets/AppIconJSJ.appiconset/Contents.json

@@ -1,14 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "编组 9备份.png",
-      "idiom" : "universal",
-      "platform" : "ios",
-      "size" : "1024x1024"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

+ 0 - 14
创维盒子/双子星云手机/Assets.xcassets/AppIconLlq.appiconset/Contents.json

@@ -1,14 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "浏览器.png",
-      "idiom" : "universal",
-      "platform" : "ios",
-      "size" : "1024x1024"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

BIN
创维盒子/双子星云手机/Assets.xcassets/AppIconLlq.appiconset/浏览器.png


+ 0 - 14
创维盒子/双子星云手机/Assets.xcassets/AppIconPugongying.appiconset/Contents.json

@@ -1,14 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "icon.png",
-      "idiom" : "universal",
-      "platform" : "ios",
-      "size" : "1024x1024"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

BIN
创维盒子/双子星云手机/Assets.xcassets/AppIconPugongying.appiconset/icon.png


+ 20 - 19
创维盒子/双子星云手机/Class/Set/MySetViewController.m

@@ -159,7 +159,8 @@
 
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
     //return 7;
-    return 6;//去掉隐藏进程
+    //return 6;//去掉隐藏进程
+    return 5;//去掉更换icon
 }
 
 - (MineViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{
@@ -193,30 +194,30 @@
         maskLayer.path = maskPath.CGPath;
         cell.bgViewLayer = maskLayer;
         cell.cellBgView.layer.mask = cell.bgViewLayer;
+//    }else if (row == 1){
+//        [cell.titleLabel setText:NSLocalizedString(@"my_set_no_change_logo",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 == 1){
-        [cell.titleLabel setText:NSLocalizedString(@"my_set_no_change_logo",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];
         [cell.maskSwitch setHidden:NO];
     //}else if (row == 4){/*版本信息*/
-    }else if (row == 3){/*版本信息*/
+    }else if (row == 2){/*版本信息*/
         [cell.titleLabel setText:NSLocalizedString(@"my_set_no_check_update",nil)];
         [cell.mImageView setImage:[UIImage imageNamed:@"app_update"]];
         [cell.titleLabel2 setText:[iPhone appVersion]];
         [cell.titleLabel2 setHidden:NO];
     //}else if (row == 5){/*更换设备*/
-    }else if (row == 4){/*更换设备*/
+    }else if (row == 3){/*更换设备*/
         [cell.titleLabel setText:NSLocalizedString(@"my_set_no_change_phone",nil)];
         [cell.mImageView setImage:[UIImage imageNamed:@"icon_change_ohone"]];
     //}else if (row == 6){
-    }else if (row == 5){
+    }else if (row == 4){
         [cell.titleLabel setText:NSLocalizedString(@"my_set_no_restart_phone",nil)];
         [cell.mImageView setImage:[UIImage imageNamed:@"icon-gengxin"]];
         /*下圆角*/
@@ -247,26 +248,26 @@
         /*修改密码*/
         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 (2 == row){/*进城隐藏*/
+//    }else if (1 == row){
+//        /*更换图标*/
+//        ChangeLogoViewController *nextVC = [[ChangeLogoViewController alloc] init];
+//        [self.navigationController pushViewController:nextVC animated:YES];
+    }else if (1 == row){/*进城隐藏*/
 //        HidenMaskSetViewController *nextVC = [[HidenMaskSetViewController alloc] init];
 //        [self.navigationController pushViewController:nextVC animated:YES];
 //    }else if (3 == row){/*设备翻转*/
 //        ;
     }
     //else if (4 == row){/*版本信息*/
-    else if (3 == row){/*版本信息*/
+    else if (2 == row){/*版本信息*/
         AboutViewController *vc = [[AboutViewController alloc] init];
         [self.navigationController pushViewController:vc animated:YES];
     //}else if (5 == row){/*更换设备*/
-    }else if (4 == row){/*更换设备*/
+    }else if (3 == row){/*更换设备*/
         TipsQRCodeForChangeDeviceViewController *vc = [[TipsQRCodeForChangeDeviceViewController alloc] init];
         [self.navigationController pushViewController:vc animated:YES];
 //    }else if (6 == row){/*重启空间*/
-    }else if (5 == row){/*重启空间*/
+    }else if (4 == row){/*重启空间*/
         /*弹窗提示重启*/
         ComontAlretViewController *nextVC = [[ComontAlretViewController alloc] initWithTiTle:NSLocalizedString(@"my_set_no_restart_phone_tips",nil)
                                                                                          msg:nil