Merge commit '12a03f64f83a51165b88c1a7ba6602621482b6ea' into HiBoxde1.0

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

@@ -49,9 +49,9 @@
 - (void)viewDidAppear:(BOOL)animated{
     [super viewDidAppear:animated];
     
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(4 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-        [self startMoveView];
-    });
+//    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(4 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+//        [self startMoveView];
+//    });
 }
 
 - (void)startMoveView{

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

@@ -148,7 +148,7 @@ AVCaptureDeviceInput *input = [AVCaptureDeviceInput deviceInputWithDevice:device
 
     _scanLineTimer = [NSTimer scheduledTimerWithTimeInterval:0.05 target:self selector:@selector(scanLineDownAndUpFun) userInfo:nil repeats:YES];
     
-    UILabel *tipLib = [[UILabel alloc] initWithFrame:CGRectMake(_cyanEdgeImageView.hw_x, _cyanEdgeImageView.hw_max_y + 15, _cyanEdgeImageView.hw_w, 20)];
+    UILabel *tipLib = [[UILabel alloc] initWithFrame:CGRectMake(20, _cyanEdgeImageView.hw_max_y + 15, SCREEN_W - 40, 20)];
     tipLib.text = NSLocalizedString(@"guide_qrcoede_tips_please",nil);
     tipLib.font = [UIFont systemFontOfSize:14.0];
     tipLib.textAlignment = NSTextAlignmentCenter;

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

@@ -149,7 +149,7 @@ AVCaptureDeviceInput *input = [AVCaptureDeviceInput deviceInputWithDevice:device
 
     _scanLineTimer = [NSTimer scheduledTimerWithTimeInterval:0.05 target:self selector:@selector(scanLineDownAndUpFun) userInfo:nil repeats:YES];
     
-    UILabel *tipLib = [[UILabel alloc] initWithFrame:CGRectMake(_cyanEdgeImageView.hw_x, _cyanEdgeImageView.hw_max_y + 15, _cyanEdgeImageView.hw_w, 20)];
+    UILabel *tipLib = [[UILabel alloc] initWithFrame:CGRectMake(20, _cyanEdgeImageView.hw_max_y + 15, SCREEN_W - 40, 20)];
     tipLib.text = NSLocalizedString(@"guide_qrcoede_tips_please",nil);
     tipLib.font = [UIFont systemFontOfSize:14.0];
     tipLib.textAlignment = NSTextAlignmentCenter;

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

@@ -35,7 +35,7 @@
     [self.toolBar setHidden:YES];
     [self.navigationBar setHidden:YES];
     [self.navBarBGView setHidden:NO];
-    [self.titleLabel setText:@"更换图标"];
+    [self.titleLabel setText:NSLocalizedString(@"my_set_no_change_logo",nil)];
     
     logoSelectView = [[LogoSelectView alloc] init];
     logoSelectView.delegate = self;
@@ -159,7 +159,7 @@
     [self.view addSubview:okBtn];
     [okBtn mas_makeConstraints:^(MASConstraintMaker *make) {
         //make.top.equalTo(pwdAgainTextField.mas_bottom).offset(16.f);
-        make.top.equalTo(logoSelectView.mas_bottom).offset(30.f);
+        make.top.equalTo(logoSelectView.mas_bottom).offset(60.f);
         make.centerX.equalTo(self.view.mas_centerX);
         make.width.mas_equalTo(okBtn_W);
         make.height.mas_equalTo(48);

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

@@ -55,13 +55,23 @@
     UILabel *upTipLabel = [[UILabel alloc] init];
     [upTipLabel setTextColor:COLOR_PACEHOLDER];
     [upTipLabel setFont:[UIFont boldSystemFontOfSize:14.f]];
-    [upTipLabel setText:NSLocalizedString(@"logo_change_logo_tip",nil)];
+    NSString *curStr = NSLocalizedString(@"logo_change_logo_tip",nil);
+    [upTipLabel setText:curStr];
+    upTipLabel.numberOfLines = 0;
     [self addSubview:upTipLabel];
+    
+    CGFloat curHeight = [curStr boundingRectWithSize:CGSizeMake(SCREEN_W -16 -16, 1000) options:(NSStringDrawingUsesLineFragmentOrigin) attributes:@{NSFontAttributeName:[UIFont boldSystemFontOfSize:14.f]} context:nil].size.height;
+    
+    if(curHeight >= 20){
+        curHeight += 10;
+    }
+    
     [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);
+        //make.height.mas_equalTo(22);
+        make.height.mas_equalTo(curHeight);
     }];
     
     /*掩盖视图类型*/

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

@@ -130,10 +130,12 @@
     [privateBtn setTitleColor:HW13B2EBColor forState:UIControlStateNormal];
     [privateBtn setBackgroundColor:[UIColor clearColor]];
     [privateBtn addTarget:self action:@selector(privateBtnClick) forControlEvents:UIControlEventTouchUpInside];
+    privateBtn.contentHorizontalAlignment = UIControlContentHorizontalAlignmentLeft;
     [self.view addSubview:privateBtn];
     [privateBtn mas_makeConstraints:^(MASConstraintMaker *make) {
         make.bottom.mas_equalTo(-80-AdaptTabHeight);
-        make.width.mas_equalTo(55);
+        //make.width.mas_equalTo(55);
+        make.width.mas_equalTo(120);
         make.height.mas_equalTo(38);
         make.left.equalTo(self.view.mas_centerX).offset(6);
     }];
@@ -145,10 +147,12 @@
     [ruleBtn setTitleColor:HW13B2EBColor forState:UIControlStateNormal];
     [ruleBtn setBackgroundColor:[UIColor clearColor]];
     [ruleBtn addTarget:self action:@selector(ruleBtnClick) forControlEvents:UIControlEventTouchUpInside];
+    ruleBtn.contentHorizontalAlignment = UIControlContentHorizontalAlignmentRight;
     [self.view addSubview:ruleBtn];
     [ruleBtn mas_makeConstraints:^(MASConstraintMaker *make) {
         make.bottom.mas_equalTo(-80-AdaptTabHeight);
-        make.width.mas_equalTo(55);
+        //make.width.mas_equalTo(55);
+        make.width.mas_equalTo(120);
         make.height.mas_equalTo(38);
         make.right.equalTo(self.view.mas_centerX).offset(-6);
     }];

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

@@ -6,6 +6,7 @@
 //
 
 #import "PlayerControlButTipView.h"
+#import "DDYLanguageTool.h"
 @interface PlayerControlButTipView()
 
 @property(nonatomic,strong)UIImageView *ControlButTipLineImageView;
@@ -48,7 +49,7 @@
     
     /*确认按钮*/
     UIButton* okBtn = [[UIButton alloc] init];
-    CGFloat okBtn_W= 250;
+    CGFloat okBtn_W= 280;
     // gradient
     CAGradientLayer *gl = [CAGradientLayer layer];
     gl.frame = CGRectMake(0,0,okBtn_W,48);
@@ -61,7 +62,20 @@
     [okBtn.layer addSublayer:gl];
     [okBtn setTitle:NSLocalizedString(@"player_ControlButton_Tip",nil) forState:(UIControlStateNormal)];
     [okBtn setTitleColor:[UIColor whiteColor] forState:(UIControlStateNormal)];
-    [okBtn.titleLabel setFont:[UIFont systemFontOfSize:16.f]];
+    
+    NSString* curLanguage = [DDYLanguageTool ddy_AppLanguage];
+    if(!curLanguage || curLanguage.length == 0){
+        curLanguage = [DDYLanguageTool ddy_SystemLanguage];
+    }
+    
+    // "zh-Hant-HK", "zh-Hans-US",
+    if([curLanguage rangeOfString:@"zh-Han"].location != NSNotFound){//中文和繁体
+        [okBtn.titleLabel setFont:[UIFont systemFontOfSize:16.f]];
+    }
+    else{//en-US
+        [okBtn.titleLabel setFont:[UIFont systemFontOfSize:14.f]];
+    }
+   
     [self addSubview:okBtn];
     [okBtn mas_makeConstraints:^(MASConstraintMaker *make) {
         //make.top.equalTo(pwdAgainTextField.mas_bottom).offset(16.f);