增加英语，西班牙语

i18n/en_US.tr

@@ -1,4 +1,241 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="hello_world">Hello world!</string>
-</resources>
+    <!-- 时间相关 -->
+    <string name="Year">-</string>
+    <string name="Month">-</string>
+    <string name="Day"> </string>
+    <string name="Monday">Monday</string>
+    <string name="Tuesday">Tuesday</string>
+    <string name="Wednesday">Wednesday</string>
+    <string name="Thursday">Thursday</string>
+    <string name="Friday">Friday</string>
+    <string name="Saturday">Saturday</string>
+    <string name="Sunday">Sunday</string>
+    <!-- 按钮 -->
+    <string name="Home">Home</string>
+    <string name="Healthcare">Healthcare</string>
+    <string name="More">More</string>
+    <string name="Fee">Fee</string>
+    <string name="Help">Help</string>
+	<string name="HelpInfo">Help sent, wait for response</string>
+	<string name="HelpResponse">Help responding, nurse on the way</string>
+    <string name="Call">Call</string>
+    <string name="Reboot">Reboot Device</string>
+    <string name="SettingServerIP">Server Settings</string>
+    <string name="SettingNet">Network Settings</string>
+    <string name="SoftVersion">Software Version</string>
+    <string name="SoftInitialization">Initialize Version</string>
+    <string name="SoftDown">Download</string>
+    <string name="SoftVersionCheck">Version Update</string>
+    <string name="SoftUpdateNow">Update Now</string>
+    <string name="Setting">Enter Settings</string>
+    <string name="Test">Enter Debugging</string>
+    <string name="Confirm">Confirm</string>
+    <string name="Cancel">Cancel</string>
+    <string name="Save">Save</string>
+    <string name="Back">Back</string>
+    <string name="CallBed">Call Bed</string>
+    <string name="CallNurse">Call</string>
+    <string name="CallCencel">Cancel Call</string>
+    <string name="CallInfo">Initiate Call</string>
+    <string name="SOSCallInfo">Initiate Emergency Call</string>
+    <string name="Voice">Voice</string>
+    <!-- 首页 -->
+    <string name="Room">Room</string>
+	<string name="InBedNum">Patients</string>
+	<string name="EmptyBedNum">Free Beds</string>
+    <string name="EmptyBed">Empty Bed</string>
+    <string name="EmptyCustomer">No Occupant</string>
+    <string name="None">None</string>
+    <string name="BedNum">Bed Number</string>
+    <string name="Woman">Female</string>
+    <string name="Man">Male</string>
+    <string name="Unknown">Unknown</string>
+    <string name="NurseConfig">Nursing Items</string>
+    <string name="Oxygen">Oxygen Countdown</string>
+    <string name="OxygenInhalation">Oxygen Inhalation</string>
+    <string name="SkinTest">Skin Test</string>
+    <string name="Infusion">Infusion</string>
+    <string name="SettingTime">Custom Time</string>
+    <string name="CountdownProgress">Countdown in Progress</string>
+    <string name="CountdownCancel">Cancel Countdown?</string>
+    <string name="CountdownEnded">Countdown Ended</string>
+    <string name="Description">Description:</string>
+    <string name="Advice">Medical Advice</string>
+    <string name="AdviceType">Advice Type</string>
+    <string name="LONG_TERM">Long-term</string>
+    <string name="TEMP">Temporary</string>
+    <string name="LoseEfficacy">失效</string>
+    <string name="TakeEffect">生效</string>
+    <string name="StartTime">Start Time:</string>
+    <string name="EndTime">End Time:</string>
+    <string name="Content">Content</string>
+    <string name="Detail">Parameters</string>
+    <string name="ResponsibleDoctor">Responsible Doctor</string>
+    <string name="ResponsibleNurse">Responsible Nurse</string>
+    <string name="Director">Department Director</string>
+    <string name="HeadNurse">Head Nurse</string>
+    <!-- 功能界面 -->
+    <string name="CallableBeds">Current Callable Beds</string>
+    <string name="ConfirmCall">Confirm Call</string>
+    <string name="CancelCall">Cancel Call</string>
+    <string name="LogoutMedicalCareMsg">Confirm exit care?</string>
+    <string name="ConfirmLogout">Confirm Logout</string>
+    <string name="CancelLogoutl">Cancel Logout</string>
+    <string name="PostitionedMsg">Current Position Located:</string>
+    <string name="RoomPatrolMsg">Room Patrol Completed:</string>
+    <string name="PromptQuit">Prompt Message Ended</string>
+	<string name="RebootDevice">Restart Device</string>
+	<string name="RebootPower">Restart Power</string>
+	<string name="RebootLine">Restart Circuit</string>
+    <string name="ThemeBlue">Switch Theme Color to Blue?</string>
+    <string name="ThemeRed">Switch Theme Color to Red?</string>
+    <string name="ThemeConfirm">Confirm theme change, device will restart</string>
+    <string name="Mode1">Switch to Mode 1?</string>
+    <string name="Mode2">Switch to Mode 2?</string>
+    <string name="Mode3">Switch to Mode 3?</string>
+    <string name="ModeConfirm">Confirm that switching mode will restart the device</string>
+    <string name="SosDisconnected">Emergency Button Disconnected</string>
+    <string name="HandleDisconnected">Handle Disconnected</string>
+    <string name="GainCall">Extension calling, click to answer</string>
+    <!-- 医护界面 -->
+    <string name="MedicalLoginMsg">Please enter the correct password to access healthcare functions</string>
+    <string name="InputMedicalPassword">Enter Password to Access Healthcare</string>
+    <string name="InputMedicalPasswordMsg">Password consists of numbers</string>
+    <string name="JobNumber">Employee ID</string>
+    <string name="Password">Password</string>
+    <string name="NfcText">Please tap NFC card at the card reader to access healthcare</string>
+	<string name="NfcText">Tap NFC card to enter</string>
+    <string name="EnteringMedicalCare">Accessing Healthcare</string>
+    <string name="ChooseMsg">Please select the corresponding staff member to access healthcare functions</string>
+    <string name="Hello">Hello,</string>
+    <string name="MedicalCareMsg">This is your personal healthcare section</string>
+    <string name="LogoutMedicalCare">Exit Healthcare</string>
+    <string name="Position">Location</string>
+    <string name="Positioned">Located</string>
+    <string name="RoomPatrol">Room Patrol</string>
+    <string name="RoomPatrolCompleted">Room Patrol Completed</string>
+    <string name="Nursing">Enter Nursing</string>
+    <string name="NursingMsg">Bed in care</string>
+    <string name="SetNursingMsg">Set to nursing status?</string>
+    <string name="InNursing">In Care</string>
+    <string name="NursingEnd">End Nursing</string>
+    <string name="SetNursingEndMsg">The bed is currently in nursing mode, confirm to exit?</string>
+    <string name="Prompt">Set Prompt</string>
+    <string name="PromptMsg">Lock Screen Display</string>
+    <!-- 提示语界面 -->
+    <string name="SetPrompt">Set Prompt Message</string>
+    <string name="CustomInput">Custom Input</string>
+    <string name="QuickPrompt">Quick Prompt Messages</string>
+    <string name="SetPromptTime">Set Prompt Time</string>
+    <string name="StartPrompt">Start Setting</string>
+    <string name="BeQuiet">Keep Quiet</string>
+    <string name="DoNotDisturb">Do Not Disturb, Nursing in Progress</string>
+    <string name="KeepQuiet">No Loud Noise</string>
+    <string name="DoNotVisit">No Visiting</string>
+    <string name="InRestroom">Using Restroom, Do Not Enter</string>
+    <string name="DoNotGather">No Gathering</string>
+    <string name="5Minutes">5 Minutes</string>
+    <string name="10Minutes">10 Minutes</string>
+    <string name="15Minutes">15 Minutes</string>
+    <string name="20Minutes">20 Minutes</string>
+    <string name="30Minutes">30 Minutes</string>
+    <string name="45Minutes">45 Minutes</string>
+    <string name="60Minutes">60 Minutes</string>
+    <string name="90Minutes">90 Minutes</string>
+	<string name="120Minutes">120 Minutes</string>
+	<string name="ExitPrompt">Exit Prompt</string>
+    <!-- 通话界面 -->
+	<string name="RemoteRefuse">Remote Refused</string>
+	<string name="RemoteBusy">Remote Busy</string>
+	<string name="CallFailed">Call Failed</string>
+	<string name="Calling">Calling</string>
+	<string name="CallConfirmed">In Call</string>
+	<string name="CallConnecting">Connecting Call</string>
+	<string name="CallInComing">Incoming Call</string>
+	<string name="CallOutTitle">Call Nurse</string>
+	<string name="Call">Call</string>
+	<string name="NotFound">Target device SIP not found, call failed</string>
+	<string name="RequestTimes">Call connection abnormal, please try to call again</string>
+    <!-- 更多界面 -->
+	<string name="DeviceInfo">Device Information</string>
+	<string name="DeviceDebug">Device Debugging</string>
+	<string name="Null">None</string>
+	<string name="InDate">Admission Date</string>
+	<string name="Advice">Medical Advice</string>
+	<string name="DeviceId">ID</string>
+	<string name="DeviceSign">Device ID</string>
+	<string name="MAC">MAC Address</string>
+	<string name="DeviceIp">IP Address</string>
+	<string name="NETMASK">Subnet Mask</string>
+	<string name="GATEWAY">Gateway</string>
+	<string name="VoiceId">Voice ID</string>
+	<string name="VoiceDomain">Voice Gateway</string>
+	<string name="ServerIP">Server IP</string>
+	<string name="InputServer">Please enter server address and port</string>
+	<string name="ServerTag">Only numbers and decimal points are allowed</string>
+	<string name="ServerIPWrong">Server address is incorrect</string>
+	<string name="InputPassword">Please enter password</string>
+	<string name="PasswordWrong">Password is incorrect</string>
+	<string name="PasswordTag">Password is only 3 digits</string>
+	<string name="PasswordText">3-digit password</string>
+	<string name="PasswordInput">Enter Password</string>
+	<string name="RestartTime">Restart Countdown:</string>
+	<string name="ScanQRCode">Scan QR Code</string>
+    <!-- 设置界面 -->
+	<string name="SettingText">Device Settings</string>
+	<string name="IsLight">Always On</string>
+	<string name="IsVolume">Enable Volume Control</string>
+	<string name="ThemeChoice">Choose Theme Color</string>
+	<string name="Blue">Blue</string>
+	<string name="Red">Red</string>
+	<string name="ModeChoice">Choose Display Mode</string>
+	<string name="ChooseLang">Choose Language</string>>
+    <!-- 测试界面 -->
+	<string name="DebugText">Device Debugging</string>
+	<string name="InputSip">Please enter target SIP account</string>
+	<string name="InputSipMsg">Enter account for testing</string>
+	<string name="OtherDevicesTest">External Device Test</string>
+	<string name="OtherDevicesTestMsg">Please check if external devices are connected before starting the test</string>
+	<string name="ChangeToRtc">Switch to RTC Call</string>
+	<string name="ChangeToSip">Switch to SIP Call</string>
+	<string name="HandleKeys">Handle Button Test</string>
+	<string name="PanelCallKeys">Panel Call Button Test</string>
+	<string name="PanelCancelKeys">Panel Cancel Button Test</string>
+	<string name="SosKeys">SOS Button Test</string>
+	<string name="RecordTest">Recording Test</string>
+	<string name="RecordText">Click the recording test button to test the microphone</string>
+	<string name="RecordStart">Recording started, recording time 5 seconds</string>
+	<string name="RecordPlay">Recording ended, starting playback</string>
+	<string name="RecordStop">Recording playback ended</string>
+	<string name="RecordFailed">Recording failed</string>
+	<string name="DoorLightTest">Door Light Test</string>
+	<string name="ColorTest">Color Test</string>
+    <!-- 颜色测试界面 -->
+	<string name="ColorMsg">Click to change color</string>
+	<string name="ContactButton">Contact Button Interface</string>
+    <!-- 错误提示 -->
+	<string name="NoBedList">No beds in the current room</string>
+	<string name="NoCustomer">No occupants in the current room</string>
+	<string name="NoBedDevice">No device on the current bed, call failed</string>
+	<string name="AccountPasswordError">Account or password is incorrect</string>
+	<string name="WrongPassword">Password is incorrect</string>
+	<string name="ConfigureEmployeeID">Please configure employee ID first</string>
+	<string name="PassNoError">Employee not found for this card</string>
+    <string name="NotActivity">No Activity</string>
+    <!-- 版本界面 -->
+	<string name="VersionTitle">Version Upgrade</string>
+	<string name="VersionInfo">Version Information</string>
+	<string name="VersionNow">Current Device Version</string>
+	<string name="VersionNoNow">Current Version Number</string>
+	<string name="Version">Version Name</string>
+	<string name="VersionNo">Version Number</string>
+	<string name="VersionMsg">Are you sure you want to restart the device?</string>
+	<string name="GetVersionFailed">Failed to get version, error code</string>
+	<string name="Searching">Searching...</string>
+	<string name="IsTheLastVersion">This is the latest version</string>
+	<string name="FindNewVersion">New version found</string>
+	<string name="Downloading">Downloading</string>
+	<string name="EthernetDisconnect">Not connected to network</string>
+	<string name="DownloadFailed">Download failed, error code</string>
+</resources>

