西班牙语字符串更新及界面优化

android_mobile/src/main/yd_w_xiaomi_2_chile/code/com/wdkl/ncs/android/component/home/settingconfig/SettingConfig.java

@@ -28,6 +28,9 @@ public class SettingConfig {
     private static final String KEY_LANGUAGE_ID = "KEY_LANGUAGE_ID";
     private static final String KEY_LANGUAGE_MODE = "KEY_LANGUAGE_MODE";
 
+    //是否使用sip通话
+    private static final String KEY_SP_SIP_ENABLE = "KEY_SP_SIP_ENABLE";
+
     public static int getLanguageId(Context context) {
         //0--auto, 1--English, 2--中文, 3--西班牙语, 4--俄语
         return getSP(context).getInt(KEY_LANGUAGE_ID, 3);
@@ -45,6 +48,14 @@ public class SettingConfig {
         getEditor(context).putInt(KEY_LANGUAGE_MODE, mode).apply();
     }
 
+    public static boolean getSipEnabled(Context context) {
+        return getSP(context).getBoolean(KEY_SP_SIP_ENABLE, false);
+    }
+
+    public static void setSipEnable(Context context, boolean enable) {
+        getEditor(context).putBoolean(KEY_SP_SIP_ENABLE, enable).apply();
+    }
+
 
     /**
      * 获取转发时间

android_mobile/src/main/yd_w_xiaomi_2_chile/res/layout/adapter_watch_contacts_item.xml

@@ -1,25 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout>
 
-    <RelativeLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
+    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/item_relayout"
         android:layout_width="match_parent"
         android:layout_height="60dp"
         android:layout_marginBottom="1dp"
-        android:background="#FFFFFF">
+        android:background="@drawable/item_selector">
 
-        <RelativeLayout
-            android:id="@+id/item_relayout"
-            android:layout_width="match_parent"
+        <LinearLayout
+            android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:background="@drawable/item_selector">
-
+            android:gravity="center_vertical"
+            android:layout_marginLeft="6dp"
+            android:orientation="vertical">
             <TextView
                 android:id="@+id/room_number_tv"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:layout_marginLeft="5dp"
                 android:text="--"
                 android:textColor="@color/header"
                 android:textSize="14sp" />
@@ -28,44 +26,43 @@
                 android:id="@+id/name_tv"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:layout_marginLeft="5dp"
-                android:layout_toRightOf="@+id/room_number_tv"
+                android:layout_marginTop="4dp"
                 android:text="--"
                 android:textColor="#F78B8F"
                 android:textSize="16sp" />
+        </LinearLayout>
 
-            <ImageView
-                android:id="@+id/awci_voice_recorder"
-                android:src="@drawable/voice_recorder"
-                android:layout_toLeftOf="@+id/awci_btn_call_out"
-                android:layout_marginEnd="10dp"
-                android:layout_centerVertical="true"
-                android:layout_width="32dp"
-                android:layout_height="22dp"
-                android:visibility="gone"/>
-            <Button
-                android:id="@+id/awci_btn_call_out"
-                android:layout_marginRight="10dp"
-                android:layout_toLeftOf="@+id/right_arrow"
-                android:textSize="12sp"
-                android:layout_centerVertical="true"
-                android:textColor="@color/grgray"
-                android:layout_width="50dp"
-                android:layout_height="22dp"
-                android:background="@drawable/javashop_btn_balck_line_bg"
-                android:text="@string/str_call"
-                android:singleLine="true"/>
+        <ImageView
+            android:id="@+id/awci_voice_recorder"
+            android:layout_width="32dp"
+            android:layout_height="22dp"
+            android:layout_marginEnd="10dp"
+            android:layout_centerVertical="true"
+            android:layout_toLeftOf="@+id/awci_btn_call_out"
+            android:src="@drawable/voice_recorder"
+            android:visibility="gone" />
 
-            <ImageView
-                android:id="@+id/right_arrow"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-                android:layout_marginRight="6dp"
-                android:src="@drawable/zhe_die" />
+        <Button
+            android:id="@+id/awci_btn_call_out"
+            android:layout_width="50dp"
+            android:layout_height="22dp"
+            android:layout_marginRight="10dp"
+            android:layout_centerVertical="true"
+            android:layout_toLeftOf="@+id/right_arrow"
+            android:background="@drawable/javashop_btn_balck_line_bg"
+            android:singleLine="true"
+            android:text="@string/str_call"
+            android:textColor="@color/grgray"
+            android:textSize="12sp" />
+
+        <ImageView
+            android:id="@+id/right_arrow"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_alignParentRight="true"
+            android:layout_marginRight="6dp"
+            android:src="@drawable/zhe_die" />
 
-        </RelativeLayout>
     </RelativeLayout>
 </layout>

android_mobile/src/main/yd_w_xiaomi_2_chile/res/layout/watch_activity_home2.xml

@@ -38,8 +38,9 @@
                         android:src="@drawable/gu_ke_lie_biao" />
 
                     <TextView
-                        android:layout_width="wrap_content"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
+                        android:gravity="center"
                         android:layout_marginTop="10dp"
                         android:text="@string/custom_title"
                         android:textColor="#ffffff"
@@ -63,8 +64,9 @@
                         android:src="@drawable/tong_hu_ji_lu" />
 
                     <TextView
-                        android:layout_width="wrap_content"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
+                        android:gravity="center"
                         android:layout_marginTop="10dp"
                         android:text="@string/call_list"
                         android:textColor="#ffffff"
@@ -231,8 +233,9 @@
                                 android:src="@drawable/icons8_users_90" />
 
                             <TextView
-                                android:layout_width="wrap_content"
+                                android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
+                                android:gravity="center"
                                 android:text="@string/colleague"
                                 android:textColor="#ffffff"
                                 android:textSize="12sp" />

android_mobile/src/main/yd_w_xiaomi_2_chile/res/layout/watch_contacts_lay.xml

@@ -15,7 +15,7 @@
 
             <RadioButton
                 android:id="@+id/rb_tab_bed"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:paddingTop="4dp"
@@ -28,7 +28,7 @@
 
             <RadioButton
                 android:id="@+id/rb_tab_room"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:paddingTop="4dp"

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

@@ -49,18 +49,18 @@
     <string name="javashop_get">立即领取</string>
 
     <string name="wdkl_app_name">Aplicación móvil</string>
-    <string name="data_empty">Vacío</string>
+    <string name="data_empty">Sin datos</string>
     <string name="register_server_ip">IP del servidor:</string>
     <string name="register_device_identifier">Identificador:</string>
-    <string name="register_done">Registrar Aceptar</string>
+    <string name="register_done">Registro correcto</string>
     <string name="register_restart">Reiniciar aplicación</string>
-    <string name="register_config_server">Servidor de configuración</string>
-    <string name="custom_title">Clientes</string>
-    <string name="call_list">llamadas</string>
+    <string name="register_config_server">Configuración de servidor</string>
+    <string name="custom_title">Pacientes</string>
+    <string name="call_list">Historico llamadas</string>
     <string name="colleague">Colegas</string>
     <string name="group_message">Mensaje de grupo</string>
     <string name="reconnect">Reconectar</string>
-    <string name="str_room">Cuarto</string>
+    <string name="str_room">Habitación</string>
     <string name="str_bed">Cama</string>
 
     <string name="str_empty">Nulo</string>
@@ -69,7 +69,7 @@
     <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="support_sent">Ayuda enviada</string>
     <string name="net_error">Error de red</string>
     <string name="call_init_error">Error de red o sip, espere</string>
     <string name="call_fail">Llamada fallida</string>
@@ -81,24 +81,24 @@
     <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">En llamada…</string>
+    <string name="call_in_call">Conectada…</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">llamada.</string>
+    <string name="call_incoming">Llamada entrante</string>
     <string name="call_failed">Error de llamada</string>
     <string name="call_end">Fin de llamada</string>
     <string name="str_call_accept">Aceptar</string>
-    <string name="str_call_transfer">Traslado</string>
+    <string name="str_call_transfer">Transferir</string>
     <string name="str_call_mute">Silencio</string>
-    <string name="str_call_handoff">Cuelga</string>
+    <string name="str_call_handoff">Colgar</string>
     <string name="str_call_speaker">Altavoz</string>
     <string name="voice_call_speech">%s llamando</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_password">Introducir clave</string>
+    <string name="invalid_password">Error de clave</string>
     <string name="input_empty">Error de parámetros</string>
     <string name="str_confirm">Confirmar</string>
     <string name="str_cancel">Cancelar</string>
@@ -110,8 +110,8 @@
 
     <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="update_success">Actualización correcta</string>
+    <string name="update_fail">Actualización incorrecta</string>
     <string name="downloading">Descargar…</string>
     <string name="updating">Actualizando, espere</string>
     <string name="update_no_required">Actualmente es la última versión</string>
@@ -121,7 +121,7 @@
     <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_support">Solicitar ayuda</string>
     <string name="str_call">Llamar</string>
 
     <string name="doctor_title">Doctor</string>
@@ -137,41 +137,41 @@
     <string name="str_voice_msg_end">Fin</string>
     <string name="str_voice_msg_btn_title">Liberar para enviar mensaje</string>
     <string name="str_voice_msg_btn_text">Presione para grabar el mensaje</string>
-    <string name="str_voice_msg_record_loss">el tiempo es demasiado corto</string>
+    <string name="str_voice_msg_record_loss">El tiempo es demasiado corto</string>
     <string name="str_voice_msg_record_cancel">Mensaje de voz cancelado</string>
-    <string name="str_voice_msg_send_success">envío exitoso</string>
-    <string name="str_voice_msg_send_fail">envío fallido</string>
+    <string name="str_voice_msg_send_success">Envío correcto</string>
+    <string name="str_voice_msg_send_fail">Envío incorrecto</string>
     <string name="str_voice_msg_play">reproducir mensaje de voz</string>
     <string name="str_im_no_channel">Por favor ingrese el canal del mensaje</string>
-    <string name="str_im_no_media_button">botón multimedia para mensaje de voz deshabilitado</string>
+    <string name="str_im_no_media_button">Botón multimedia para mensaje de voz deshabilitado</string>
     <string name="str_im_media_button_unuseful">Presione el botón de grabación</string>
     <string name="str_im_stop">Parar</string>
 
     <string name="str_select_responsible_title">Seleccionar responsable</string>
     <string name="str_select_resposible_err">Error responsable</string>
     <string name="str_no_resposible">Sin responsabilidad</string>
-    <string name="str_set_resposible_success">Establecer éxito responsable</string>
+    <string name="str_set_resposible_success">Establecido responsable</string>
     <string name="str_set_resposible_fail">Error al establecer responsable</string>
-    <string name="str_event_handle_warning">el evento necesita ser manejado</string>
-    <string name="str_event_response">Respondido: %s %s</string>
+    <string name="str_event_handle_warning">El evento necesita ser manejado</string>
+    <string name="str_event_response">Contestado: %s %s</string>
     <string name="str_event_cancel">Evento cancelado</string>
     <string name="str_event_done">Evento realizado</string>
     <string name="str_search">Buscar</string>
 
     <string name="call_phone_failed">Llamada fallida, verifique el número de teléfono</string>
-    <string name="phone_type">Móvil-%d; Extender-%d; Anfitrión-%d</string>
-    <string name="user_change_success">Cambio exitoso, por favor espere.</string>
-    <string name="user_change_failed">Cambio fallido, vuelva a intentarlo.</string>
+    <string name="phone_type">Móvil-%d; Extendido-%d; Servidor-%d</string>
+    <string name="user_change_success">Modificación correcta, por favor espere.</string>
+    <string name="user_change_failed">Modificación incorrecta, vuelva a intentarlo.</string>
     <string name="retry_tips">Vuelve a intentarlo más tarde</string>
-    <string name="tts_init_success">éxito</string>
-    <string name="tts_init_failed">error</string>
+    <string name="tts_init_success">Correcto</string>
+    <string name="tts_init_failed">Error</string>
 
     <string name="event_voice_msg">Mensaje de voz</string>
     <string name="event_voice_call">Llamar</string>
     <string name="event_undo">Deshacer</string>
-    <string name="event_responded">Respondido</string>
+    <string name="event_responded">Contestado</string>
     <string name="device_change_check">Confirmar cambio?</string>
-    <string name="device_change_tips">Cambiando, espera</string>
+    <string name="device_change_tips">Modificando, espere</string>
     <string name="invalid_phone_number">Teléfono no válido: %s</string>
 
     <string name="version_title">Versión:</string>
@@ -185,7 +185,7 @@
     <string name="str_user_change">Cambio de usuario</string>
     <string name="str_check_update">Comprobar actualización</string>
     <string name="str_system_settings">Configuración del sistema</string>
-    <string name="str_check_net">Net check</string>
+    <string name="str_check_net">Comprobar conexión</string>
     <string name="media_button_message">Habilitar mensaje de botón multimedia:</string>
 
     <string name="permission_tips">Otorgue permisos</string>
@@ -200,41 +200,41 @@
     <string name="net_disconnect">Desconectado, verifique la red</string>
     <string name="device_user_not_register">Usuario no registrado</string>
     <string name="click_twice_start_settings">Hacer clic dos veces para abrir la configuración</string>
-    <string name="click_twice_to_back">Click again to back</string>
-    <string name="low_power">Poca potencia</string>
+    <string name="click_twice_to_back">Clickee otra vez para volver atrás</string>
+    <string name="low_power">Carga baja</string>
 
-    <string name="language_set_title">Conjunto de idiomas:</string>
+    <string name="language_set_title">Selección de idioma:</string>
     <string name="language_set_mode">Sincronizar idioma del servidor:</string>
-    <string name="str_language_settings">Conjunto de idiomas</string>
-
-    <string name="contact_start_load">Start load contact</string>
-    <string name="contact_start_update">Start update, wait a moment.</string>
-    <string name="device_not_registered">Device not registered</string>
-    <string name="contact_load_count">Load contact count: %d</string>
-    <string name="contact_list_item">Contact name: %s, number: %s</string>
-    <string name="contact_updating">Updating</string>
-    <string name="contact_update_complete">Update complete:</string>
-    <string name="contact_update_porgress">Update progress:</string>
-    <string name="contact_add">Add contact:</string>
-    <string name="contact_duplication">Duplicate contact:</string>
-    <string name="contact_number_empty">Empty contact number</string>
-    <string name="contact_delete_complete">Delete contact complete.</string>
-
-    <string name="device_number_update_success">Update success!</string>
-    <string name="device_number_update_failed">Update failed!</string>
-    <string name="device_number_update_empty">Empty number!</string>
-    <string name="grant_write_permission">Please grant write external file permission!</string>
-    <string name="contatc_update_title">Update contact</string>
-    <string name="phone_number_title">My phone number</string>
-    <string name="wait_moment">Please wait</string>
-    <string name="send_sms_number_empty">Send phone number empty</string>
-    <string name="phone_number_check_tips">Please double-check the phone number is correct</string>
-    <string name="check_my_phone_number">Check my phone number</string>
-    <string name="operator_number">Operator number:</string>
-    <string name="check_sms_command">SMS cmd:</string>
-    <string name="str_send">Send</string>
+    <string name="str_language_settings">Seleccionar idioma</string>
+
+    <string name="contact_start_load">Comenzar carga de contacto</string>
+    <string name="contact_start_update">Comenzar actualización, por favor, espere.</string>
+    <string name="device_not_registered">Dispositivo no registrado</string>
+    <string name="contact_load_count">Contador de carga de contactos: %d</string>
+    <string name="contact_list_item">Nombre de contacto: %s, número: %s</string>
+    <string name="contact_updating">Actualizando</string>
+    <string name="contact_update_complete">Actualizacion finalizada:</string>
+    <string name="contact_update_porgress">Realizando actualización:</string>
+    <string name="contact_add">Añadir contacto:</string>
+    <string name="contact_duplication">Contacto duplicado:</string>
+    <string name="contact_number_empty">Número de contacto vacío</string>
+    <string name="contact_delete_complete">Contacto eliminado.</string>
+
+    <string name="device_number_update_success">Actualización correcta!</string>
+    <string name="device_number_update_failed">Actualización no correcta!</string>
+    <string name="device_number_update_empty">Número vacío!</string>
+    <string name="grant_write_permission">Otorue privilegios de escritura de ficheros!</string>
+    <string name="contatc_update_title">Actualizar contacto</string>
+    <string name="phone_number_title">Número de teléfono</string>
+    <string name="wait_moment">Por favor, espere</string>
+    <string name="send_sms_number_empty">No enviar número de teléfono</string>
+    <string name="phone_number_check_tips">Por favor doble comprobación número de teléfono</string>
+    <string name="check_my_phone_number">Comprobar número de teléfono</string>
+    <string name="operator_number">Número de operador:</string>
+    <string name="check_sms_command">Comando SMS:</string>
+    <string name="str_send">Enviar</string>
     <string name="speech_sample_text">Este es un ejemplo de texto a voz</string>
 
-    <string name="network_connect">Connected</string>
-    <string name="network_disconnect">Disconnect</string>
+    <string name="network_connect">Conectado</string>
+    <string name="network_disconnect">Desconectado</string>
 </resources>