From: snickersun <scy@incartech.cn>
Date: Tue, 22 Dec 2020 03:43:16 +0000 (+0800)
Subject: release V737
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=9b383e3f9aecaa494e17eda39984e737a425d89d;p=protocol_srv.git

release V737
修改语言切换 德，法，意 时都配置为瑞典的
---

diff --git a/app/release/ICSer_V732_2012161810_release.apk b/app/release/ICSer_V737_2012221140_release.apk
similarity index 76%
rename from app/release/ICSer_V732_2012161810_release.apk
rename to app/release/ICSer_V737_2012221140_release.apk
index a4e7c344..9cbe01ed 100644
Binary files a/app/release/ICSer_V732_2012161810_release.apk and b/app/release/ICSer_V737_2012221140_release.apk differ
diff --git a/app/release/output.json b/app/release/output.json
index 91b21e1a..b5c70ea0 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":736,"versionName":"2012171741","enabled":true,"outputFile":"ICSer_V736_2012171741_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V736_2012171741_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":737,"versionName":"2012221140","enabled":true,"outputFile":"ICSer_V737_2012221140_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V737_2012221140_release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/java/com/enqualcomm/support/utils/LanguageUtils.java b/app/src/main/java/com/enqualcomm/support/utils/LanguageUtils.java
index dcf7843f..80e8c7f3 100644
--- a/app/src/main/java/com/enqualcomm/support/utils/LanguageUtils.java
+++ b/app/src/main/java/com/enqualcomm/support/utils/LanguageUtils.java
@@ -78,22 +78,22 @@ public class LanguageUtils {
                 am.getClass().getMethod("updateConfiguration", new Class[]{android.content.res.Configuration.class}).invoke(am, new Object[]{config});
                 BackupManager.dataChanged("com.android.providers.settings");
             }else if (language.equals(context.getResources().getString(R.string.de))) {
-                config.getClass().getDeclaredField("locale").set(config, Locale.GERMANY);
+                config.getClass().getDeclaredField("locale").set(config, new Locale("de", "CH"));
                 config.getClass().getDeclaredField("userSetLocale").setBoolean(config, true);
                 am.getClass().getMethod("updateConfiguration", new Class[]{android.content.res.Configuration.class}).invoke(am, new Object[]{config});
                 BackupManager.dataChanged("com.android.providers.settings");
             }else if (language.equals(context.getResources().getString(R.string.it))) {
-                config.getClass().getDeclaredField("locale").set(config, Locale.ITALY);
+                config.getClass().getDeclaredField("locale").set(config, new Locale("it", "CH"));
                 config.getClass().getDeclaredField("userSetLocale").setBoolean(config, true);
                 am.getClass().getMethod("updateConfiguration", new Class[]{android.content.res.Configuration.class}).invoke(am, new Object[]{config});
                 BackupManager.dataChanged("com.android.providers.settings");
             }else if (language.equals(context.getResources().getString(R.string.fr))) {
-                config.getClass().getDeclaredField("locale").set(config, Locale.FRANCE);
+                config.getClass().getDeclaredField("locale").set(config, new Locale("fr", "CH"));
                 config.getClass().getDeclaredField("userSetLocale").setBoolean(config, true);
                 am.getClass().getMethod("updateConfiguration", new Class[]{android.content.res.Configuration.class}).invoke(am, new Object[]{config});
                 BackupManager.dataChanged("com.android.providers.settings");
             }