i18n/es_ES-西班牙语.tr

@@ -0,0 +1,303 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- 时间相关 -->
+	<string name="Year">-</string>
+	<string name="Month">-</string>
+	<string name="Day"> </string>
+    <string name="Monday">Lunes</string>
+    <string name="Tuesday">Martes</string>
+    <string name="Wednesday">Miércoles</string>
+    <string name="Thursday">Jueves</string>
+    <string name="Friday">Viernes</string>
+    <string name="Saturday">Sábado</string>
+    <string name="Sunday">Domingo</string>
+    <!-- 按钮 -->
+    <string name="Home">Inicio</string>
+    <string name="Healthcare">Atención médica</string>
+    <string name="More">Más</string>
+    <string name="Fee">Tarifa</string>
+    <string name="Help">Ayuda</string>
+	<string name="HelpInfo">Ayuda enviada, espere respuesta</string>
+	<string name="HelpResponse">Ayuda respondiendo, enfermera en camino</string>
+    <string name="Call">Llamar</string>
+    <string name="Reboot">Reiniciar dispositivo</string>
+    <string name="SettingServerIP">Configuración del servidor</string>
+    <string name="SettingNet">Configuración de red</string>
+    <string name="SoftVersion">Versión del software</string>
+    <string name="SoftInitialization">Inicializar versión</string>
+    <string name="SoftDown">Descargar</string>
+    <string name="SoftVersionCheck">Actualizar versión</string>
+    <string name="SoftUpdateNow">Actualizar ahora</string>
+    <string name="Setting">Entrar a la configuración</string>
+    <string name="Test">Entrar al modo de prueba</string>
+    <string name="Confirm">Confirmar</string>
+    <string name="Cancel">Cancelar</string>
+    <string name="Save">Guardar</string>
+    <string name="Back">Volver</string>
+    <string name="CallBed">Llamar a la cama</string>
+    <string name="CallNurse">Llamar</string>
+    <string name="CallCencel">Cancelar llamada</string>
+    <string name="CallInfo">Iniciar llamada</string>
+    <string name="SOSCallInfo">Iniciar llamada de emergencia</string>
+    <string name="Voice">Voz</string>
+    <!-- 首页 -->
+    <string name="Room">Habitación</string>
+	<string name="InBedNum">Pacientes</string>
+	<string name="EmptyBedNum">Camas Libres</string>
+    <string name="EmptyBed">Cama vacía</string>
+    <string name="EmptyCustomer">Sin ocupante</string>
+	<string name="None">Ninguno</string>
+	<string name="BedNum">Número de cama</string>
+	<string name="Woman">Mujer</string>
+	<string name="Man">Hombre</string>
+	<string name="Unknown">Desconocido</string>
+	<string name="NurseConfig">Elementos de cuidado</string>
+	<string name="Oxygen">Cuenta atrás de oxígeno</string>
+	<string name="OxygenInhalation">Inhalación de oxígeno</string>
+	<string name="SkinTest">Prueba de piel</string>
+	<string name="Infusion">Infusión</string>
+	<string name="SettingTime">Tiempo personalizado</string>
+	<string name="CountdownProgress">Cuenta atrás en curso</string>
+	<string name="CountdownCancel">¿Cancelar cuenta atrás?</string>
+	<string name="CountdownEnded">Cuenta atrás finalizada</string>
+	<string name="Description">Descripción:</string>
+	<string name="Advice">Consejo médico</string>
+	<string name="AdviceType">Tipo de consejo</string>
+	<string name="LONG_TERM">Largo plazo</string>
+	<string name="TEMP">Temporal</string>
+	<string name="LoseEfficacy">Perder eficacia</string>
+	<string name="TakeEffect">Entrar en vigor</string>
+	<string name="StartTime">Hora de inicio:</string>
+	<string name="EndTime">Hora de finalización:</string>
+	<string name="Content">Contenido</string>
+	<string name="Detail">Parámetros</string>
+	<string name="ResponsibleDoctor">Médico responsable</string>
+	<string name="ResponsibleNurse">Enfermera responsable</string>
+	<string name="Director">Director del departamento</string>
+	<string name="HeadNurse">Enfermera jefe</string>
+    <!-- 功能界面 -->
+	<string name="CallableBeds">Camas llamables actuales</string>
+	<string name="ConfirmCall">Confirmar llamada</string>
+	<string name="CancelCall">Cancelar llamada</string>
+	<string name="LogoutMedicalCareMsg">¿Salir de cuidados?</string>
+	<string name="ConfirmLogout">Confirmar cierre de sesión</string>
+	<string name="CancelLogoutl">Cancelar cierre de sesión</string>
+	<string name="PostitionedMsg">Posición actual localizada:</string>
+	<string name="RoomPatrolMsg">Ronda de habitación completada:</string>
+	<string name="PromptQuit">Mensaje de aviso finalizado</string>
+	<string name="RebootDevice">Rein. Disp.</string>
+	<string name="RebootPower">Rein. Pow.</string>
+	<string name="RebootLine">Rein. Lína.</string>
+	<string name="ThemeBlue">¿Cambiar el color del tema a azul?</string>
+	<string name="ThemeRed">¿Cambiar el color del tema a rojo?</string>
+	<string name="ThemeConfirm">Cambiar tema, reiniciará</string>
+	<string name="Mode1">¿Cambiar a modo 1?</string>
+	<string name="Mode2">¿Cambiar a modo 2?</string>
+	<string name="Mode3">¿Cambiar a modo 3?</string>
+	<string name="ModeConfirm">Confirmar que cambiar el modo reiniciará el dispositivo</string>
+	<string name="SosDisconnected">Botón de emergencia desconectado</string>
+	<string name="HandleDisconnected">Mando desconectado</string>
+	<string name="GainCall">Llamada de extensión, clic para responder</string>
+    <!-- 医护界面 -->
+	<string name="MedicalLoginMsg">Por favor, introduzca la contraseña correcta para acceder a las funciones de atención médica</string>
+	<string name="InputMedicalPassword">Introducir contraseña para acceder a la atención médica</string>
+	<string name="InputMedicalPasswordMsg">La contraseña consiste en números</string>
+	<string name="JobNumber">Número de empleado</string>
+	<string name="Password">Contraseña</string>
+	<string name="NfcText">Toca tarjeta NFC para entrar</string>
+	<string name="NfcMsgText">Un NFC válido acercado con éxito permitirá el acceso directo a la atención médica</string>
+	<string name="EnteringMedicalCare">Accediendo a la atención médica</string>
+	<string name="ChooseMsg">Por favor, seleccione al empleado correspondiente para acceder a las funciones de atención médica</string>
+	<string name="Hello">Hola,</string>
+	<string name="MedicalCareMsg">Esta es su sección personal de atención médica</string>
+	<string name="LogoutMedicalCare">Salir de la atención médica</string>
+	<string name="Position">Localización</string>
+	<string name="Positioned">Localizado</string>
+	<string name="RoomPatrol">Ronda de habitación</string>
+	<string name="RoomPatrolCompleted">Ronda de habitación completada</string>
+	<string name="Nursing">Entrar en cuidados</string>
+	<string name="NursingMsg">Cama en cuidados</string>
+	<string name="SetNursingMsg">¿Establecer en modo de cuidados?</string>
+	<string name="InNursing">En Cuidados</string>
+	<string name="NursingEnd">Finalizar cuidados</string>
+	<string name="SetNursingEndMsg">La cama actualmente está en modo de cuidados, ¿confirmar para salir?</string>
+	<string name="Prompt">Mensaje</string>
+	<string name="PromptMsg">Mostrar en pantalla de bloqueo</string>
+    <!-- 提示语界面 -->
+	<string name="SetPrompt">Establecer mensaje de aviso</string>
+	<string name="CustomInput">Entrada personalizada</string>
+	<string name="QuickPrompt">Mensajes de aviso rápidos</string>
+	<string name="SetPromptTime">Establecer tiempo de aviso</string>
+	<string name="StartPrompt">Comenzar configuración</string>
+	<string name="BeQuiet">Mantener silencio</string>
+	<string name="DoNotDisturb">No molestar, cuidados en curso</string>
+	<string name="KeepQuiet">No hacer ruido</string>
+	<string name="DoNotVisit">No visitar</string>
+	<string name="InRestroom">Usando el baño, no entrar</string>
+	<string name="DoNotGather">No agruparse</string>
+	<string name="5Minutes">5 minutos</string>
+	<string name="10Minutes">10 minutos</string>
+	<string name="15Minutes">15 minutos</string>
+	<string name="20Minutes">20 minutos</string>
+	<string name="30Minutes">30 minutos</string>
+	<string name="45Minutes">45 minutos</string>
+	<string name="60Minutes">60 minutos</string>
+	<string name="90Minutes">90 minutos</string>
+	<string name="120Minutes">120 minutos</string>
+	<string name="ExitPrompt">Salir del aviso</string>
+    <!-- 通话界面 -->
+	<string name="RemoteRefuse">Rechazo remoto</string>
+	<string name="RemoteBusy">Ocupado remoto</string>
+	<string name="CallFailed">Llamada fallida</string>
+	<string name="Calling">Llamando</string>
+	<string name="CallConfirmed">En llamada</string>
+	<string name="CallConnecting">Conectando llamada</string>
+	<string name="CallInComing">Llamada entrante</string>
+	<string name="CallOutTitle">Llamar a enfermera</string>
+	<string name="Call">Llamar</string>
+	<string name="NotFound">No se encontró el SIP del dispositivo objetivo, llamada fallida</string>
+	<string name="RequestTimes">Conexión de llamada anormal, por favor intente llamar nuevamente</string>
+    <!-- 更多界面 -->
+	<string name="DeviceInfo">Datos Disp.</string>
+	<string name="DeviceDebug">Dep. Disp.</string>
+	<string name="Null">Ninguno</string>
+	<string name="InDate">Fecha de ingreso</string>
+	<string name="Advice">Consejo médico</string>
+	<string name="DeviceId">ID Disp.</string>
+	<string name="DeviceSign">ID Interno</string>
+	<string name="MAC">MAC</string>
+	<string name="DeviceIp">IP</string>
+	<string name="NETMASK">NETMASK</string>
+	<string name="GATEWAY">GATEWAY</string>
+	<string name="VoiceId">ID de Voz</string>
+	<string name="VoiceDomain">Dom. Voz</string>
+	<string name="ServerIP">Servidor IP</string>
+	<string name="InputServer">Por favor, introduzca la dirección y puerto del servidor</string>
+	<string name="ServerTag">Solo se permiten números y puntos decimales</string>
+	<string name="ServerIPWrong">La dirección del servidor es incorrecta</string>
+	<string name="InputPassword">Por favor, introduzca la contraseña</string>
+	<string name="PasswordWrong">Contraseña incorrecta</string>
+	<string name="PasswordTag">La contraseña solo tiene 3 dígitos</string>
+	<string name="PasswordText">Contraseña de 3 dígitos</string>
+	<string name="PasswordInput">Introducir contraseña</string>
+	<string name="RestartTime">Cuenta atrás para reinicio:</string>
+	<string name="ScanQRCode">Escanear código QR</string>
+    <!-- 设置界面 -->
+	<string name="SettingText">Configuración del dispositivo</string>
+	<string name="IsLight">Siempre encendido</string>
+	<string name="IsVolume">Activar control de volumen</string>
+	<string name="ThemeChoice">Elegir color del tema</string>
+	<string name="Blue">Azul</string>
+	<string name="Red">Rojo</string>
+	<string name="ModeChoice">Elegir modo de visualización</string>
+	<string name="ChooseLang">Elegir idioma</string>
+    <!-- 测试界面 -->
+	<string name="DebugText">Depuración del dispositivo</string>
+	<string name="InputSip">Por favor, introduzca la cuenta SIP objetivo</string>
+	<string name="InputSipMsg">Introducir cuenta para prueba</string>
+	<string name="OtherDevicesTest">Prueba de dispositivos externos</string>
+	<string name="OtherDevicesTestMsg">Por favor, compruebe si los dispositivos externos están conectados antes de comenzar la prueba</string>
+	<string name="ChangeToRtc">Cambiar a llamada RTC</string>
+	<string name="ChangeToSip">Cambiar a llamada SIP</string>
+	<string name="HandleKeys">Prueba de botones del mando</string>
+	<string name="PanelCallKeys">Prueba de botones de llamada del panel</string>
+	<string name="PanelCancelKeys">Prueba de botones de cancelación del panel</string>
+	<string name="SosKeys">Prueba de botones SOS</string>
+	<string name="RecordTest">Prueba de grabación</string>
+	<string name="RecordText">Haga clic en el botón de prueba de grabación para probar el micrófono</string>
+	<string name="RecordStart">Grabación iniciada, tiempo de grabación 5 segundos</string>
+	<string name="RecordPlay">Grabación finalizada, comenzando reproducción</string>
+	<string name="RecordStop">Reproducción de grabación finalizada</string>
+	<string name="RecordFailed">Grabación fallida</string>
+	<string name="DoorLightTest">Prueba de luz de la puerta</string>
+	<string name="ColorTest">Prueba de color</string>
+    <!-- 颜色测试界面 -->
+	<string name="ColorMsg">Haga clic para cambiar de color</string>
+	<string name="ContactButton">Interfaz de botón de contacto</string>
+    <!-- 错误提示 -->
+	<string name="NoBedList">No hay camas en la habitación actual</string>
+	<string name="NoCustomer">No hay usuarios ingresados en la habitación actual</string>
+	<string name="NoBedDevice">No hay dispositivo en la cama actual, llamada fallida</string>
+	<string name="AccountPasswordError">Cuenta o contraseña incorrecta</string>
+	<string name="WrongPassword">Contraseña incorrecta</string>
+	<string name="ConfigureEmployeeID">Por favor, configure primero el número de empleado</string>
+	<string name="PassNoError">No se encontró al empleado de esta tarjeta</string>
+	<string name="NotActivity">Sin actividad</string>
+    <!-- 版本界面 -->
+	<string name="VersionTitle">Actualización de versión</string>
+	<string name="VersionInfo">Información de versión</string>
+	<string name="VersionNow">Versión actual del dispositivo</string>
+	<string name="VersionNoNow">Número de versión actual</string>
+	<string name="Version">Nombre de la versión</string>
+	<string name="VersionNo">Número de versión</string>
+	<string name="VersionMsg">¿Está seguro de que desea reiniciar el dispositivo?</string>
+	<string name="GetVersionFailed">Error al obtener la versión, código de error</string>
+	<string name="Searching">Consultando...</string>
+	<string name="IsTheLastVersion">Esta es la última versión</string>
+	<string name="FindNewVersion">Se ha encontrado una nueva versión</string>
+	<string name="Downloading">Descargando</string>
+	<string name="EthernetDisconnect">No hay conexión a la red</string>
+	<string name="DownloadFailed">Error de descarga, código de error</string>
+	<!-- 内置 -->
+	<string name="sys_setup">Configuración</string>
+	<string name="sys_developer_options">Opciones para desarrolladores</string>
+	<string name="sys_debug_switch">Interruptor de depuración</string>
+	<string name="sys_net_setup">Configuración de red</string>
+	<string name="sys_wifi_setup">Configuración de WIFI</string>
+	<string name="sys_lte4g_setup">Configuración de 4G</string>
+	<string name="sys_hotspot_setup">Configuración de punto de acceso</string>
+	<string name="sys_ethernet_setup">Configuración de Ethernet</string>
+	<string name="sys_hotspot_switch">Activar/Desactivar punto de acceso</string>
+	<string name="sys_hotspot_name">Nombre del punto de acceso:</string>
+	<string name="sys_hotspot_password">Contraseña del punto de acceso:</string>
+	<string name="sys_show_password">Mostrar contraseña</string>
+	<string name="sys_save">Guardar</string>
+	<string name="sys_lang_setup">Configuración de idioma</string>
+	<string name="sys_cancel">Cancelar</string>
+	<string name="sys_confirm">Confirmar</string>
+	<string name="sys_lang_switch_tip">¿Desea cambiar el idioma del sistema a %s?</string>
+	<string name="sys_wifi_name">Nombre:</string>
+	<string name="sys_wifi_encryption_method">Método de encriptación:</string>
+	<string name="sys_wifi_encryption_encrypted">Encriptado</string>
+	<string name="sys_wifi_encryption_open">Abierto</string>
+	<string name="sys_wifi_password">Contraseña:</string>
+	<string name="sys_wifi_status">Estado:</string>
+	<string name="sys_wifi_connect">Conectar</string>
+	<string name="sys_wifi_disconnect">Desconectar</string>
+	<string name="sys_wifi_status_authenticating">Autenticando...</string>
+	<string name="sys_wifi_status_handshake">Obteniendo IP...</string>
+	<string name="sys_wifi_status_connected">Conectado</string>
+	<string name="sys_wifi_ip_addr">Dirección IP:</string>
+	<string name="sys_wifi_mac_addr">Dirección MAC:</string>
+	<string name="sys_wifi_password_error">Error de contraseña</string>
+	<string name="sys_lte4g_manufacturer">Fabricante:</string>
+	<string name="sys_lte4g_version">Versión:</string>
+	<string name="sys_ethernet_connect_type">Tipo de conexión</string>
+	<string name="sys_ethernet_dynamic_ip">Obtener IP automáticamente</string>
+	<string name="sys_ethernet_static_ip">IP estática</string>
+	<string name="sys_ethernet_ip_addr">Dirección IP</string>
+	<string name="sys_ethernet_mask">Máscara de subred</string>
+	<string name="sys_ethernet_gateway">Puerta de enlace predeterminada</string>
+	<string name="sys_ethernet_first_dns">Servidor DNS principal</string>
+	<string name="sys_ethernet_second_dns">Servidor DNS secundario</string>
+	<string name="sys_ethernet_save_ok">Guardado exitosamente</string>
+	<string name="sys_ethernet_save_error">Error al guardar</string>
+	<string name="sys_touch_calibration">Calibración de toque</string>
+	<string name="sys_upgrade">Actualizar</string>
+	<string name="sys_upgrade_need_reboot">El sistema reiniciará para actualizar</string>
+	<string name="sys_upgrade_success">Actualización exitosa, el sistema reiniciará</string>
+	<string name="sys_upgrade_fail">La actualización falló</string>
+	<string name="sys_upgrade_pack_format_error">El formato del paquete de actualización es incorrecto, por favor genere uno nuevo!</string>
+	<string name="sys_upgrade_type_no_match_error">El modelo del paquete de actualización no coincide!</string>
+	<string name="sys_upgrade_forbid_error">La actualización está prohibida!</string>
+	<string name="sys_upgrade_image_size_error">La imagen es mayor que el tamaño de la partición, la actualización falló</string>
+	<string name="sys_upgrade_logo_size_error">La resolución de la imagen del logotipo de inicio es mayor que la del monitor, la actualización falló</string>
+	<string name="sys_upgrade_not_support_logo_error">No se admite la actualización del logotipo de inicio, la actualización falló</string>
+	<string name="sys_exit">Salir</string>
+	<string name="sys_upgrade_warning">En proceso de actualización, no desconecte la energía</string>
+	<string name="sys_upgrade_ts_tip_warning">Atención: Después de la actualización, por favor elimine el archivo ts.cfg en la tarjeta T para evitar una actualización repetida!</string>
+	<string name="sys_ts_type">Tipo:</string>
+	<string name="sys_ts_version">Versión:</string>
+	<string name="sys_ts_pix">Resolución:</string>
+	<string name="sys_ts_date">Fecha:</string>
+</resources>

