vothin 11 hónapja
szülő
commit
1c61c1717b
42 módosított fájl, 782 hozzáadás és 3 törlés
  1. 2 2
      .settings/com.zksw.flythings.easyui.prefs
  2. 315 1
      i18n/en_US.tr
  3. 381 0
      i18n/es_ES-西班牙语.tr
  4. 1 0
      i18n/zh_CN.tr
  5. 15 0
      jni/activity/settingActivity.cpp
  6. 4 0
      jni/activity/settingActivity.h
  7. 33 0
      jni/logic/functionLogic.cc
  8. 26 0
      jni/logic/settingLogic.cc
  9. 2 0
      jni/logic/startLogic.cc
  10. 3 0
      jni/service/BusinessConfig.h
  11. BIN
      libs/armeabi/libzkgui.so
  12. BIN
      obj/activity/callActivity.o
  13. BIN
      obj/activity/customerAffairActivity.o
  14. BIN
      obj/activity/deviceAddActivity.o
  15. BIN
      obj/activity/deviceInfoActivity.o
  16. BIN
      obj/activity/functionActivity.o
  17. BIN
      obj/activity/interactionActivity.o
  18. BIN
      obj/activity/mainActivity.o
  19. BIN
      obj/activity/medicalCareActivity.o
  20. BIN
      obj/activity/moreActivity.o
  21. BIN
      obj/activity/navibar.o
  22. BIN
      obj/activity/promptActivity.o
  23. BIN
      obj/activity/settingActivity.o
  24. BIN
      obj/activity/sipTestActivity.o
  25. BIN
      obj/activity/startActivity.o
  26. BIN
      obj/activity/statusbar.o
  27. BIN
      obj/activity/updateActivity.o
  28. BIN
      obj/core/update_assistant.o
  29. BIN
      obj/net/tcp_client.o
  30. BIN
      obj/net/tcp_model.o
  31. BIN
      obj/net/tcp_util.o
  32. BIN
      obj/server/http_server.o
  33. BIN
      obj/service/BusinessConfig.o
  34. BIN
      obj/service/time.o
  35. BIN
      obj/uart/UartContext.o
  36. BIN
      resources/Harmony_231030.ttf
  37. BIN
      resources/main/affair2.png
  38. BIN
      resources/main/affair2_grey.png
  39. BIN
      ui/deviceAdd.ftu
  40. BIN
      ui/deviceInfo.ftu
  41. BIN
      ui/main.ftu
  42. BIN
      ui/setting.ftu

+ 2 - 2
.settings/com.zksw.flythings.easyui.prefs

@@ -1,5 +1,5 @@
-easyui.cfg.debug={"baud"\:"115200","defBrightness"\:-1,"font"\:"/mnt/extsd/ui/Harmony_231030.ttf","languageCode"\:"zh_CN","languagePath"\:"/mnt/extsd/tr/","resPath"\:"/mnt/extsd/ui/","rotateScreen"\:0,"rotateTouch"\:0,"screensaverTimeOut"\:-1,"startupLibPath"\:"/mnt/extsd/lib/libzkgui.so","startupTouchCalib"\:false,"touchDev"\:"/dev/input/event1","uart"\:"ttyS1","zkdebug"\:false}
-easyui.cfg.release={"baud"\:"115200","defBrightness"\:-1,"font"\:"/res/ui/Harmony_231030.ttf","languageCode"\:"zh_CN","languagePath"\:"/res/tr/","resPath"\:"/res/ui/","rotateScreen"\:0,"rotateTouch"\:0,"screensaverTimeOut"\:-1,"startupLibPath"\:"/res/lib/libzkgui.so","startupTouchCalib"\:false,"touchDev"\:"/dev/input/event1","uart"\:"ttyS1","zkdebug"\:false}
+easyui.cfg.debug={"baud"\:"115200","defBrightness"\:-1,"font"\:"/mnt/extsd/ui/Harmony_240509.ttf","languageCode"\:"zh_CN","languagePath"\:"/mnt/extsd/tr/","resPath"\:"/mnt/extsd/ui/","rotateScreen"\:0,"rotateTouch"\:0,"screensaverTimeOut"\:-1,"startupLibPath"\:"/mnt/extsd/lib/libzkgui.so","startupTouchCalib"\:false,"touchDev"\:"/dev/input/event1","uart"\:"ttyS1","zkdebug"\:false}
+easyui.cfg.release={"baud"\:"115200","defBrightness"\:-1,"font"\:"/res/ui/Harmony_240509.ttf","languageCode"\:"zh_CN","languagePath"\:"/res/tr/","resPath"\:"/res/ui/","rotateScreen"\:0,"rotateTouch"\:0,"screensaverTimeOut"\:-1,"startupLibPath"\:"/res/lib/libzkgui.so","startupTouchCalib"\:false,"touchDev"\:"/dev/input/event1","uart"\:"ttyS1","zkdebug"\:false}
 eclipse.preferences.version=1
 platform={"name"\:"Z21","cprojectTemplateDir"\:"bundle/cproject/z21","internalCode"\:"z21"}
 resolution=800x480

