护理增加密码

i18n/zh_CN.tr

@@ -77,6 +77,8 @@
     <string name="ResponsibleNurse">责任护士</string>
     <string name="Director">科主任</string>
     <string name="HeadNurse">护士长</string>
+    <string name="NursingPasswordInput">进入护理请输入密码</string>
+    <string name="PasswordTag2">4位密码</string>
     <!-- 系统信息 -->
     <string name="Null">无</string>
     <string name="InDate">入院日期</string>

jni/activity/mainActivity.cpp

@@ -4,6 +4,12 @@
 #include "mainActivity.h"
 
 /*TAG:GlobalVariable全局变量*/
+static ZKTextView* mErrorTextViewPtr;
+static ZKButton* mConfirmButtonPtr;
+static ZKTextView* mPasswordTextViewPtr;
+static ZKEditText* mPasswordEditTextPtr;
+static ZKTextView* mNursingPasswordInputTextViewPtr;
+static ZKWindow* mPasswordWindowPtr;
 static ZKTextView* mHeadNurseTextViewPtr;
 static ZKTextView* mHeadNurseTitleTextViewPtr;
 static ZKTextView* mDirectorTextViewPtr;
@@ -64,6 +70,7 @@ typedef struct {
 
 /*TAG:ButtonCallbackTab按键映射表*/
 static S_ButtonCallback sButtonCallbackTab[] = {
+    ID_MAIN_ConfirmButton, onButtonClick_ConfirmButton,
     ID_MAIN_CallBedCancel, onButtonClick_CallBedCancel,
     ID_MAIN_FunctionBack, onButtonClick_FunctionBack,
     ID_MAIN_FunctionButton, onButtonClick_FunctionButton,
@@ -120,6 +127,7 @@ typedef struct {
 }S_EditTextInputCallback;
 /*TAG:EditTextInputCallback*/
 static S_EditTextInputCallback SEditTextInputCallbackTab[] = {
+    ID_MAIN_PasswordEditText, onEditTextChanged_PasswordEditText,
 };
 
 typedef void (*VideoViewCallback)(ZKVideoView *pVideoView, int msg);
@@ -147,6 +155,12 @@ mainActivity::~mainActivity() {
     unregisterProtocolDataUpdateListener(onProtocolDataUpdate);
     onUI_quit();
     mActivityPtr = NULL;
+    mErrorTextViewPtr = NULL;
+    mConfirmButtonPtr = NULL;
+    mPasswordTextViewPtr = NULL;
+    mPasswordEditTextPtr = NULL;
+    mNursingPasswordInputTextViewPtr = NULL;
+    mPasswordWindowPtr = NULL;
     mHeadNurseTextViewPtr = NULL;
     mHeadNurseTitleTextViewPtr = NULL;
     mDirectorTextViewPtr = NULL;
@@ -179,6 +193,12 @@ const char* mainActivity::getAppName() const{
 //TAG:onCreate
 void mainActivity::onCreate() {
 	Activity::onCreate();
+    mErrorTextViewPtr = (ZKTextView*)findControlByID(ID_MAIN_ErrorTextView);
+    mConfirmButtonPtr = (ZKButton*)findControlByID(ID_MAIN_ConfirmButton);
+    mPasswordTextViewPtr = (ZKTextView*)findControlByID(ID_MAIN_PasswordTextView);
+    mPasswordEditTextPtr = (ZKEditText*)findControlByID(ID_MAIN_PasswordEditText);if(mPasswordEditTextPtr!= NULL){mPasswordEditTextPtr->setTextChangeListener(this);}
+    mNursingPasswordInputTextViewPtr = (ZKTextView*)findControlByID(ID_MAIN_NursingPasswordInputTextView);
+    mPasswordWindowPtr = (ZKWindow*)findControlByID(ID_MAIN_PasswordWindow);
     mHeadNurseTextViewPtr = (ZKTextView*)findControlByID(ID_MAIN_HeadNurseTextView);
     mHeadNurseTitleTextViewPtr = (ZKTextView*)findControlByID(ID_MAIN_HeadNurseTitleTextView);
     mDirectorTextViewPtr = (ZKTextView*)findControlByID(ID_MAIN_DirectorTextView);

jni/activity/mainActivity.h

@@ -27,6 +27,12 @@
 #include "window/ZKSlideWindow.h"
 
 /*TAG:Macro宏ID*/
+#define ID_MAIN_ErrorTextView    50026
+#define ID_MAIN_ConfirmButton    20015
+#define ID_MAIN_PasswordTextView    50025
+#define ID_MAIN_PasswordEditText    51003
+#define ID_MAIN_NursingPasswordInputTextView    50015
+#define ID_MAIN_PasswordWindow    110006
 #define ID_MAIN_HeadNurseTextView    50005
 #define ID_MAIN_HeadNurseTitleTextView    50003
 #define ID_MAIN_DirectorTextView    50004

jni/logic/mainLogic.cc

@@ -1144,55 +1144,8 @@ static bool onButtonClick_CallCencelButton(ZKButton *pButton) {
 
 static bool onButtonClick_NursingButton(ZKButton *pButton) {
     LOGD(" ButtonClick NursingButton !!!\n");
-
-//	std::string color = StoragePreferences::getString(STORE_NURSING_COLOR_RGB, "010");
-//	std::string heartStr;
-//	if (color != "" && color.size() == 3) {
-//		heartStr = "DOORLED," + color + "F";
-//	} else {
-//		heartStr = "DOORLED,010F";
-//	}
-//	const char* sendMsg = heartStr.c_str();
-//	sendProtocolTo(UART_TTYS2, (byte*)(sendMsg), strlen(sendMsg));
-	std::string color = StoragePreferences::getString(STORE_NURSING_COLOR_RGB, "010");
-	if (color != "" && color.size() == 3) {
-		color = color + "F";
-	} else {
-		color = "010F";
-	}
-	lightControl("DOORLED", color);
-
-	mFunctionWinPtr->showWnd();
-	mFunctionTextViewPtr->setText(LANGUAGEMANAGER->getValue("InNursing"));
-	mFunctionButtonPtr->setText(LANGUAGEMANAGER->getValue("NursingEnd"));
-	mFunctionBackPtr->setVisible(false);
-
-	// 发送tcp, tcp_type = SIDE, tcp_action = NURSING
-	TcpModel tcpModel;
-	tcpModel.tid = base::format("t%d",TimeHelper::getCurrentTime());
-	tcpModel.type = TcpType::SIDE;
-	tcpModel.action = SideAction::NURSING;
-	tcpModel.from_id = StoragePreferences::getInt(STORE_DEVICE_ID,0);
-	tcpModel.to_id = NULL;
-	std::string req = getTcpModelString(tcpModel);
-	LOGD("TCP SIDE : %s",req.c_str());
-
-	//回调注册
-	TcpCallback callback;
-	callback.tid = tcpModel.tid;
-	callback.jsonStr = req;
-	callback.onSuccess = [](Json::Value json){
-		LOGD("side callback success");
-		return 0;
-	};
-	callback.onFalied = [](Json::Value json){
-		LOGD("side callback failed");
-		return 0;
-	};
-	TcpClient::instance()->sendMsgWithCb(req.c_str(), callback);
-
-	// 把护理状态缓存起来
-	StoragePreferences::putBool(STORE_NURSING_TYPE, true);
+	mPasswordEditTextPtr->setText("");
+	mPasswordWindowPtr->showWnd();
     return false;
 }
 
@@ -1255,3 +1208,60 @@ static bool onButtonClick_CallBedCancel(ZKButton *pButton) {
 	mCallBebWinPtr->hideWnd();
     return false;
 }
+static void onEditTextChanged_PasswordEditText(const std::string &text) {
+    //LOGD(" onEditTextChanged_ PasswordEditText %s !!!\n", text.c_str());
+}
+
+static bool onButtonClick_ConfirmButton(ZKButton *pButton) {
+    LOGD(" ButtonClick ConfirmButton !!!\n");
+    string pwd = mPasswordEditTextPtr->getText();
+	string cpwd = "1020";
+
+    if (pwd == cpwd){
+    	mPasswordWindowPtr->hideWnd();
+
+		std::string color = StoragePreferences::getString(STORE_NURSING_COLOR_RGB, "010");
+		if (color != "" && color.size() == 3) {
+			color = color + "F";
+		} else {
+			color = "010F";
+		}
+		lightControl("DOORLED", color);
+
+		mFunctionWinPtr->showWnd();
+		mFunctionTextViewPtr->setText(LANGUAGEMANAGER->getValue("InNursing"));
+		mFunctionButtonPtr->setText(LANGUAGEMANAGER->getValue("NursingEnd"));
+		mFunctionBackPtr->setVisible(false);
+
+		// 发送tcp, tcp_type = SIDE, tcp_action = NURSING
+		TcpModel tcpModel;
+		tcpModel.tid = base::format("t%d",TimeHelper::getCurrentTime());
+		tcpModel.type = TcpType::SIDE;
+		tcpModel.action = SideAction::NURSING;
+		tcpModel.from_id = StoragePreferences::getInt(STORE_DEVICE_ID,0);
+		tcpModel.to_id = NULL;
+		std::string req = getTcpModelString(tcpModel);
+		LOGD("TCP SIDE : %s",req.c_str());
+
+		//回调注册
+		TcpCallback callback;
+		callback.tid = tcpModel.tid;
+		callback.jsonStr = req;
+		callback.onSuccess = [](Json::Value json){
+			LOGD("side callback success");
+			return 0;
+		};
+		callback.onFalied = [](Json::Value json){
+			LOGD("side callback failed");
+			return 0;
+		};
+		TcpClient::instance()->sendMsgWithCb(req.c_str(), callback);
+
+		// 把护理状态缓存起来
+		StoragePreferences::putBool(STORE_NURSING_TYPE, true);
+		return false;
+    } else {
+    	mErrorTextViewPtr->setTextTr("PasswordWrong");
+    }
+    return false;
+}

jni/service/BusinessConfig.h

@@ -66,8 +66,8 @@
 
 static int defaultTemplateInt = 1;
 
-static std::string versionCode = "v1.0.55";
-static int versionNo = 55;
+static std::string versionCode = "v1.0.56";
+static int versionNo = 56;
 static std::string serverIP = "172.28.100.100";
 static std::string tcpIP = "172.28.100.100";
 static int serverHttpPort = 8006;