i18n/zh_CN.tr

@@ -75,7 +75,6 @@
     <string name="ResponsibleNurse">责任护士</string>
     <string name="Director">科主任</string>
     <string name="HeadNurse">护士长</string>
-    <!-- 导航栏 -->
     <!-- 功能界面 -->
     <string name="CallableBeds">当前可呼叫床位</string>
     <string name="ConfirmCall">确认呼叫</string>
@@ -98,6 +97,7 @@
     <string name="ModeConfirm">确认切换模式后，本机会重启</string>
     <string name="SosDisconnected">紧急按钮已断连</string>
     <string name="HandleDisconnected">手柄已断连</string>
+    <string name="GainCall">分机正在呼叫，可以点击接听按钮进行接听</string>
     <!-- 医护界面 -->
     <string name="MedicalLoginMsg">请输入正确的密码，进入医护功能</string>
     <string name="InputMedicalPassword">输入密码进入医护</string>
@@ -190,6 +190,7 @@
     <string name="Blue">蓝</string>
     <string name="Red">红</string>
     <string name="ModeChoice">选择显示模式</string>
+    <string name="ChooseLang">选择语言</string>
     <!-- 测试界面 -->
     <string name="DebugText">设备调试</string>
     <string name="InputSip">请输入目标SIP账号</string>
