增加退出护理时的SOSCancel

i18n/en_US.tr

@@ -315,4 +315,5 @@
 	<string name="Downloading">Downloading</string>
 	<string name="EthernetDisconnect">Ethernet Disconnected</string>
 	<string name="DownloadFailed">Download failed, error code</string>
+    <string name="NotBedDevice">There are no registered bed devices, this feature cannot be used.</string>
 </resources>

i18n/es_ES-西班牙语.tr

@@ -171,9 +171,9 @@
 	<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="RebootDevice">Reiniciar</string>
+	<string name="RebootPower">Reiniciar p/a</string>
+	<string name="RebootLine">Reiniciar 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>
@@ -295,11 +295,11 @@
 	<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="DeviceLocal">local</string>
+	<string name="DeviceExtension1">m1</string>
+	<string name="DeviceExtension2">m2</string>
+	<string name="DeviceExtension3">m3</string>
+	<string name="DeviceExtension4">m4</string>
 	<string name="Part">Departamento</string>
 	<string name="Room">Habitación</string>
 	<string name="Bed">Cama</string>
@@ -378,4 +378,5 @@
 	<string name="Downloading">Descargando</string>
 	<string name="EthernetDisconnect">Ethernet Desconectada</string>
 	<string name="DownloadFailed">Descarga fallida, código error</string>
+    <string name="NotBedDevice">Sin camas registradas. Función no disponible.</string>
 </resources>

i18n/zh_CN.tr

@@ -315,4 +315,5 @@
     <string name="Downloading">下载中</string>
     <string name="EthernetDisconnect">未连接网络</string>
     <string name="DownloadFailed">下载错误，错误码</string>
+    <string name="NotBedDevice">没有注册床位设备，无法使用该功能</string>
 </resources>

jni/logic/mainLogic.cc

