1.用户协议链接修改

2.更换图标界面UI修改

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

@@ -39,105 +39,106 @@
     
     logoSelectView = [[LogoSelectView alloc] init];
     logoSelectView.delegate = self;
+    //logoSelectView.backgroundColor = [UIColor redColor];
     [self.view addSubview:logoSelectView];
     [logoSelectView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.height.mas_equalTo(226);
+        make.height.mas_equalTo(256);
         make.left.mas_equalTo(0);
         make.right.mas_equalTo(0);
         make.top.equalTo(self.navBarBGView.mas_bottom);
     }];
     
     /*修改入口密码*/
-    UILabel *pwdLabel = [[UILabel alloc] init];
-    [pwdLabel setFont:[UIFont boldSystemFontOfSize:16.f]];
-    [pwdLabel setTextColor:HW0A132BColor];
-    [pwdLabel setText:NSLocalizedString(@"logo_set_pwd_tips",nil)];
-
-    [self.view addSubview:pwdLabel];
-    [pwdLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.equalTo(logoSelectView.mas_bottom).offset(24.f);
-        make.left.mas_equalTo(16.f);
-        make.right.mas_equalTo(-16.f);
-        make.height.mas_equalTo(20.f);
-    }];
-    
-    NSString *placeholderStr  = NSLocalizedString(@"logo_input_pwd_tips",nil);
-    NSString *placeholderStr1  = NSLocalizedString(@"logo_input_pwd_again_tips",nil);
-    CGFloat fontSize          = 13.f;
-    CGFloat textfontSize      = 16.f;
-    CGFloat inputTextFieldH   = 48.f;
-    NSMutableParagraphStyle *style = [[NSMutableParagraphStyle alloc] init];
-    style.alignment = NSTextAlignmentLeft;
-    
-    NSAttributedString *attri = nil;
-    NSAttributedString *attri1 = nil;
-    NSString *verphone = [iPhone phoneVersion];
-    
-    if ([verphone isEqualToString:@"10.3.3"]){
-        attri = [[NSAttributedString alloc] initWithString:placeholderStr
-        attributes:@{NSForegroundColorAttributeName:COLOR_PACEHOLDER,
-                     NSFontAttributeName:[UIFont systemFontOfSize:fontSize],
-                     NSBaselineOffsetAttributeName:[NSNumber numberWithFloat:-1.5],
-                     NSParagraphStyleAttributeName:style}];
-        attri1 = [[NSAttributedString alloc] initWithString:placeholderStr1
-        attributes:@{NSForegroundColorAttributeName:COLOR_PACEHOLDER,
-                     NSFontAttributeName:[UIFont systemFontOfSize:fontSize],
-                     NSBaselineOffsetAttributeName:[NSNumber numberWithFloat:-1.5],
-                     NSParagraphStyleAttributeName:style}];
-    }else{
-        attri = [[NSAttributedString alloc] initWithString:placeholderStr
-        attributes:@{NSForegroundColorAttributeName:COLOR_PACEHOLDER,
-                     NSFontAttributeName:[UIFont systemFontOfSize:fontSize],
-                     NSParagraphStyleAttributeName:style}];
-        attri1 = [[NSAttributedString alloc] initWithString:placeholderStr1
-        attributes:@{NSForegroundColorAttributeName:COLOR_PACEHOLDER,
-                     NSFontAttributeName:[UIFont systemFontOfSize:fontSize],
-                     NSBaselineOffsetAttributeName:[NSNumber numberWithFloat:-1.5],
-                     NSParagraphStyleAttributeName:style}];
-    }
-    
-    pwdTextField = [[UITextField alloc] init];
-    pwdTextField.delegate = self;
-    [pwdTextField setNl_maxLength:4];
-    [pwdTextField setKeyboardType:(UIKeyboardTypeNumberPad)];
-    [self.view addSubview:pwdTextField];
-    [pwdTextField mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.equalTo(pwdLabel.mas_bottom).offset(12.f);
-        make.left.mas_equalTo(16.f);
-        make.right.mas_equalTo(-16.f);
-        make.height.mas_equalTo(inputTextFieldH);
-    }];
-    pwdTextField.attributedPlaceholder = attri;
-    pwdTextField.layer.cornerRadius = 8.f;
-    [pwdTextField setFont:[UIFont systemFontOfSize:textfontSize]];
-    [pwdTextField setTextColor:HW0A132BColor];
-    [pwdTextField setBackgroundColor:[UIColor whiteColor]];
-    UIView *leftView = [[UIView alloc] initWithFrame:(CGRectMake(0, 0, 15, inputTextFieldH))];
-    [leftView setBackgroundColor:[UIColor clearColor]];
-    [pwdTextField setLeftView:leftView];
-    [pwdTextField setLeftViewMode:(UITextFieldViewModeAlways)];
-    
-    pwdAgainTextField = [[UITextField alloc] init];
-    pwdAgainTextField.delegate = self;
-    [pwdAgainTextField setNl_maxLength:4];
-    [pwdAgainTextField setKeyboardType:(UIKeyboardTypeNumberPad)];
-    [self.view addSubview:pwdAgainTextField];
-    [pwdAgainTextField mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.equalTo(pwdTextField.mas_bottom).offset(15.f);
-        make.left.mas_equalTo(16.f);
-        make.right.mas_equalTo(-16.f);
-        make.height.mas_equalTo(inputTextFieldH);
-    }];
-    pwdAgainTextField.attributedPlaceholder = attri1;
-    pwdAgainTextField.layer.cornerRadius = 8.f;
-    [pwdAgainTextField setFont:[UIFont systemFontOfSize:textfontSize]];
-    [pwdAgainTextField setTextColor:HW0A132BColor];
-    [pwdAgainTextField setBackgroundColor:[UIColor whiteColor]];
-    UIView *leftView1 = [[UIView alloc] initWithFrame:(CGRectMake(0, 0, 15, inputTextFieldH))];
-    [leftView1 setBackgroundColor:[UIColor clearColor]];
-    [pwdAgainTextField setLeftView:leftView1];
-    [pwdAgainTextField setLeftViewMode:(UITextFieldViewModeAlways)];
-    
+//    UILabel *pwdLabel = [[UILabel alloc] init];
+//    [pwdLabel setFont:[UIFont boldSystemFontOfSize:16.f]];
+//    [pwdLabel setTextColor:HW0A132BColor];
+//    [pwdLabel setText:NSLocalizedString(@"logo_set_pwd_tips",nil)];
+//
+//    [self.view addSubview:pwdLabel];
+//    [pwdLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+//        make.top.equalTo(logoSelectView.mas_bottom).offset(24.f);
+//        make.left.mas_equalTo(16.f);
+//        make.right.mas_equalTo(-16.f);
+//        make.height.mas_equalTo(20.f);
+//    }];
+//
+//    NSString *placeholderStr  = NSLocalizedString(@"logo_input_pwd_tips",nil);
+//    NSString *placeholderStr1  = NSLocalizedString(@"logo_input_pwd_again_tips",nil);
+//    CGFloat fontSize          = 13.f;
+//    CGFloat textfontSize      = 16.f;
+//    CGFloat inputTextFieldH   = 48.f;
+//    NSMutableParagraphStyle *style = [[NSMutableParagraphStyle alloc] init];
+//    style.alignment = NSTextAlignmentLeft;
+//
+//    NSAttributedString *attri = nil;
+//    NSAttributedString *attri1 = nil;
+//    NSString *verphone = [iPhone phoneVersion];
+//
+//    if ([verphone isEqualToString:@"10.3.3"]){
+//        attri = [[NSAttributedString alloc] initWithString:placeholderStr
+//        attributes:@{NSForegroundColorAttributeName:COLOR_PACEHOLDER,
+//                     NSFontAttributeName:[UIFont systemFontOfSize:fontSize],
+//                     NSBaselineOffsetAttributeName:[NSNumber numberWithFloat:-1.5],
+//                     NSParagraphStyleAttributeName:style}];
+//        attri1 = [[NSAttributedString alloc] initWithString:placeholderStr1
+//        attributes:@{NSForegroundColorAttributeName:COLOR_PACEHOLDER,
+//                     NSFontAttributeName:[UIFont systemFontOfSize:fontSize],
+//                     NSBaselineOffsetAttributeName:[NSNumber numberWithFloat:-1.5],
+//                     NSParagraphStyleAttributeName:style}];
+//    }else{
+//        attri = [[NSAttributedString alloc] initWithString:placeholderStr
+//        attributes:@{NSForegroundColorAttributeName:COLOR_PACEHOLDER,
+//                     NSFontAttributeName:[UIFont systemFontOfSize:fontSize],
+//                     NSParagraphStyleAttributeName:style}];
+//        attri1 = [[NSAttributedString alloc] initWithString:placeholderStr1
+//        attributes:@{NSForegroundColorAttributeName:COLOR_PACEHOLDER,
+//                     NSFontAttributeName:[UIFont systemFontOfSize:fontSize],
+//                     NSBaselineOffsetAttributeName:[NSNumber numberWithFloat:-1.5],
+//                     NSParagraphStyleAttributeName:style}];
+//    }
+//
+//    pwdTextField = [[UITextField alloc] init];
+//    pwdTextField.delegate = self;
+//    [pwdTextField setNl_maxLength:4];
+//    [pwdTextField setKeyboardType:(UIKeyboardTypeNumberPad)];
+//    [self.view addSubview:pwdTextField];
+//    [pwdTextField mas_makeConstraints:^(MASConstraintMaker *make) {
+//        make.top.equalTo(pwdLabel.mas_bottom).offset(12.f);
+//        make.left.mas_equalTo(16.f);
+//        make.right.mas_equalTo(-16.f);
+//        make.height.mas_equalTo(inputTextFieldH);
+//    }];
+//    pwdTextField.attributedPlaceholder = attri;
+//    pwdTextField.layer.cornerRadius = 8.f;
+//    [pwdTextField setFont:[UIFont systemFontOfSize:textfontSize]];
+//    [pwdTextField setTextColor:HW0A132BColor];
+//    [pwdTextField setBackgroundColor:[UIColor whiteColor]];
+//    UIView *leftView = [[UIView alloc] initWithFrame:(CGRectMake(0, 0, 15, inputTextFieldH))];
+//    [leftView setBackgroundColor:[UIColor clearColor]];
+//    [pwdTextField setLeftView:leftView];
+//    [pwdTextField setLeftViewMode:(UITextFieldViewModeAlways)];
+//
+//    pwdAgainTextField = [[UITextField alloc] init];
+//    pwdAgainTextField.delegate = self;
+//    [pwdAgainTextField setNl_maxLength:4];
+//    [pwdAgainTextField setKeyboardType:(UIKeyboardTypeNumberPad)];
+//    [self.view addSubview:pwdAgainTextField];
+//    [pwdAgainTextField mas_makeConstraints:^(MASConstraintMaker *make) {
+//        make.top.equalTo(pwdTextField.mas_bottom).offset(15.f);
+//        make.left.mas_equalTo(16.f);
+//        make.right.mas_equalTo(-16.f);
+//        make.height.mas_equalTo(inputTextFieldH);
+//    }];
+//    pwdAgainTextField.attributedPlaceholder = attri1;
+//    pwdAgainTextField.layer.cornerRadius = 8.f;
+//    [pwdAgainTextField setFont:[UIFont systemFontOfSize:textfontSize]];
+//    [pwdAgainTextField setTextColor:HW0A132BColor];
+//    [pwdAgainTextField setBackgroundColor:[UIColor whiteColor]];
+//    UIView *leftView1 = [[UIView alloc] initWithFrame:(CGRectMake(0, 0, 15, inputTextFieldH))];
+//    [leftView1 setBackgroundColor:[UIColor clearColor]];
+//    [pwdAgainTextField setLeftView:leftView1];
+//    [pwdAgainTextField setLeftViewMode:(UITextFieldViewModeAlways)];
+//
     /*确认按钮*/
     okBtn = [[UIButton alloc] init];
     CGFloat okBtn_W = SCREEN_W - 2*16.f;
