1.bug修复

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

@@ -5724,7 +5724,7 @@
 				CODE_SIGN_ENTITLEMENTS = "隐私保护.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 5;
+				CURRENT_PROJECT_VERSION = 6;
 				DEVELOPMENT_TEAM = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -5803,7 +5803,7 @@
 				CODE_SIGN_ENTITLEMENTS = "隐私保护.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 5;
+				CURRENT_PROJECT_VERSION = 6;
 				DEVELOPMENT_TEAM = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",

创维盒子/双子星云手机/NAS/view/NASMySpaceTableViewCell.m

@@ -106,34 +106,35 @@
     [_progressSelectView.layer addSublayer:_glayer];
     
     
-    CGFloat butWidth = (SCREEN_W - 16*2 - 16*2)/3.0;
+    CGFloat butWidth = (SCREEN_W - 16*2 - 16*2)/2.0;
     
     UIFont *curFont = [UIFont systemFontOfSize:12.0];
     
-    NSArray *arLanguages = [[NSUserDefaults standardUserDefaults] objectForKey:@"AppleLanguages"];
-    NSLog(@"arLanguages:%@",arLanguages);
-    ///获取设备当前地区的代码和APP语言环境
-    NSString *languageCode = [NSLocale preferredLanguages][0];
-  
-    //目前支持 中文（简体 繁体） 英文 日语
-    if([languageCode rangeOfString:@"zh-Hans"].location != NSNotFound)
-    {
-    }
-    else if([languageCode rangeOfString:@"zh-Hant"].location != NSNotFound)
-    {
-    }
-    else{
-        curFont = [UIFont systemFontOfSize:10.0];
-    }
+//    NSArray *arLanguages = [[NSUserDefaults standardUserDefaults] objectForKey:@"AppleLanguages"];
+//    NSLog(@"arLanguages:%@",arLanguages);
+//    ///获取设备当前地区的代码和APP语言环境
+//    NSString *languageCode = [NSLocale preferredLanguages][0];
+//  
+//    //目前支持 中文（简体 繁体） 英文 日语
+//    if([languageCode rangeOfString:@"zh-Hans"].location != NSNotFound)
+//    {
+//    }
+//    else if([languageCode rangeOfString:@"zh-Hant"].location != NSNotFound)
+//    {
+//    }
+//    else{
+//        curFont = [UIFont systemFontOfSize:10.0];
+//    }
     
     _totalLabel = [[UILabel alloc] init];
     _totalLabel.font = curFont;
+    _totalLabel.textAlignment = NSTextAlignmentRight;
     _totalLabel.textColor = [UIColor hwColor:@"#818CA2"];
     //_fileNamelabel.backgroundColor = [UIColor greenColor];
     [whiteBgView addSubview:_totalLabel];
     
     [_totalLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.mas_equalTo(16);
+        make.right.mas_equalTo(-16);
         make.width.mas_equalTo(butWidth);
         make.top.mas_equalTo(_progressBgView.mas_bottom).offset(10);
     }];
@@ -141,28 +142,29 @@
     _usedlabel = [[UILabel alloc] init];
     _usedlabel.font = curFont;
     _usedlabel.textColor = [UIColor hwColor:@"#818CA2"];
-    _usedlabel.textAlignment = NSTextAlignmentCenter;
+    //_usedlabel.textAlignment = NSTextAlignmentRight;
     //_usedlabel.backgroundColor = [UIColor greenColor];
     [whiteBgView addSubview:_usedlabel];
     
     [_usedlabel mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.mas_equalTo(_totalLabel.mas_right);
+        //make.left.mas_equalTo(_totalLabel.mas_right);
+        make.left.mas_equalTo(16);
         make.width.mas_equalTo(butWidth);
         make.top.mas_equalTo(_progressBgView.mas_bottom).offset(10);
     }];
     
