1.1.3版本扫码提示界面新UI

创维盒子/双子星云手机/Assets.xcassets/Guide/scan_tip/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

创维盒子/双子星云手机/Assets.xcassets/Guide/scan_tip/scan_tip_Hans.imageset/Contents.json

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

创维盒子/双子星云手机/Assets.xcassets/Guide/scan_tip/scan_tip_Hant.imageset/Contents.json

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

创维盒子/双子星云手机/Assets.xcassets/Guide/scan_tip/scan_tip_en.imageset/Contents.json

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

创维盒子/双子星云手机/Assets.xcassets/Guide/scan_tip/scan_tip_ja.imageset/Contents.json

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

创维盒子/双子星云手机/Class/Guide/TipsQRCodeViewController.m

@@ -28,73 +28,173 @@
     [self.navigationBar setHidden:YES];
     [self.toolBar setHidden:YES];
     
+    [self initBaseUIFun];
+    
     /*背景视图*/
-    UIImageView *bgImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"guide_qrcode_bg_icon"]];
-    [bgImageView setContentMode:(UIViewContentModeScaleToFill)];
-    [self.view addSubview:bgImageView];
-    [bgImageView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.mas_equalTo(0);
-        make.bottom.mas_equalTo(0);
+//    UIImageView *bgImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"guide_qrcode_bg_icon"]];
+//    [bgImageView setContentMode:(UIViewContentModeScaleToFill)];
+//    [self.view addSubview:bgImageView];
+//    [bgImageView mas_makeConstraints:^(MASConstraintMaker *make) {
+//        make.top.mas_equalTo(0);
+//        make.bottom.mas_equalTo(0);
+//        make.left.mas_equalTo(0);
+//        make.right.mas_equalTo(0);
+//    }];
+//
+//    UIButton *qrcodeBtn = [[UIButton alloc] init];
+//    [qrcodeBtn setBackgroundColor:[UIColor clearColor]];
+//    [qrcodeBtn setBackgroundImage:[UIImage imageNamed:@"guide_qrcode_icon"] forState:(UIControlStateNormal)];
+//    [self.view addSubview:qrcodeBtn];
+//    [qrcodeBtn mas_makeConstraints:^(MASConstraintMaker *make) {
+//        make.top.mas_equalTo((363.f/812.f)*self.view.height - 80.f);
+//        make.centerX.equalTo(self.view.mas_centerX);
+//        make.width.mas_equalTo(160);
+//        make.height.mas_equalTo(160);
+//    }];
+//
+//    [qrcodeBtn addTarget:self
+//                  action:@selector(qrcodeBtnPressed)
+//        forControlEvents:(UIControlEventTouchUpInside)];
+//
+//    /*提示文字*/
+//    UILabel *tipsLabel = [[UILabel alloc] init];
+//    [tipsLabel setFont:[UIFont systemFontOfSize:14]];
+//    [tipsLabel setTextColor:HW666666Color];
+//    [tipsLabel setTextAlignment:(NSTextAlignmentCenter)];
+//    [self.view addSubview:tipsLabel];
+//    [tipsLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+//        make.top.equalTo(qrcodeBtn.mas_bottom).offset(8);
+//        make.left.mas_equalTo(60);
+//        make.right.mas_equalTo(-60);
+//    }];
+//    [tipsLabel setText:NSLocalizedString(@"guide_qrcoede_tips",nil)];
+//
+//    /*扫一扫按钮*/
+//    UIButton *qrcodeSmallBtn = [[UIButton alloc] init];
+//    qrcodeSmallBtn.frame = CGRectMake(0, 0, 120.f, 36.f);
+//
+//    // gradient
+//    CAGradientLayer *gl = [CAGradientLayer layer];
+//    gl.frame = CGRectMake(0,0,120.f,36.f);
+//    gl.startPoint = CGPointMake(0, 0.5);
+//    gl.endPoint = CGPointMake(1, 0.5);
+//    gl.colors = @[(__bridge id)HW0CDEFDColor.CGColor, (__bridge id)HW058DFBColor.CGColor];
+//    gl.locations = @[@(0), @(1.0f)];
+//
+//    [qrcodeSmallBtn.layer addSublayer:gl];
+//    [qrcodeSmallBtn addTarget:self action:@selector(qrcodeBtnPressed) forControlEvents:(UIControlEventTouchUpInside)];
+//    [qrcodeSmallBtn setTitle:NSLocalizedString(@"guide_qrcoede_btn_title",nil) forState:(UIControlStateNormal)];
+//    [qrcodeSmallBtn setTitleColor:[UIColor whiteColor] forState:(UIControlStateNormal)];
+//    [qrcodeSmallBtn.titleLabel setFont:[UIFont systemFontOfSize:14.f]];
+//    [qrcodeSmallBtn.layer setCornerRadius:18.f];
+//    qrcodeSmallBtn.clipsToBounds = YES;
+//    [self.view addSubview:qrcodeSmallBtn];
+//    [qrcodeSmallBtn mas_makeConstraints:^(MASConstraintMaker *make) {
+//        make.centerX.equalTo(self.view.mas_centerX);
+//        make.width.mas_equalTo(120.f);
+//        make.top.equalTo(tipsLabel.mas_bottom).offset(20);
+//        make.height.mas_equalTo(36.f);
+//    }];
+}
+
+- (void)initBaseUIFun
+{
+    self.view.backgroundColor = [UIColor whiteColor];
+    
+    NSString *curTitleStr = NSLocalizedString(@"scan_Tip_title",nil);
+    
+    /*标题*/
+    UILabel *titleLabel = [[UILabel alloc] init];
+    [titleLabel setFont:[UIFont systemFontOfSize:18]];
+    [titleLabel setTextColor:HW333333Color];
+    [titleLabel setTextAlignment:(NSTextAlignmentCenter)];
+    [self.view addSubview:titleLabel];
+    [titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.top.equalTo(self.titleLabel.mas_top).offset(0);
+        make.left.mas_equalTo(10);
+        make.right.mas_equalTo(-10);
+        make.height.mas_equalTo(25.0);
+    }];
+    [titleLabel setText:curTitleStr];
+    
+    //
+    UIScrollView *bgScorllV = [[UIScrollView alloc] init];
+    bgScorllV.showsHorizontalScrollIndicator = NO;
+    //bgScorllV.backgroundColor = [UIColor redColor];
+    [self.view addSubview:bgScorllV];
+    
+    [bgScorllV mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.top.equalTo(self.titleLabel.mas_bottom).offset(30);
         make.left.mas_equalTo(0);
         make.right.mas_equalTo(0);
+        make.bottom.mas_equalTo(-100.0);
     }];