@@ -157,7 +158,8 @@
     [okBtn.titleLabel setFont:[UIFont systemFontOfSize:16.f]];
     [self.view addSubview:okBtn];
     [okBtn mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.equalTo(pwdAgainTextField.mas_bottom).offset(16.f);
+        //make.top.equalTo(pwdAgainTextField.mas_bottom).offset(16.f);
+        make.top.equalTo(logoSelectView.mas_bottom).offset(30.f);
         make.centerX.equalTo(self.view.mas_centerX);
         make.width.mas_equalTo(okBtn_W);
         make.height.mas_equalTo(48);
@@ -211,20 +213,20 @@
 }
 
 - (void)okBtnPressed{
-    if (pwdTextField.text.length > 0 || pwdAgainTextField.text.length > 0){
-        if (![pwdTextField.text isEqualToString:pwdAgainTextField.text] || pwdAgainTextField.text.length != 4 ){
-            [[iToast makeText:NSLocalizedString(@"logo_input_pwd_no_same_tips",nil)] show];
-            return;
-        }else{
-            /*设置密码*/
-            NSDictionary *deviceDict = [HWDataManager getObjectWithKey:Const_Have_Add_Device];
-            NSMutableDictionary *dict = [[NSMutableDictionary alloc] initWithDictionary:deviceDict];
-            [dict setObject:pwdAgainTextField.text forKey:Const_Have_Add_Device_PWD];
-            [HWDataManager setObjectWithKey:Const_Have_Add_Device value:dict];
-            
-            [[iToast makeText:NSLocalizedString(@"logo_set_pwd_success",nil)] show];
-        }
-    }
+//    if (pwdTextField.text.length > 0 || pwdAgainTextField.text.length > 0){
+//        if (![pwdTextField.text isEqualToString:pwdAgainTextField.text] || pwdAgainTextField.text.length != 4 ){
+//            [[iToast makeText:NSLocalizedString(@"logo_input_pwd_no_same_tips",nil)] show];
+//            return;
+//        }else{
+//            /*设置密码*/
+//            NSDictionary *deviceDict = [HWDataManager getObjectWithKey:Const_Have_Add_Device];
+//            NSMutableDictionary *dict = [[NSMutableDictionary alloc] initWithDictionary:deviceDict];
+//            [dict setObject:pwdAgainTextField.text forKey:Const_Have_Add_Device_PWD];
+//            [HWDataManager setObjectWithKey:Const_Have_Add_Device value:dict];
+//            
+//            [[iToast makeText:NSLocalizedString(@"logo_set_pwd_success",nil)] show];
+//        }
+//    }
     
     if (logoSelectView.selectIndex == 1){
         /*设置图标*/

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

@@ -51,6 +51,19 @@
         make.height.mas_equalTo(22);
     }];
     