-            getCurrentLanguage();
+
         } catch (Exception e) {
             e.printStackTrace();
             return false;
diff --git a/app/src/main/res/values-de-rCH/strings.xml b/app/src/main/res/values-de-rCH/strings.xml
new file mode 100644
index 00000000..d4303234
--- /dev/null
+++ b/app/src/main/res/values-de-rCH/strings.xml
@@ -0,0 +1,154 @@
+<resources>
+    <string name="app_name">ICProtocolServer</string>
+    <string name="program_abnormal">Sorry, the program is abnormal and will quit!</string>
+    <string name="app_died_str">Sorry, Program Error, will quit!</string>
+
+    <string name="app_label_hasnot_been_installed">"%1$s hasn't been installed"</string>
+
+    <string name="cancel">Cancel</string>
+
+    <string name="cloudpush_app_name">Push Service</string>
+
+    <string name="family_group">FamilyGroup</string>
+    <string name="all_group">GroupAll</string>
+
+    <string name="sms_title">SMS</string>
+    <string name="sms_notify">You have new Message！</string>
+    <string name="hht_call_end"> \'s not answered call!</string>
+
+
+    <string name="hht_call_start">You have </string>
+
+    <string name="hht_misscall_call">Missed Call</string>
+
+    <string name="findDev">Find Device!</string>
+
+    <string name="hwpush_ability_value">successRateAnalytics</string>
+
+    <string name="hwpush_cancel">Cancel</string>
+
+    <string name="hwpush_collect">Favorite</string>
+
+    <string name="hwpush_collect_tip">A Favorites icon will be created on the home screen. You can touch the icon to view all your favorite notifications.</string>
+
+    <string name="hwpush_collect_tip_known">OK</string>
+
+    <string name="hwpush_delete">Delete</string>
+
+    <string name="hwpush_deltitle">Delete notifications</string>
+
+    <string name="hwpush_dialog_limit_message">A maximum of 1000 favorite notifications can be saved. Delete some notifications before you can add new ones. Go to your favorite notifications list?</string>
+
+    <string name="hwpush_dialog_limit_ok">Go</string>
+
+    <string name="hwpush_dialog_limit_title">Note</string>
+
+    <string name="hwpush_forward">Forward</string>
+
+    <string name="hwpush_goback">Back</string>
+
+    <string name="hwpush_loading_title">Loading... Please wait.</string>
+
+    <string name="hwpush_msg_collect">Favorites</string>
+
+    <string name="hwpush_msg_favorites">Favorite notifications</string>
+
+    <string name="hwpush_no_collection">No favorite notifications</string>
+
+    <string name="hwpush_refresh">Refresh</string>
+
+    <string name="hwpush_request_provider_permission">Store messages</string>
+
+    <string name="hwpush_richmedia">Rich media</string>
+
+    <string name="hwpush_selectall">Select all</string>
+
+    <string name="hwpush_unselectall">Deselect all</string>
+
+    <string name="no_name">no Name</string>
+
+    <string name="notification_call">PhoneNum</string>
+
+    <string name="notification_current">Now</string>
+
+    <string name="notification_missed_call"> Missed calls!</string>
+
+    <string name="notification_time_unit">minutes before</string>
+
+    <string name="notification_wechat">Chat </string>
+
+    <string name="notification_wechat_content"> new Message!</string>
+
+    <string name="notification_wechat_emoj">[表情]</string>
+
+    <string name="notification_wechat_pic">[图片]</string>
+
+    <string name="notification_wechat_video">[视频]</string>
+
+    <string name="notification_wechat_voice">[语音]</string>
+
+    <string name="ok">OK</string>
+
+    <string name="please_buy">您暂未激活该功能哦，快去APP上激活吧~</string>
+
+    <string name="ringtone_spring_ding_dong">spring_ding_dong.mp3</string>
+
+    <string name="search_menu_title">Search</string>
+
+    <string name="setting_title">Chat Message </string>
+
+    <string name="start_video_call">正在发起视频通话...</string>
+
+    <string name="statistics">statistics</string>
+
+    <string name="status_bar_notification_info_overflow">999+</string>
+
+    <string name="ticker">\"微聊消息:\" + \"您有新微聊消息，请注意查收！\"</string>
+
+    <string name="title_alert">dialog主题</string>
+
+    <string name="video_disconnect">The call has been disconnected because the watch is overheated</string>
+
+    <string name="video_disconnect2">Dear, to protect your eyes, the call will be disconnected</string>
+
+    <string name="video_display_name">宝贝</string>
+
+    <string name="voiceMessage">From :</string>
+
+    <string name="voiceMessageEnd"> Chat message!</string>
+
+    <string name="alarm_low_battery">Low battery, please charge!</string>
+    <string name="alarm_lock_success">Locking success!</string>
+    <string name="alarm_unbind_success">Congratulations on your successful unbind!</string>
+    <string name="alarm_Illegal_unlock">Illegal to unlock!</string>
+    <string name="alarm_out_wall">You have crossed the line, please return as soon as possible!</string>
+    <string name="alarm_cross_boundary">You have crossed the boundary!</string>
+    <string name="alarm_wristband_off">Wristband has fallen off</string>
+    <string name="alarm_wristband_on">Wristband has been wear</string>
+
+    <string name="hotline">HotLine</string>
+
+
+
+    <string name="notification_title">通知消息</string>
+    <string name="notification_button_str">知道了</string>
+    <string name="dialog_notification_title">消息提醒</string>
+    <string name="dialog_btn_close">关闭</string>
+    <string name="dialog_btn_open">阅读</string>
+
+    <string name="sedentary_name">久坐提醒</string>
+    <string name="sedentary_msg">Sedentary reminder !</string>
+
+
+
+    <string name="en">English</string>
+    <string name="ja">日本語</string>
+    <string name="th">ภาษาไทย</string>
+    <string name="zh">简体中文</string>
+    <string name="zh_rhk">繁體中文</string>
+    <string name="it">意大利</string>
+    <string name="fr">法语</string>
+    <string name="de">德语</string>
+
+    <!--    法语，德语，意大利-->
+</resources>
diff --git a/app/src/main/res/values-fr-rCH/strings.xml b/app/src/main/res/values-fr-rCH/strings.xml
new file mode 100644
index 00000000..d4303234
--- /dev/null
+++ b/app/src/main/res/values-fr-rCH/strings.xml
@@ -0,0 +1,154 @@
+<resources>
+    <string name="app_name">ICProtocolServer</string>
+    <string name="program_abnormal">Sorry, the program is abnormal and will quit!</string>
+    <string name="app_died_str">Sorry, Program Error, will quit!</string>
+
+    <string name="app_label_hasnot_been_installed">"%1$s hasn't been installed"</string>
+
+    <string name="cancel">Cancel</string>
+
+    <string name="cloudpush_app_name">Push Service</string>
+
+    <string name="family_group">FamilyGroup</string>
+    <string name="all_group">GroupAll</string>
+
+    <string name="sms_title">SMS</string>
+    <string name="sms_notify">You have new Message！</string>
+    <string name="hht_call_end"> \'s not answered call!</string>
+
+
+    <string name="hht_call_start">You have </string>
+
+    <string name="hht_misscall_call">Missed Call</string>
+
+    <string name="findDev">Find Device!</string>
+
+    <string name="hwpush_ability_value">successRateAnalytics</string>
+
+    <string name="hwpush_cancel">Cancel</string>
+
+    <string name="hwpush_collect">Favorite</string>
+
+    <string name="hwpush_collect_tip">A Favorites icon will be created on the home screen. You can touch the icon to view all your favorite notifications.</string>
+
+    <string name="hwpush_collect_tip_known">OK</string>
+
+    <string name="hwpush_delete">Delete</string>
+
+    <string name="hwpush_deltitle">Delete notifications</string>
+
+    <string name="hwpush_dialog_limit_message">A maximum of 1000 favorite notifications can be saved. Delete some notifications before you can add new ones. Go to your favorite notifications list?</string>
+
+    <string name="hwpush_dialog_limit_ok">Go</string>
+
+    <string name="hwpush_dialog_limit_title">Note</string>
+
+    <string name="hwpush_forward">Forward</string>
+
+    <string name="hwpush_goback">Back</string>
+
+    <string name="hwpush_loading_title">Loading... Please wait.</string>
+
+    <string name="hwpush_msg_collect">Favorites</string>
+
+    <string name="hwpush_msg_favorites">Favorite notifications</string>
+
+    <string name="hwpush_no_collection">No favorite notifications</string>
+
+    <string name="hwpush_refresh">Refresh</string>
+
+    <string name="hwpush_request_provider_permission">Store messages</string>
+
+    <string name="hwpush_richmedia">Rich media</string>
+
+    <string name="hwpush_selectall">Select all</string>
+
+    <string name="hwpush_unselectall">Deselect all</string>
+
+    <string name="no_name">no Name</string>
+
+    <string name="notification_call">PhoneNum</string>
+
+    <string name="notification_current">Now</string>
+
+    <string name="notification_missed_call"> Missed calls!</string>
+
+    <string name="notification_time_unit">minutes before</string>
+
+    <string name="notification_wechat">Chat </string>
+
+    <string name="notification_wechat_content"> new Message!</string>
+
+    <string name="notification_wechat_emoj">[表情]</string>
+
+    <string name="notification_wechat_pic">[图片]</string>
+
+    <string name="notification_wechat_video">[视频]</string>
+
+    <string name="notification_wechat_voice">[语音]</string>
+
+    <string name="ok">OK</string>
+
+    <string name="please_buy">您暂未激活该功能哦，快去APP上激活吧~</string>
+
+    <string name="ringtone_spring_ding_dong">spring_ding_dong.mp3</string>
+
+    <string name="search_menu_title">Search</string>
+
+    <string name="setting_title">Chat Message </string>
+
+    <string name="start_video_call">正在发起视频通话...</string>
+
+    <string name="statistics">statistics</string>
+
+    <string name="status_bar_notification_info_overflow">999+</string>
+
+    <string name="ticker">\"微聊消息:\" + \"您有新微聊消息，请注意查收！\"</string>
+
+    <string name="title_alert">dialog主题</string>
+
+    <string name="video_disconnect">The call has been disconnected because the watch is overheated</string>
+
+    <string name="video_disconnect2">Dear, to protect your eyes, the call will be disconnected</string>
+
+    <string name="video_display_name">宝贝</string>
+
+    <string name="voiceMessage">From :</string>
+
+    <string name="voiceMessageEnd"> Chat message!</string>
+
+    <string name="alarm_low_battery">Low battery, please charge!</string>
+    <string name="alarm_lock_success">Locking success!</string>
+    <string name="alarm_unbind_success">Congratulations on your successful unbind!</string>
+    <string name="alarm_Illegal_unlock">Illegal to unlock!</string>
+    <string name="alarm_out_wall">You have crossed the line, please return as soon as possible!</string>
+    <string name="alarm_cross_boundary">You have crossed the boundary!</string>
+    <string name="alarm_wristband_off">Wristband has fallen off</string>
+    <string name="alarm_wristband_on">Wristband has been wear</string>
+
+    <string name="hotline">HotLine</string>
+
+
+
+    <string name="notification_title">通知消息</string>
+    <string name="notification_button_str">知道了</string>
+    <string name="dialog_notification_title">消息提醒</string>
+    <string name="dialog_btn_close">关闭</string>
+    <string name="dialog_btn_open">阅读</string>
+
+    <string name="sedentary_name">久坐提醒</string>
+    <string name="sedentary_msg">Sedentary reminder !</string>
+
+
+
+    <string name="en">English</string>
+    <string name="ja">日本語</string>
+    <string name="th">ภาษาไทย</string>
+    <string name="zh">简体中文</string>
+    <string name="zh_rhk">繁體中文</string>
+    <string name="it">意大利</string>
+    <string name="fr">法语</string>
+    <string name="de">德语</string>
+
+    <!--    法语，德语，意大利-->
+</resources>
diff --git a/app/src/main/res/values-it-rCH/strings.xml b/app/src/main/res/values-it-rCH/strings.xml
new file mode 100644
index 00000000..d4303234
--- /dev/null
+++ b/app/src/main/res/values-it-rCH/strings.xml
@@ -0,0 +1,154 @@
+<resources>
+    <string name="app_name">ICProtocolServer</string>
+    <string name="program_abnormal">Sorry, the program is abnormal and will quit!</string>
+    <string name="app_died_str">Sorry, Program Error, will quit!</string>
+
+    <string name="app_label_hasnot_been_installed">"%1$s hasn't been installed"</string>
+
+    <string name="cancel">Cancel</string>
+
+    <string name="cloudpush_app_name">Push Service</string>
+
+    <string name="family_group">FamilyGroup</string>
+    <string name="all_group">GroupAll</string>
+
+    <string name="sms_title">SMS</string>
+    <string name="sms_notify">You have new Message！</string>
+    <string name="hht_call_end"> \'s not answered call!</string>
+
+
+    <string name="hht_call_start">You have </string>
+
+    <string name="hht_misscall_call">Missed Call</string>
+
+    <string name="findDev">Find Device!</string>
+
+    <string name="hwpush_ability_value">successRateAnalytics</string>
+
+    <string name="hwpush_cancel">Cancel</string>
+
+    <string name="hwpush_collect">Favorite</string>
+
+    <string name="hwpush_collect_tip">A Favorites icon will be created on the home screen. You can touch the icon to view all your favorite notifications.</string>
+
+    <string name="hwpush_collect_tip_known">OK</string>
+
+    <string name="hwpush_delete">Delete</string>
+
+    <string name="hwpush_deltitle">Delete notifications</string>
+
+    <string name="hwpush_dialog_limit_message">A maximum of 1000 favorite notifications can be saved. Delete some notifications before you can add new ones. Go to your favorite notifications list?</string>
+
+    <string name="hwpush_dialog_limit_ok">Go</string>
+
+    <string name="hwpush_dialog_limit_title">Note</string>
+
+    <string name="hwpush_forward">Forward</string>
+
+    <string name="hwpush_goback">Back</string>
+
+    <string name="hwpush_loading_title">Loading... Please wait.</string>
+
+    <string name="hwpush_msg_collect">Favorites</string>
+
+    <string name="hwpush_msg_favorites">Favorite notifications</string>
+
+    <string name="hwpush_no_collection">No favorite notifications</string>
+
+    <string name="hwpush_refresh">Refresh</string>
+
+    <string name="hwpush_request_provider_permission">Store messages</string>
+
+    <string name="hwpush_richmedia">Rich media</string>
+
+    <string name="hwpush_selectall">Select all</string>
+
+    <string name="hwpush_unselectall">Deselect all</string>
+
+    <string name="no_name">no Name</string>
+
+    <string name="notification_call">PhoneNum</string>
+
+    <string name="notification_current">Now</string>
+
+    <string name="notification_missed_call"> Missed calls!</string>
+
+    <string name="notification_time_unit">minutes before</string>
+
+    <string name="notification_wechat">Chat </string>
+
+    <string name="notification_wechat_content"> new Message!</string>
+
+    <string name="notification_wechat_emoj">[表情]</string>
+
+    <string name="notification_wechat_pic">[图片]</string>
+
+    <string name="notification_wechat_video">[视频]</string>
+
+    <string name="notification_wechat_voice">[语音]</string>
+
+    <string name="ok">OK</string>
+
+    <string name="please_buy">您暂未激活该功能哦，快去APP上激活吧~</string>
+
+    <string name="ringtone_spring_ding_dong">spring_ding_dong.mp3</string>
+
+    <string name="search_menu_title">Search</string>
+
+    <string name="setting_title">Chat Message </string>
+
+    <string name="start_video_call">正在发起视频通话...</string>
+
+    <string name="statistics">statistics</string>
+
+    <string name="status_bar_notification_info_overflow">999+</string>
+
+    <string name="ticker">\"微聊消息:\" + \"您有新微聊消息，请注意查收！\"</string>
+
+    <string name="title_alert">dialog主题</string>
+
+    <string name="video_disconnect">The call has been disconnected because the watch is overheated</string>
+
+    <string name="video_disconnect2">Dear, to protect your eyes, the call will be disconnected</string>
+
+    <string name="video_display_name">宝贝</string>
+
+    <string name="voiceMessage">From :</string>
+
+    <string name="voiceMessageEnd"> Chat message!</string>
+
+    <string name="alarm_low_battery">Low battery, please charge!</string>
+    <string name="alarm_lock_success">Locking success!</string>
+    <string name="alarm_unbind_success">Congratulations on your successful unbind!</string>
+    <string name="alarm_Illegal_unlock">Illegal to unlock!</string>
+    <string name="alarm_out_wall">You have crossed the line, please return as soon as possible!</string>
+    <string name="alarm_cross_boundary">You have crossed the boundary!</string>
+    <string name="alarm_wristband_off">Wristband has fallen off</string>
+    <string name="alarm_wristband_on">Wristband has been wear</string>
+
+    <string name="hotline">HotLine</string>
+
+
+
+    <string name="notification_title">通知消息</string>
+    <string name="notification_button_str">知道了</string>
+    <string name="dialog_notification_title">消息提醒</string>
+    <string name="dialog_btn_close">关闭</string>
+    <string name="dialog_btn_open">阅读</string>
+
+    <string name="sedentary_name">久坐提醒</string>
+    <string name="sedentary_msg">Sedentary reminder !</string>
+
+
+
+    <string name="en">English</string>
+    <string name="ja">日本語</string>
+    <string name="th">ภาษาไทย</string>
+    <string name="zh">简体中文</string>
+    <string name="zh_rhk">繁體中文</string>
+    <string name="it">意大利</string>
+    <string name="fr">法语</string>
+    <string name="de">德语</string>
+
+    <!--    法语，德语，意大利-->
+</resources>
diff --git a/app/version_code.properties b/app/version_code.properties
index 48f2a036..372797c2 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Thu Dec 17 17:41:27 CST 2020
-VERSION_CODE=736
+#Tue Dec 22 11:40:46 CST 2020
+VERSION_CODE=737