+ 315 - 1
i18n/en_US.tr

@@ -1,4 +1,318 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="hello_world">Hello world!</string>
+    <!-- 时间相关 -->
+    <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">Fees</string>
+	<string name="Help">Reinforcement</string>
+	<string name="HelpInfo">Reinforcement has been sent, please wait</string>
+	<string name="HelpResponse">Your reinforcement has been responded, and nurse is 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">Initialization version</string>
+	<string name="SoftDown">Download</string>
+	<string name="SoftVersionCheck">Version update</string>
+	<string name="SoftUpdateNow">Upgrade 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">make a call</string>
+	<string name="SOSCallInfo">make a emergency call</string>
+	<string name="Voice">Voice</string>
+	<string name="BlueCode">Blue Code</string>
+    <!-- 首页 -->
+	<string name="Room">Room</string>
+	<string name="InBedNum">Occupied</string>
+	<string name="EmptyBedNum">Vacant</string>
+	<string name="EmptyBed">Empty bed</string>
+	<string name="EmptyCustomer">No occupancy</string>
+	<string name="None">No occupancy</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">Counting down</string>
+	<string name="CountdownCancel">Cancel countdown</string>
+	<string name="CountdownEnded">Countdown ended</string>
+	<string name="Description">Description:</string>
+	<string name="Advice">Advice</string>
+	<string name="AdviceType">Advice type</string>
+	<string name="LONG_TERM">Long-term</string>
+	<string name="TEMP">Temporary</string>
+	<string name="LoseEfficacy">Expired</string>
+	<string name="TakeEffect">Take effect</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"> director</string>
+	<string name="HeadNurse">Head nurse</string>
+	<string name="CustomerAffair">User affairs</string>
+	<string name="EventButton">Key event</string>
+	<string name="Logined">Logged in</string>
+	<string name="NfcLoginSuccess">NFC card login success</string>
+	<string name="NfcLogoutSuccess">NFC logged out</string>
+    <!-- 交互界面 -->
+	<string name="Recover">Recover list</string>
+	<string name="All">All</string>
+	<string name="NotReceived">Missed</string>
+	<string name="SOSCall">SOS Call</string>
+	<string name="EventCall">-Event</string>
+	<string name="ReinforceCall">Request Reinforcement</string>
+	<string name="CallIn">Incoming call-</string>
+	<string name="CallOut">Outgoing call-</string>
+	<string name="Responded">Responded</string>
+	<string name="NotRespond">Not responded</string>
+	<string name="Answered">Answered</string>
+	<string name="Not Answered">Unanswered</string>
+	<string name="Other">Other</string>
+	<string name="Sented">Sent</string>
+	<string name="Canceled">Canceled</string>
+	<string name="Completed">Completed</string>
+    <!-- 导航栏 -->
+    <!-- 功能界面 -->
+	<string name="CallableBeds">Currently callable beds</string>
+	<string name="ConfirmCall">Confirm call</string>
+	<string name="CancelCall">Cancel call</string>
+	<string name="LogoutMedicalCareMsg">Please confirm, do you want to log out of medical care? </string>
+	<string name="ConfirmLogout">Confirm Logout</string>
+	<string name="CancelLogoutl">Cancel Logout</string>
+	<string name="PostitionedMsg">Current location has been located:</string>
+	<string name="RoomPatrolMsg">Room patrol has been completed:</string>
+	<string name="PromptQuit">Prompt has ended</string>
+	<string name="RebootDevice">Reboot device</string>
+	<string name="RebootPower">Reboot device power</string>
+	<string name="RebootLine">Reboot line power</string>
+	<string name="ThemeBlue">Switch theme color to blue</string>
+	<string name="ThemeRed">Switch the theme color to red</string>
+	<string name="ThemeConfirm">After confirming the theme color switch, this device will reboot</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">After confirming the mode switch, the machine will restart</string>
+	<string name="IsExecuteAffair">Execute the user task</string>
+	<string name="EventCalled">-Event has been issued</string>
+	<string name="EventResponse">already responded-</string>
+	<string name="EventCompleteOrCancel">Complete or cancel</string>
+	<string name="BlueCodeMsg">Blue Code sent out</string>
+	<string name="PartFrameTreeMsg">No department data</string>
+	<string name="RoomFrameTreeMsg">No room data</string>
+	<string name="BedFrameTreeMsg">No bed data</string>
+	<string name="ChoicePartMsg">Select the department to register</string>
+	<string name="ChoiceRoomMsg">Select the room to register</string>
+	<string name="ChoiceBedMsg">Select the bed to register</string>
+	<string name="IsNfcLogout">Please confirm to log out? </string>
+	<string name="HCallSendSuccess">Call sent out</string>
+	<string name="SosDisconnected">Emergency button disconnected</string>
+	<string name="HandleDisconnected">handset disconnected</string>
+	<string name="Handle1Disconnected">handset 1 disconnected</string>
+	<string name="Handle2Disconnected">handset 2 disconnected</string>
+	<string name="Handle3Disconnected">handset 3 disconnected</string>
+	<string name="Handle4Disconnected">handset 4 disconnected</string>
+    <!-- 医护界面 -->
+	<string name="MedicalLoginMsg">Please enter the correct password to begin medical care</string>
+	<string name="InputMedicalPassword">Enter the password to begin medical care</string>
+	<string name="InputMedicalPasswordMsg">The password consists of numbers</string>
+	<string name="JobNumber">Job number</string>
+	<string name="Password">Password</string>
+	<string name="NfcText">Please use NFC card to begin medical care</string>
+	<string name="NfcMsgText">please Use a valid NFC card to begin medical care </string>
+	<string name="EnteringMedicalCare">begin medical care</string>
+	<string name="ChooseMsg">Please select the corresponding employee to begin medical care </string>
+	<string name="Hello">Hello,</string>
+	<string name="MedicalCareMsg">In your personal medical care section</string>
+	<string name="LogoutMedicalCare">Log out of medical care</string>
+	<string name="Position">Position</string>
+	<string name="Positioned">Positioned</string>
+	<string name="RoomPatrol">Room Patrol</string>
+	<string name="RoomPatrolCompleted">Room patrol completed</string>
+	<string name="Nursing">Nursing</string>
+	<string name="NursingMsg">This room has begun nursing</string>
+	<string name="SetNursingMsg">Set to nursing status? </string>
+	<string name="SetNursingMsg2">Entered nursing status</string>
+	<string name="InNursing">In Nursing</string>
+	<string name="NursingEnd">Nursing End</string>
+	<string name="SetNursingEndMsg">The above bed is in nursing. Confirm to exit? </string>
+	<string name="SetNursingEndMsg2">Exit nursing? </string>
+	<string name="Prompt">Set tips words</string>
+	<string name="PromptMsg">Lock screen display</string>
+    <!-- 提示语界面 -->
+	<string name="SetPrompt">Set tips words</string>
+	<string name="CustomInput">Custom input</string>
+	<string name="QuickPrompt">Quick tips</string>
+	<string name="SetPromptTime">Set tips time</string>
+	<string name="StartPrompt">Start setting</string>
+	<string name="BeQuiet">Keep quiet</string>
+	<string name="DoNotDisturb">Do not disturb during nursing</string>
+	<string name="KeepQuiet">Do not make loud noises</string>
+	<string name="DoNotVisit">Do not visit</string>
+	<string name="InRestroom">Do not enter during restroom</string>
+	<string name="DoNotGather">Do not gather too many people</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 tips</string>
+    <!-- 事务界面 -->
+	<string name="CustomerAffair">Customer Task</string>
+	<string name="AffairContent">Task Content</string>
+	<string name="PlanTime">Schedule Time</string>
+	<string name="AffairStatus">Task Status</string>
+	<string name="Execute">Execute</string>
+	<string name="Unexecuted">Unexecuted</string>
+	<string name="Executed">Executed</string>
+	<string name="AffairHandle">Operation</string>
+    <!-- 通话界面 -->
+	<string name="RemoteRefuse">Call Rejected</string>
+	<string name="RemoteBusy">Busy online</string>
+	<string name="CallFailed"> call failed</string>
+	<string name="Calling">Calling</string>
+	<string name="CallConfirmed">Calling</string>
+	<string name="CallConnecting">Connecting</string>
+	<string name="CallInComing">Incoming call</string>
+	<string name="CallOutTitle">Call nurse</string>
+	<string name="Call">Call</string>
+    <!-- 更多界面 -->
+	<string name="DeviceInfo">Equipment Info</string>
+	<string name="DeviceDebug">Device Reg</string>
+	<string name="Null">None</string>
+	<string name="InDate">Date of admission</string>
+	<string name="Advice">Doctor Advice</string>
+	<string name="DeviceId">ID</string>
+	<string name="DeviceSign">Device ID</string>
+	<string name="MAC">Device MAC</string>
+	<string name="DeviceIp">IP</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 the server address and port</string>
+	<string name="ServerTag">Only numbers and points can be entered</string>
+	<string name="ServerIPWrong">Server address wrong</string>
+	<string name="InputPassword">Please enter password</string>
+	<string name="PasswordWrong">Wrong password</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="DeviceAdd">Device registration</string>
+	<string name="DeviceLocal">this device</string>
+	<string name="DeviceExtension1">handset 1</string>
+	<string name="DeviceExtension2">handset 2</string>
+	<string name="DeviceExtension3">handset 3</string>
+	<string name="DeviceExtension4">handset 4</string>
+	<string name="Part">Department</string>
+	<string name="Room">Room</string>
+	<string name="Bed">Bed</string>
+	<string name="ConfirmAdd">Register</string>
+	<string name="DeviceAddMsg">Device name: this device Device type: 3</string>
+	<string name="DeviceAddMsg2">Device name: Handset 1 Device type: 4</string>
+	<string name="DeviceAddMsg3">Device name: Handset 2 Device type: 4</string>
+	<string name="DeviceAddMsg4">Device name: Handset 3 Device type: 4</string>
+	<string name="DeviceAddMsg5">Device name: Handset 4 Device type: 4</string>
+	<string name="DeviceAddMsg6">Registration ID: </string>
+	<string name="RoomDevice">Doorway screen</string>
+	<string name="BedDevice">Bedside terminal</string>
+	<string name="AddDeviceSuccess">Device registration successful</string>
+	<string name="HospitalList">Hospital list</string>
+	<string name="DeviceAddTitle">Registration Info</string>
+    <!-- 设置界面 -->
+	<string name="SettingText">Device settings</string>
+	<string name="IsLight">Is it always on</string>
+	<string name="IsVolume">Turn on volume control</string>
+	<string name="ThemeChoice">Select theme color</string>
+	<string name="Blue">Blue</string>
+	<string name="Red">Red</string>
+	<string name="ModeChoice">Select display mode</string>
+	<string name="ChooseLang">Select Language</string>
+    <!-- 测试界面 -->
+	<string name="DebugText">Device debugging</string>
+	<string name="InputSip">Please enter target SIP account</string>
+	<string name="InputSipMsg">Enter the account for testing</string>
+	<string name="OtherDevicesTest">External device test</string>
+	<string name="OtherDevicesTestMsg">Please check whether external device is 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">Handset key test</string>
+	<string name="PanelCallKeys">Panel call key test</string>
+	<string name="PanelCancelKeys">Panel cancel key test</string>
+	<string name="SosKeys">SOS key 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 starts, recording time is 5 seconds</string>
+	<string name="RecordPlay">Recording ends, start playing</string>
+	<string name="RecordStop">Recording playback ends</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">There are no beds in the current room</string>
+	<string name="NoCustomer">The room has a user</string>
+	<string name="NoBedDevice">There is no device in the current bed, call failed</string>
+	<string name="AccountPasswordError">Account or password error</string>
+	<string name="WrongPassword">Password error</string>
+	<string name="ConfigureEmployeeID">Please configure employee ID first</string>
+	<string name="PassNoError">The employee with this card can not be found</string>
+	<string name="AddDeviceErrorMsg">Registration failed, error code: </string>
+	<string name="DEVICE_MAC_REPEAT">MAC address already occurred</string>
+	<string name="DEVICE_FRAME_FAILED">Device type and space structure type do not match! </string>
+	<string name="AddDeviceFailed">Registration failed</string>
+	<string name="AddDeviceFrameFailed">No space id can be registered</string>
+	<string name="HandleError">Handset:</string>
+	<string name="NotAdd">Not registered</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 retrieve version, error code</string>
+	<string name="Searching">Searching...</string>
+	<string name="IsTheLastVersion">Already on the latest version</string>
+	<string name="FindNewVersion">New Version Found</string>
+	<string name="Downloading">Downloading</string>
+	<string name="EthernetDisconnect">Ethernet Disconnected</string>
+	<string name="DownloadFailed">Download failed, error code</string>
 </resources>