@@ -221,6 +222,7 @@
     <string name="WrongPassword">密码错误</string>
     <string name="ConfigureEmployeeID">请先配置员工工号</string>
     <string name="PassNoError">未找到该卡员工</string>
+    <string name="NotActivity">暂无界面</string>
     <!-- 版本界面 -->
     <string name="VersionTitle">版本升级</string>
     <string name="VersionInfo">版本信息</string>
@@ -236,4 +238,4 @@
     <string name="Downloading">下载中</string>
     <string name="EthernetDisconnect">未连接网络</string>
     <string name="DownloadFailed">下载错误，错误码</string>
-</resources>
+</resources>

jni/activity/settingActivity.cpp

@@ -4,6 +4,10 @@
 #include "settingActivity.h"
 
 /*TAG:GlobalVariable全局变量*/
+static ZKButton* mZhCnButtonPtr;
+static ZKButton* mEsEsButtonPtr;
+static ZKButton* mEnUsButtonPtr;
+static ZKTextView* mChooseLangTextViewPtr;
 static ZKRadioGroup* mModeRadioGroupPtr;
 static ZKTextView* mModeTextViewPtr;
 static ZKRadioGroup* mThemeRadioGroupPtr;
@@ -53,6 +57,9 @@ typedef struct {
 
 /*TAG:ButtonCallbackTab按键映射表*/
 static S_ButtonCallback sButtonCallbackTab[] = {
+    ID_SETTING_ZhCnButton, onButtonClick_ZhCnButton,
+    ID_SETTING_EsEsButton, onButtonClick_EsEsButton,
+    ID_SETTING_EnUsButton, onButtonClick_EnUsButton,
     ID_SETTING_sys_back, onButtonClick_sys_back,
     ID_SETTING_TestButton, onButtonClick_TestButton,
 };
@@ -149,6 +156,10 @@ settingActivity::~settingActivity() {
     unregisterProtocolDataUpdateListener(onProtocolDataUpdate);
     onUI_quit();
     mActivityPtr = NULL;
+    mZhCnButtonPtr = NULL;
+    mEsEsButtonPtr = NULL;
+    mEnUsButtonPtr = NULL;
+    mChooseLangTextViewPtr = NULL;
     mModeRadioGroupPtr = NULL;
     mModeTextViewPtr = NULL;
     mThemeRadioGroupPtr = NULL;
@@ -170,6 +181,10 @@ const char* settingActivity::getAppName() const{
 //TAG:onCreate
 void settingActivity::onCreate() {
 	Activity::onCreate();
+    mZhCnButtonPtr = (ZKButton*)findControlByID(ID_SETTING_ZhCnButton);
+    mEsEsButtonPtr = (ZKButton*)findControlByID(ID_SETTING_EsEsButton);
+    mEnUsButtonPtr = (ZKButton*)findControlByID(ID_SETTING_EnUsButton);
+    mChooseLangTextViewPtr = (ZKTextView*)findControlByID(ID_SETTING_ChooseLangTextView);
     mModeRadioGroupPtr = (ZKRadioGroup*)findControlByID(ID_SETTING_ModeRadioGroup);if(mModeRadioGroupPtr!= NULL){mModeRadioGroupPtr->setCheckedChangeListener(this);}
     mModeTextViewPtr = (ZKTextView*)findControlByID(ID_SETTING_ModeTextView);
     mThemeRadioGroupPtr = (ZKRadioGroup*)findControlByID(ID_SETTING_ThemeRadioGroup);if(mThemeRadioGroupPtr!= NULL){mThemeRadioGroupPtr->setCheckedChangeListener(this);}

jni/activity/settingActivity.h

@@ -29,6 +29,10 @@
 #include "window/ZKSlideWindow.h"
 
 /*TAG:Macro宏ID*/
+#define ID_SETTING_ZhCnButton    20001
+#define ID_SETTING_EsEsButton    20003
+#define ID_SETTING_EnUsButton    20002
+#define ID_SETTING_ChooseLangTextView    50006
 #define ID_SETTING_ModeRadioButton3    22005
 #define ID_SETTING_ModeRadioButton2    22004
 #define ID_SETTING_ModeRadioButton1    22003

jni/logic/deviceInfoLogic.cc

@@ -421,13 +421,5 @@ static bool onButtonClick_RestartButton(ZKButton *pButton) {
     Intent* intent = new Intent();
 	intent->putExtra(functionWindows, "reboot");
 	EASYUICONTEXT->openActivity("functionActivity", intent);
-
-//	const char* req = "-1";
-//	TcpClient::instance()->sendMsg(req);
-//
-//    lightControl("CALLLED", "000F");
-//    //重启
-//	sync();
-//	reboot(RB_AUTOBOOT);
     return false;
 }

jni/logic/functionLogic.cc

@@ -215,7 +215,7 @@ void nursingEnd(string functionText) {
 	mFunctionTextViewPtr->setText(functionText);
 	mStateTextViewPtr->setVisible(true);
 	mStateTextViewPtr->setText(LANGUAGEMANAGER->getValue("SetNursingEndMsg"));
-	mFunctionButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "button/elliptic_pink.png");
+	mFunctionButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "button/elliptic_pink2.png");
 	mFunctionButtonPtr->setText(LANGUAGEMANAGER->getValue("NursingEnd"));
 	mFunctionWindowPtr->showWnd();
 }
@@ -280,6 +280,30 @@ void mode(string functionText) {
     mFunctionWindowPtr->showWnd();
 }
 
+void setLanguage(string functionText) {
+	mIconPainterPtr->setBackgroundPic("icon/chenggong.png");
+	if (functionText == "zh_CN") {
+		mFunctionTextViewPtr->setText("切换成中文");
+		mFunctionButtonPtr->setText("确定");
+	}
+	else if (functionText == "en_US") {
+		mFunctionTextViewPtr->setText("Switch to English");
+		mFunctionButtonPtr->setText("Confirm");
+	}
+	else if (functionText == "es_ES") {
+		mFunctionTextViewPtr->setText("Cambiar al español");
+		mFunctionButtonPtr->setText("Determinar");
+	}
+	mStateTextViewPtr->setVisible(false);
+    if (functionThemeInt == 1) {
+        mFunctionButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "button/elliptic_bule2.png");
+    }
+    else if (functionThemeInt == 2) {
+        mFunctionButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "button/elliptic_pink2.png");
+    }
+	mFunctionWindowPtr->showWnd();
+}
+
 
 
 
