1.需求：更换图标-新增默认private-X图标

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

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

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

@@ -263,7 +263,15 @@
         //[infoDict setObject:NSLocalizedString(@"logo_bowser",nil) forKey:@"CFBundleDisplayName"]; // 或者使用CFBundleName
 
     }
-    
+    else if (logoSelectView.selectIndex == 0){
+        
+        [iTools lc_setAlternateIconName:@"AppIcon1"];
+        [HWDataManager setIntegerWithKey:Const_Mask_View_Model value:0];
+        
+        // 修改应用名称
+        //[infoDict setObject:NSLocalizedString(@"logo_bowser",nil) forKey:@"CFBundleDisplayName"]; // 或者使用CFBundleName
+
+    }
   
     
     // 保存修改后的Info.plist文件

创维盒子/双子星云手机/Class/Set/ChangeLogo/View/LogoSelectView.m

@@ -11,6 +11,7 @@
 
 @interface LogoSelectView()
 {
+    UIButton *defBtn;//默认privatex
     UIButton *claBtn;
     UIButton *bowserBtn;
 }
@@ -89,68 +90,130 @@
         make.height.mas_equalTo(180);
     }];
     
-    claBtn = [[UIButton alloc] init];
-    [claBtn setBackgroundColor:HWF7F7F7Color];
-    claBtn.clipsToBounds = YES;
-    claBtn.layer.cornerRadius = 16.f;
-    [claBtn addTarget:self
-               action:@selector(claBtnPressed)
-     forControlEvents:(UIControlEventTouchUpInside)];
-    [bgView addSubview:claBtn];
-    [claBtn mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.mas_equalTo(34.f);
-        make.left.mas_equalTo(52*AUTOSCALE);
-        make.width.mas_equalTo(112);
-        make.height.mas_equalTo(112);
-    }];
+    //按钮 宽高
+    CGFloat butSpace = 10.0;
+    CGFloat butWH = (SCREEN_W - 16*2 - butSpace*4)/3;
     
-    [claBtn.layer setBorderWidth:2];
-    if (maskModel == 1){
-        selectIndex = 1;
-        [claBtn.layer setBorderColor:HW13B2EBColor.CGColor];
-    }else{
-        [claBtn.layer setBorderColor:[UIColor clearColor].CGColor];
+    for (int i=0; i<3; i++) {
+        UIButton* curBut = [[UIButton alloc] init];
+        [curBut setBackgroundColor:HWF7F7F7Color];
+        curBut.clipsToBounds = YES;
+        curBut.layer.cornerRadius = 16.f;
+        [curBut addTarget:self
+                   action:@selector(didCickButtonFun:)
+         forControlEvents:(UIControlEventTouchUpInside)];
+        [curBut setTitleColor:HW0A132BColor forState:(UIControlStateNormal)];
+        [curBut.titleLabel setFont:[UIFont systemFontOfSize:14]];
+        curBut.tag = 10+i;
+        [bgView addSubview:curBut];
+        [curBut mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.top.mas_equalTo(34.f);
+            make.left.mas_equalTo(butSpace + i*(butSpace+butWH));
+            make.width.mas_equalTo(butWH);
+            make.height.mas_equalTo(butWH);
+        }];
+        
+        [curBut.layer setBorderWidth:2];
+        
+        
+        if (maskModel == i){
+            selectIndex = maskModel;
+            [curBut.layer setBorderColor:HW13B2EBColor.CGColor];
+        }else{
+            [curBut.layer setBorderColor:[UIColor clearColor].CGColor];
+        }
+        
+        if (i == 0){
+            [curBut setTitle:@"Private-X" forState:(UIControlStateNormal)];
+            //[curBut setTitle:NSLocalizedString(@"logo_calculator",nil) forState:(UIControlStateNormal)];
+            [curBut setImage:[UIImage imageNamed:@"PrivateX_icon"] forState:(UIControlStateNormal)];
+            defBtn = curBut;
+        }
+        else if(i == 1){
+            [curBut setTitle:NSLocalizedString(@"logo_calculator",nil) forState:(UIControlStateNormal)];
+            [curBut setImage:[UIImage imageNamed:@"calculator_icon"] forState:(UIControlStateNormal)];
+            claBtn = curBut;
+        }
+        else if(i == 2){
+            [curBut setTitle:NSLocalizedString(@"logo_bowser",nil) forState:(UIControlStateNormal)];
+            [curBut setImage:[UIImage imageNamed:@"web_icon"] forState:(UIControlStateNormal)];
+            bowserBtn = curBut;
+        }
+        
+        NSInteger titleleng = curBut.titleLabel.text.length;
+        CGFloat titleOffset = 10.0;
+        
+        if(titleleng >5){
+            titleOffset = 0;
+        }
+        
+        [curBut setTitleEdgeInsets:UIEdgeInsetsMake(curBut.imageView.frame.size.height+10,-curBut.imageView.frame.size.width, 0.0,0.0)];
+        [curBut setImageEdgeInsets:UIEdgeInsetsMake(-curBut.bounds.size.width/4+15, curBut.bounds.size.width/4-titleOffset, curBut.titleLabel.bounds.size.height, -curBut.bounds.size.width/4)];
     }