+    /*提示*/
+    UILabel *upTipLabel = [[UILabel alloc] init];
+    [upTipLabel setTextColor:COLOR_PACEHOLDER];
+    [upTipLabel setFont:[UIFont boldSystemFontOfSize:14.f]];
+    [upTipLabel setText:NSLocalizedString(@"logo_change_logo_tip",nil)];
+    [self addSubview:upTipLabel];
+    [upTipLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.top.mas_equalTo(upLabel.mas_bottom).offset(10.0);
+        make.left.mas_equalTo(16);
+        make.right.mas_equalTo(-16);
+        make.height.mas_equalTo(22);
+    }];
+    
     /*掩盖视图类型*/
     NSInteger maskModel = [HWDataManager getIntegerWithKey:Const_Mask_View_Model];
     
@@ -60,7 +73,7 @@
     [bgView.layer setCornerRadius:8.f];
     [self addSubview:bgView];
     [bgView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.equalTo(upLabel.mas_bottom).offset(12.f);
+        make.top.equalTo(upTipLabel.mas_bottom).offset(12.f);
         make.left.mas_equalTo(16);
         make.right.mas_equalTo(-16);
         make.height.mas_equalTo(180);

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

@@ -266,11 +266,11 @@
 }
 
 - (void)ruleBtnClick {
- 
+//https://cliys.armclouding.com/h5/protocol/protocol.html?agreementCoding=YSZYHXY2002&type=1
 //    [self gotoProtocolWKWebVCByPush:YES];
     CustomerWebViewController *vc = [[CustomerWebViewController alloc] init];
     vc.titleStr = NSLocalizedString(@"app_update_use_deal",nil);
-    NSString *url = [NSString stringWithFormat:@"%@/h5/protocol/protocol.html?agreementCoding=YSZYHXY2002&type=1", CloudService];
+    NSString *url = @"https://cliys.armclouding.com/h5/protocol/protocol.html?agreementCoding=YSZYHXY2003&type=1";//[NSString stringWithFormat:@"%@/h5/protocol/protocol.html?agreementCoding=YSZYHXY2002&type=1", CloudService];
     vc.webUrl = url;
     [self.navigationController pushViewController:vc animated:YES];
 }
