将首页呼叫床位替换成取消呼叫

i18n/zh_CN.tr

@@ -36,7 +36,7 @@
     <string name="Back">返回</string>
     <string name="CallBed">呼叫床位</string>
     <string name="CallNurse">呼叫护士站</string>
-    <string name="CallCencel">取消呼叫</string>
+    <string name="CallCancel">取消呼叫</string>
     <string name="CallInfo">发起呼叫</string>
     <string name="SOSCallInfo">发起紧急呼叫</string>
     <string name="Voice">语音</string>

jni/activity/navibar.cpp

@@ -2,13 +2,13 @@
 #include "entry/EasyUIContext.h"
 
 /*TAG:GlobalVariable全局变量*/
+static ZKPainter* mCallCancelPicPainterPtr;
+static ZKButton* mCallCancelButtonPtr;
 static ZKPainter* mBgPainterPtr;
 static ZKButton* mHomeButtonPtr;
-static ZKPainter* mCallBedPicPainterPtr;
 static ZKPainter* mCallNursePicPainterPtr;
 static ZKPainter* mHelpPicPainterPtr;
 static ZKButton* mHealthCareButtonPtr;
-static ZKButton* mCallBedButtonPtr;
 static ZKButton* mCallNurseButtonPtr;
 static ZKButton* mHelpButtonPtr;
 static ZKButton* mMoreButtonPtr;