+
+    NSString *languageCode = [NSLocale preferredLanguages][0];
+  
+    NSString *imageNameStr = @"scan_tip_en";
+    CGFloat imageW = 345.0;
+    CGFloat imageH = 598.0;
     
-    UIButton *qrcodeBtn = [[UIButton alloc] init];
-    [qrcodeBtn setBackgroundColor:[UIColor clearColor]];
-    [qrcodeBtn setBackgroundImage:[UIImage imageNamed:@"guide_qrcode_icon"] forState:(UIControlStateNormal)];
-    [self.view addSubview:qrcodeBtn];
-    [qrcodeBtn mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.mas_equalTo((363.f/812.f)*self.view.height - 80.f);
-        make.centerX.equalTo(self.view.mas_centerX);
-        make.width.mas_equalTo(160);
-        make.height.mas_equalTo(160);
-    }];
+    if([languageCode rangeOfString:@"zh-Hans"].location != NSNotFound)
+    {
+        imageNameStr = @"scan_tip_Hans";
+    }
+    else if([languageCode rangeOfString:@"zh-Hant"].location != NSNotFound)
+    {
+        imageNameStr = @"scan_tip_Hant";
+    }
+    else if([languageCode rangeOfString:@"ja-"].location != NSNotFound)
+    {
+        imageNameStr = @"scan_tip_ja";
+        
+        imageH = 672.0;
+    }
     