-    [claBtn setTitle:NSLocalizedString(@"logo_calculator",nil) forState:(UIControlStateNormal)];
-    [claBtn setTitleColor:HW0A132BColor forState:(UIControlStateNormal)];
-    [claBtn.titleLabel setFont:[UIFont systemFontOfSize:14]];
-    [claBtn setImage:[UIImage imageNamed:@"calculator_icon"] forState:(UIControlStateNormal)];
-    [claBtn setTitleEdgeInsets:UIEdgeInsetsMake(claBtn.imageView.frame.size.height+10,-claBtn.imageView.frame.size.width, 0.0,0.0)];
-    [claBtn setImageEdgeInsets:UIEdgeInsetsMake(-claBtn.bounds.size.width/4+15, claBtn.bounds.size.width/4-10, claBtn.titleLabel.bounds.size.height, -claBtn.bounds.size.width/4)];
-    
-    bowserBtn = [[UIButton alloc] init];
-    [bowserBtn setBackgroundColor:HWF7F7F7Color];
-    bowserBtn.clipsToBounds = YES;
-    bowserBtn.layer.cornerRadius = 16.f;
-    [bowserBtn addTarget:self
-                  action:@selector(bowserBtnPressed)
-        forControlEvents:(UIControlEventTouchUpInside)];
-    [bgView addSubview:bowserBtn];
-    [bowserBtn mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.mas_equalTo(34.f);
-        make.right.mas_equalTo(-52*AUTOSCALE);
-        make.width.mas_equalTo(112);
-        make.height.mas_equalTo(112);
-    }];
     
