1.多国语言上传

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

@@ -145,6 +145,12 @@
     [_rightButton addTarget:self action:@selector(didClickSelectAllButton:) forControlEvents:UIControlEventTouchUpInside];
     [self.navBarBGView addSubview:_rightButton];
     
+    //多国语言适配
+    NSString *languageCode = [NSLocale preferredLanguages][0];
+    if([languageCode rangeOfString:@"ja-"].location != NSNotFound)
+    {
+        _rightButton.titleLabel.font = [UIFont systemFontOfSize:13.0];
+    }
     
     [_rightButton mas_makeConstraints:^(MASConstraintMaker *make) {
         make.width.mas_equalTo(90);

创维盒子/双子星云手机/Class/Set/uploadFile/downLoadFile/view/downloadFileBottomView.m

@@ -72,7 +72,7 @@
     }];
     
     //图片上传
-    NSString* curImgUploadStr = [[NSString alloc] initWithFormat:@"%@ %@",@"  ",NSLocalizedString(@"my_set_no_File_download",nil)];
+    NSString* curImgUploadStr = [[NSString alloc] initWithFormat:@"%@ %@",@"",NSLocalizedString(@"my_set_no_File_download",nil)];
     
     
     // gradient
@@ -102,11 +102,17 @@
     self.uploadButon = imageUploadBut;
     
     //imageUploadBut.backgroundColor = [UIColor redColor];
+    //多国语言适配
+    NSString *languageCode = [NSLocale preferredLanguages][0];
+    if([languageCode rangeOfString:@"ja-"].location != NSNotFound)
+    {
+        imageUploadBut.titleLabel.font = [UIFont systemFontOfSize:10.0];
+    }
     
     [imageUploadBut mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.right.mas_equalTo(-15);
+        make.right.mas_equalTo(-10);
         make.top.mas_equalTo(10);
-        make.width.mas_equalTo(88);
+        make.width.mas_equalTo(98);
         make.height.mas_equalTo(40);
     }];
     

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

@@ -27,6 +27,14 @@
     [self.navigationBar setHidden:YES];
     [self.navBarBGView setHidden:NO];
     [self.titleLabel setText:NSLocalizedString(@"File_backups_path_set",nil)];
+    
+    //多国语言适配
+    NSString *languageCode = [NSLocale preferredLanguages][0];
+    if([languageCode rangeOfString:@"ja-"].location != NSNotFound)
+    {
+        self.titleLabel.font = [UIFont boldSystemFontOfSize:15.0];
+    }
+    
     [self.view setBackgroundColor:HWF5F7FAColor];
     
     [self drawAnyView];

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

@@ -85,12 +85,15 @@
     titleLabel = [[UILabel alloc] init];
     [cellBgView addSubview:titleLabel];
     titleLabel.font = [UIFont boldSystemFontOfSize:14.f];
+    //titleLabel.adjustsFontSizeToFitWidth = YES;
+    titleLabel.numberOfLines = 2;
     [titleLabel setTextColor:HW0A132BColor];
     [titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
         //make.left.equalTo(mImageView.mas_right).offset(5.f);
         make.left.mas_equalTo(10.f);
-        make.right.mas_equalTo(-50.f);
+        make.right.mas_equalTo(-60.f);
         make.centerY.equalTo(cellBgView.mas_centerY);
+        make.height.mas_equalTo(35.f);
     }];
     
     /**副标题*/

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

@@ -56,7 +56,7 @@
 //    }];
     
     //图片上传
-    NSString* curImgUploadStr = [[NSString alloc] initWithFormat:@"%@ %@",@"  ",NSLocalizedString(@"my_set_no_File_upload",nil)];
+    NSString* curImgUploadStr = [[NSString alloc] initWithFormat:@"%@ %@",@"",NSLocalizedString(@"my_set_no_File_upload",nil)];
     
     
     // gradient
@@ -86,11 +86,17 @@
     self.uploadButon = imageUploadBut;
     
     //imageUploadBut.backgroundColor = [UIColor redColor];