-    [qrcodeBtn addTarget:self
-                  action:@selector(qrcodeBtnPressed)
-        forControlEvents:(UIControlEventTouchUpInside)];
     
-    /*提示文字*/
-    UILabel *tipsLabel = [[UILabel alloc] init];
-    [tipsLabel setFont:[UIFont systemFontOfSize:14]];
-    [tipsLabel setTextColor:HW666666Color];
-    [tipsLabel setTextAlignment:(NSTextAlignmentCenter)];
-    [self.view addSubview:tipsLabel];
-    [tipsLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.equalTo(qrcodeBtn.mas_bottom).offset(8);
-        make.left.mas_equalTo(60);
-        make.right.mas_equalTo(-60);
+    
+    UIImageView * bgImageV = [[UIImageView alloc] init];
+    bgImageV.image = [UIImage imageNamed:imageNameStr];
+    [bgScorllV addSubview:bgImageV];
+    
+    [bgImageV mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.centerX.mas_equalTo(0);
+        make.top.mas_equalTo(0);
+        make.width.mas_equalTo(imageW);
+        make.height.mas_equalTo(imageH);
     }];
-    [tipsLabel setText:NSLocalizedString(@"guide_qrcoede_tips",nil)];
+    
+    bgScorllV.contentSize = CGSizeMake(imageW, imageH);
+    
     
     /*扫一扫按钮*/
     UIButton *qrcodeSmallBtn = [[UIButton alloc] init];
-    qrcodeSmallBtn.frame = CGRectMake(0, 0, 120.f, 36.f);
-
+   
     // gradient
     CAGradientLayer *gl = [CAGradientLayer layer];
-    gl.frame = CGRectMake(0,0,120.f,36.f);
+    gl.frame = CGRectMake(0,0,345.f,48.f);
     gl.startPoint = CGPointMake(0, 0.5);
     gl.endPoint = CGPointMake(1, 0.5);
     gl.colors = @[(__bridge id)HW0CDEFDColor.CGColor, (__bridge id)HW058DFBColor.CGColor];
     gl.locations = @[@(0), @(1.0f)];
-    
+
     [qrcodeSmallBtn.layer addSublayer:gl];
     [qrcodeSmallBtn addTarget:self action:@selector(qrcodeBtnPressed) forControlEvents:(UIControlEventTouchUpInside)];
-    [qrcodeSmallBtn setTitle:NSLocalizedString(@"guide_qrcoede_btn_title",nil) forState:(UIControlStateNormal)];
+    [qrcodeSmallBtn setTitle:NSLocalizedString(@"scan_Tip_title_button",nil) forState:(UIControlStateNormal)];
     [qrcodeSmallBtn setTitleColor:[UIColor whiteColor] forState:(UIControlStateNormal)];
-    [qrcodeSmallBtn.titleLabel setFont:[UIFont systemFontOfSize:14.f]];
-    [qrcodeSmallBtn.layer setCornerRadius:18.f];
+    [qrcodeSmallBtn.titleLabel setFont:[UIFont systemFontOfSize:16.f]];
+    [qrcodeSmallBtn.layer setCornerRadius:8.f];
     qrcodeSmallBtn.clipsToBounds = YES;
     [self.view addSubview:qrcodeSmallBtn];
     [qrcodeSmallBtn mas_makeConstraints:^(MASConstraintMaker *make) {
         make.centerX.equalTo(self.view.mas_centerX);
-        make.width.mas_equalTo(120.f);
-        make.top.equalTo(tipsLabel.mas_bottom).offset(20);
-        make.height.mas_equalTo(36.f);
+        make.width.mas_equalTo(345.f);
+        make.top.equalTo(bgScorllV.mas_bottom).offset(15);
+        make.height.mas_equalTo(48.f);
     }];
 }
 