@@ -367,6 +391,14 @@ static void onUI_intent(const Intent *intentPtr) {
             _functionText = intentPtr->getExtra(functionText);
             mode(_functionText);
         }
+		else if (_functionWindows == "language") {
+			_functionText = intentPtr->getExtra(functionText);
+			 setLanguage(_functionText);
+		}
+		else {
+			_warnText = LANGUAGEMANAGER->getValue("NotActivity");
+			warn(_warnText);
+		}
     }
 }
 
@@ -563,9 +595,7 @@ static bool onButtonClick_FunctionButton(ZKButton *pButton) {
     	else if (_functionText == "红色") {
             StoragePreferences::putInt(STORE_THEME, 2);
     	}
-		sync();
-		reboot(RB_AUTOBOOT);
-		EASYUICONTEXT->closeActivity("functionActivity");
+    	deviceReboot();
     }
     else if (_functionWindows == "mode") {
         if (_functionText == "模式1") {
@@ -577,8 +607,11 @@ static bool onButtonClick_FunctionButton(ZKButton *pButton) {
         else if (_functionText == "模式3") {
             StoragePreferences::putInt(STORE_MODE, 3);
         }
-        sync();
-        reboot(RB_AUTOBOOT);
+        deviceReboot();
+    }
+    else if (_functionWindows == "language") {
+    	StoragePreferences::putString(STORE_LANG, _functionText);
+    	deviceReboot();
     }
 
     return false;
@@ -715,13 +748,7 @@ static bool onButtonClick_ServerConfirmButton(ZKButton *pButton) {
     StoragePreferences::putString(STORE_GATEWAY, mServerIpEditTextPtr->getText().c_str());
     StoragePreferences::putInt(STORE_HTTP_PORT, std::atoi(mServerPortEditTextPtr->getText().c_str()));
 
-	const char* req = "-1";
-	TcpClient::instance()->sendMsg(req);
-
-    lightControl("CALLLED", "000F");
-    //重启
-    sync();
-    reboot(RB_AUTOBOOT);
+	deviceReboot();
     return false;
 }
 
@@ -734,13 +761,7 @@ static bool onButtonClick_ServerCancelButton(ZKButton *pButton) {
 }
 static bool onButtonClick_RebootDeviceButton(ZKButton *pButton) {
     LOGD(" ButtonClick RebootDeviceButton !!!\n");
-	const char* req = "-1";
-	TcpClient::instance()->sendMsg(req);
-
-    lightControl("CALLLED", "000F");
-	//重启
-	sync();
-	reboot(RB_AUTOBOOT);
+	deviceReboot();
     return false;
 }
 

jni/logic/moreLogic.cc

@@ -85,7 +85,7 @@ void getDeviceMenu() {
 			if (count == 0) {
 				Json::Value deviceInfo;
 				deviceInfo["icon_src"] = deviceInfoPic;
-				deviceInfo["name"] = "设备信息";
+				deviceInfo["name"] = LANGUAGEMANAGER->getValue("DeviceInfo");
 				deviceInfo["introduction"] = "查看信息和设置";
 				deviceInfo["act_name"] = "deviceInfoActivity";
 				deviceMenus.append(deviceInfo);
@@ -112,14 +112,14 @@ static void onUI_init(){
     //Tips :添加 UI初始化的显示代码到这里,如:mText1Ptr->setText("123");
 
 	deviceMenus[0]["icon_src"] = deviceInfoPic;
-	deviceMenus[0]["name"] = "设备信息";
+	deviceMenus[0]["name"] = LANGUAGEMANAGER->getValue("DeviceInfo");
 	deviceMenus[0]["introduction"] = "查看信息和设置";
 	deviceMenus[0]["act_name"] = "deviceInfoActivity";
 
 	deviceMenus[1]["icon_src"] ="/more/keshi.png";
-	deviceMenus[1]["name"] = "呼叫床位";
+	deviceMenus[1]["name"] = LANGUAGEMANAGER->getValue("CallBed");
 	deviceMenus[1]["introduction"] = "呼叫床位分机";
-	deviceMenus[0]["act_name"] = "callBedActivity";
+	deviceMenus[1]["act_name"] = "callBedActivity";
 //
 //	deviceMenus[2]["icon_src"] ="/more/yiyuan.png";
 //	deviceMenus[2]["name"] = "医院简介";
@@ -230,37 +230,13 @@ static void obtainListItemData_DeviceMenuListView(ZKListView *pListView,ZKListVi
 static void onListItemClick_DeviceMenuListView(ZKListView *pListView, int index, int id) {
     //LOGD(" onListItemClick_ DeviceMenuListView  !!!\n");
 
-	string name = deviceMenus[index]["name"].asString();
-	if (name == "设备信息") {
+	string actName = deviceMenus[index]["act_name"].asString();
+	if (actName == "deviceInfoActivity") {
 		EASYUICONTEXT->openActivity("deviceInfoActivity");
 	}
-	else if (name == "呼叫床位") {
+	else if (actName == "callBedActivity") {
 		Intent* intent = new Intent();
 		intent->putExtra(functionWindows, "callBed");
 		EASYUICONTEXT->openActivity("functionActivity", intent);
-//	    // 发送tcp, tcp_type = VOICE, tcp_action = CANCEL_BY_DOOR
-//		TcpModel tcpModel;
-//		tcpModel.tid = base::format("t%d",TimeHelper::getCurrentTime());
-//		tcpModel.type = TcpType::VOICE;
-//		tcpModel.action = VoiceAction::CANCEL_BY_DOOR;
-//		tcpModel.from_id = StoragePreferences::getInt(STORE_DEVICE_ID,0);
-//		std::string req = getTcpModelString(tcpModel);
-//		LOGD("TCP VOICE : %s",req.c_str());
-//
-//		std::string cencalByDoorTid = tcpModel.tid;
-//
-//		//回调注册
-//		TcpCallback callback;
-//		callback.tid = tcpModel.tid;
-//		callback.jsonStr = req;
-//		callback.onSuccess = [](Json::Value json){
-//			LOGD("side callback success");
-//			return 0;
-//		};
-//		callback.onFalied = [](Json::Value json){
-//			LOGD("side callback failed");
-//			return 0;
-//		};
-//		TcpClient::instance()->sendMsgWithCb(req.c_str(), callback);
 	}
 }

jni/logic/settingLogic.cc

@@ -211,3 +211,30 @@ static void onCheckedChanged_ModeRadioGroup(ZKRadioGroup* pRadioGroup, int check
     intent->putExtra(functionText, modeStr);
     EASYUICONTEXT->openActivity("functionActivity", intent);
 }
+
+static bool onButtonClick_ZhCnButton(ZKButton *pButton) {
+    LOGD(" ButtonClick ZhCnButton !!!\n");
+    Intent* intent = new Intent();
+	intent->putExtra(functionWindows, "language");
+	intent->putExtra(functionText, "zh_CN");
+	EASYUICONTEXT->openActivity("functionActivity", intent);
+    return false;
+}
+
+static bool onButtonClick_EnUsButton(ZKButton *pButton) {
+    LOGD(" ButtonClick EnUsButton !!!\n");
+    Intent* intent = new Intent();
+	intent->putExtra(functionWindows, "language");
+	intent->putExtra(functionText, "en_US");
+	EASYUICONTEXT->openActivity("functionActivity", intent);
+    return false;
+}
+
+static bool onButtonClick_EsEsButton(ZKButton *pButton) {
+    LOGD(" ButtonClick EsEsButton !!!\n");
+    Intent* intent = new Intent();
+	intent->putExtra(functionWindows, "language");
+	intent->putExtra(functionText, "es_ES");
+	EASYUICONTEXT->openActivity("functionActivity", intent);
+    return false;
+}

jni/logic/startLogic.cc

@@ -294,21 +294,10 @@ void handleMsg(byte* inBytes){
 			EASYUICONTEXT->openActivity("updateActivity", intent);
 		}
 		else if (tcpModel.action == DeviceAction::RESTART) {	// 重启设备
-			const char* req = "-1";
-			TcpClient::instance()->sendMsg(req);
-
-		    lightControl("CALLLED", "000F");
-			sync();
-			reboot(RB_AUTOBOOT);
+	    	deviceReboot();
 		}
         else if (tcpModel.action == DeviceAction::REBOOT) {
-            const char* req = "-1";
-            TcpClient::instance()->sendMsg(req);
-
-            lightControl("CALLLED", "000F");
-            //重启
-            sync();
-            reboot(RB_AUTOBOOT);
+        	deviceReboot();
         }
 		else if (tcpModel.action == DeviceAction::DEVICE_REFRESH) {	// 设备刷新
 			dataRefresh();
@@ -320,13 +309,7 @@ void handleMsg(byte* inBytes){
 			StoragePreferences::putString(STORE_GATEWAY, tcpModel.json["server_ip"].asCString());
 			StoragePreferences::putString(STORE_HTTP_PORT, tcpModel.json["server_port"].asCString());
 
-			const char* req = "-1";
-			TcpClient::instance()->sendMsg(req);
-
-		    lightControl("CALLLED", "000F");
-			//重启
-			sync();
-			reboot(RB_AUTOBOOT);
+	    	deviceReboot();
 		}
 	} else if (tcpModel.type == TcpType::DATA){
 		if (tcpModel.action == DataAction::REFRESH){	// 刷新数据
@@ -578,6 +561,16 @@ void setSleepTimerRegistered(bool result) {
 	}
 }
 
+
+void deviceReboot() {
+	LOGD("正在重启");
+	const char* req = "-1";
+	TcpClient::instance()->sendMsg(req);
+
+	sync();
+	reboot(RB_AUTOBOOT);
+}
+
 void screenOn() {
 	isSleep = false;
 	BRIGHTNESSHELPER->screenOn();
@@ -728,18 +721,19 @@ static S_ACTIVITY_TIMEER REGISTER_ACTIVITY_TIMER_TAB[] = {
  * 当界面构造时触发
  */
 static void onUI_init(){
+	EASYUICONTEXT->updateLocalesCode(StoragePreferences::getString(STORE_LANG, defaultLang).c_str());
 	//IO监测
-	IGpioListener *iGpioListenerA1 = new A1GpioListener();
-	GpioHelper::registerGpioListener("A1", iGpioListenerA1, E_GPIO_EDGE_TYPE_FALLING);
-
-	IGpioListener *iGpioListenerA2 = new A2GpioListener();
-	GpioHelper::registerGpioListener("A2", iGpioListenerA1, E_GPIO_EDGE_TYPE_FALLING);
-
-	IGpioListener *iGpioListenerA3 = new A3GpioListener();
-	GpioHelper::registerGpioListener("A3", iGpioListenerA1, E_GPIO_EDGE_TYPE_FALLING);
-
-	IGpioListener *iGpioListenerA4 = new A4GpioListener();
-	GpioHelper::registerGpioListener("A4", iGpioListenerA1, E_GPIO_EDGE_TYPE_FALLING);
+//	IGpioListener *iGpioListenerA1 = new A1GpioListener();
+//	GpioHelper::registerGpioListener("A1", iGpioListenerA1, E_GPIO_EDGE_TYPE_FALLING);
+//
+//	IGpioListener *iGpioListenerA2 = new A2GpioListener();
+//	GpioHelper::registerGpioListener("A2", iGpioListenerA1, E_GPIO_EDGE_TYPE_FALLING);
+//
+//	IGpioListener *iGpioListenerA3 = new A3GpioListener();
+//	GpioHelper::registerGpioListener("A3", iGpioListenerA1, E_GPIO_EDGE_TYPE_FALLING);
+//
+//	IGpioListener *iGpioListenerA4 = new A4GpioListener();
+//	GpioHelper::registerGpioListener("A4", iGpioListenerA1, E_GPIO_EDGE_TYPE_FALLING);
 
 	//TCP启动
 	TcpClient::instance()->startTcp();
@@ -1080,9 +1074,7 @@ static bool onUI_Timer(int id){
 
 	    if (netresetInt == 5) {
 	    	LOGD("网卡重启无效，程序内部重启");
-	    	//重启
-	    	sync();
-	    	reboot(RB_AUTOBOOT);
+	    	deviceReboot();
 	    }
 	}
 		break;

jni/logic/statusbar.cc

@@ -199,18 +199,6 @@ static void updateNetState(){
 
 			// 网卡重启
 			LOGD("断网300秒，网卡断电重启");
-//			std::string heartStr = "NETRESET,1F";
-//			LOGD("=====> the heartStr == %s", heartStr.c_str());
-//			const char* sendMsg = heartStr.c_str();
-//			sendProtocolTo(UART_TTYS2, (byte*)(sendMsg), strlen(sendMsg));
-//
-//			//重启
-//			sleep(5);
-//			LOGD("网卡重启无效，程序内部重启");
-//
-//		    lightControl("CALLLED", "000F");
-//			sync();
-//			reboot(RB_AUTOBOOT);
 			systemRestart();
 		}
 	}

jni/service/BusinessConfig.h

@@ -67,6 +67,10 @@
 
 #define STORE_MAC_ADDR "mac_addr"
 
+#define STORE_LANG "language"
+//static std::string defaultLang = "zh_CN";
+static std::string defaultLang = "en_US";
+
 static uint32_t redLightColour = 0xFFFEB8BF;
 static uint32_t redDeepColour = 0xFFF78B8F;
 static uint32_t buleLightColour = 0xFF759FFF;
@@ -192,6 +196,7 @@ void setClerk(std::string clerk_name, std::string pass_no, int _authItid);
 
 void nfcLogin(std::string revStr);
 
+void deviceReboot();
 void systemRestart();
 
 enum CallFinishType {