@@ -49,9 +49,9 @@ typedef struct {
 
 /*TAG:ButtonCallbackTab按键映射表*/
 static S_ButtonCallback sButtonCallbackTab[] = {
+    ID_NAVIBAR_CallCancelButton, onButtonClick_CallCancelButton,
     ID_NAVIBAR_HomeButton, onButtonClick_HomeButton,
     ID_NAVIBAR_HealthCareButton, onButtonClick_HealthCareButton,
-    ID_NAVIBAR_CallBedButton, onButtonClick_CallBedButton,
     ID_NAVIBAR_CallNurseButton, onButtonClick_CallNurseButton,
     ID_NAVIBAR_HelpButton, onButtonClick_HelpButton,
     ID_NAVIBAR_MoreButton, onButtonClick_MoreButton,
@@ -132,13 +132,13 @@ navibar::~navibar() {
     unregisterProtocolDataUpdateListener(onProtocolDataUpdate);
     onUI_quit();
     mnavibarPtr = NULL;
+    mCallCancelPicPainterPtr = NULL;
+    mCallCancelButtonPtr = NULL;
     mBgPainterPtr = NULL;
     mHomeButtonPtr = NULL;
-    mCallBedPicPainterPtr = NULL;
     mCallNursePicPainterPtr = NULL;
     mHelpPicPainterPtr = NULL;
     mHealthCareButtonPtr = NULL;
-    mCallBedButtonPtr = NULL;
     mCallNurseButtonPtr = NULL;
     mHelpButtonPtr = NULL;
     mMoreButtonPtr = NULL;
@@ -151,13 +151,13 @@ const char* navibar::getAppName() const{
 //TAG:onCreate
 void navibar::onCreate() {
 	BaseApp::onCreate();
+    mCallCancelPicPainterPtr = (ZKPainter*)findControlByID(ID_NAVIBAR_CallCancelPicPainter);
+    mCallCancelButtonPtr = (ZKButton*)findControlByID(ID_NAVIBAR_CallCancelButton);
     mBgPainterPtr = (ZKPainter*)findControlByID(ID_NAVIBAR_BgPainter);
     mHomeButtonPtr = (ZKButton*)findControlByID(ID_NAVIBAR_HomeButton);
-    mCallBedPicPainterPtr = (ZKPainter*)findControlByID(ID_NAVIBAR_CallBedPicPainter);
     mCallNursePicPainterPtr = (ZKPainter*)findControlByID(ID_NAVIBAR_CallNursePicPainter);
     mHelpPicPainterPtr = (ZKPainter*)findControlByID(ID_NAVIBAR_HelpPicPainter);
     mHealthCareButtonPtr = (ZKButton*)findControlByID(ID_NAVIBAR_HealthCareButton);
-    mCallBedButtonPtr = (ZKButton*)findControlByID(ID_NAVIBAR_CallBedButton);
     mCallNurseButtonPtr = (ZKButton*)findControlByID(ID_NAVIBAR_CallNurseButton);
     mHelpButtonPtr = (ZKButton*)findControlByID(ID_NAVIBAR_HelpButton);
     mMoreButtonPtr = (ZKButton*)findControlByID(ID_NAVIBAR_MoreButton);

jni/activity/navibar.h

@@ -23,13 +23,13 @@
 #include "control/ZKRadioGroup.h"
 #include "window/ZKSlideWindow.h"
 /*TAG:Macro宏ID*/
+#define ID_NAVIBAR_CallCancelPicPainter    52003
+#define ID_NAVIBAR_CallCancelButton    20006
 #define ID_NAVIBAR_BgPainter    52004
 #define ID_NAVIBAR_HomeButton    20001
-#define ID_NAVIBAR_CallBedPicPainter    52003
 #define ID_NAVIBAR_CallNursePicPainter    52002
 #define ID_NAVIBAR_HelpPicPainter    52001
 #define ID_NAVIBAR_HealthCareButton    20002
-#define ID_NAVIBAR_CallBedButton    20006
 #define ID_NAVIBAR_CallNurseButton    20005
 #define ID_NAVIBAR_HelpButton    20004
 #define ID_NAVIBAR_MoreButton    20003

jni/logic/mainLogic.cc

@@ -347,7 +347,7 @@ public:
 			StoragePreferences::putInt(STORE_AUTO_POSITION, partSetting.autoPosition);
 
 			setRightTitle(root);
-			callBedButtonSetVisible();
+//			callBedButtonSetVisible();
 
 			getFrameRoom(frameInfo["frame_id"].asInt());
 

jni/logic/moreLogic.cc

@@ -77,6 +77,11 @@ void getDeviceMenu() {
 					root[i]["icon_src"] = "/more/shebi.png";
 					deviceMenus.append(root[i]);
 				}
+				else if (root[i]["act_name"].asString() == "callBedActivity") {
+					count += 1;
+					root[i]["icon_src"] = deviceInfoPic;
+					deviceMenus.append(root[i]);
+				}
 			}
 			if (count == 0) {
 				Json::Value deviceInfo;
@@ -112,6 +117,11 @@ static void onUI_init(){
 	deviceMenus[0]["introduction"] = "查看信息和设置";
 	deviceMenus[0]["act_name"] = "deviceInfoActivity";
 
+	deviceMenus[1]["icon_src"] ="/more/keshi.png";
+	deviceMenus[1]["name"] = "呼叫床位";
+	deviceMenus[1]["introduction"] = "呼叫床位分机";
+	deviceMenus[0]["act_name"] = "callBedActivity";
+
 //	deviceMenus[1]["icon_src"] ="/more/keshi.png";
 //	deviceMenus[1]["name"] = "科室介绍";
 //	deviceMenus[1]["introduction"] = "科室详细介绍";
@@ -229,4 +239,10 @@ static void onListItemClick_DeviceMenuListView(ZKListView *pListView, int index,
 	if (name == "设备信息") {
 		EASYUICONTEXT->openActivity("deviceInfoActivity");
 	}
+
+	else if (name == "呼叫床位") {
+		Intent* intent = new Intent();
+		intent->putExtra(functionWindows, "callBed");
+		EASYUICONTEXT->openActivity("functionActivity", intent);
+	}
 }

jni/logic/navibar.cc

@@ -99,34 +99,34 @@ void goCare() {
     EASYUICONTEXT->closeActivity("moreActivity");
 }
 
-void callBedButtonSetVisible() {
-	if (mnavibarPtr == NULL) {
-		return;
-	}
-
-	int roomCallBed = StoragePreferences::getInt(STORE_ROOM_CALL_BED, 1);
-	if (!roomCallBed) {
-		// 如果roomCallBed是0的话，那就隐藏
-		mCallBedButtonPtr->setVisible(roomCallBed);
-		mCallBedPicPainterPtr->setVisible(roomCallBed);
-
-		mHelpButtonPtr->setPosition(LayoutPosition(10, 822, 77, 77));
-		mHelpPicPainterPtr->setPosition(LayoutPosition(35, 834, 32, 26));
-		mCallNurseButtonPtr->setPosition(LayoutPosition(10, 909, 77, 77));
-		mCallNursePicPainterPtr->setPosition(LayoutPosition(34, 919, 27, 27));
-
-	}
-	else {
-		// 如果roomCallBed是1的话，那就显示
-		mCallBedButtonPtr->setVisible(roomCallBed);
-		mCallBedPicPainterPtr->setVisible(roomCallBed);
-
-		mHelpButtonPtr->setPosition(LayoutPosition(10, 735, 77, 77));
-		mHelpPicPainterPtr->setPosition(LayoutPosition(33, 747, 32, 26));
-		mCallNurseButtonPtr->setPosition(LayoutPosition(10, 822, 77, 77));
-		mCallNursePicPainterPtr->setPosition(LayoutPosition(35, 834, 27, 27));
-	}
-}
+//void callBedButtonSetVisible() {
+//	if (mnavibarPtr == NULL) {
+//		return;
+//	}
+//
+//	int roomCallBed = StoragePreferences::getInt(STORE_ROOM_CALL_BED, 1);
+//	if (!roomCallBed) {
+//		// 如果roomCallBed是0的话，那就隐藏
+//		mCallBedButtonPtr->setVisible(roomCallBed);
+//		mCallBedPicPainterPtr->setVisible(roomCallBed);
+//
+//		mHelpButtonPtr->setPosition(LayoutPosition(10, 822, 77, 77));
+//		mHelpPicPainterPtr->setPosition(LayoutPosition(35, 834, 32, 26));
+//		mCallNurseButtonPtr->setPosition(LayoutPosition(10, 909, 77, 77));
+//		mCallNursePicPainterPtr->setPosition(LayoutPosition(34, 919, 27, 27));
+//
+//	}
+//	else {
+//		// 如果roomCallBed是1的话，那就显示
+//		mCallBedButtonPtr->setVisible(roomCallBed);
+//		mCallBedPicPainterPtr->setVisible(roomCallBed);
+//
+//		mHelpButtonPtr->setPosition(LayoutPosition(10, 735, 77, 77));
+//		mHelpPicPainterPtr->setPosition(LayoutPosition(33, 747, 32, 26));
+//		mCallNurseButtonPtr->setPosition(LayoutPosition(10, 822, 77, 77));
+//		mCallNursePicPainterPtr->setPosition(LayoutPosition(35, 834, 27, 27));
+//	}
+//}
 /**
  * 注册定时器
  * 填充数组用于注册定时器
@@ -142,7 +142,7 @@ static S_ACTIVITY_TIMEER REGISTER_ACTIVITY_TIMER_TAB[] = {
  */
 static void onUI_init(){
     //Tips :添加 UI初始化的显示代码到这里,如:mText1->setText("123");
-	callBedButtonSetVisible();
+//	callBedButtonSetVisible();
 	setNavibarTheme();
 }
 
@@ -275,11 +275,8 @@ static bool onButtonClick_CallNurseButton(ZKButton *pButton) {
     return false;
 }
 
-static bool onButtonClick_CallBedButton(ZKButton *pButton) {
-    LOGD(" ButtonClick CallBedButton !!!\n");
-
-	Intent* intent = new Intent();
-	intent->putExtra(functionWindows, "callBed");
-	EASYUICONTEXT->openActivity("functionActivity", intent);
+static bool onButtonClick_CallCancelButton(ZKButton *pButton) {
+    LOGD(" ButtonClick CallCancelButton !!!\n");
+    sendVoiceCancelByDoor();
     return false;
 }

jni/logic/startLogic.cc

@@ -317,8 +317,11 @@ void handleMsg(byte* inBytes){
 		}
 	} else if (tcpModel.type == TcpType::VOICE){
 		if (tcpModel.action == VoiceAction::FAILED){
-			callActivityFinish(CallFinishType::FAILED);
-
+            const char* currentAppName = EASYUICONTEXT->currentAppName();
+            string _currentAppName = currentAppName;
+            if (_currentAppName == "callActivity") {
+                callActivityFinish(CallFinishType::FAILED);
+            }
 		} else if (tcpModel.action == VoiceAction::SUCCESS){
 			CallingStatus::instance()->setTcpModel(tcpModel);	// 只有呼叫成功才闪红灯
 

jni/net/tcp_util.cpp

@@ -111,6 +111,15 @@ void sendVoiceCancel(int toId) {
 	sendTcpModel(tcpModel);
 }
 
+void sendVoiceCancelByDoor() {
+	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);
+	sendTcpModel(tcpModel);
+}
 
 
 void sendSosCall(std::string sosMsg) {

jni/net/tcp_util.h

@@ -18,6 +18,7 @@ std::string sendVoiceCall(Json::Value json);
 std::string sendVoiceCall(int toId);
 void sendVoiceTcp(std::string action, TcpModel model, int toId);
 void sendVoiceCancel(int toId);
+void sendVoiceCancelByDoor();
 
 void sendSosCall(std::string sosMsg);
 void sendSosCancel(std::string sosId);

jni/service/BusinessConfig.h

@@ -79,8 +79,8 @@ static uint32_t whiteColour = 0xFFFFFF;
 static int defaultThemeInt = 1;
 static int defaultModeInt = 1;
 
-static std::string versionCode = "v1.0.49";
-static int versionNo = 49;
+static std::string versionCode = "v1.0.50";
+static int versionNo = 50;
 static std::string serverIP = "172.28.100.100";
 static std::string tcpIP = "172.28.100.100";
 static int serverHttpPort = 8006;
@@ -154,7 +154,7 @@ void pingThreadExitPending();
 bool getIsUpdate();
 
 // 控制呼叫床位按钮是否显示
-void callBedButtonSetVisible();
+//void callBedButtonSetVisible();
 
 Json::Value getFrame();