+
 - (void)qrcodeBtnPressed{
     QRCodeScanViewController *nextVC = [[QRCodeScanViewController alloc] init];
     [self.navigationController pushViewController:nextVC animated:YES];

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

@@ -42,70 +42,170 @@
     [self.navBarBGView setHidden:NO];
     [self.titleLabel setText:NSLocalizedString(@"my_set_no_change_phone",nil)];
     
-    /*背景视图*/
-    UIImageView *bgImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"guide_qrcode_bg_icon"]];
-    [bgImageView setContentMode:(UIViewContentModeScaleToFill)];
-    [self.view addSubview:bgImageView];
-    [bgImageView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.mas_equalTo(0);
-        make.bottom.mas_equalTo(0);
+    [self initBaseUIFun];
+    
+//    /*背景视图*/
+//    UIImageView *bgImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"guide_qrcode_bg_icon"]];
+//    [bgImageView setContentMode:(UIViewContentModeScaleToFill)];
+//    [self.view addSubview:bgImageView];
+//    [bgImageView mas_makeConstraints:^(MASConstraintMaker *make) {
+//        make.top.mas_equalTo(0);
+//        make.bottom.mas_equalTo(0);
+//        make.left.mas_equalTo(0);
+//        make.right.mas_equalTo(0);
+//    }];
+//    
+//    UIButton *qrcodeBtn = [[UIButton alloc] init];
+//    [qrcodeBtn setBackgroundColor:[UIColor clearColor]];
+//    [qrcodeBtn setBackgroundImage:[UIImage imageNamed:@"guide_qrcode_icon"] forState:(UIControlStateNormal)];
+//    [self.view addSubview:qrcodeBtn];
+//    [qrcodeBtn mas_makeConstraints:^(MASConstraintMaker *make) {
+//        make.top.mas_equalTo((363.f/812.f)*self.view.height - 80.f);
+//        make.centerX.equalTo(self.view.mas_centerX);
+//        make.width.mas_equalTo(160);
+//        make.height.mas_equalTo(160);
+//    }];
+//    
+//    [qrcodeBtn addTarget:self
+//                  action:@selector(qrcodeBtnPressed)
+//        forControlEvents:(UIControlEventTouchUpInside)];
+//    
+//    /*提示文字*/
+//    UILabel *tipsLabel = [[UILabel alloc] init];
+//    [tipsLabel setFont:[UIFont systemFontOfSize:14]];
+//    [tipsLabel setTextColor:HW666666Color];
+//    [tipsLabel setTextAlignment:(NSTextAlignmentCenter)];
+//    [self.view addSubview:tipsLabel];
+//    [tipsLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+//        make.top.equalTo(qrcodeBtn.mas_bottom).offset(8);
+//        make.left.mas_equalTo(60);
+//        make.right.mas_equalTo(-60);
+//    }];
+//    [tipsLabel setText:NSLocalizedString(@"guide_qrcoede_tips",nil)];
+//    
+//    /*扫一扫按钮*/
+//    UIButton *qrcodeSmallBtn = [[UIButton alloc] init];
+//    qrcodeSmallBtn.frame = CGRectMake(0, 0, 120.f, 36.f);
+//
+//    // gradient
+//    CAGradientLayer *gl = [CAGradientLayer layer];
+//    gl.frame = CGRectMake(0,0,120.f,36.f);
+//    gl.startPoint = CGPointMake(0, 0.5);
+//    gl.endPoint = CGPointMake(1, 0.5);
+//    gl.colors = @[(__bridge id)HW0CDEFDColor.CGColor, (__bridge id)HW058DFBColor.CGColor];
+//    gl.locations = @[@(0), @(1.0f)];
+//    
+//    [qrcodeSmallBtn.layer addSublayer:gl];
+//    [qrcodeSmallBtn addTarget:self action:@selector(qrcodeBtnPressed) forControlEvents:(UIControlEventTouchUpInside)];
+//    [qrcodeSmallBtn setTitle:NSLocalizedString(@"guide_qrcoede_btn_title",nil) forState:(UIControlStateNormal)];
+//    [qrcodeSmallBtn setTitleColor:[UIColor whiteColor] forState:(UIControlStateNormal)];
+//    [qrcodeSmallBtn.titleLabel setFont:[UIFont systemFontOfSize:14.f]];
+//    [qrcodeSmallBtn.layer setCornerRadius:18.f];
+//    qrcodeSmallBtn.clipsToBounds = YES;
+//    [self.view addSubview:qrcodeSmallBtn];
+//    [qrcodeSmallBtn mas_makeConstraints:^(MASConstraintMaker *make) {
+//        make.centerX.equalTo(self.view.mas_centerX);
+//        make.width.mas_equalTo(120.f);
+//        make.top.equalTo(tipsLabel.mas_bottom).offset(20);
+//        make.height.mas_equalTo(36.f);
+//    }];
+}
+
+
+- (void)initBaseUIFun
+{
+    self.view.backgroundColor = [UIColor whiteColor];
+    
+//    NSString *curTitleStr = NSLocalizedString(@"scan_Tip_title",nil);
+//
+//    /*标题*/
+//    UILabel *titleLabel = [[UILabel alloc] init];
+//    [titleLabel setFont:[UIFont systemFontOfSize:18]];
+//    [titleLabel setTextColor:HW333333Color];
+//    [titleLabel setTextAlignment:(NSTextAlignmentCenter)];
+//    [self.view addSubview:titleLabel];
+//    [titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+//        make.top.equalTo(self.titleLabel.mas_top).offset(0);
+//        make.left.mas_equalTo(10);
+//        make.right.mas_equalTo(-10);
+//        make.height.mas_equalTo(25.0);
+//    }];
+//    [titleLabel setText:curTitleStr];
+    
+    //
+    UIScrollView *bgScorllV = [[UIScrollView alloc] init];
+    bgScorllV.showsHorizontalScrollIndicator = NO;
+    //bgScorllV.backgroundColor = [UIColor redColor];
+    [self.view addSubview:bgScorllV];
+    
+    [bgScorllV mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.top.equalTo(self.titleLabel.mas_bottom).offset(30);
         make.left.mas_equalTo(0);
         make.right.mas_equalTo(0);
+        make.bottom.mas_equalTo(-100.0);
     }];
