更新TcpAction，更新俄语资源

callingbed/src/main/java/com/wdkl/app/ncs/callingbed/activity/CallingbedActivity.kt

@@ -559,36 +559,39 @@ class CallingbedActivity :BaseActivity<CallingbedActivityPresenter, CallingbedMa
         JanusConstant.STUN_SERVER = arrayOf<String>(data.stunServer)
         //JanusConstant.TURN_SERVER = data.turnServer
 
-        var needReboot = false
-        if ("cn".equals(data.lang)) {
-            //中文
-            if (SettingConfig.getLanguageId(activity) != 2) {
-                needReboot = true
-            }
-            SettingConfig.setLanguageId(activity, 2)
-        } else if ("en".equals(data.lang)) {
-            //英文
-            if (SettingConfig.getLanguageId(activity) != 1) {
-                needReboot = true
-            }
-            SettingConfig.setLanguageId(activity, 1)
-        } else if ("es".equals(data.lang)) {
-            //西班牙语
-            if (SettingConfig.getLanguageId(activity) != 3) {
-                needReboot = true
-            }
-            SettingConfig.setLanguageId(activity, 3)
-        } else if ("ru".equals(data.lang)) {
-            //俄语
-            if (SettingConfig.getLanguageId(activity) != 4) {
-                needReboot = true
+        //通过服务端设置语言
+        if (SettingConfig.getLanguageMode(activity) == 0) {
+            var needReboot = false
+            if ("cn".equals(data.lang)) {
+                //中文
+                if (SettingConfig.getLanguageId(activity) != 2) {
+                    needReboot = true
+                }
+                SettingConfig.setLanguageId(activity, 2)
+            } else if ("en".equals(data.lang)) {
+                //英文
+                if (SettingConfig.getLanguageId(activity) != 1) {
+                    needReboot = true
+                }
+                SettingConfig.setLanguageId(activity, 1)
+            } else if ("es".equals(data.lang)) {
+                //西班牙语
+                if (SettingConfig.getLanguageId(activity) != 3) {
+                    needReboot = true
+                }
+                SettingConfig.setLanguageId(activity, 3)
+            } else if ("ru".equals(data.lang)) {
+                //俄语
+                if (SettingConfig.getLanguageId(activity) != 4) {
+                    needReboot = true
+                }
+                SettingConfig.setLanguageId(activity, 4)
             }
-            SettingConfig.setLanguageId(activity, 4)
-        }
 
-        if (needReboot) {
-            AppTool.Time.delay(10000) {
-                AppUpdateHelper.restartApp(activity)
+            if (needReboot) {
+                AppTool.Time.delay(10000) {
+                    AppUpdateHelper.restartApp(activity)
+                }
             }
         }
 

callingbed/src/main/java/com/wdkl/app/ncs/callingbed/settings/SettingConfig.java

@@ -66,10 +66,12 @@ public class SettingConfig {
 
     //默认语言
     private static final String KEY_LANGUAGE_ID = "KEY_LANGUAGE_ID";
+    private static final String KEY_LANGUAGE_MODE = "KEY_LANGUAGE_MODE";
     //是否自动接通
     private static final String KEY_SP_AUTO_ANSWER = "KEY_SP_AUTO_ANSWER";
 
     public static int getLanguageId(Context context) {
+        //0--auto, 1--English, 2--中文, 3--西班牙语, 4--俄语
         return getSP(context).getInt(KEY_LANGUAGE_ID, 2);
     }
 
@@ -77,6 +79,14 @@ public class SettingConfig {
         getEditor(context).putInt(KEY_LANGUAGE_ID, id).apply();
     }
 
+    public static int getLanguageMode(Context context) {
+        return getSP(context).getInt(KEY_LANGUAGE_MODE, 0);
+    }
+
+    public static void setLanguageMode(Context context, int mode) {
+        getEditor(context).putInt(KEY_LANGUAGE_MODE, mode).apply();
+    }
+
     /**
      * 获取分机白天亮度
      *

middleware/src/main/code/com/wdkl/ncs/android/middleware/tcp/enums/TcpAction.java

@@ -15,7 +15,8 @@ public interface TcpAction {
 
     enum CallbackAction implements TcpAction {
         SUCCESS("同步"),
-        FAILED("失败");
+        FAILED("失败"),
+        NO_MATCH("没有匹配");
         private final String description;
         CallbackAction(String description){
             this.description = description;
@@ -36,7 +37,7 @@ public interface TcpAction {
         }
         public static CallbackAction fromString(String v) {
             CallbackAction userOptionEnum = ENUM_MAP.get(v);
-            return userOptionEnum == null ? SUCCESS :userOptionEnum;
+            return userOptionEnum == null ? NO_MATCH :userOptionEnum;
         }
     }
 
@@ -47,7 +48,8 @@ public interface TcpAction {
         CALLING("通话中"),
         HANDOFF("挂断"),
         DATA("数据传输"),
-        CANCEL("取消");
+        CANCEL("取消"),
+        NO_MATCH("没有匹配");
 
 
         private final String description;
@@ -71,7 +73,7 @@ public interface TcpAction {
         }
         public static PhoneAction fromString(String v) {
             PhoneAction userOptionEnum = ENUM_MAP.get(v);
-            return userOptionEnum == null ? CALL :userOptionEnum;
+            return userOptionEnum == null ? NO_MATCH :userOptionEnum;
         }
     }
 
@@ -99,7 +101,10 @@ public interface TcpAction {
         GAIN_CALL("应答"),
         GAIN_OK("应答成功"),
         GAIN_FAIL("应答失败"),
-        GAINED("呼叫被应答");
+        GAINED("呼叫被应答"),
+        HCALL("手柄呼叫"),
+        HRESPONSE("响应手柄"),
+        NO_MATCH("没有匹配");
 
 
         private final String description;
@@ -123,7 +128,7 @@ public interface TcpAction {
         }
         public static VoiceAction fromString(String v) {
             VoiceAction userOptionEnum = ENUM_MAP.get(v);
-            return userOptionEnum == null ? CALL :userOptionEnum;
+            return userOptionEnum == null ? NO_MATCH :userOptionEnum;
         }
     }
 
@@ -139,7 +144,8 @@ public interface TcpAction {
         HANDOFF("挂断"),
         CANCEL("取消"),
         SUCCESS("呼叫成功"),
-        FAILED("呼叫失败");
+        FAILED("呼叫失败"),
+        NO_MATCH("没有匹配");
 
         private final String description;
         VideoAction(String description){
@@ -162,7 +168,7 @@ public interface TcpAction {
         }
         public static VideoAction fromString(String v) {
             VideoAction userOptionEnum = ENUM_MAP.get(v);
-            return userOptionEnum == null ? CALL :userOptionEnum;
+            return userOptionEnum == null ? NO_MATCH :userOptionEnum;
         }
     }
 
@@ -188,7 +194,9 @@ public interface TcpAction {
         ALARM_TEMPERATURE("温度报警"),
         ALARM_FALL("跌到报警"),
         ALARM_VITAL("体征报警"),
-        AlARM_BUTTON("紧急按钮");
+        AlARM_BUTTON("紧急按钮"),
+        ALARM_FALL_RADAR("跌到报警"),
+        NO_MATCH("没有匹配");
 
         private final String description;
         SOSAction(String description){
@@ -211,13 +219,14 @@ public interface TcpAction {
         }
         public static SOSAction fromString(String v) {
             SOSAction userOptionEnum = ENUM_MAP.get(v);
-            return userOptionEnum == null ? CALL :userOptionEnum;
+            return userOptionEnum == null ? NO_MATCH :userOptionEnum;
         }
     }
 
     enum ReinforceAction implements TcpAction {
         CALL("增援"),
-        RESPONSED("已响应");
+        RESPONSED("已响应"),
+        NO_MATCH("没有匹配");
 
         private final String description;
         ReinforceAction(String description){
@@ -240,7 +249,7 @@ public interface TcpAction {
         }
         public static ReinforceAction fromString(String v) {
             ReinforceAction userOptionEnum = ENUM_MAP.get(v);
-            return userOptionEnum == null ? CALL :userOptionEnum;
+            return userOptionEnum == null ? NO_MATCH :userOptionEnum;
         }
     }
 
@@ -248,7 +257,8 @@ public interface TcpAction {
     enum IMAction implements TcpAction {
         MSG("语音留言"),
         MSG_READ("语音留言已读"),
-        RECEIVED("客户端收到确认");
+        RECEIVED("客户端收到确认"),
+        NO_MATCH("没有匹配");
 
         private final String description;
         IMAction(String description){
@@ -271,7 +281,7 @@ public interface TcpAction {
         }
         public static IMAction fromString(String v) {
             IMAction userOptionEnum = ENUM_MAP.get(v);
-            return userOptionEnum == null ? MSG_READ :userOptionEnum;
+            return userOptionEnum == null ? NO_MATCH :userOptionEnum;
         }
 
     }
@@ -279,7 +289,8 @@ public interface TcpAction {
     enum CHANNELIMAction implements TcpAction {
         MSG("语音留言"),
         MSG_READ("语音留言已读"),
-        RECEIVED("接收端收到确认");
+        RECEIVED("接收端收到确认"),
+        NO_MATCH("没有匹配");
 
         private final String description;
         CHANNELIMAction(String description){
@@ -302,7 +313,7 @@ public interface TcpAction {
         }
         public static CHANNELIMAction fromString(String v) {
             CHANNELIMAction userOptionEnum = ENUM_MAP.get(v);
-            return userOptionEnum == null ? MSG_READ :userOptionEnum;
+            return userOptionEnum == null ? NO_MATCH :userOptionEnum;
         }
 
     }
@@ -315,7 +326,8 @@ public interface TcpAction {
         SYSTEM_SETTING("系统设置"),
         DEVICE_CHANGE("设备更换"),
         USER_CHANGE("用户绑定"),
-        SERVER_CHANGE("设备ip地址更换");
+        SERVER_CHANGE("设备ip地址更换"),
+        NO_MATCH("没有匹配");
 
         private final String description;
         DeviceAction(String description){
@@ -337,7 +349,7 @@ public interface TcpAction {
         }
         public static DeviceAction fromString(String v) {
             DeviceAction userOptionEnum = ENUM_MAP.get(v);
-            return userOptionEnum == null ? RESTART :userOptionEnum;
+            return userOptionEnum == null ? NO_MATCH :userOptionEnum;
         }
     }
 
@@ -347,7 +359,9 @@ public interface TcpAction {
         RECEIVED("接收端收到确认"),
         CANCEL("取消"),
         CANCEL_CONFIRM("接收端确认收到取消"),
-        COMPLETED("完成");
+        COMPLETED("完成"),
+        NO_MATCH("没有匹配");
+
         private final String description;
         EventAction(String description){
             this.description = description;
@@ -368,7 +382,7 @@ public interface TcpAction {
         }
         public static EventAction fromString(String v) {
             EventAction userOptionEnum = ENUM_MAP.get(v);
-            return userOptionEnum == null ? KEY_CLICK :userOptionEnum;
+            return userOptionEnum == null ? NO_MATCH :userOptionEnum;
         }
     }
 
@@ -379,7 +393,9 @@ public interface TcpAction {
         SOS_CALL("紧急呼叫"),
         SOS_CANCEL("取消"),
         NURSING("护理"),
-        NURSING_END("护理结束");
+        NURSING_END("护理结束"),
+        NO_MATCH("没有匹配");
+
         private final String description;
         SideAction(String description){
             this.description = description;
@@ -400,7 +416,7 @@ public interface TcpAction {
         }
         public static SideAction fromString(String v) {
             SideAction userOptionEnum = ENUM_MAP.get(v);
-            return userOptionEnum == null ? CALL :userOptionEnum;
+            return userOptionEnum == null ? NO_MATCH :userOptionEnum;
         }
     }
 
@@ -408,7 +424,9 @@ public interface TcpAction {
 
     enum DataAction implements TcpAction {
         REFRESH("刷新数据"),
-        INTERACTION("刷新交互列表");
+        INTERACTION("刷新交互列表"),
+        NO_MATCH("没有匹配");
+
         private final String description;
         DataAction(String description){
             this.description = description;
@@ -429,13 +447,15 @@ public interface TcpAction {
         }
         public static DataAction fromString(String v) {
             DataAction userOptionEnum = ENUM_MAP.get(v);
-            return userOptionEnum == null ? REFRESH :userOptionEnum;
+            return userOptionEnum == null ? NO_MATCH :userOptionEnum;
         }
     }
 
     enum BroadcastAction implements TcpAction {
         START("开始"),
-        STOP("停止");
+        STOP("停止"),
+        NO_MATCH("没有匹配");
+
         private final String description;
         BroadcastAction(String description){
             this.description = description;
@@ -456,12 +476,14 @@ public interface TcpAction {
         }
         public static BroadcastAction fromString(String v) {
             BroadcastAction userOptionEnum = ENUM_MAP.get(v);
-            return userOptionEnum == null ? START :userOptionEnum;
+            return userOptionEnum == null ? NO_MATCH :userOptionEnum;
         }
     }
 
     enum TimeAction implements TcpAction {
-        SYNC("同步");
+        SYNC("同步"),
+        NO_MATCH("没有匹配");
+
         private final String description;
         TimeAction(String description){
             this.description = description;
@@ -482,7 +504,7 @@ public interface TcpAction {
         }
         public static TimeAction fromString(String v) {
             TimeAction userOptionEnum = ENUM_MAP.get(v);
-            return userOptionEnum == null ? SYNC :userOptionEnum;
+            return userOptionEnum == null ? NO_MATCH :userOptionEnum;
         }
     }
 
@@ -497,7 +519,8 @@ public interface TcpAction {
         SUCCESS("连接主机成功"),
         HANGUP("挂断"),
         TIMEOUT("响应超时"),
-        FAILED("连接失败");
+        FAILED("连接失败"),
+        NO_MATCH("没有匹配");
 
 
         private final String description;
@@ -521,13 +544,15 @@ public interface TcpAction {
         }
         public static EntraceGuardAction fromString(String v) {
             EntraceGuardAction userOptionEnum = ENUM_MAP.get(v);
-            return userOptionEnum;
+            return userOptionEnum == null ? NO_MATCH :userOptionEnum;
         }
     }
 
     enum LocationAction implements TcpAction {
         ASK("主动询问"),
-        UPDATE("上传数据");
+        UPDATE("上传数据"),
+        NO_MATCH("没有匹配");
+
         private final String description;
         LocationAction(String description){
             this.description = description;
@@ -548,7 +573,7 @@ public interface TcpAction {
         }
         public static LocationAction fromString(String v) {
             LocationAction userOptionEnum = ENUM_MAP.get(v);
-            return userOptionEnum == null ? ASK :userOptionEnum;
+            return userOptionEnum == null ? NO_MATCH :userOptionEnum;
         }
     }
 }

resource/src/main/res/values-ru/strings.xml

@@ -48,66 +48,57 @@
     <string name="javashop_use">立即使用</string>
     <string name="javashop_get">立即领取</string>
 
-    <string name="default_nurse_config_name">NULL</string>
-    <string name="str_empty">NULL</string>
-    <string name="device_disable">Device disabled</string>
-    <string name="str_disable">Device enable</string>
-    <string name="str_enable">Enabled</string>
-    <string name="setting_params_error">Setting params error:</string>
-    <string name="support_sent">Reinforcements sent</string>
-    <string name="net_error">Network error</string>
-    <string name="no_custom">Calling error</string>
-    <string name="call_init_error">Network or sip error, please wait</string>
-    <string name="custom_empty">No custom</string>
-    <string name="call_fail">Call failed</string>
-    <string name="tips_reboot">Please reboot device</string>
-    <string name="broadcast_start">Start broadcast</string>
-    <string name="broadcast_stop">Stop broadcast</string>
-
-    <string name="no_response">No response</string>
-    <string name="call_success">Call success</string>
-    <string name="call_in_calling">Calling…</string>
-    <string name="call_connecting">Connecting…</string>
-    <string name="call_in_call">Connected…</string>
-    <string name="call_disconnect">Disconnect</string>
-    <string name="call_error">Connect error</string>
-    <string name="call_reject">Reject</string>
-    <string name="call_busy">Busy</string>
-    <string name="call_incoming">New call…</string>
-    <string name="call_failed">Call error</string>
-
-    <string name="indate">In date: </string>
-    <string name="subtotal">Subtotal: </string>
+    <string name="default_nurse_config_name">Элемент медсестры</string>
+    <string name="str_empty">НОЛЬ</string>
+    <string name="device_disable">Устройство отключено</string>
+    <string name="str_disable">Включить устройство</string>
+    <string name="str_enable">Включено</string>
+    <string name="setting_params_error">Ошибка настройки параметров:</string>
+    <string name="support_sent">Подкрепления отправлены</string>
+    <string name="net_error">Ошибка сети</string>
+    <string name="no_custom">Ошибка вызова</string>
+    <string name="call_init_error">Ошибка сети или sip, подождите</string>
+    <string name="tips_reboot">Перезагрузите устройство</string>
+    <string name="no_response">Нет ответа</string>
+    <string name="call_success">Успешный вызов</string>
+    <string name="call_in_calling">Вызов…</string>
+    <string name="call_connecting">Подключение…</string>
+    <string name="call_in_call">Подключено…</string>
+    <string name="call_disconnect">Отключить</string>
+    <string name="call_error">Ошибка подключения</string>
+    <string name="call_reject">Отклонить</string>
+    <string name="call_busy">Занят</string>
+    <string name="call_incoming">Новый звонок…</string>
+    <string name="call_failed">Ошибка вызова</string>
+    <string name="indate">Дата: </string>
+    <string name="subtotal">Промежуточный итог: </string>
     <string name="countdown_time">%ds</string>
-    <string name="input_password">Input password</string>
-    <string name="invalid_password">Password error</string>
-    <string name="input_empty">Params error</string>
-    <string name="str_confirm">Confirm</string>
-    <string name="str_cancel">Cancel</string>
-    <string name="str_delete">Delete</string>
-    <string name="str_save">Save</string>
-
-    <string name="download_error">Download error!</string>
-    <string name="download_cancel">Download cancel</string>
-    <string name="update_success">Update success</string>
-    <string name="update_fail">Update failed</string>
-    <string name="downloading">Download…</string>
-    <string name="updating">Updating, please wait</string>
-    <string name="update_no_required">It is currently the latest version</string>
-    <string name="detect_new_version">Detected new version, update now?</string>
-
-    <string name="str_home">Home</string>
-    <string name="str_fees">Fees</string>
-    <string name="str_more">More</string>
-    <string name="str_support">Reinforce</string>
-    <string name="str_call">Call</string>
-
-    <string name="doctor_title">Doctor</string>
-    <string name="nurse_title">Nurse</string>
+    <string name="input_password">Введите пароль</string>
+    <string name="invalid_password">Ошибка пароля</string>
+    <string name="input_empty">Ошибка параметров</string>
+    <string name="str_confirm">Подтвердить</string>
+    <string name="str_cancel">Отменить</string>
+    <string name="str_delete">Удалить</string>
+    <string name="str_save">Сохранить</string>
+    <string name="download_error">Ошибка загрузки!</string>
+    <string name="download_cancel">Отмена загрузки</string>
+    <string name="update_success">Обновление выполнено</string>
+    <string name="update_fail">Ошибка обновления</string>
+    <string name="downloading">Загрузить…</string>
+    <string name="updating">Идет обновление, подождите</string>
+    <string name="update_no_required">В настоящее время это последняя версия</string>
+    <string name="detect_new_version">Обнаружена новая версия, обновить сейчас?</string>
+    <string name="str_home">Главная</string>
+    <string name="str_fees">Сборы</string>
+    <string name="str_more">Еще</string>
+    <string name="str_support">Усилить</string>
+    <string name="str_call">Позвонить</string>
+    <string name="doctor_title">Доктор</string>
+    <string name="nurse_title">Медсестра</string>
     <string name="empty_title">""</string>
-    <string name="reboot_device">Reboot</string>
-    <string name="check_update">Check update</string>
-    <string name="server_config">Server config</string>
-    <string name="product_desc">Product:</string>
-    <string name="device_error">Device error, please reboot!</string>
+    <string name="reboot_device">Перезагрузить</string>
+    <string name="check_update">Проверить обновление</string>
+    <string name="server_config">Конфигурация сервера</string>
+    <string name="product_desc">описание продукта:</string>
+    <string name="device_error">Ошибка устройства, перезагрузите компьютер!</string>
 </resources>