-    [bowserBtn.layer setBorderWidth:2];
-    if (maskModel == 2){
-        selectIndex = 2;
-        [bowserBtn.layer setBorderColor:HW13B2EBColor.CGColor];
-    }else{
-        [bowserBtn.layer setBorderColor:[UIColor clearColor].CGColor];
-    }
-    [bowserBtn setTitle:NSLocalizedString(@"logo_bowser",nil) forState:(UIControlStateNormal)];
-    [bowserBtn setTitleColor:HW0A132BColor forState:(UIControlStateNormal)];
-    [bowserBtn.titleLabel setFont:[UIFont systemFontOfSize:14]];
-    [bowserBtn setImage:[UIImage imageNamed:@"web_icon"] forState:(UIControlStateNormal)];
-    [bowserBtn setTitleEdgeInsets:UIEdgeInsetsMake(bowserBtn.imageView.frame.size.height+10,-bowserBtn.imageView.frame.size.width, 0.0,0.0)];
-    [bowserBtn setImageEdgeInsets:UIEdgeInsetsMake(-bowserBtn.bounds.size.width/4+15, bowserBtn.bounds.size.width/4-10, bowserBtn.titleLabel.bounds.size.height, -bowserBtn.bounds.size.width/4)];
+//    claBtn = [[UIButton alloc] init];
+//    [claBtn setBackgroundColor:HWF7F7F7Color];
+//    claBtn.clipsToBounds = YES;
+//    claBtn.layer.cornerRadius = 16.f;
+//    [claBtn addTarget:self
+//               action:@selector(claBtnPressed)
+//     forControlEvents:(UIControlEventTouchUpInside)];
+//    [bgView addSubview:claBtn];
+//    [claBtn mas_makeConstraints:^(MASConstraintMaker *make) {
+//        make.top.mas_equalTo(34.f);
+//        make.left.mas_equalTo(52*AUTOSCALE);
+//        make.width.mas_equalTo(112);
+//        make.height.mas_equalTo(112);
+//    }];
+//    
+//    [claBtn.layer setBorderWidth:2];
+//    if (maskModel == 1){
+//        selectIndex = 1;
+//        [claBtn.layer setBorderColor:HW13B2EBColor.CGColor];
+//    }else{
+//        [claBtn.layer setBorderColor:[UIColor clearColor].CGColor];
+//    }
+//    [claBtn setTitle:NSLocalizedString(@"logo_calculator",nil) forState:(UIControlStateNormal)];
+//    [claBtn setTitleColor:HW0A132BColor forState:(UIControlStateNormal)];
+//    [claBtn.titleLabel setFont:[UIFont systemFontOfSize:14]];
+//    [claBtn setImage:[UIImage imageNamed:@"calculator_icon"] forState:(UIControlStateNormal)];
+//    [claBtn setTitleEdgeInsets:UIEdgeInsetsMake(claBtn.imageView.frame.size.height+10,-claBtn.imageView.frame.size.width, 0.0,0.0)];
+//    [claBtn setImageEdgeInsets:UIEdgeInsetsMake(-claBtn.bounds.size.width/4+15, claBtn.bounds.size.width/4-10, claBtn.titleLabel.bounds.size.height, -claBtn.bounds.size.width/4)];
+//    
+//    bowserBtn = [[UIButton alloc] init];
+//    [bowserBtn setBackgroundColor:HWF7F7F7Color];
+//    bowserBtn.clipsToBounds = YES;
+//    bowserBtn.layer.cornerRadius = 16.f;
+//    [bowserBtn addTarget:self
+//                  action:@selector(bowserBtnPressed)
+//        forControlEvents:(UIControlEventTouchUpInside)];
+//    [bgView addSubview:bowserBtn];
+//    [bowserBtn mas_makeConstraints:^(MASConstraintMaker *make) {
+//        make.top.mas_equalTo(34.f);
+//        make.right.mas_equalTo(-52*AUTOSCALE);
+//        make.width.mas_equalTo(112);
+//        make.height.mas_equalTo(112);
+//    }];
+//    
+//    [bowserBtn.layer setBorderWidth:2];
+//    if (maskModel == 2){
+//        selectIndex = 2;
+//        [bowserBtn.layer setBorderColor:HW13B2EBColor.CGColor];
+//    }else{
+//        [bowserBtn.layer setBorderColor:[UIColor clearColor].CGColor];
+//    }
+//    [bowserBtn setTitle:NSLocalizedString(@"logo_bowser",nil) forState:(UIControlStateNormal)];
+//    [bowserBtn setTitleColor:HW0A132BColor forState:(UIControlStateNormal)];
+//    [bowserBtn.titleLabel setFont:[UIFont systemFontOfSize:14]];
+//    [bowserBtn setImage:[UIImage imageNamed:@"web_icon"] forState:(UIControlStateNormal)];
+//    [bowserBtn setTitleEdgeInsets:UIEdgeInsetsMake(bowserBtn.imageView.frame.size.height+10,-bowserBtn.imageView.frame.size.width, 0.0,0.0)];
+//    [bowserBtn setImageEdgeInsets:UIEdgeInsetsMake(-bowserBtn.bounds.size.width/4+15, bowserBtn.bounds.size.width/4-10, bowserBtn.titleLabel.bounds.size.height, -bowserBtn.bounds.size.width/4)];
 }
 
 - (void)claBtnPressed{
     [claBtn.layer setBorderColor:HW13B2EBColor.CGColor];
     [bowserBtn.layer setBorderColor:[UIColor clearColor].CGColor];
+    [defBtn.layer setBorderColor:[UIColor clearColor].CGColor];
     selectIndex = 1;
     if ([delegate respondsToSelector:@selector(logoSelectViewHaveSelect)]){
         [delegate logoSelectViewHaveSelect];
@@ -160,10 +223,34 @@
 - (void)bowserBtnPressed{
     [bowserBtn.layer setBorderColor:HW13B2EBColor.CGColor];
     [claBtn.layer setBorderColor:[UIColor clearColor].CGColor];
+    [defBtn.layer setBorderColor:[UIColor clearColor].CGColor];
     selectIndex = 2;
     if ([delegate respondsToSelector:@selector(logoSelectViewHaveSelect)]){
         [delegate logoSelectViewHaveSelect];
     }
 }
 
+- (void)PrivateXBtnPressed{
+    [defBtn.layer setBorderColor:HW13B2EBColor.CGColor];
+    [bowserBtn.layer setBorderColor:[UIColor clearColor].CGColor];
+    [claBtn.layer setBorderColor:[UIColor clearColor].CGColor];
+    selectIndex = 0;
+    if ([delegate respondsToSelector:@selector(logoSelectViewHaveSelect)]){
+        [delegate logoSelectViewHaveSelect];
+    }
+}
+
+- (void)didCickButtonFun:(UIButton*)but
+{
+    NSInteger tag = but.tag;
+    if(tag == 10){
+        [self PrivateXBtnPressed];
+    }
+    else if(tag == 11){
+        [self claBtnPressed];
+    }
+    else if(tag == 12){
+        [self bowserBtnPressed];
+    }
+}
 @end