@@ -280,7 +280,7 @@
 //    [self gotoPrivateProtocolWKWebVCByPush:YES];
     CustomerWebViewController *vc = [[CustomerWebViewController alloc] init];
     vc.titleStr = NSLocalizedString(@"app_update_private",nil);
-    NSString *url = [NSString stringWithFormat:@"%@/h5/protocol/protocol.html?agreementCoding=YSZYSXY2001&type=1", CloudService];
+    NSString *url = @"https://cliys.armclouding.com/h5/protocol/protocol.html?agreementCoding=YSZYSXY2002&type=1";//[NSString stringWithFormat:@"%@/h5/protocol/protocol.html?agreementCoding=YSZYSXY2001&type=1", CloudService];
     vc.webUrl = url;
     [self.navigationController pushViewController:vc animated:YES];
 }

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

@@ -66,7 +66,7 @@ ShowImageViewDelegate>{
                   inRect:CGRectMake(0, 0, glkshowImageView.drawableWidth, glkshowImageView.drawableHeight)
                 fromRect:[ciImage extent]];
     
-    [self->glkshowImageView display];
+    //[self->glkshowImageView display];
 }
 
 - (void)showIMage

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

@@ -58,6 +58,7 @@
 "log_login_system_busy" = "系统繁忙，请稍后再试！";
 
 "logo_select_logo" = "请选择图标";
