修改翻译和显示

.settings/com.zksw.flythings.easyui.prefs

@@ -1,5 +1,5 @@
-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}
+easyui.cfg.debug={"baud"\:"115200","defBrightness"\:-1,"font"\:"/mnt/extsd/ui/Harmony_240927.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_240927.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

i18n/es_ES-西班牙语.tr

@@ -217,7 +217,7 @@
 	<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="Nursing">Presencia</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>
@@ -251,10 +251,10 @@
 	<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="AffairContent">Descripción</string>
+	<string name="PlanTime">Planificada</string>
+	<string name="AffairStatus">Estado</string>
+	<string name="Execute">Realizar</string>
 	<string name="Unexecuted">Sin realizar</string>
 	<string name="Executed">Realizada</string>
 	<string name="AffairHandle">Realización</string>
@@ -278,15 +278,15 @@
 	<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="NETMASK">Máscara Subred</string>
+	<string name="GATEWAY">Puerta Enlace</string>
 	<string name="VoiceId">ID de voz</string>
-	<string name="VoiceDomain">Dom. Voz</string>
-	<string name="ServerIP">Servidor IP</string>
+	<string name="VoiceDomain">Servidor VoIP</string>
+	<string name="ServerIP">IP Servidor</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="InputPassword">Introduzca 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>

jni/logic/customerAffairLogic.cc

@@ -45,7 +45,7 @@ Json::Value customerAffairs;
 
 
 void getCustomerAffair() {
-	std::string url = getHttpGateway() + "/deviceBed/get_affairs_by_customer_id/" + _affairTransmitCustomerId;
+	std::string url = getHttpGateway() + "/deviceRoom/get_affairs_of_late/" + _affairTransmitCustomerId;
 
 	LOGD("请求用户事务列表. url = %s", url.c_str());
 	//发起HTTP GET请求

jni/logic/mainLogic.cc

@@ -1131,22 +1131,29 @@ static void obtainListItemData_BedListView4(ZKListView *pListView,ZKListView::ZK
 		}
 
 
-		string customerSex = frameBedList[index]["customer_sex"].asString();
-		if (customerSex == "0") {	// 如果性别为女性，替换成女性，底色为粉色
-			sex->setText(LANGUAGEMANAGER->getValue("Woman"));
-			sex->setTextColor(0xFF9F9F);
-			sex->setBackgroundPic("9/lightRed.9.png");
-		}
-		else if (customerSex == "1") {
-			sex->setText(LANGUAGEMANAGER->getValue("Man"));
-			sex->setTextColor(0x3A78EF);
-			sex->setBackgroundPic("9/lightBlue.9.png");
-		}
-		else {
+		if (partSetting.customerAgeHiddenOnDoor != 0) {
 			sex->setText(LANGUAGEMANAGER->getValue("Unknown"));
 			sex->setTextColor(0x37B643);
 			sex->setBackgroundPic("9/lightGreen.9.png");
 		}
+		else {
+			string customerSex = frameBedList[index]["customer_sex"].asString();
+			if (customerSex == "0") {	// 如果性别为女性，替换成女性，底色为粉色
+				sex->setText(LANGUAGEMANAGER->getValue("Woman"));
+				sex->setTextColor(0xFF9F9F);
+				sex->setBackgroundPic("9/lightRed.9.png");
+			}
+			else if (customerSex == "1") {
+				sex->setText(LANGUAGEMANAGER->getValue("Man"));
+				sex->setTextColor(0x3A78EF);
+				sex->setBackgroundPic("9/lightBlue.9.png");
+			}
+			else {
+				sex->setText(LANGUAGEMANAGER->getValue("Unknown"));
+				sex->setTextColor(0x37B643);
+				sex->setBackgroundPic("9/lightGreen.9.png");
+			}
+		}
 
 
 		// 医生护士相关