+    //多国语言适配
+    NSString *languageCode = [NSLocale preferredLanguages][0];
+    if([languageCode rangeOfString:@"ja-"].location != NSNotFound)
+    {
+        imageUploadBut.titleLabel.font = [UIFont systemFontOfSize:10.0];
+    }
     
     [imageUploadBut mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.right.mas_equalTo(-15);
+        make.right.mas_equalTo(-10);
         make.top.mas_equalTo(10);
-        make.width.mas_equalTo(88);
+        make.width.mas_equalTo(98);
         make.height.mas_equalTo(40);
     }];
     

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

@@ -41,17 +41,19 @@
     self.indexPathsForSelectedItems = [NSMutableArray new];
     
     _uploadFileRoutelabel = [[UILabel alloc] init];
-    _uploadFileRoutelabel.font = [UIFont systemFontOfSize:14.0];
+    //_uploadFileRoutelabel.font = [UIFont systemFontOfSize:14.0];
     //_uploadFileRoutelabel.textColor = [UIColor hwColor:@"#959799" alpha:1.0];
     _uploadFileRoutelabel.textColor =[UIColor hwColor:@"#01B7EA" alpha:1.0];
     [self addSubview:_uploadFileRoutelabel];
+    _uploadFileRoutelabel.adjustsFontSizeToFitWidth = YES;
+    
     [self setSavePathDataFun];
     
     [_uploadFileRoutelabel mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.mas_equalTo(15);
-        make.top.mas_equalTo(_selectNumLabel.mas_bottom).offset(10);
+        make.top.mas_equalTo(_selectNumLabel.mas_bottom).offset(12);
         make.right.mas_equalTo(-110);
-        make.height.mas_equalTo(20);
+        make.height.mas_equalTo(15);
     }];
     
     UIView *tapView = [[UIView alloc] init];
@@ -69,7 +71,7 @@
     [tapView addGestureRecognizer:tap];
     
     //图片上传
-    NSString* curImgUploadStr = [[NSString alloc] initWithFormat:@"%@ %@",@"  ",NSLocalizedString(@"my_set_no_File_upload",nil)];
+    NSString* curImgUploadStr = [[NSString alloc] initWithFormat:@"%@ %@",@"",NSLocalizedString(@"my_set_no_File_upload",nil)];
     
     
     // gradient
@@ -99,11 +101,17 @@
     self.uploadButon = imageUploadBut;
     
     //imageUploadBut.backgroundColor = [UIColor redColor];
+    //多国语言适配
+    NSString *languageCode = [NSLocale preferredLanguages][0];
+    if([languageCode rangeOfString:@"ja-"].location != NSNotFound)
+    {
+        imageUploadBut.titleLabel.font = [UIFont systemFontOfSize:10.0];
+    }
     
     [imageUploadBut mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.right.mas_equalTo(-15);
+        make.right.mas_equalTo(-10);
         make.top.mas_equalTo(10);
-        make.width.mas_equalTo(88);
+        make.width.mas_equalTo(98);
         make.height.mas_equalTo(40);
     }];
     

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

@@ -264,8 +264,16 @@
     _rightButton.hidden = YES;
     [self.navBarBGView addSubview:_rightButton];
     
+    //多国语言适配
+    NSString *languageCode = [NSLocale preferredLanguages][0];
+    if([languageCode rangeOfString:@"ja-"].location != NSNotFound)
+    {
+        _rightButton.titleLabel.font = [UIFont systemFontOfSize:13.0];
+        _leftButton.titleLabel.font = [UIFont systemFontOfSize:13.0];
+    }
+    
     [_rightButton mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.width.mas_equalTo(80);
+        make.width.mas_equalTo(90);
         make.right.mas_equalTo(-15);
         make.height.mas_equalTo(self.backBtn.mas_height);
         make.centerY.mas_equalTo(self.backBtn.mas_centerY);

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

@@ -134,10 +134,11 @@
     }];
     
     _fileProgresslabel = [[UILabel alloc] init];
-    _fileProgresslabel.font = [UIFont systemFontOfSize:12.0];
+    //_fileProgresslabel.font = [UIFont systemFontOfSize:12.0];
     _fileProgresslabel.textColor = [UIColor hwColor:@"#959799" alpha:1.0];
     //_fileProgresslabel.backgroundColor = [UIColor greenColor];
     [self.contentView addSubview:_fileProgresslabel];