+"logo_change_logo_tip" = "此APP在手机桌面的图标会更换为你选择的图标及名称";
 "logo_calculator" = "计算器";
 "logo_bowser" = "浏览器";
 "logo_set_pwd_tips" = "修改入口密码";

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

@@ -66,6 +66,7 @@
 
 
 "logo_select_logo" = "请选择图标";
+"logo_change_logo_tip" = "此APP在手机桌面的图标会更换为你选择的图标及名称";
 "logo_calculator" = "计算器";
 "logo_bowser" = "浏览器";
 "logo_set_pwd_tips" = "修改入口密码";
@@ -199,6 +200,10 @@
 "guide_set_open_calcula_guide_tips" = "软件会伪装成计算器。在计算器页面输入您设置的启动密码输入成功可进入私密空间";
 "guide_set_open_web_guide_tips" = "软件会伪装成浏览器。在浏览器页面输入您设的启动密码，输入成功可进入私密空间";
 
+"guide_qrcoede_tips_error" = "小主，二维码错误，请扫描正确的序列号哦";
+"guide_qrcoede_tips_ok" = "扫码成功！正在为你快速连接中";
+"guide_qrcoede_tips_please" = "请扫描序列号二维码";
+
 
 //guide_middle_0_icon
 //NSLocalizedString(@"my_set_no_reset_pwd_title",nil)