+ 381 - 0
i18n/es_ES-西班牙语.tr

@@ -0,0 +1,381 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<!-- 内置 -->
+	<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>
+	<!-- 时间相关 -->
+	<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="BedNum">Cama Núm.</string>
+	<string name="More">More</string>
+	<string name="Fee">Tarifas</string>
+	<string name="Help">Ayuda de Refuerzo</string>
+	<string name="HelpInfo">Petición de ayuda enviada, espere</string>
+	<string name="HelpResponse">Se ha respondido a su petición de auda, la enfermera está en camino</string>
+	<string name="Call">Llamada</string>
+	<string name="Reboot">Reiniciar</string>
+	<string name="SettingServerIP">IP del servidor</string>
+	<string name="SettingNet">Config. Red</string>
+	<string name="SoftVersion">Versión</string>
+	<string name="SoftInitialization">Versión inicial</string>
+	<string name="SoftDown">Descargar</string>
+	<string name="SoftVersionCheck">Ver Actualiz.</string>
+	<string name="SoftUpdateNow">Actualizar ahora</string>
+	<string name="Setting">Configuración</string>
+	<string name="Test">Modo de prueba</string>
+	<string name="Confirm">Confirmar</string>
+	<string name="Cancel">Cancelar</string>
+	<string name="Save">Guardar</string>
+	<string name="Back">Atrás</string>
+	<string name="CallBed">Llamada de  cama</string>
+	<string name="CallNurse">Llamada</string>
+	<string name="CallCencel">Cancelar llamada</string>
+	<string name="CallInfo">Llamar</string>
+	<string name="SOSCallInfo">Llamada de emergencia</string>
+	<string name="Voice">Voz</string>
+	<string name="BlueCode">Código azul</string>
+    <!-- 首页 -->
+	<string name="Room">Habitación</string>
+	<string name="InBedNum">Pacientes</string>
+	<string name="EmptyBedNum">Camas Libres</string>
+	<string name="EmptyBed">Cama disponible</string>
+	<string name="EmptyCustomer">Sin ocupación</string>
+	<string name="None">Sin ocupación</string>
+	<string name="BedNum">Número de cama</string>
+	<string name="Woman">Femenino</string>
+	<string name="Man">Masculino</string>
+	<string name="Unknown">Desconocido</string>
+	<string name="NurseConfig">Elementos de enfermería</string>
+	<string name="Oxygen">Temporizador de oxígeno</string>
+	<string name="OxygenInhalation">Inhalación de oxígeno</string>
+	<string name="SkinTest">Prueba cutánea</string>
+	<string name="Infusion">Infusión</string>
+	<string name="SettingTime">Hora personalizada</string>
+	<string name="CountdownProgress">Temporizador</string>
+	<string name="CountdownCancel">Cancelar temporizador</string>
+	<string name="CountdownEnded">Temporizador finalizado</string>
+	<string name="Description">Descripción:</string>
+	<string name="Advice">Aviso</string>
+	<string name="AdviceType">Tipo de aviso</string>
+	<string name="LONG_TERM">Largo plazo</string>
+	<string name="TEMP">Temporal</string>
+	<string name="LoseEfficacy">Expirado</string>
+	<string name="TakeEffect">Aplicar</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">Responsable Enfermería</string>
+	<string name="Director"> Director</string>
+	<string name="HeadNurse">Jefe Enfermeria</string>
+	<string name="CustomerAffair">Acciones de usuario</string>
+	<string name="EventButton">Clave Evento</string>
+	<string name="Logined">Iniciar sesión</string>
+	<string name="NfcLoginSuccess">Inicio de sesión de tarjeta NFC correcto</string>
+	<string name="NfcLogoutSuccess">NFC cerró sesión</string>
+    <!-- 交互界面 -->
+	<string name="Recover">Lista de recuperación</string>
+	<string name="All">Todos</string>
+	<string name="NotReceived">Perdidas</string>
+	<string name="SOSCall">Llamada SOS</string>
+	<string name="EventCall">-Evento</string>
+	<string name="ReinforceCall">Solicitar ayuda de refuerzo</string>
+	<string name="CallIn">Llamada entrante</string>
+	<string name="CallOut">Llamada saliente</string>
+	<string name="Responded">Contestada</string>
+	<string name="NotRespond">No contestada</string>
+	<string name="Answered">Aceptada</string>
+	<string name="Not Answered">Son Aceptada</string>
+	<string name="Other">Otro</string>
+	<string name="Sented">Enviada</string>
+	<string name="Canceled">Cancelada</string>
+	<string name="Completed">Completada</string>
+    <!-- 导航栏 -->
+    <!-- 功能界面 -->
+	<string name="CallableBeds">Camas llamables</string>
+	<string name="ConfirmCall">Confirmar llamada</string>
+	<string name="CancelCall">Cancelar llamada</string>
+	<string name="LogoutMedicalCareMsg">Por favor, confirme, ¿desea cerrar sesión en la atención médica? </string>
+	<string name="ConfirmLogout">Confirmar cierre de sesión</string>
+	<string name="CancelLogoutl">Cancelar cierre de sesión</string>
+	<string name="PostitionedMsg">Se ha encontrado la ubicación actual:</string>
+	<string name="RoomPatrolMsg">Se ha completado la ronda de la sala:</string>
+	<string name="PromptQuit">El mensaje ha finalizado</string>
+	<string name="RebootDevice">Reiniciar dispositivo</string>
+	<string name="RebootPower">Reiniciar alimentación del dispositivo</string>
+	<string name="RebootLine">Reiniciar alimentación de la línea</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">Después de confirmar el cambio de color del tema, este dispositivo se reiniciará</string>
+	<string name="Mode1">Cambiar a modo 1</string>
+	<string name="Mode2">Cambiar al modo 2</string>
+	<string name="Mode3">Cambiar al modo 3</string>
+	<string name="ModeConfirm">Después de confirmar el cambio de modo, la máquina se reiniciará</string>
+	<string name="IsExecuteAffair">Ejecutar la tarea del usuario</string>
+	<string name="EventCalled">-Se ha emitido un evento</string>
+	<string name="EventResponse">Ya realizado-</string>
+	<string name="EventCompleteOrCancel">Completar o cancelar</string>
+	<string name="BlueCodeMsg">Código azul enviado</string>
+	<string name="PartFrameTreeMsg">Sin datos del departamento</string>
+	<string name="RoomFrameTreeMsg">Sin datos de la habitación</string>
+	<string name="BedFrameTreeMsg">Sin datos de la cama</string>
+	<string name="ChoicePartMsg">Seleccione el departamento a registrar</string>
+	<string name="ChoiceRoomMsg">Seleccione la habitación a registrar</string>
+	<string name="ChoiceBedMsg">Seleccione la cama a registrar</string>
+	<string name="IsNfcLogout">¿Desea confirmar cerrar sesión? </string>
+	<string name="HCallSendSuccess">Llamada enviada</string>
+	<string name="SosDisconnected">Botón de emergencia desconectado</string>
+	<string name="HandleDisconnected">Pulsador de cama desconectado</string>
+	<string name="Handle1Disconnected">Pulsador de cama 1 desconectado</string>
+	<string name="Handle2Disconnected">Pulsador de cama 2 desconectado</string>
+	<string name="Handle3Disconnected">Pulsador de cama 3 desconectado</string>
+	<string name="Handle4Disconnected">Pulsador de cama 4 desconectado</string>
+    <!-- 医护界面 -->
+	<string name="MedicalLoginMsg">Ingrese la contraseña correcta para comenzar la atención médica</string>
+	<string name="InputMedicalPassword">Ingrese la contraseña para comenzar la atención médica</string>
+	<string name="InputMedicalPasswordMsg">Contraseña  númérica</string>
+	<string name="JobNumber">Identificador de tarea</string>
+	<string name="Password">Contraseña</string>
+	<string name="NfcText">Utilice una tarjeta NFC para comenzar la atención médica</string>
+	<string name="NfcMsgText">Utilice una tarjeta NFC válida para comenzar la atención médica </string>
+	<string name="EnteringMedicalCare">Comience la atención médica</string>
+	<string name="ChooseMsg">Seleccione el empleado correspondiente para comenzar la atención médica </string>
+	<string name="Hello">Hola,</string>
+	<string name="MedicalCareMsg">En su sección de atención médica personal</string>
+	<string name="LogoutMedicalCare">Cerrar sesión de atención médica</string>
+	<string name="Position">Posición</string>
+	<string name="Positioned">Posicionado</string>
+	<string name="RoomPatrol">Ronda de habitación</string>
+	<string name="RoomPatrolCompleted">Ronda de habitación completada</string>
+	<string name="Nursing">Enfermería</string>
+	<string name="NursingMsg">Ha comenzado la asistencia</string>
+	<string name="SetNursingMsg">¿Establecer estado de asistencia enfermera? </string>
+	<string name="SetNursingMsg2">Estado de asistencia de enfermería </string>
+	<string name="InNursing">En Presencia de enfermería</string>
+	<string name="NursingEnd">Cuidado Fin</string>
+	<string name="SetNursingEndMsg">La cama tiene presencia de enfermería. ¿Confirmar para finalizar? </string>
+	<string name="SetNursingEndMsg2">¿Finalizar presencia enfermeria? </string>
+	<string name="Prompt">Establecer  sugerencias</string>
+	<string name="PromptMsg">Pantalla de bloqueo</string>
+    <!-- 提示语界面 -->
+	<string name="SetPrompt">Establecer sugerencias</string>
+	<string name="CustomInput">Entrada personalizada</string>
+	<string name="QuickPrompt">Sugerencias rápidas</string>
+	<string name="SetPromptTime">Establecer tiempo de sugerencias</string>
+	<string name="StartPrompt">Configuración de inicio</string>
+	<string name="BeQuiet">Mantener silencio</string>
+	<string name="DoNotDisturb">No molestar durante presencia de enfermería</string>
+	<string name="KeepQuiet">No hacer ruidos fuertes</string>
+	<string name="DoNotVisit">No visitar</string>
+	<string name="InRestroom">No entrar durante el descanso</string>
+	<string name="DoNotGather">No permitios grupos de personas</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">Sugerencias de salida</string>
+    <!-- 事务界面 -->
+	<string name="CustomerAffair">Tarea de paciente</string>
+	<string name="AffairContent">Tarea Contenido</string>
+	<string name="PlanTime">Tiempo Planificación</string>
+	<string name="AffairStatus">Estado Tarea</string>
+	<string name="Execute">Realizarr</string>
+	<string name="Unexecuted">Sin realizar</string>
+	<string name="Executed">Realizada</string>
+	<string name="AffairHandle">Realización</string>
+    <!-- 通话界面 -->
+	<string name="RemoteRefuse">Llamada rechazada</string>
+	<string name="RemoteBusy">Línea ocupada</string>
+	<string name="CallFailed"> Llamada fallida</string>
+	<string name="Calling">Llamando</string>
+	<string name="CallConfirmed">Llamando</string>
+	<string name="CallConnecting">Conectando</string>
+	<string name="CallInComing">Llamada entrante</string>
+	<string name="CallOutTitle">Llamar enfermería</string>
+	<string name="Call">Llamar</string>
+    <!-- 更多界面 -->
+	<string name="DeviceInfo">Equipo Info</string>
+	<string name="DeviceDebug">Depuración del dispositivo</string>
+	<string name="Null">Ninguno</string>
+	<string name="InDate">Fecha de admisión</string>
+	<string name="Advice">Sugerencia médica</string>
+	<string name="DeviceId">ID</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">Introduzca la dirección y el puerto del servidor</string>
+	<string name="ServerTag">Solo se pueden ingresar números y puntos</string>
+	<string name="ServerIPWrong">Dirección de servidor incorrecta</string>
+	<string name="InputPassword">Ingrese la contraseña</string>
+	<string name="PasswordWrong">Contraseña incorrecta</string>
+	<string name="PasswordTag">La contraseña tiene solo 3 dígitos</string>
+	<string name="PasswordText">Contraseña de 3 dígitos</string>
+	<string name="PasswordInput">Introduzca contraseña</string>
+	<string name="RestartTime">Temporizador de reinicio:</string>
+	<string name="ScanQRCode">Esc. QR</string>
+    <!-- 注册界面 -->
+	<string name="DeviceAdd">Registro Equipo</string>
+	<string name="DeviceLocal">este dispositivo</string>
+	<string name="DeviceExtension1">Pulsador cama 1</string>
+	<string name="DeviceExtension2">Pulsador cama 2</string>
+    <string name="DeviceExtension3">Pulsador cama 3</string>
+    <string name="DeviceExtension4">Pulsador cama 4</string>
+	<string name="Part">Departamento</string>
+	<string name="Room">Habitación</string>
+	<string name="Bed">Cama</string>
+	<string name="ConfirmAdd">Registrar</string>
+	<string name="DeviceAddMsg">Nombre del dispositivo: Tipo de dispositivo: 3</string>
+	<string name="DeviceAddMsg2">Nombre del dispositivo: Pulsador cama 1 Tipo de dispositivo: 4</string>
+	<string name="DeviceAddMsg3">Nombre del dispositivo: Pulsador cama 2 Tipo de dispositivo: 4</string>
+    <string name="DeviceAddMsg4">Nombre del dispositivo: Pulsador cama 3 Tipo de dispositivo: 4</string>
+    <string name="DeviceAddMsg5">Nombre del dispositivo: Pulsador cama 4 Tipo de dispositivo: 4</string>
+	<string name="DeviceAddMsg6">ID de registro: </string>
+	<string name="RoomDevice">Pantalla de entrada</string>
+	<string name="BedDevice">Terminal de cama</string>
+	<string name="AddDeviceSuccess">Registro del dispositivo correcto</string>
+	<string name="HospitalList">Lista de hospitales</string>
+	<string name="DeviceAddTitle">Información de Registro</string>
+    <!-- 设置界面 -->
+	<string name="SettingText">Configuración del dispositivo</string>
+	<string name="IsLight">¿Está siempre encendido?</string>
+	<string name="IsVolume">Activar el control de volumen</string>
+	<string name="ThemeChoice">Seleccionar color del tema</string>
+	<string name="Blue">Azul</string>
+	<string name="Red">Rojo</string>
+	<string name="ModeChoice">Seleccionar modo de visualización</string>
+	<string name="ChooseLang">Seleccionar idioma</string>
+    <!-- 测试界面 -->
+	<string name="DebugText">Depuración del dispositivo</string>
+	<string name="InputSip">Introduzca la cuenta SIP de destino</string>
+	<string name="InputSipMsg">Introduzca la cuenta para la prueba</string>
+	<string name="OtherDevicesTest">Prueba de dispositivo externo</string>
+	<string name="OtherDevicesTestMsg">Compruebe conexión dispositivo externo</string>
+	<string name="ChangeToRtc">Cambiar a llamada RTC</string>
+	<string name="ChangeToSip">Cambiar a llamada SIP</string>
+	<string name="HandleKeys">Prueba de pulsador de cama</string>
+	<string name="PanelCallKeys">Prueba del panel</string>
+	<string name="PanelCancelKeys">Prueba de cancelación del panel</string>
+	<string name="SosKeys">Comprobación boton emergencia</string>
+	<string name="RecordTest">Prueba de grabación</string>
+	<string name="RecordTest">Grabando comprobación</string>
+	<string name="RecordText">Pulse botón para comprobación del micrófono</string>
+	<string name="RecordStart">La comprobación comenzará en 5 segundos</string>
+	<string name="RecordPlay">Grabación finalizada, pulse play</string>
+	<string name="RecordStop">Finalizar grabación</string>
+	<string name="RecordFailed">Grabación fallida</string>
+	<string name="DoorLightTest">Comprobación lámpara de pasillo</string>
+	<string name="ColorTest">Prueba de color</string>
+    <!-- 颜色测试界面 -->
+	<string name="ColorMsg">Pulse para cambiar color</string>
+	<string name="ContactButton">Botón de contacto</string>
+    <!-- 错误提示 -->
+	<string name="NoBedList">No hay camas en la habitación actual</string>
+	<string name="NoCustomer">La habitación está ocupada por un usuario</string>
+	<string name="NoBedDevice">No hay ningún dispositivo en la cama actual, la llamada falló</string>
+	<string name="AccountPasswordError">Error de cuenta o contraseña</string>
+	<string name="WrongPassword">Error de contraseña</string>
+	<string name="ConfigureEmployeeID">Configure primero la ID del empleado</string>
+	<string name="PassNoError">No se puede encontrar al empleado de esta tarjeta</string>
+	<string name="AddDeviceErrorMsg">Error en el registro, código de error: </string>
+	<string name="DEVICE_MAC_REPEAT">Ya existe un dispositivo con esta dirección MAC</string>
+	<string name="DEVICE_FRAME_FAILED">¡El tipo de dispositivo y el tipo de estructura espacial no coinciden! </string>
+	<string name="AddDeviceFailed">Error en el registro</string>
+	<string name="AddDeviceFrameFailed">No se puede registrar ningún ID estructural</string>
+	<string name="HandleError">Manejador:</string>
+	<string name="NotAdd">No registrado</string>
+    <!-- 版本界面 -->
+	<string name="VersionTitle">Nombre de versión</string>
+	<string name="VersionInfo">Información de versión</string>
+	<string name="VersionNow">Versión actual dispositivo</string>
+	<string name="VersionNoNow">Versión actual</string>
+	<string name="Version">Versión</string>
+	<string name="VersionNo">Número versión</string>
+	<string name="VersionMsg">Desea reiniciar el dispositivo?</string>
+	<string name="GetVersionFailed">Fallo en recuperar versión, código error</string>
+	<string name="Searching">Buscando...</string>
+	<string name="IsTheLastVersion">Última version instalada</string>
+	<string name="FindNewVersion">Nueva versión encontrada</string>
+	<string name="Downloading">Descargando</string>
+	<string name="EthernetDisconnect">Ethernet Desconectada</string>
+	<string name="DownloadFailed">Descarga fallida, código error</string>
+</resources>