+    _fileProgresslabel.adjustsFontSizeToFitWidth = YES;
     
     [_fileProgresslabel mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.mas_equalTo(_fileImageView.mas_right).offset(10);

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

@@ -127,6 +127,13 @@
     
     [self.navBarBGView addSubview:rightBut];
     
+    //多国语言适配
+    NSString *languageCode = [NSLocale preferredLanguages][0];
+    if([languageCode rangeOfString:@"ja-"].location != NSNotFound)
+    {
+        rightBut.titleLabel.font = [UIFont systemFontOfSize:13.0];
+    }
+    
     [rightBut mas_makeConstraints:^(MASConstraintMaker *make) {
         make.right.mas_equalTo(-20);
         make.centerY.mas_equalTo(self.backBtn.mas_centerY);

创维盒子/双子星云手机/Class/Set/view/mySetHeadView.m

@@ -103,16 +103,17 @@
     
     UILabel *PrivacyTipLabel2 = [[UILabel alloc] init];
     PrivacyTipLabel2.text = NSLocalizedString(@"my_set_Privacy_Mode_tip1",nil) ;
-    PrivacyTipLabel2.font = [UIFont systemFontOfSize:12.0];
+    //PrivacyTipLabel2.font = [UIFont systemFontOfSize:12.0];
     PrivacyTipLabel2.textColor = [UIColor hwColor:@"#6A6A6A" alpha:1.0];
     PrivacyTipLabel2.numberOfLines = 0;
     [PrivacyBg addSubview:PrivacyTipLabel2];
+    PrivacyTipLabel2.adjustsFontSizeToFitWidth = YES;
 
     [PrivacyTipLabel2 mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.mas_equalTo(10);
-        make.top.mas_equalTo(PrivacyTipLabel.mas_bottom).offset(10);
+        make.top.mas_equalTo(PrivacyTipLabel.mas_bottom).offset(15);
         make.right.mas_equalTo(-10);
-        make.height.mas_equalTo(40);
+        make.height.mas_equalTo(30);
     }];
     
     
@@ -138,7 +139,7 @@
     [titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.mas_equalTo(10);
         make.top.mas_equalTo(10);
-        make.width.mas_equalTo(100);
+        make.width.mas_equalTo(120);
         make.height.mas_equalTo(20);
     }];
 
@@ -248,7 +249,7 @@
     [BackupsTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.mas_equalTo(10);
         make.top.mas_equalTo(10);
-        make.width.mas_equalTo(100);
+        make.width.mas_equalTo(180);
         make.height.mas_equalTo(20);
     }];
 
@@ -348,7 +349,7 @@
     [imageBackupsTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
         make.centerY.mas_equalTo(-10);
         make.left.mas_equalTo(backupsImageV.mas_right).offset(10);
-        make.width.mas_equalTo(100);
+        make.right.mas_equalTo(-(10+60+10));
         make.height.mas_equalTo(20);
     }];
     
@@ -361,7 +362,7 @@
     [_imageBackupsLabel mas_makeConstraints:^(MASConstraintMaker *make) {
         make.centerY.mas_equalTo(10);
         make.left.mas_equalTo(backupsImageV.mas_right).offset(10);
-        make.width.mas_equalTo(100);
+        make.right.mas_equalTo(-(10+60+10));
         make.height.mas_equalTo(20);
     }];
     
@@ -407,7 +408,7 @@
     [otherTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.mas_equalTo(10);
         make.top.mas_equalTo(10);
-        make.width.mas_equalTo(100);
+        make.width.mas_equalTo(150);
         make.height.mas_equalTo(20);
     }];
     

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

@@ -370,3 +370,25 @@
 "File_Record_backups_photo_close_tip"   = "Album permission has been turned off";
 "phone_space_Insufficient"   = "Insufficient phone space";
 "backups_cannot_use_WWAN_tip"   = "No Wi-Fi, paused transmission. Enable mobile data backup in settings.";
+
+//1.3.1
+"File_upload_path_tip"   = "Upload Path";
+"File_upload_to_tip"   = "Upload to";
+"disk_not_find_tip"   = "Unable to find task path";
+"File_upload_set_default_path_tip"   = "Please complete the upload operation before changing the path";
+"disk_space_not_tip"   = "not enough space";
+"disk_phone_default_tip"   = "Cloud machine";
+"disk_Extra_default_tip"   = "disk";
+"File_upload_path_new_save"   = "The folder already exists";
+"disk_extract_tip"   = "Disk unplugged";
+"disk_save_extract_tip"   = "disk Retreat safely";
+"disk_insertion_tip"   = "Disk insertion";
+"disk_insertion_pop_title"   = "inserted";
+"disk_insertion_pop_tip"   = "Please safely eject the USB drive from the file manager before removal to prevent disk damage and data loss";
+"disk_insertion_pop_tip_sub1" = "01 desktop";
+"disk_insertion_pop_tip_sub2" = "02 Files";
+"disk_insertion_pop_tip_sub3" = "03 Files setting";
+"upload_file_and_not_path_tip" = "The disk path does not exist. Please check if the disk is connected properly";
+"save_path_change_suc_tip" = "Path change successful";
+"upload_task_not_done_tip" = "There is currently an upload task in progress, please try again later";
+"download_task_not_done_tip" = "There is currently a download task in progress, please try again later";

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

@@ -254,7 +254,7 @@
 "my_set_no_Restore_Factory_ok_tips" = "初期化しました";
 "my_set_no_Restore_Factory_ok_msg" = "修復が完了しました。ホーム画面に戻ります。";
 "my_set_no_Restore_FactoryOK" = "わかりました";
-"my_set_no_File_upload_title"   = "ファイルのアップロード";
+"my_set_no_File_upload_title"   = "アップロード";
 "my_set_no_File_upload_record"   = "アップロード履歴";
 "my_set_no_image_upload"   = "写真";
 "my_set_no_video_upload"   = "動画";
@@ -272,7 +272,7 @@
 "File_upload_Record_clear_fail_Tip_msg"   = "選択中のエラーが発生したタスクを削除しますか？";
 "File_upload_Record_clear_uploading_Tip_msg"   = "タスクが完了していません。選択したタスクを削除しますか？";
 "File_upload_Record_select_all"   = "全て選択する";
-"File_upload_cancel_select_all"   = "取消";
+"File_upload_cancel_select_all"   = "すべて選択解除";
 "File_upload_Record_delete"   = "削除";
 "File_upload_Record_delete_noFile"   = "ファイルを選択してください";
 "File_upload_fail"   = "ファイルをアップロードできませんでした";
@@ -290,7 +290,7 @@
 "my_set_Privacy_Model"   = "プライベートモード";
 "my_set_Privacy_Model_tip"   = "「プライベートモード」では、パスワード設定、アイコン変更、反転終了や使用中のアプリ非表示など、個人情報を安全に保護する機能が搭載されています。";
 "my_set_Privacy_Mode_set"   = "プライベートモードの設定";
-"my_set_Privacy_Mode_tip1"   = "「プライベートモード」では、パスワード設定、アイコン変更、反転終了や使用中のアプリ非表示など、個人情報を安全に保護する機能が搭載されています。";
+"my_set_Privacy_Mode_tip1"   = "「プライベートモード」では、パスワード設定、反転終了や使用中のアプリ非表示など、個人情報を安全に保護する機能が搭載されています。";
 "my_set_Privacy_Mode_tip2"   = "プライベートモードが選択されていない場合は、“設定”から選択できます。";
 "my_set_Privacy_Mode_open"   = "プライベートモードを有効にする";
 "my_set_no_change_login"   = "ログイン偽装";
@@ -318,7 +318,7 @@
 "set_Privacy_title" = "ファイルのバックアップ";
 "set_upload_download_tip" = "アップロード/ダウンロード設定";
 "set_Privacy_right_tip" = "バックアップ設定";
-"set_Privacy_title_image" = "フォトアルバムのバックアップ";
+"set_Privacy_title_image" = "バックアップ";
 "set_Privacy_title_image_open" = "バックアップがオンになっています";
 "set_Privacy_title_image_close" = "バックアップがオフになっています";
 "common_open" = "オンにする";
@@ -369,3 +369,25 @@
 "File_Record_backups_photo_close_tip"   = "アルバムの許可がオフになっています";
 "phone_space_Insufficient"   = "携帯電話のスペースが不足している";
 "backups_cannot_use_WWAN_tip"   = "Wi-Fiなし、転送停止中。データ通信のバックアップをオンにしてください";
+
+//1.3.1
+"File_upload_path_tip"   = "アップロードパス";
+"File_upload_to_tip"   = "にアップロード";
+"disk_not_find_tip"   = "タスクパスが見つかりません";
+"File_upload_set_default_path_tip"   = "パスを変更するには、アップロード操作を完了してください";
+"disk_space_not_tip"   = "スペース不足";
+"disk_phone_default_tip"   = "クラウドマシン";
+"disk_Extra_default_tip"   = "ディスク";
+"File_upload_path_new_save"   = "フォルダは既に存在します";
+"disk_extract_tip"   = "ディスクが取り外されました";
+"disk_save_extract_tip"   = "ディスクの安全な取り外し";
+"disk_insertion_tip"   = "ディスク挿入";
+"disk_insertion_pop_title"   = "挿入済み";
+"disk_insertion_pop_tip"   = "USBディスクを削除する前に、ファイルマネージャで「安全にポップアップ」して、ディスクの損傷やデータ損失の原因となる直接的な抜き取りを回避してください";
+"disk_insertion_pop_tip_sub1" = "01デスクトップ";
+"disk_insertion_pop_tip_sub2" = "02ファイル";
+"disk_insertion_pop_tip_sub3" = "03設定";
+"upload_file_and_not_path_tip" = "ディスクパスは存在しません。ディスクが正常に接続されているかどうかを確認してください";
+"save_path_change_suc_tip" = "パス変更は成功しました";
+"upload_task_not_done_tip" = "現在アップロードタスクが進行中ですので、後で操作してください";
+"download_task_not_done_tip" = "現在ダウンロードタスクが進行中ですので、後で操作してください";

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

@@ -379,7 +379,7 @@
 "disk_phone_default_tip"   = "云机";
 "disk_Extra_default_tip"   = "磁盘";
 "File_upload_path_new_save"   = "文件夹已存在";
-"disk_extract_tip"   = "磁盘拔出";
+"disk_extract_tip"   = "磁盘已拔出";
 "disk_save_extract_tip"   = "磁盘安全拔出";
 "disk_insertion_tip"   = "磁盘插入";
 "disk_insertion_pop_title"   = "已插入";

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

@@ -369,3 +369,25 @@
 "File_Record_backups_photo_close_tip"   = "相簿權限已關閉";
 "phone_space_Insufficient"   = "手機空間不足";
 "backups_cannot_use_WWAN_tip"   = "目前處於非Wi-Fi環境已暫停傳輸，請在備份設置中開啟流量備份。";
+
+//1.3.1
+"File_upload_path_tip"   = "上傳路徑";
+"File_upload_to_tip"   = "上傳到";
+"disk_not_find_tip"   = "無法找到任務路徑";
+"File_upload_set_default_path_tip"   = "請完成上傳操作後再更改路徑";
+"disk_space_not_tip"   = "空間不足";
+"disk_phone_default_tip"   = "雲端機";
+"disk_Extra_default_tip"   = "磁碟";
+"File_upload_path_new_save"   = "資料夾已存在";
+"disk_extract_tip"   = "磁碟已拔出";
+"disk_save_extract_tip"   = "磁碟安全拔出";
+"disk_insertion_tip"   = "磁碟插入";
+"disk_insertion_pop_title"   = "已插入";
+"disk_insertion_pop_tip"   = "在移除USB之前，請在檔案總管「安全彈出」 避免直接拔出，造成磁碟損害和資料遺失";
+"disk_insertion_pop_tip_sub1" = "01案頭";
+"disk_insertion_pop_tip_sub2" = "02文件管理";
+"disk_insertion_pop_tip_sub3" = "03檔案設定";
+"upload_file_and_not_path_tip" = "磁片路徑不存在，請檢查磁片是否正常連接";
+"save_path_change_suc_tip" = "路徑更改已成功";
+"upload_task_not_done_tip" = "目前有上傳任務正在進行中，請稍後再操作";
+"download_task_not_done_tip" = "目前有下載任務正在進行中，請稍後再操作";