@@ -761,16 +761,14 @@ static void obtainListItemData_BedListView(ZKListView *pListView,ZKListView::ZKL
 		doctor->setText(frameBedList[index]["doctor_name"].asString());
 		nurse->setText(frameBedList[index]["nurse_name"].asString());
 
-		if (frameBedList[index]["bed_device_id"].asString() != "") {
-			affair->setInvalid(false);
-			event->setInvalid(false);
+
+		if (frameBedList[index]["bed_device_id"].asString() == "") {
+			affair->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/main/affair2_grey.png");
 		}
 		else {
-			affair->setInvalid(true);
-			event->setInvalid(true);
+			affair->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/main/affair2.png");
 		}
 
-
 //		// 护理项相关
 //		Json::Value nurseConfigList = frameBedList[index]["nurse_config_dtos"];
 //		if (nurseConfigList.size() > 0) {
@@ -824,11 +822,16 @@ static void obtainListItemData_BedListView(ZKListView *pListView,ZKListView::ZKL
 }
 
 static void onListItemClick_BedListView(ZKListView *pListView, int index, int id) {
-    //LOGD(" onListItemClick_ BedListView  !!!\n");
+    LOGD(" onListItemClick_ BedListView  !!!\n");
 	if (frameBedList[index]["bed_device_id"].asString() == "") {
+//		Intent* intent = new Intent();
+//		intent->putExtra(functionWindows, "warn");
+//		intent->putExtra(warnText, LANGUAGEMANAGER->getValue("NotBedDevice"));
+//		EASYUICONTEXT->openActivity("functionActivity", intent);
 		return;
 	}
 	if (id == ID_MAIN_EventSubItem) {
+		LOGD("触发事件按钮，index ===> %d", index);
 		string _customerId = frameBedList[index]["customer_id"].asString();
 		string _deviceId = frameBedList[index]["bed_device_id"].asString();
 
@@ -839,6 +842,7 @@ static void onListItemClick_BedListView(ZKListView *pListView, int index, int id
 
 	}
 	else if (id == ID_MAIN_AffairSubItem) {
+		LOGD("触发事务按钮，index ===> %d", index);
 		string _customerId = frameBedList[index]["customer_id"].asString();
 		string _deviceId = frameBedList[index]["bed_device_id"].asString();
 

jni/logic/navibar.cc

@@ -135,6 +135,20 @@ void setNursing2(bool setNursing) {
 
 		// 把护理状态缓存起来
 		StoragePreferences::putBool(STORE_NURSING_TYPE, true);
+
+		std::list<string> _sosData = getSosDataList();
+		if (_sosData.empty()) {
+			return;
+		}
+
+		std::list<string>::iterator it = _sosData.begin();
+
+		while (it != _sosData.end()) {
+			string sosDataStr = *it;
+			sendSosCancel(sosDataStr);
+			it++;
+		}
+		cleanSosDataList();
 	}
 	else {
 		setNursingBg(setNursing);

jni/logic/startLogic.cc

@@ -13,6 +13,7 @@
 #include "utils/BrightnessHelper.h"
 #include <time.h>
 #include <thread>
+#include <list>
 #include <string>
 #include <unistd.h>
 #include <sys/reboot.h>
@@ -59,6 +60,8 @@ static bool isTriggerHandle4 = false;
 
 srv::HttpServer httpServer;
 
+std::list<string> sosDataList;
+
 namespace {
 	std::string uilogic[] = {
 			"testActivity",
@@ -182,6 +185,15 @@ namespace {
 }
 
 
+
+std::list<string> getSosDataList() {
+	return sosDataList;
+}
+
+void cleanSosDataList() {
+	sosDataList.clear();
+}
+
 void systemRestart() {
     if (!isNetreset) {
     	isNetreset = true;
@@ -469,6 +481,9 @@ void handleMsg(byte* inBytes){
 			mActivityPtr->registerUserTimer(SOS_CLICK_TIME_HANDLE, 10000);		// 10秒后才能触发
 			mActivityPtr->registerUserTimer(SOS_LAMP_TIME_HANDLE, 120000);		// 2分钟后才能触发
 
+			if (tcpModel.json.isMember("id")) {
+				sosDataList.push_back(tcpModel.json["id"].asString());
+			}
 		}
 		else if (tcpModel.action == SideAction::SOS_CANCEL) {
 			// 进行门灯还原

jni/net/tcp_util.cpp

@@ -238,3 +238,15 @@ void sendSosCall(std::string sosMsg) {
 
 }
 
+
+void sendSosCancel(std::string sosId) {
+	TcpModel tcpModel;
+	tcpModel.tid = base::format("t%d", TimeHelper::getCurrentTime());
+	tcpModel.type = TcpType::SOS;
+	tcpModel.action = SosAction::CANCEL;
+	tcpModel.from_id = StoragePreferences::getInt(STORE_DEVICE_ID, 0);
+	tcpModel.data = sosId;
+
+	sendTcpModel(tcpModel);
+}
+

jni/net/tcp_util.h

@@ -24,6 +24,7 @@ void sendVoiceTcp(std::string action, TcpModel model, int toId);
 void sendVoiceCancel(int fromId, int toId);
 std::string sendVoiceHCall(int id);
 void sendSosCall(std::string sosMsg);
+void sendSosCancel(std::string sosId);
 
 
 

jni/service/BusinessConfig.h

@@ -6,6 +6,7 @@
  */
 #include <string.h>
 #include <time.h>
+#include <list>
 #include "storage/StoragePreferences.h"
 #include "utils/BrightnessHelper.h"
 #include "utils/TimeHelper.h"
@@ -225,6 +226,9 @@ bool getClerkByPartIdAndPassNo(std::string passNo);
 int getHandleId(int id);
 bool isHandleId(int id);
 
+std::list<std::string> getSosDataList();
+void cleanSosDataList();
+
 enum CallFinishType {
 	CANCEL,
 	REJECT,