1.英文版本问题

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

@@ -5724,7 +5724,7 @@
 				CODE_SIGN_ENTITLEMENTS = "隐私保护.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 5;
 				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 = 4;
+				CURRENT_PROJECT_VERSION = 5;
 				DEVELOPMENT_TEAM = 6SV76WTUUR;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",

创维盒子/双子星云手机/Class/Set/clearCache/clearCacheAlretViewController.m

@@ -129,6 +129,7 @@
     [selectBut setImage:[UIImage imageNamed:@"common_un_check"] forState:UIControlStateNormal];
     [selectBut setTitle:NSLocalizedString(@"clear_cache_include_file_Transfer",nil) forState:UIControlStateNormal];
     selectBut.titleLabel.font = [UIFont systemFontOfSize:12.0];
+    selectBut.titleLabel.numberOfLines = 0;
     [selectBut setTitleColor:[UIColor hwColor:@"#151515" alpha:1.0] forState:UIControlStateNormal];
     [selectBut addTarget:self action:@selector(didClickSelectButtonFun:) forControlEvents:UIControlEventTouchUpInside];
     
@@ -141,7 +142,7 @@
         }else{
             make.top.equalTo(titleLabel.mas_bottom).offset(25.f);
         }
-        make.height.mas_equalTo(20);
+        make.height.mas_equalTo(30);
     }];
     
     /*双按钮*/

创维盒子/双子星云手机/Class/Set/uploadFile/fileTransfeSet/fileTransferPathCheckViewController.m

@@ -78,10 +78,31 @@
 
 - (void)drawAnyView{
     
+    UIFont *curFont = [UIFont systemFontOfSize:18.0];
+    NSString *butTitle = NSLocalizedString(@"File_upload_path_new",nil);
+    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:13.0];
+        if ([butTitle containsString:@"Create new path"]) {
+            butTitle = @"Create";
+        }
+    }
+    
     UIButton* rightButton = [[UIButton alloc] init];
-    [rightButton setTitle:NSLocalizedString(@"File_upload_path_new",nil)  forState:UIControlStateNormal];
+    [rightButton setTitle:butTitle  forState:UIControlStateNormal];
     [rightButton setTitleColor:[UIColor hwColor:@"#FF9500" alpha:1.0] forState:UIControlStateNormal];
-    rightButton.titleLabel.font = [UIFont systemFontOfSize:18.0];
+    rightButton.titleLabel.font = curFont;
     rightButton.contentHorizontalAlignment = UIControlContentHorizontalAlignmentRight;
     [rightButton addTarget:self action:@selector(didiClikRightButFun:) forControlEvents:UIControlEventTouchUpInside];
     [self.navBarBGView addSubview:rightButton];

创维盒子/双子星云手机/Class/Set/uploadFile/nonWifiTipInRecordView.m

@@ -43,13 +43,29 @@
         make.centerY.mas_equalTo(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];
+    }
+        
     //去开启
     NSString *buttonTitle = NSLocalizedString(@"common_wwan_open_tip",nil);
     UIButton *openButton = [[UIButton alloc] init];
     openButton.backgroundColor =  [UIColor hwColor:@"#DD4E4E" alpha:1.0];
     [openButton setTitle:buttonTitle forState:UIControlStateNormal];
     [openButton setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
-    openButton.titleLabel.font = [UIFont systemFontOfSize:12.0];
+    openButton.titleLabel.font = curFont;
     openButton.layer.cornerRadius = 4;
     openButton.userInteractionEnabled = NO;
     [whiteBgView addSubview:openButton];

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

@@ -108,8 +108,26 @@
     
     CGFloat butWidth = (SCREEN_W - 16*2 - 16*2)/3.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];
+    }
+    
     _totalLabel = [[UILabel alloc] init];
-    _totalLabel.font = [UIFont systemFontOfSize:12.0];
+    _totalLabel.font = curFont;
     _totalLabel.textColor = [UIColor hwColor:@"#818CA2"];
     //_fileNamelabel.backgroundColor = [UIColor greenColor];
     [whiteBgView addSubview:_totalLabel];
@@ -121,7 +139,7 @@
     }];
     
     _usedlabel = [[UILabel alloc] init];
-    _usedlabel.font = [UIFont systemFontOfSize:12.0];
+    _usedlabel.font = curFont;
     _usedlabel.textColor = [UIColor hwColor:@"#818CA2"];
     _usedlabel.textAlignment = NSTextAlignmentCenter;
     //_usedlabel.backgroundColor = [UIColor greenColor];
@@ -134,7 +152,7 @@
     }];
     
     _unuselabel = [[UILabel alloc] init];
-    _unuselabel.font = [UIFont systemFontOfSize:12.0];
+    _unuselabel.font = curFont;
     _unuselabel.textColor = [UIColor hwColor:@"#818CA2"];
     _unuselabel.textAlignment = NSTextAlignmentRight;
     //_unuselabel.backgroundColor = [UIColor greenColor];

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

@@ -539,7 +539,7 @@
 "NAS_cloudPhone_Space"   = "Cloud Phone Space";
 "NAS_disk_Total_title"   = "Total Space";
 "NAS_disk_used_Space"   = "Used";
-"NAS_disk_unuse_Space"   = "Available Capacity";
+"NAS_disk_unuse_Space"   = "Available";
 "NAS_common_used"   = "Common Features";
 "NAS_last_file"   = "Recent Files";
 "NAS_bottom_tip"   = "- That's all -";
@@ -624,8 +624,8 @@
 "enable_photo_permission"   = "Enable Photo Permission";
 "enable_photo_permission_tip"   = "Photo access disabled; granting access will enhance upload service. Process encrypted for security.";
 "enable_photo_permission_noData_tip"   = "Album permission not enabled. Go enable it!";
-"common_wwan_open_tip"   = "Go to Open";
-"no_wifi_warn_tip"   = "Currently in a non-WIFI environment. To transfer files via data, please enable data transfer in settings.";
+"common_wwan_open_tip"   = "Go setting";
+"no_wifi_warn_tip"   = "Currently not on WIFI. Enable data transfer in settings to use mobile data.";
 "shortcatRep_tip"   = "Screenshot saved to cloud directory under control";
 "webrtc_msg_delayed"   = "Latency:";
 "webrtc_msg_PacketLoss"   = "Packet Loss:";
@@ -634,7 +634,7 @@
 "system_version_current"   = "Current System Version";
 "asystem_version_wait_update"   = "System Update Version Pending";
 "File_Transfer_background_working_tip_2"   = "Enabling background file transfer will consume battery. If power-saving mode is enabled, background transfer cannot occur. Please disable power-saving mode to enable background operation.";
-"mine_cloudPhone_Model_title"   = "Cloud Phone Mode";
+"mine_cloudPhone_Model_title"   = "Homepage Settings";
 "cloudPhone_Model_tip"   = "If enabled, the app will open directly to the cloud phone page; if disabled, it will go to the NAS page.";
 "go_setting_title" = "Go to Settings";
 "cloudPhone_Model_open_tip"   = "Cloud phone mode has been enabled, next time you launch the app, you will directly enter the cloud phone";