增加西班牙语支持

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

@@ -540,6 +540,33 @@ 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)
+        }
+
+        if (needReboot) {
+            AppTool.Time.delay(5000) {
+                AppUpdateHelper.restartApp(activity)
+            }
+        }
+
         //开启TCP连接
         startTcp()
         showMessage("tcp connect --> host: " + Constant.TCP_SERVER_URL + ", port: " + Constant.TCP_PORT)

callingbed/src/main/java/com/wdkl/app/ncs/callingbed/helper/LocaleMangerUtils.java

@@ -18,7 +18,7 @@ public class LocaleMangerUtils {
         return Locale.getDefault();
     }
 
-    //获取当前语言id: 0--auto, 1--English, 2--中文, 3--俄语, 4--西班牙语
+    //获取当前语言id: 0--auto, 1--English, 2--中文, 3--西班牙语, 4--俄语
     public static int getCurrentLocaleIndex() {
         int languageSize = BaseApplication.appContext.getResources().getStringArray(R.array.language_list).length;
         int index = SettingConfig.getLanguageId(BaseApplication.appContext);
@@ -43,10 +43,10 @@ public class LocaleMangerUtils {
                 locale = Locale.CHINESE;
                 break;
             case 3:
-                locale = new Locale("ru");
+                locale = new Locale("es");
                 break;
             case 4:
-                locale = new Locale("es");
+                locale = new Locale("ru");
                 break;
         }
 

callingbed/src/main/res/layout/item_nurse_config.xml

@@ -14,7 +14,7 @@
 
     <TextView
         android:id="@+id/tv_nurse_config_name"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="match_parent"
         android:layout_weight="1"
         android:paddingLeft="6dp"
@@ -25,7 +25,7 @@
 
     <TextView
         android:id="@+id/tv_nurse_config_value"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="match_parent"
         android:layout_weight="1"
         android:paddingRight="6dp"

middleware/src/main/code/com/wdkl/ncs/android/middleware/model/ServerInfo.java

@@ -64,6 +64,8 @@ public class ServerInfo implements Serializable {
 
     private Long serverTime;
 
+    private String lang;
+
     public String getTcpLocalIp() {
         return tcpLocalIp;
     }
@@ -175,4 +177,12 @@ public class ServerInfo implements Serializable {
     public void setServerTime(Long serverTime) {
         this.serverTime = serverTime;
     }
+
+    public String getLang() {
+        return lang;
+    }
+
+    public void setLang(String lang) {
+        this.lang = lang;
+    }
 }

resource/src/main/res/values-es/arrays.xml

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<resources>
+    <string-array name="language_list">
+        <item value="0">Automático</item>
+        <item value="1">Inglés</item>
+        <item value="2">Chino</item>
+        <item value="3">Español</item>
+        <!--<item value="4">Ruso</item>-->
+    </string-array>
+
+    <string-array name="time_zones">
+        <item>GMT-11:00</item>
+        <item>GMT-10:00</item>
+        <item>GMT-09:00</item>
+        <item>GMT-08:00</item>
+        <item>GMT-07:00</item>
+        <item>GMT-06:00</item>
+        <item>GMT-05:00</item>
+        <item>GMT-04:00</item>
+        <item>GMT-03:30</item>
+        <item>GMT-02:00</item>
+        <item>GMT-01:00</item>
+        <item>GMT+00:00</item>
+        <item>GMT+01:00</item>
+        <item>GMT+02:00</item>
+        <item>GMT+03:00</item>
+        <item>GMT+03:30</item>
+        <item>GMT+04:00</item>
+        <item>GMT+04:30</item>
+        <item>GMT+05:00</item>
+        <item>GMT+05:30</item>
+        <item>GMT+05:45</item>
+        <item>GMT+06:00</item>
+        <item>GMT+06:30</item>
+        <item>GMT+07:00</item>
+        <item>GMT+08:00</item>
+        <item>GMT+09:00</item>
+        <item>GMT+09:30</item>
+        <item>GMT+10:00</item>
+        <item>GMT+10:30</item>
+        <item>GMT+11:00</item>
+        <item>GMT+12:00</item>
+        <item>GMT+13:00</item>
+        <item>GMT+14:00</item>
+    </string-array>
+
+</resources>

resource/src/main/res/values-es/string.xml

@@ -0,0 +1,104 @@
+<resources>
+    <string name="javashop_app_name">NCS-extension_5inch</string>
+    <string name="javashop_qrcode_name">扫啊扫</string>
+    <string name="javashop_navigation_home_title">首页</string>
+    <string name="javashop_navigation_category_title">分类</string>
+    <string name="javashop_navigation_cart_title">购物车</string>
+    <string name="javashop_navigation_persion_title">我的</string>
+    <string name="javashop_cart_shop_item_title">优惠券</string>
+    <string name="javashop_group_promotion_fulldiscount">满折</string>
+    <string name="javashop_group_promotion_fullminus">满减</string>
+    <string name="javashop_group_promotion_point">积分</string>
+    <string name="javashop_group_promotion_freeship">免邮</string>
+    <string name="javashop_group_promotion_gift">赠品</string>
+    <string name="javashop_group_promotion_bonus">赠券</string>
+    <string name="javashop_group_not_full_tobuy">再逛逛</string>
+    <string name="javashop_promotion_string">促销</string>
+    <string name="javashop_singgle_promotion_edit_string">修改</string>
+    <string name="javashop_member_action_order_wait_pay">待付款</string>
+    <string name="javashop_member_action_order_wait_rog">待收货</string>
+    <string name="javashop_member_action_order_wait_comment">待评论</string>
+    <string name="javashop_member_action_aftersale">退换/售后</string>
+    <string name="javashop_member_action_order_all">我的订单</string>
+    <string name="javashop_member_action_point">积分</string>
+    <string name="javashop_member_action_bouns">优惠券</string>
+    <string name="javashop_member_action_goods">收藏商品</string>
+    <string name="javashop_member_action_shop">收藏店铺</string>
+    <string name="javashop_member_action_security">账户安全</string>
+    <string name="javashop_member_action_history">我的足迹</string>
+    <string name="javashop_member_action_address">我的地址</string>
+    <string name="javashop_member_action_user_service">客户服务</string>
+    <string name="javashop_setting_action_receipt">我的发票</string>
+    <string name="javashop_setting_action_privacy">隐私设置</string>
+    <string name="javashop_setting_action_share">应用分享</string>
+    <string name="javashop_setting_action_about">关于</string>
+    <string name="javashop_setting_action_logout">退出登录</string>
+    <string name="javashop_setting_action_cache">清除缓存</string>
+    <string name="javashop_goods_filter_all">全部</string>
+    <string name="javashop_all_brand">全部品牌</string>
+    <string name="javashop_confrim">确定</string>
+    <string name="javashop_cancel">取消</string>
+    <string name="javashop_add_cart">加入购物车</string>
+    <string name="javashop_shop">店铺</string>
+    <string name="javashop_self">自营</string>
+    <string name="javashop_collect">关注</string>
+    <string name="javashop_cart">购物车</string>
+    <string name="javashop_login">登录</string>
+    <string name="javashop_send_message">发送验证码</string>
+    <string name="javashop_use">立即使用</string>
+    <string name="javashop_get">立即领取</string>
+
+    <string name="default_nurse_config_name">Elemento de enfermera</string>
+    <string name="str_empty">NULO</string>
+    <string name="device_disable">Dispositivo deshabilitado</string>
+    <string name="str_disable">Activar dispositivo</string>
+    <string name="str_enable">Habilitado</string>
+    <string name="setting_params_error">Error de configuración de parámetros:</string>
+    <string name="support_sent">Refuerzos enviados</string>
+    <string name="net_error">Error de red</string>
+    <string name="no_custom">Error de llamada</string>
+    <string name="call_init_error">Error de red o sip, espere</string>
+    <string name="tips_reboot">Reinicie el dispositivo</string>
+    <string name="no_response">Sin respuesta</string>
+    <string name="call_success">Llamada exitosa</string>
+    <string name="call_in_calling">Llamando…</string>
+    <string name="call_connecting">Conectando…</string>
+    <string name="call_in_call">Conectado…</string>
+    <string name="call_disconnect">Desconectar</string>
+    <string name="call_error">Error de conexión</string>
+    <string name="call_reject">Rechazar</string>
+    <string name="call_busy">Ocupado</string>
+    <string name="call_incoming">Nueva llamada…</string>
+    <string name="call_failed">Error de llamada</string>
+    <string name="indate">Fecha de entrada: </string>
+    <string name="subtotal">Subtotal: </string>
+    <string name="countdown_time">%ds</string>
+    <string name="input_password">Introducir contrase?a</string>
+    <string name="invalid_password">Error de contrase?a</string>
+    <string name="input_empty">Error de parámetros</string>
+    <string name="str_confirm">Confirmar</string>
+    <string name="str_cancel">Cancelar</string>
+    <string name="str_delete">Eliminar</string>
+    <string name="str_save">Guardar</string>
+    <string name="download_error">Error de descarga!</string>
+    <string name="download_cancel">Cancelar descarga</string>
+    <string name="update_success">Actualización exitosa</string>
+    <string name="update_fail">Actualización fallida</string>
+    <string name="downloading">Descargar…</string>
+    <string name="updating">Actualizando, espere</string>
+    <string name="update_no_required">Actualmente es la última versión</string>
+    <string name="detect_new_version">Nueva versión detectada, ?actualizar ahora?</string>
+    <string name="str_home">Inicio</string>
+    <string name="str_fees">Tarifas</string>
+    <string name="str_more">Más</string>
+    <string name="str_support">Reforzar</string>
+    <string name="str_call">Llamar</string>
+    <string name="doctor_title">Doctor</string>
+    <string name="nurse_title">Enfermera</string>
+    <string name="empty_title">""</string>
+    <string name="reboot_device">Reiniciar</string>
+    <string name="check_update">Comprobar actualización</string>
+    <string name="server_config">Configuración del servidor</string>
+    <string name="product_desc">Descripción del Producto:</string>
+    <string name="device_error">Error del dispositivo, reinicie!</string>
+</resources>

resource/src/main/res/values-zh/arrays.xml

@@ -5,8 +5,8 @@
         <item value="0">跟随系统</item>
         <item value="1">英语</item>
         <item value="2">中文</item>
-        <!--<item value="3">俄语</item>
-        <item value="4">西班牙语</item>-->
+        <item value="3">西班牙语</item>
+        <!--<item value="4">俄语</item>-->
     </string-array>
 
     <string-array name="time_zones">

resource/src/main/res/values/arrays.xml

@@ -5,8 +5,8 @@
         <item value="0">Auto</item>
         <item value="1">English</item>
         <item value="2">Chinese</item>
-        <!--<item value="3">Russian</item>
-        <item value="4">Spanish</item>-->
+        <item value="3">Spanish</item>
+        <!--<item value="4">Russian</item>-->
     </string-array>
 
     <string-array name="time_zones">