+
+    NSString *languageCode = [NSLocale preferredLanguages][0];
+  
+    NSString *imageNameStr = @"scan_tip_en";
+    CGFloat imageW = 345.0;
+    CGFloat imageH = 598.0;
     
-    UIButton *qrcodeBtn = [[UIButton alloc] init];
-    [qrcodeBtn setBackgroundColor:[UIColor clearColor]];
-    [qrcodeBtn setBackgroundImage:[UIImage imageNamed:@"guide_qrcode_icon"] forState:(UIControlStateNormal)];
-    [self.view addSubview:qrcodeBtn];
-    [qrcodeBtn mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.mas_equalTo((363.f/812.f)*self.view.height - 80.f);
-        make.centerX.equalTo(self.view.mas_centerX);
-        make.width.mas_equalTo(160);
-        make.height.mas_equalTo(160);
-    }];
+    if([languageCode rangeOfString:@"zh-Hans"].location != NSNotFound)
+    {
+        imageNameStr = @"scan_tip_Hans";
+    }
+    else if([languageCode rangeOfString:@"zh-Hant"].location != NSNotFound)
+    {
+        imageNameStr = @"scan_tip_Hant";
+    }
+    else if([languageCode rangeOfString:@"ja-"].location != NSNotFound)
+    {
+        imageNameStr = @"scan_tip_ja";
+        
+        imageH = 672.0;
+    }
+    
+    
+    
+    UIImageView * bgImageV = [[UIImageView alloc] init];
+    bgImageV.image = [UIImage imageNamed:imageNameStr];
+    [bgScorllV addSubview:bgImageV];
     
