增加增援、定位等铃声，优化医护跳转逻辑

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

@@ -1,5 +1,5 @@
-easyui.cfg.debug={"baud"\:"115200","defBrightness"\:-1,"font"\:"/mnt/extsd/ui/Harmony.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.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_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}
 eclipse.preferences.version=1
 platform={"name"\:"Z21","cprojectTemplateDir"\:"bundle/cproject/z21","internalCode"\:"z21"}
 resolution=800x480

i18n/zh_CN.tr

@@ -83,6 +83,7 @@
     <string name="CancelLogoutl">取消退出</string>
     <string name="PostitionedMsg">已定位当前位置：</string>
     <string name="RoomPatrolMsg">已巡房：</string>
+	<string name="PromptQuit">提示语已结束</string>
     <!-- 医护界面 -->
     <string name="MedicalLoginMsg">请输入正确的密码，进入医护功能</string>
     <string name="InputMedicalPassword">输入密码进入医护</string>

jni/activity/navibar.cpp

@@ -2,7 +2,7 @@
 #include "entry/EasyUIContext.h"
 
 /*TAG:GlobalVariable全局变量*/
-static ZKButton* msys_homePtr;
+static ZKButton* mHomeButtonPtr;
 static ZKPainter* mCallBedPicPainterPtr;
 static ZKPainter* mCallNursePicPainterPtr;
 static ZKPainter* mHelpPicPainterPtr;
@@ -48,7 +48,7 @@ typedef struct {
 
 /*TAG:ButtonCallbackTab按键映射表*/
 static S_ButtonCallback sButtonCallbackTab[] = {
-    ID_NAVIBAR_sys_home, onButtonClick_sys_home,
+    ID_NAVIBAR_HomeButton, onButtonClick_HomeButton,
     ID_NAVIBAR_HealthCareButton, onButtonClick_HealthCareButton,
     ID_NAVIBAR_CallBedButton, onButtonClick_CallBedButton,
     ID_NAVIBAR_CallNurseButton, onButtonClick_CallNurseButton,
@@ -131,7 +131,7 @@ navibar::~navibar() {
     unregisterProtocolDataUpdateListener(onProtocolDataUpdate);
     onUI_quit();
     mnavibarPtr = NULL;
-    msys_homePtr = NULL;
+    mHomeButtonPtr = NULL;
     mCallBedPicPainterPtr = NULL;
     mCallNursePicPainterPtr = NULL;
     mHelpPicPainterPtr = NULL;
@@ -149,7 +149,7 @@ const char* navibar::getAppName() const{
 //TAG:onCreate
 void navibar::onCreate() {
 	BaseApp::onCreate();
-    msys_homePtr = (ZKButton*)findControlByID(ID_NAVIBAR_sys_home);
+    mHomeButtonPtr = (ZKButton*)findControlByID(ID_NAVIBAR_HomeButton);
     mCallBedPicPainterPtr = (ZKPainter*)findControlByID(ID_NAVIBAR_CallBedPicPainter);
     mCallNursePicPainterPtr = (ZKPainter*)findControlByID(ID_NAVIBAR_CallNursePicPainter);
     mHelpPicPainterPtr = (ZKPainter*)findControlByID(ID_NAVIBAR_HelpPicPainter);

jni/activity/navibar.h

@@ -23,7 +23,7 @@
 #include "control/ZKRadioGroup.h"
 #include "window/ZKSlideWindow.h"
 /*TAG:Macro宏ID*/
-#define ID_NAVIBAR_sys_home   101
+#define ID_NAVIBAR_HomeButton    20001
 #define ID_NAVIBAR_CallBedPicPainter    52003
 #define ID_NAVIBAR_CallNursePicPainter    52002
 #define ID_NAVIBAR_HelpPicPainter    52001

jni/logic/functionLogic.cc

@@ -1,6 +1,8 @@
 #pragma once
 #include "uart/ProtocolSender.h"
 #include "service/BusinessConfig.h"
+#include "voip/media_player.h"
+#include "manager/ConfigManager.h"
 
 #include <sys/reboot.h>
 /*
@@ -40,8 +42,12 @@ static string _functionWindows;
 static string _functionText;
 static string _nursingText;
 static string _warnText;
+static string _goActivity;
+
+static base::MediaPlayer mediaPlayer;
+
+#define FUNCTION_TIMER_HANDLE 3	// 增援的定时器id
 
-#define HELP_TIMER_HANDLE 3	// 增援的定时器id
 
 
 static void callBed() {
@@ -73,7 +79,7 @@ static void help() {
 	mFunctionButtonPtr->setText(LANGUAGEMANAGER->getValue("Confirm"));
 	mFunctionWindowPtr->showWnd();
 
-	mActivityPtr->registerUserTimer(HELP_TIMER_HANDLE, 30 * 1000);	// 30秒
+	mActivityPtr->registerUserTimer(FUNCTION_TIMER_HANDLE, 30 * 1000);	// 30秒
 }
 
 static void helpResopnse() {
@@ -84,18 +90,14 @@ static void helpResopnse() {
 	mFunctionButtonPtr->setText(LANGUAGEMANAGER->getValue("Confirm"));
 	mFunctionWindowPtr->showWnd();
 
-	mActivityPtr->registerUserTimer(HELP_TIMER_HANDLE, 30 * 1000);	// 30秒
+	mActivityPtr->registerUserTimer(FUNCTION_TIMER_HANDLE, 30 * 1000);	// 30秒
 }
 
-void helpResopnseFoFunctionActivity() {
+void toFunctionActivity(std::string data) {
 	if (_functionWindows == "help") {
-		mIconPainterPtr->setBackgroundPic("icon/xiangy.png");
-		mFunctionTextViewPtr->setText(LANGUAGEMANAGER->getValue("HelpResponse"));
-		mStateTextViewPtr->setVisible(false);
-		mFunctionButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "button/elliptic_yellow.png");
-		mFunctionButtonPtr->setText(LANGUAGEMANAGER->getValue("Confirm"));
-
-		mActivityPtr->registerUserTimer(HELP_TIMER_HANDLE, 30 * 1000);	// 30秒
+		helpResopnse();
+		mediaPlayer.Play(CONFIGMANAGER->getResFilePath("response.wav"), "", 1000,
+		        base::MediaPlayer::PlayMode::Default);
 	}
 }
 
@@ -105,12 +107,14 @@ void warn(string warnText) {
 }
 
 void position(string functionText) {
-	mIconPainterPtr->setBackgroundPic("icon/chenggong.png");
+	mIconPainterPtr->setBackgroundPic("icon/chenggong_y.png");
 	mFunctionTextViewPtr->setText(LANGUAGEMANAGER->getValue("PostitionedMsg") + functionText);
 	mStateTextViewPtr->setVisible(false);
 	mFunctionButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "button/elliptic_yellow.png");
 	mFunctionButtonPtr->setText(LANGUAGEMANAGER->getValue("Confirm"));
 	mFunctionWindowPtr->showWnd();
+
+	mActivityPtr->registerUserTimer(FUNCTION_TIMER_HANDLE, 30 * 1000);	// 30秒
 }
 
 void roomPatrol(string functionText) {
@@ -120,8 +124,11 @@ void roomPatrol(string functionText) {
 	mFunctionButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "button/elliptic_green.png");
 	mFunctionButtonPtr->setText(LANGUAGEMANAGER->getValue("Confirm"));
 	mFunctionWindowPtr->showWnd();
+
+	mActivityPtr->registerUserTimer(FUNCTION_TIMER_HANDLE, 30 * 1000);	// 30秒
 }
 
+
 void nursing(string functionText, string nursingText) {
 	mIconPainterPtr->setBackgroundPic("icon/huli2.png");
 	mFunctionTextViewPtr->setText(functionText);
@@ -191,24 +198,33 @@ static void onUI_intent(const Intent *intentPtr) {
 		}
 		else if (_functionWindows == "help") {
 			help();
+			mediaPlayer.Play(CONFIGMANAGER->getResFilePath("response.wav"), "", 1000,
+			        base::MediaPlayer::PlayMode::Default);
 		}
 		else if (_functionWindows == "helpResonse") {
 			helpResopnse();
+			mediaPlayer.Play(CONFIGMANAGER->getResFilePath("response.wav"), "", 1000,
+			        base::MediaPlayer::PlayMode::Default);
 		}
 		else if (_functionWindows == "warn") {
 			_warnText = intentPtr->getExtra(warnText);
 			warn(_warnText);
 		}
 		else if (_functionWindows == "logoutMedicalCare") {
+			_goActivity = intentPtr->getExtra(goActivity);
 			mLogoutWindowPtr->showWnd();
 		}
 		else if (_functionWindows == "position") {
 			_functionText = intentPtr->getExtra(functionText);
 			position(_functionText);
+			mediaPlayer.Play(CONFIGMANAGER->getResFilePath("response.wav"), "", 1000,
+			        base::MediaPlayer::PlayMode::Default);
 		}
 		else if (_functionWindows == "roomPatrol") {
 			_functionText = intentPtr->getExtra(functionText);
 			roomPatrol(_functionText);
+			mediaPlayer.Play(CONFIGMANAGER->getResFilePath("response.wav"), "", 1000,
+			        base::MediaPlayer::PlayMode::Default);
 		}
 		else if (_functionWindows == "nursing") {
 			_functionText = intentPtr->getExtra(functionText);
@@ -269,7 +285,7 @@ static void onProtocolDataUpdate(const SProtocolData &data) {
  */
 static bool onUI_Timer(int id){
 	switch (id) {
-		case HELP_TIMER_HANDLE:
+		case FUNCTION_TIMER_HANDLE:
 			mFunctionWindowPtr->hideWnd();
 			EASYUICONTEXT->closeActivity("functionActivity");
 			return false;
@@ -383,8 +399,12 @@ static bool onButtonClick_backButton(ZKButton *pButton) {
 }
 static bool onButtonClick_FunctionButton(ZKButton *pButton) {
     LOGD(" ButtonClick FunctionButton !!!\n");
-    if (_functionWindows == "help" || _functionWindows == "helpResonse") {
-    	mActivityPtr->unregisterUserTimer(HELP_TIMER_HANDLE);
+    if (_functionWindows == "help" ||
+    		_functionWindows == "helpResonse" ||
+			_functionWindows == "position" ||
+			_functionWindows == "roomPatrol"
+			) {
+    	mActivityPtr->unregisterUserTimer(FUNCTION_TIMER_HANDLE);
     }
     else if (_functionWindows == "nursing") {
     	setNursing(true);
@@ -400,6 +420,12 @@ static bool onButtonClick_ConfirmLogoutButton(ZKButton *pButton) {
     LOGD(" ButtonClick ConfirmLogoutButton !!!\n");
     logoutMedicalCare();
 	EASYUICONTEXT->closeActivity("functionActivity");
+	if (_goActivity == "home") {
+		goHome();
+	}
+	else if (_goActivity == "more") {
+		goMore();
+	}
     return false;
 }
 

jni/logic/mainLogic.cc

@@ -406,6 +406,9 @@ public:
 					}
 				}
 			}
+			if (clerkId != 0) {
+				goCare();
+			}
 		}
 	}
 

jni/logic/medicalCareLogic.cc

@@ -85,6 +85,10 @@ void setClerk(std::string clerk_name, std::string pass_no, int _authItid) {
 	authItId = _authItid;
 }
 
+int getAuthItId() {
+	return authItId;
+}
+
 void setAuthItId(int id) {
 	authItId = id;
 }
@@ -147,14 +151,14 @@ void setPosition(bool setPosition) {
 		setPositionButton(setPosition);
 
 		if (positionItId != 0) {
-			TcpModel tcpModel;
-			tcpModel.tid = base::format("t%d", TimeHelper::getCurrentTime());
-			tcpModel.type = TcpType::POSITION;
-			tcpModel.action = PositionAction::POSITION_END;
-			tcpModel.from_id = StoragePreferences::getInt(STORE_DEVICE_ID,0);
-			tcpModel.to_id = 0;
-			tcpModel.data = to_string(positionItId);
-			sendTcpModel(tcpModel);
+//			TcpModel tcpModel;
+//			tcpModel.tid = base::format("t%d", TimeHelper::getCurrentTime());
+//			tcpModel.type = TcpType::POSITION;
+//			tcpModel.action = PositionAction::POSITION_END;
+//			tcpModel.from_id = StoragePreferences::getInt(STORE_DEVICE_ID,0);
+//			tcpModel.to_id = 0;
+//			tcpModel.data = to_string(positionItId);
+//			sendTcpModel(tcpModel);
 
 			positionItId = 0;
 		}
@@ -213,17 +217,16 @@ void setRoomPatrol(bool setRoomPatrol) {
 		setRoomPatrolButton(setRoomPatrol);
 
 		if (roomCheckItId != 0) {
-			TcpModel tcpModel;
-			tcpModel.tid = base::format("t%d", TimeHelper::getCurrentTime());
-			tcpModel.type = TcpType::ROOMCHECK;
-			tcpModel.action = RoomCheckAction::END;
-			tcpModel.from_id = StoragePreferences::getInt(STORE_DEVICE_ID,0);
-			tcpModel.to_id = 0;
-			tcpModel.data = to_string(roomCheckItId);
-			sendTcpModel(tcpModel);
-
+//			TcpModel tcpModel;
+//			tcpModel.tid = base::format("t%d", TimeHelper::getCurrentTime());
+//			tcpModel.type = TcpType::ROOMCHECK;
+//			tcpModel.action = RoomCheckAction::END;
+//			tcpModel.from_id = StoragePreferences::getInt(STORE_DEVICE_ID,0);
+//			tcpModel.to_id = 0;
+//			tcpModel.data = to_string(roomCheckItId);
+//			sendTcpModel(tcpModel);
+//
 			roomCheckItId = 0;
-
 		}
 	}
 }
@@ -337,6 +340,8 @@ void logoutMedicalCare() {
 		tcpModel.data = to_string(authItId);
 
 		sendTcpModel(tcpModel);
+
+		authItId = 0;
 	}
 }
 
@@ -562,6 +567,7 @@ static bool onButtonClick_LogoutButton(ZKButton *pButton) {
 
 	Intent* intent = new Intent();
 	intent->putExtra(functionWindows, "logoutMedicalCare");
+	intent->putExtra(goActivity, "");
 	EASYUICONTEXT->openActivity("functionActivity", intent);
     return false;
 }

jni/logic/navibar.cc

@@ -37,8 +37,8 @@
 */
 
 void goHome() {
-    msys_homePtr->setBackgroundPic("button/elliptic_white.png");
-    msys_homePtr->setTextColor(0x3A78EF);
+	mHomeButtonPtr->setBackgroundPic("button/elliptic_white.png");
+	mHomeButtonPtr->setTextColor(0x3A78EF);
     mHealthCareButtonPtr->setBackgroundPic("");
     mHealthCareButtonPtr->setTextColor(0xFFFFFF);
     mMoreButtonPtr->setBackgroundPic("");
@@ -49,6 +49,32 @@ void goHome() {
     EASYUICONTEXT->closeActivity("medicalCareActivity");
 }
 
+void goMore() {
+	mHomeButtonPtr->setBackgroundPic("");
+	mHomeButtonPtr->setTextColor(0xFFFFFF);
+	mHealthCareButtonPtr->setBackgroundPic("");
+	mHealthCareButtonPtr->setTextColor(0xFFFFFF);
+	mMoreButtonPtr->setBackgroundPic("button/elliptic_white.png");
+	mMoreButtonPtr->setTextColor(0x3A78EF);
+
+	EASYUICONTEXT->openActivity("moreActivity");
+	EASYUICONTEXT->closeActivity("mainActivity");
+	EASYUICONTEXT->closeActivity("medicalCareActivity");
+}
+
+void goCare() {
+	mHomeButtonPtr->setBackgroundPic("");
+	mHomeButtonPtr->setTextColor(0xFFFFFF);
+    mHealthCareButtonPtr->setBackgroundPic("button/elliptic_white.png");
+    mHealthCareButtonPtr->setTextColor(0x3A78EF);
+    mMoreButtonPtr->setBackgroundPic("");
+    mMoreButtonPtr->setTextColor(0xFFFFFF);
+
+    EASYUICONTEXT->openActivity("medicalCareActivity");
+    EASYUICONTEXT->closeActivity("mainActivity");
+    EASYUICONTEXT->closeActivity("moreActivity");
+}
+
 void callBedButtonSetVisible() {
 	if (mnavibarPtr == NULL) {
 		return;
@@ -154,39 +180,37 @@ static bool onnavibarActivityTouchEvent(const MotionEvent &ev) {
 
 
 
-static bool onButtonClick_sys_home(ZKButton *pButton) {
-    LOGD(" ButtonClick sys_home !!!\n");
-    goHome();
+
+static bool onButtonClick_HomeButton(ZKButton *pButton) {
+    LOGD(" ButtonClick HomeButton !!!\n");
+    if (getAuthItId() != 0) {
+    	Intent* intent = new Intent();
+    	intent->putExtra(functionWindows, "logoutMedicalCare");
+    	intent->putExtra(goActivity, "home");
+    	EASYUICONTEXT->openActivity("functionActivity", intent);
+    } else {
+        goHome();
+    }
     return false;
 }
 
 static bool onButtonClick_HealthCareButton(ZKButton *pButton) {
     LOGD(" ButtonClick HealthCareButton !!!\n");
-    msys_homePtr->setBackgroundPic("");
-    msys_homePtr->setTextColor(0xFFFFFF);
-    mHealthCareButtonPtr->setBackgroundPic("button/elliptic_white.png");
-    mHealthCareButtonPtr->setTextColor(0x3A78EF);
-    mMoreButtonPtr->setBackgroundPic("");
-    mMoreButtonPtr->setTextColor(0xFFFFFF);
-
-    EASYUICONTEXT->openActivity("medicalCareActivity");
-    EASYUICONTEXT->closeActivity("mainActivity");
-    EASYUICONTEXT->closeActivity("moreActivity");
+    goCare();
     return false;
 }
 
 static bool onButtonClick_MoreButton(ZKButton *pButton) {
     LOGD(" ButtonClick MoreButton !!!\n");
-    msys_homePtr->setBackgroundPic("");
-    msys_homePtr->setTextColor(0xFFFFFF);
-    mHealthCareButtonPtr->setBackgroundPic("");
-    mHealthCareButtonPtr->setTextColor(0xFFFFFF);
-    mMoreButtonPtr->setBackgroundPic("button/elliptic_white.png");
-    mMoreButtonPtr->setTextColor(0x3A78EF);
 
-    EASYUICONTEXT->openActivity("moreActivity");
-    EASYUICONTEXT->closeActivity("mainActivity");
-    EASYUICONTEXT->closeActivity("medicalCareActivity");
+    if (getAuthItId() != 0) {
+    	Intent* intent = new Intent();
+    	intent->putExtra(functionWindows, "logoutMedicalCare");
+    	intent->putExtra(goActivity, "more");
+    	EASYUICONTEXT->openActivity("functionActivity", intent);
+    } else {
+    	goMore();
+    }
     return false;
 }
 
@@ -198,22 +222,7 @@ static bool onButtonClick_HelpButton(ZKButton *pButton) {
 	tcpModel.action = ReinforceAction::CALL;
 	tcpModel.from_id = StoragePreferences::getInt(STORE_DEVICE_ID,0);
 	tcpModel.to_id = 0;
-	std::string req = getTcpModelString(tcpModel);
-	LOGD("REINFORCE CALL : %s",req.c_str());
-
-	//回调注册
-	TcpCallback callback;
-	callback.tid = tcpModel.tid;
-	callback.jsonStr = req;
-	callback.onSuccess = [](Json::Value json){
-		LOGD("callback success");
-		return 0;
-	};
-	callback.onFalied = [](Json::Value json){
-		LOGD("callback failed");
-		return 0;
-	};
-	TcpClient::instance()->sendMsgWithCb(req.c_str(), callback);
+	sendTcpModel(tcpModel);
 
 
 	Intent* intent = new Intent();
@@ -249,5 +258,3 @@ static bool onButtonClick_CallBedButton(ZKButton *pButton) {
 	EASYUICONTEXT->openActivity("functionActivity", intent);
     return false;
 }
-
-

jni/logic/promptLogic.cc

@@ -171,15 +171,20 @@ static void onProtocolDataUpdate(const SProtocolData &data) {
 static bool onUI_Timer(int id){
 	switch (id) {
 		case PROMPT_TIME_HANDLE:
+		{
 			mPromptWindowPtr->hideWnd();
 			mSetPromptWindowPtr->showWnd();
 
 		    if (promptTimeItId != 0) {
 		    	sendPromptQuit(promptTimeItId);
 		    }
+
+		    logoutMedicalCare();
+	        goHome();
+	    	EASYUICONTEXT->closeActivity("promptActivity");
 			return false;
 			break;
-
+		}
 		default:
 			break;
 	}

jni/logic/startLogic.cc

@@ -234,7 +234,7 @@ void handleMsg(byte* inBytes){
 				intent->putExtra(functionWindows, "helpResonse");
 				EASYUICONTEXT->openActivity("functionActivity", intent);
 			} else {
-				helpResopnseFoFunctionActivity();
+				toFunctionActivity("");
 			}
 		}
 	} else if (tcpModel.type == TcpType::DEVICE){

jni/service/BusinessConfig.h

@@ -139,7 +139,7 @@ void callBedButtonSetVisible();
 
 Json::Value getFrame();
 
-void helpResopnseFoFunctionActivity();
+void toFunctionActivity(std::string data);
 
 void logoutMedicalCare();
 
@@ -159,8 +159,13 @@ void setPositionButton(bool setPosition);
 void setRoomPatrolButton(bool setRoomPatrol);
 void sendPromptQuit(int id);
 
+int getAuthItId();
 void setAuthItId(int id);
 
+void goHome();
+void goMore();
+void goCare();
+
 std::string getClerkPassNo();
 
 void setClerk(std::string clerk_name, std::string pass_no, int _authItid);
@@ -291,6 +296,7 @@ static std::string nursingText = "nursingText";
 static std::string warnText = "warnText";
 static std::string promptText2 = "promptText2";
 static std::string promptTime2 = "promptTime2";
+static std::string goActivity = "goActivity";
 
 class CallingStatus{
 public: