1.多国语言适配

创维盒子/双子星云手机/AppDelegate/customLaunchView/customLaunchView.m

@@ -21,7 +21,39 @@
 -(void)drawAnyView
 {
     UIImageView *imageView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_W, SCREEN_H)];
-    imageView.image = [UIImage imageNamed:@"customLaunch"];
+    imageView.image = [UIImage imageNamed:@"login_bg"];
     [self addSubview:imageView];
+    
+    UIImageView *imageView111 = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_W, SCREEN_H)];
+    
+    [self addSubview:imageView111];
+    
+    //NSString *preferredLanguage = [[[NSBundle mainBundle] preferredLocalizations] firstObject];
+    ///获取设备当前地区的代码和APP语言环境
+    NSString *languageCode = [NSLocale preferredLanguages][0];
+  
+    NSString *imageNameStr = @"customLaunch_en";
+    
+    if([languageCode isEqualToString:@"zh-Hans-US"])
+    {
+        imageNameStr = @"customLaunch_Hans";
+    }
+    else if([languageCode isEqualToString:@"zh-Hant-HK"])
+    {
+        imageNameStr = @"customLaunch_Hans_HK";
+    }
+    else if([languageCode isEqualToString:@"ja-US"])
+    {
+        imageNameStr = @"customLaunch_ja";
+    }
+    
+    imageView111.image = [UIImage imageNamed:imageNameStr];
+    
+    [imageView111 mas_remakeConstraints:^(MASConstraintMaker *make) {
+        make.centerX.mas_equalTo(0);
+        make.centerY.mas_equalTo(0);
+        make.width.mas_equalTo(375.0);
+        make.height.mas_equalTo(320.0);
+    }];
 }
 @end

创维盒子/双子星云手机/Assets.xcassets/customLaunch/customLaunch_Hans.imageset/Contents.json

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

创维盒子/双子星云手机/Assets.xcassets/customLaunch/customLaunch_Hans_HK.imageset/Contents.json

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

创维盒子/双子星云手机/Assets.xcassets/customLaunch/customLaunch_en.imageset/Contents.json

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

创维盒子/双子星云手机/Assets.xcassets/customLaunch/customLaunch_ja.imageset/Contents.json

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

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

@@ -63,9 +63,9 @@
     }];
    
    
-    
+    NSString *curTitle = NSLocalizedString(@"input_8_secret_key",nil);
     UILabel *titleLab = [[UILabel alloc]init];
-    titleLab.text = @"请输入8位密钥";
+    titleLab.text = curTitle;
     titleLab.textColor = [UIColor hwColor:@"#333333" alpha:1.0];
     titleLab.font = [UIFont systemFontOfSize:16];
     titleLab.textAlignment = NSTextAlignmentCenter;

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

@@ -33,9 +33,11 @@
     [rightBut addTarget:self action:@selector(rightBtnPressed) forControlEvents:UIControlEventTouchUpInside];
     [self.navBarBGView addSubview:rightBut];
     
+    rightBut.contentHorizontalAlignment = UIControlContentHorizontalAlignmentRight;
+    
     [rightBut mas_makeConstraints:^(MASConstraintMaker *make) {
         make.centerY.equalTo(self.backBtn.mas_centerY);
-        make.width.mas_equalTo(80);
+        make.width.mas_equalTo(250);
         make.right.mas_equalTo(-20);
         make.height.mas_equalTo(30);
     }];

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

@@ -153,7 +153,7 @@
     [forgetPwdBut mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.mas_equalTo(pointView3.mas_bottom).offset(20.f);
         make.centerX.mas_equalTo(0.f);
-        make.width.mas_equalTo(150);
+        make.width.mas_equalTo(300);
         make.height.mas_equalTo(40);
     }];
     

创维盒子/双子星云手机/Class/Set/privacyMode/privacyModeViewController.m

@@ -78,7 +78,7 @@
     [topLab mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.mas_equalTo(topImageV.mas_right).offset(5);
         make.top.mas_equalTo(topImageV.mas_top).offset(0);
-        make.width.mas_equalTo(100);
+        make.width.mas_equalTo(200);
         make.height.mas_equalTo(28);
     }];
     

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

@@ -40,7 +40,7 @@
     [self addSubview:_rightButton];
     
     [_rightButton mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.width.mas_equalTo(80);
+        make.width.mas_equalTo(150);
         make.right.mas_equalTo(-15);
         make.top.mas_equalTo(0);
         make.bottom.mas_equalTo(0);

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

@@ -32,6 +32,14 @@
     
     _butWidth = (SCREEN_W - 30)/3.0;
     
+    NSString *languageCode = [NSLocale preferredLanguages][0];
+  
+    CGFloat fontSize = 14.0;
+    
+    if([languageCode isEqualToString:@"ja-US"])
+    {
+        fontSize = 8;
+    }
  
     for (NSInteger i=0; i<titleArr.count; i++) {
    
@@ -42,7 +50,7 @@
         [but setTitle:title forState:UIControlStateNormal];
         [but setTitleColor:[UIColor hwColor:@"#666666" alpha:1.0] forState:UIControlStateNormal];
         [but setTitleColor:[UIColor hwColor:@"#0A132B" alpha:1.0] forState:UIControlStateSelected];
-        but.titleLabel.font = [UIFont systemFontOfSize:14.0];
+        but.titleLabel.font = [UIFont systemFontOfSize:fontSize];
         [but addTarget:self action:@selector(didClickButFun:) forControlEvents:UIControlEventTouchUpInside];
         [self addSubview:but];
         

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

@@ -55,7 +55,7 @@
     [rightLabel mas_makeConstraints:^(MASConstraintMaker *make) {
         make.right.mas_equalTo(arrowImageView.mas_left).offset(-2);
         make.top.mas_equalTo(10);
-        make.width.mas_equalTo(100);
+        make.width.mas_equalTo(200);
         make.height.mas_equalTo(20);
     }];
     

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

@@ -237,3 +237,69 @@
 "player_Secret_key_copy" = "Copy Key";
 "player_Secret_key_copy_suc" = "Key copied successfully";
 "player_Secret_key_close" = "close";
+
+
+//1.1 新增
+"input_pwd_forget_pwd" = "forget the password";
+"input_pwd_forget_secret_key" = "Forgot secret key";
+
+"guide_qrcoede_open_album" = "Open your photo";
+
+"my_set_no_common_problem" = "FAQ";
+"my_set_no_Restore_Factory" = "Restore Factory";
+
+"my_set_no_Restore_Factory_tips" = "Are you sure you want to factory reset?";
+"my_set_no_Restore_Factory_msg" = "It may cause data loss, application loss and settings reset. Please be careful.";
+"my_set_no_Restore_Factorying_tips" = "Restoring to factory settings";
+"my_set_no_Restore_Factorying_msg" = "The factory settings are being restored, please do not operate during this period.";
+"my_set_no_Restore_Factorying" = "Recovering";
+"my_set_no_Restore_Factory_ok_tips" = "Factory reset successful";
+"my_set_no_Restore_Factory_ok_msg" = "When the recovery is complete, you will be redirected to the home page.";
+"my_set_no_Restore_FactoryOK" = "OK";
+"my_set_no_File_upload"   = "Upload File";
+"my_set_no_File_upload_record"   = "Upload Records";
+"my_set_no_image_upload"   = "Upload Image";
+"my_set_no_video_upload"   = "Upload video";
+"my_set_no_File_upload"   = "Upload";
+"File_upload_Record_no_data"   = "No Records";
+"File_upload_Record_uploading"   = "Uploading";
+"File_upload_Record_upload_suc"   = "Upload successful";
+"File_upload_Record_upload_fail"   = "upload failed";
+"File_upload_Record_did_upload"   = "Uploaded";
+"File_upload_Record_all_suspend"   = "Pause all";
+"File_upload_Record_all_open"   = "Turn all on";
+"File_upload_Record_clear_Record"   = "clear record";
+"File_upload_Record_clear_Tip_title"   = "Tips";
+"File_upload_Record_clear_done_Tip_msg"   = "Only clear records, files in the file center will not be deleted";
+"File_upload_Record_clear_fail_Tip_msg"   = "Only clear records, files in the file center will not be deleted";
+"File_upload_Record_clear_uploading_Tip_msg"   = "The task is not completed. Are you sure you want to delete the selected task?";
+"File_upload_Record_select_all"   = "select all";
+"File_upload_cancel_select_all"   = "Cancel";
+"File_upload_Record_delete"   = "delete";
+"File_upload_Record_delete_noFile"   = "Please select a file first";
+"File_upload_fail"   = "File upload failed";
+"File_upload_success"   = "File uploaded successfully";
+"File_upload_file_already_exists"   = "File already exists";
+"my_set_about_version_tap_tip"   = "Detailed version information";
+"my_set_about_version_tap_jingxiang"   = "Image version number";
+"my_set_about_version_tap_daili"   = "Agent version number";
+"my_set_about_version_tap_app"   = "Mobile version number";
+"my_set_about_version_tap_TV"   = "TV version number";
+"my_set_about_version_tap_sn"   = "SN number";
+"my_set_about_version_tap_av"   = "AV version number";
+"my_set_Privacy_Model"   = "Privacy Mode";
+"my_set_Privacy_Model_tip"   = "In the privacy mode, you can set a password,Login disguise, flip to exit, and hide background processes to protect your privacy.";
+"my_set_Privacy_Mode_set"   = "Privacy Settings";
+"my_set_Privacy_Mode_tip1"   = "In the privacy mode, you can set a password, Login disguise,flip to exit, and hide background processes to protect your privacy.";
+"my_set_Privacy_Mode_tip2"   = "If you have not turned on privacy mode, you can turn it on in the Settings.";
+"my_set_Privacy_Mode_open"   = "Turn on privacy mode";
+"my_set_no_change_login"   = "Login disguise";
+"logo_select_login"   = "Please select Login disguise";
+"logo_change_login_tip" = "The app will be changed to the one you choose.";
+"logo_did_change_login" = "Setup successful";
+"my_set_no_close_TV_p2p"   = "Turn off screencasting";
+"my_set_no_close_TV_p2p_tip"   = "Screencasting in progress, confirm to close screencasting";
+"common_save_suc"   = "Saved";
+"common_save_fail"   = "Saving failed";
+"player_Tip_ios_no_wifi_Sync"   = "The local parameters have been synchronized.(iOS can't be synchronized.)";
+"input_8_secret_key"   = "Please enter an 8-digit key";

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

@@ -235,3 +235,69 @@
 "player_Secret_key_copy" = "キーのコピー";
 "player_Secret_key_copy_suc" = "鍵のコピーに成功しました";
 "player_Secret_key_close" = "閉じる";
+
+
+//1.1 新增
+"input_pwd_forget_pwd" = "パスワードを忘れた";
+"input_pwd_forget_secret_key" = "シリアルナンバーを忘れました";
+
+"guide_qrcoede_open_album" = "アルバムを開く";
+
+"my_set_no_common_problem" = "よくあるご質問";
+"my_set_no_Restore_Factory" = "初期化する";
+
+"my_set_no_Restore_Factory_tips" = "初期化しますか？";
+"my_set_no_Restore_Factory_msg" = "データやアプリケーションの損失および設定がリセットされる可能性があります。ご注意ください。";
+"my_set_no_Restore_Factorying_tips" = "初期化中";
+"my_set_no_Restore_Factorying_msg" = "初期化中です。そのままお待ちください。";
+"my_set_no_Restore_Factorying" = "修復中";
+"my_set_no_Restore_Factory_ok_tips" = "初期化しました";
+"my_set_no_Restore_Factory_ok_msg" = "修復が完了しました。ホーム画面に戻ります。";
+"my_set_no_Restore_FactoryOK" = "わかりました";
+"my_set_no_File_upload"   = "ファイルのアップロード";
+"my_set_no_File_upload_record"   = "アップロード履歴";
+"my_set_no_image_upload"   = "写真のアップロード";
+"my_set_no_video_upload"   = "動画のアップロード";
+"my_set_no_File_upload"   = "アップロード";
+"File_upload_Record_no_data"   = "アップロードされたデータはありません。";
+"File_upload_Record_uploading"   = "アップロード中";
+"File_upload_Record_upload_suc"   = "アップロードできました";
+"File_upload_Record_upload_fail"   = "アップロードできませんでした";
+"File_upload_Record_did_upload"   = "アップロード済み";
+"File_upload_Record_all_suspend"   = "全て一時停止する";
+"File_upload_Record_all_open"   = "全て開始する";
+"File_upload_Record_clear_Record"   = "アップロードできました";
+"File_upload_Record_clear_Tip_title"   = "お知らせ";
+"File_upload_Record_clear_done_Tip_msg"   = "ファイルセンター内のデータは削除されず、履歴だけが削除されます";
+"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_Record_delete"   = "削除";
+"File_upload_Record_delete_noFile"   = "ファイルを選択してください";
+"File_upload_fail"   = "ファイルをアップロードできませんでした";
+"File_upload_success"   = "ファイルをアップロードしました";
+"File_upload_file_already_exists"   = "既に同じファイルが保存されています。";
+"my_set_about_version_tap_tip"   = "バージョン情報の詳細";
+"my_set_about_version_tap_jingxiang"   = "アプリケーションのバージョン番号";
+"my_set_about_version_tap_daili"   = "プロキシのバージョン番号";
+"my_set_about_version_tap_app"   = "携帯のバージョン番号";
+"my_set_about_version_tap_TV"   = "テレビのバージョン番号";
+"my_set_about_version_tap_sn"   = "シリアルナンバー";
+"my_set_about_version_tap_av"   = "アンチウイルスソフトのバージョン番号";
+"my_set_Privacy_Model"   = "プライベートモード";
+"my_set_Privacy_Model_tip"   = "「プライベートモード」では、パスワード設定、アイコン変更、反転終了や使用中のアプリ非表示など、個人情報を安全に保護する機能が搭載されています。";
+"my_set_Privacy_Mode_set"   = "プライベートモードの設定";
+"my_set_Privacy_Mode_tip1"   = "「プライベートモード」では、パスワード設定、アイコン変更、反転終了や使用中のアプリ非表示など、個人情報を安全に保護する機能が搭載されています。";
+"my_set_Privacy_Mode_tip2"   = "プライベートモードが選択されていない場合は、“設定”から選択できます。";
+"my_set_Privacy_Mode_open"   = "プライベートモードを有効にする";
+"my_set_no_change_login"   = "ログイン偽装";
+"logo_select_login"   = "偽装ログインを選択する";
+"logo_change_login_tip" = "このアプリは選択されたアイコンに表示が切り替わります。";
+"logo_did_change_login" = "設定が完了しました";
+"my_set_no_close_TV_p2p"   = "ミラーリングを終了する";
+"my_set_no_close_TV_p2p_tip"   = "ミラーリング中です。終了しますか？";
+"common_save_suc"   = "保存しました";
+"common_save_fail"   = "保存できませんでした";
+"player_Tip_ios_no_wifi_Sync"   = "アプリケーションの設定はバックアップされましたが、iOSではまだこの機能はサポートされていません";
+"input_8_secret_key"   = "8ビットキーを入力してください";

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

@@ -299,3 +299,4 @@
 "common_save_suc"   = "保存成功";
 "common_save_fail"   = "保存失败";
 "player_Tip_ios_no_wifi_Sync"   = "本机参数已同步完成，IOS无法同步wifi";
+"input_8_secret_key"   = "请输入8位密钥";

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

@@ -237,3 +237,68 @@
 "player_Secret_key_copy" = "複製金鑰";
 "player_Secret_key_copy_suc" = "金鑰複製成功";
 "player_Secret_key_close" = "關閉";
+
+//1.1 新增
+"input_pwd_forget_pwd" = "忘記密碼";
+"input_pwd_forget_secret_key" = "忘記秘鑰";
+
+"guide_qrcoede_open_album" = "打開相册";
+
+"my_set_no_common_problem" = "常見問題";
+"my_set_no_Restore_Factory" = "恢復出廠";
+
+"my_set_no_Restore_Factory_tips" = "你確定要恢復出廠？";
+"my_set_no_Restore_Factory_msg" = "可能導致資料丟失、應用遺失和設定重置，需謹慎操作。";
+"my_set_no_Restore_Factorying_tips" = "恢復出廠設定中";
+"my_set_no_Restore_Factorying_msg" = "正在恢復出廠設定中，期間請勿操作。";
+"my_set_no_Restore_Factorying" = "恢復中";
+"my_set_no_Restore_Factory_ok_tips" = "恢復出廠設定成功";
+"my_set_no_Restore_Factory_ok_msg" = "恢復完成，將跳轉到首頁。";
+"my_set_no_Restore_FactoryOK" = "好的";
+"my_set_no_File_upload"   = "文件上傳";
+"my_set_no_File_upload_record"   = "上傳記錄";
+"my_set_no_image_upload"   = "上傳圖片";
+"my_set_no_video_upload"   = "上傳視頻";
+"my_set_no_File_upload"   = "上傳";
+"File_upload_Record_no_data"   = "暫無上傳記錄";
+"File_upload_Record_uploading"   = "上傳中";
+"File_upload_Record_upload_suc"   = "上傳成功";
+"File_upload_Record_upload_fail"   = "上傳失敗";
+"File_upload_Record_did_upload"   = "已上傳";
+"File_upload_Record_all_suspend"   = "全部暫停";
+"File_upload_Record_all_open"   = "全部開啟";
+"File_upload_Record_clear_Record"   = "清空記錄";
+"File_upload_Record_clear_Tip_title"   = "溫馨提示";
+"File_upload_Record_clear_done_Tip_msg"   = "僅删除記錄，不會刪除檔中心的檔案";
+"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_Record_delete"   = "删除";
+"File_upload_Record_delete_noFile"   = "請先選擇檔案";
+"File_upload_fail"   = "文件上傳失敗";
+"File_upload_success"   = "文件上傳成功";
+"File_upload_file_already_exists"   = "檔案已存在";
+"my_set_about_version_tap_tip"   = "詳細版本資訊";
+"my_set_about_version_tap_jingxiang"   = "鏡像版本號";
+"my_set_about_version_tap_daili"   = "代理版本號";
+"my_set_about_version_tap_app"   = "手機版本號";
+"my_set_about_version_tap_TV"   = "TV版本號";
+"my_set_about_version_tap_sn"   = "SN號";
+"my_set_about_version_tap_av"   = "AV版本號";
+"my_set_Privacy_Model"   = "隱私模式";
+"my_set_Privacy_Model_tip"   = "隱私模式下，具有設置密碼登入，登入偽裝，翻轉退出及行程隱藏等保護您個人資訊安全的功能";
+"my_set_Privacy_Mode_set"   = "隱私模式設定";
+"my_set_Privacy_Mode_tip1"   = "隱私模式下，具有設置密碼登入，登入偽裝，翻轉退出及行程隱藏等保護您個人資訊安全的功能";
+"my_set_Privacy_Mode_tip2"   = "若未選擇開啟隱私模式，可到設定中開啟";
+"my_set_Privacy_Mode_open"   = "開啟隱私模式";
+"my_set_no_change_login"   = "登入偽裝";
+"logo_select_login"   = "請選擇登入偽裝";
+"logo_change_login_tip" = "此APP的登入管道將會更換為你選擇的應用";
+"logo_did_change_login" = "設定已成功";
+"my_set_no_close_TV_p2p"   = "關閉投屏";
+"my_set_no_close_TV_p2p_tip"   = "正在投屏中，確定關閉投屏";
+"common_save_suc"   = "保存成功";
+"common_save_fail"   = "保存失敗";
+"player_Tip_ios_no_wifi_Sync"   = "本機參數已同步完成，IOS無法同步wifi";
+"input_8_secret_key"   = "請輸入8位密鑰";