-    [qrcodeBtn addTarget:self
-                  action:@selector(qrcodeBtnPressed)
-        forControlEvents:(UIControlEventTouchUpInside)];
-    
-    /*提示文字*/
-    UILabel *tipsLabel = [[UILabel alloc] init];
-    [tipsLabel setFont:[UIFont systemFontOfSize:14]];
-    [tipsLabel setTextColor:HW666666Color];
-    [tipsLabel setTextAlignment:(NSTextAlignmentCenter)];
-    [self.view addSubview:tipsLabel];
-    [tipsLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.equalTo(qrcodeBtn.mas_bottom).offset(8);
-        make.left.mas_equalTo(60);
-        make.right.mas_equalTo(-60);
+    [bgImageV mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.centerX.mas_equalTo(0);
+        make.top.mas_equalTo(0);
+        make.width.mas_equalTo(imageW);
+        make.height.mas_equalTo(imageH);
     }];
-    [tipsLabel setText:NSLocalizedString(@"guide_qrcoede_tips",nil)];
+    
+    bgScorllV.contentSize = CGSizeMake(imageW, imageH);
+    
     
     /*扫一扫按钮*/
     UIButton *qrcodeSmallBtn = [[UIButton alloc] init];
-    qrcodeSmallBtn.frame = CGRectMake(0, 0, 120.f, 36.f);
-
+   
     // gradient
     CAGradientLayer *gl = [CAGradientLayer layer];
-    gl.frame = CGRectMake(0,0,120.f,36.f);
+    gl.frame = CGRectMake(0,0,345.f,48.f);
     gl.startPoint = CGPointMake(0, 0.5);
     gl.endPoint = CGPointMake(1, 0.5);
     gl.colors = @[(__bridge id)HW0CDEFDColor.CGColor, (__bridge id)HW058DFBColor.CGColor];
     gl.locations = @[@(0), @(1.0f)];
-    
+
     [qrcodeSmallBtn.layer addSublayer:gl];
     [qrcodeSmallBtn addTarget:self action:@selector(qrcodeBtnPressed) forControlEvents:(UIControlEventTouchUpInside)];
-    [qrcodeSmallBtn setTitle:NSLocalizedString(@"guide_qrcoede_btn_title",nil) forState:(UIControlStateNormal)];
+    [qrcodeSmallBtn setTitle:NSLocalizedString(@"scan_Tip_title_button",nil) forState:(UIControlStateNormal)];
     [qrcodeSmallBtn setTitleColor:[UIColor whiteColor] forState:(UIControlStateNormal)];
-    [qrcodeSmallBtn.titleLabel setFont:[UIFont systemFontOfSize:14.f]];
-    [qrcodeSmallBtn.layer setCornerRadius:18.f];
+    [qrcodeSmallBtn.titleLabel setFont:[UIFont systemFontOfSize:16.f]];
+    [qrcodeSmallBtn.layer setCornerRadius:8.f];
     qrcodeSmallBtn.clipsToBounds = YES;
     [self.view addSubview:qrcodeSmallBtn];
     [qrcodeSmallBtn mas_makeConstraints:^(MASConstraintMaker *make) {
         make.centerX.equalTo(self.view.mas_centerX);
-        make.width.mas_equalTo(120.f);
-        make.top.equalTo(tipsLabel.mas_bottom).offset(20);
-        make.height.mas_equalTo(36.f);
+        make.width.mas_equalTo(345.f);
+        make.top.equalTo(bgScorllV.mas_bottom).offset(15);
+        make.height.mas_equalTo(48.f);
     }];
 }
 

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

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

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

@@ -306,3 +306,7 @@
 "image_version_pop_tip1"   = "盒盒子设备目前还未更新到最新版本 \n 请断电重启进行盒子设备更新";
 "image_version_pop_tip2"   = "设备更新期间请勿操作，预计需15分钟";
 "tv_p2p_ing"   = "正在投屏中";
+
+//1.3 新增
+"scan_Tip_title"   = "Private-X设置使用教程";
+"scan_Tip_title_button" = "扫描设备序列码";