-    _unuselabel = [[UILabel alloc] init];
-    _unuselabel.font = curFont;
-    _unuselabel.textColor = [UIColor hwColor:@"#818CA2"];
-    _unuselabel.textAlignment = NSTextAlignmentRight;
-    //_unuselabel.backgroundColor = [UIColor greenColor];
-    [whiteBgView addSubview:_unuselabel];
-    
-    [_unuselabel mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.right.mas_equalTo(-13);
-        make.width.mas_equalTo(butWidth);
-        make.top.mas_equalTo(_progressBgView.mas_bottom).offset(10);
-    }];
+//    _unuselabel = [[UILabel alloc] init];
+//    _unuselabel.font = curFont;
+//    _unuselabel.textColor = [UIColor hwColor:@"#818CA2"];
+//    _unuselabel.textAlignment = NSTextAlignmentRight;
+//    //_unuselabel.backgroundColor = [UIColor greenColor];
+//    [whiteBgView addSubview:_unuselabel];
+//    
+//    [_unuselabel mas_makeConstraints:^(MASConstraintMaker *make) {
+//        make.right.mas_equalTo(-13);
+//        make.width.mas_equalTo(butWidth);
+//        make.top.mas_equalTo(_progressBgView.mas_bottom).offset(10);
+//    }];
     
 }
 
@@ -224,12 +226,12 @@
     }
     _usedlabel.text = usedStr;
     
-    NSString *unusedStr  = [[NSString alloc] initWithFormat:@"%@%.2fGB",NSLocalizedString(@"NAS_disk_unuse_Space",nil),extraAvableSizeF];
-    if(extraAvableSizeF > 1024){
-        extraAvableSizeF = extraAvableSizeF/1024.0;
-        unusedStr  = [[NSString alloc] initWithFormat:@"%@%.2fTB",NSLocalizedString(@"NAS_disk_unuse_Space",nil),extraAvableSizeF];
-    }
-    _unuselabel.text = unusedStr;
+//    NSString *unusedStr  = [[NSString alloc] initWithFormat:@"%@%.2fGB",NSLocalizedString(@"NAS_disk_unuse_Space",nil),extraAvableSizeF];
+//    if(extraAvableSizeF > 1024){
+//        extraAvableSizeF = extraAvableSizeF/1024.0;
+//        unusedStr  = [[NSString alloc] initWithFormat:@"%@%.2fTB",NSLocalizedString(@"NAS_disk_unuse_Space",nil),extraAvableSizeF];
+//    }
+//    _unuselabel.text = unusedStr;
 
 }
 @end

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

@@ -202,7 +202,7 @@
 "guide_set_pwd_makesure_title" = "Please confirm your password";
 "guide_set_pwd_guide" = "Set a unique password";
 "guide_input_pwd_title" = "Enter the startup password";
-"guide_set_pwd_guide_know" = "I understand";
+"guide_set_pwd_guide_know" = "Understood";
 "guide_set_pwd_up_step" = "Previous step";
 "guide_set_open_calcula_guide_tips" = "The software will masquerade as a calculator. On the calculator page, enter the startup password you set; successful entry grants access to the GBOX.";
 "guide_set_open_web_guide_tips" = "The software will masquerade as a browser. On the browser page, enter the startup password you set; successful entry grants access to the GBOX.";
@@ -522,7 +522,7 @@
 "get_sn_msg_201_title" = "Device information does not exist";
 "get_sn_msg_201_content" = "Please provide SN for customer service inquiry!";
 "get_sn_msg_202_title" = "Device activation failed";
-"get_sn_msg_202_content" = "Check power & network. If issue persists, provide SN for assistance.";
+"get_sn_msg_202_content" = "Check if the device is powered on and connected to the internet. If the issue persists, please provide the SN to contact customer service for assistance!";
 "File_download_Path_other_done"   = "Download to:iphone/File";
 "File_download_error_404"   = "Resource lost";
 "play_video_fail_tip"   = "Preview unsupported for this file type";