+ 1 - 0
i18n/zh_CN.tr

@@ -261,6 +261,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>

+ 15 - 0
jni/activity/settingActivity.cpp

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

+ 4 - 0
jni/activity/settingActivity.h

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

+ 33 - 0
jni/logic/functionLogic.cc

@@ -463,6 +463,26 @@ void navibarLogout() {
 }
 
 
+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);
+	mFunctionButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "button/elliptic_bule2.png");
+	mFunctionWindowPtr->showWnd();
+}
+
+
 
 /**
  * 注册定时器
@@ -597,6 +617,10 @@ static void onUI_intent(const Intent *intentPtr) {
 		else if (_functionWindows == "navibarLogout") {
 			navibarLogout();
 		}
+		else if (_functionWindows == "language") {
+			_functionText = intentPtr->getExtra(functionText);
+			 setLanguage(_functionText);
+		}
     }
 }
 
@@ -853,6 +877,15 @@ static bool onButtonClick_FunctionButton(ZKButton *pButton) {
         sync();
         reboot(RB_AUTOBOOT);
     }
+    else if (_functionWindows == "language") {
+    	StoragePreferences::putString(STORE_LANG, _functionText);
+    	const char* req = "-1";
+    	TcpClient::instance()->sendMsg(req);
+
+        //重启
+        sync();
+        reboot(RB_AUTOBOOT);
+    }
 
     return false;
 }

+ 26 - 0
jni/logic/settingLogic.cc

@@ -211,3 +211,29 @@ 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;
+}

+ 2 - 0
jni/logic/startLogic.cc

@@ -760,6 +760,8 @@ 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);

+ 3 - 0
jni/service/BusinessConfig.h

@@ -68,6 +68,9 @@
 
 #define STORE_MAC_ADDR "mac_addr"
 
+#define STORE_LANG "language"
+static std::string defaultLang = "zh_CN";
+
 static uint32_t redLightColour = 0xFFFEB8BF;
 static uint32_t redDeepColour = 0xFFF78B8F;
 static uint32_t buleLightColour = 0xFF759FFF;

BIN
libs/armeabi/libzkgui.so


BIN
obj/activity/callActivity.o


BIN
obj/activity/customerAffairActivity.o


BIN
obj/activity/deviceAddActivity.o


BIN
obj/activity/deviceInfoActivity.o


BIN
obj/activity/functionActivity.o


BIN
obj/activity/interactionActivity.o


BIN
obj/activity/mainActivity.o


BIN
obj/activity/medicalCareActivity.o


BIN
obj/activity/moreActivity.o


BIN
obj/activity/navibar.o


BIN
obj/activity/promptActivity.o


BIN
obj/activity/settingActivity.o


BIN
obj/activity/sipTestActivity.o


BIN
obj/activity/startActivity.o


BIN
obj/activity/statusbar.o


BIN
obj/activity/updateActivity.o


BIN
obj/core/update_assistant.o


BIN
obj/net/tcp_client.o


BIN
obj/net/tcp_model.o


BIN
obj/net/tcp_util.o


BIN
obj/server/http_server.o


BIN
obj/service/BusinessConfig.o


BIN
obj/service/time.o


BIN
obj/uart/UartContext.o


BIN
resources/Harmony_231030.ttf


BIN
resources/main/affair2.png


BIN
resources/main/affair2_grey.png


BIN
ui/deviceAdd.ftu


BIN
ui/deviceInfo.ftu


BIN
ui/main.ftu


BIN
ui/setting.ftu