替换成点9图，增加护理倒计时，修改首页床位列表显示

i18n/zh_CN.tr

@@ -127,6 +127,7 @@
 	<string name="DoNotVisit">请勿探视</string>
 	<string name="InRestroom">正在如厕请勿进入</string>
 	<string name="DoNotGather">请不要过多人聚集</string>
+    <string name="5Minutes">5分钟</string>
     <string name="10Minutes">10分钟</string>
     <string name="15Minutes">15分钟</string>
     <string name="20Minutes">20分钟时</string>

jni/activity/functionActivity.cpp

@@ -4,6 +4,17 @@
 #include "functionActivity.h"
 
 /*TAG:GlobalVariable全局变量*/
+static ZKButton* mNursingTimeBackButtonPtr;
+static ZKButton* mNursingTimeButtonPtr;
+static ZKTextView* mUnitTextViewPtr;
+static ZKTextView* mTimeTextViewPtr;
+static ZKPainter* mTimeTextPainterPtr;
+static ZKButton* mReduce5ButtonPtr;
+static ZKButton* mReduce1ButtonPtr;
+static ZKButton* mAdd5ButtonPtr;
+static ZKButton* mAdd1ButtonPtr;
+static ZKListView* mTimeListViewPtr;
+static ZKWindow* mNursingTimeWindowPtr;
 static ZKButton* mRebootLineButtonPtr;
 static ZKTextView* mRebootLineTextViewPtr;
 static ZKButton* mRebootPowerButtonPtr;
@@ -83,6 +94,12 @@ typedef struct {
 
 /*TAG:ButtonCallbackTab按键映射表*/
 static S_ButtonCallback sButtonCallbackTab[] = {
+    ID_FUNCTION_NursingTimeBackButton, onButtonClick_NursingTimeBackButton,
+    ID_FUNCTION_NursingTimeButton, onButtonClick_NursingTimeButton,
+    ID_FUNCTION_Reduce5Button, onButtonClick_Reduce5Button,
+    ID_FUNCTION_Reduce1Button, onButtonClick_Reduce1Button,
+    ID_FUNCTION_Add5Button, onButtonClick_Add5Button,
+    ID_FUNCTION_Add1Button, onButtonClick_Add1Button,
     ID_FUNCTION_RebootLineButton, onButtonClick_RebootLineButton,
     ID_FUNCTION_RebootPowerButton, onButtonClick_RebootPowerButton,
     ID_FUNCTION_RebootDeviceButton, onButtonClick_RebootDeviceButton,
@@ -121,6 +138,7 @@ typedef struct {
 }S_ListViewFunctionsCallback;
 /*TAG:ListViewFunctionsCallback*/
 static S_ListViewFunctionsCallback SListViewFunctionsCallbackTab[] = {
+    ID_FUNCTION_TimeListView, getListItemCount_TimeListView, obtainListItemData_TimeListView, onListItemClick_TimeListView,
     ID_FUNCTION_CallBedListView, getListItemCount_CallBedListView, obtainListItemData_CallBedListView, onListItemClick_CallBedListView,
 };
 
@@ -172,6 +190,17 @@ functionActivity::~functionActivity() {
     unregisterProtocolDataUpdateListener(onProtocolDataUpdate);
     onUI_quit();
     mActivityPtr = NULL;
+    mNursingTimeBackButtonPtr = NULL;
+    mNursingTimeButtonPtr = NULL;
+    mUnitTextViewPtr = NULL;
+    mTimeTextViewPtr = NULL;
+    mTimeTextPainterPtr = NULL;
+    mReduce5ButtonPtr = NULL;
+    mReduce1ButtonPtr = NULL;
+    mAdd5ButtonPtr = NULL;
+    mAdd1ButtonPtr = NULL;
+    mTimeListViewPtr = NULL;
+    mNursingTimeWindowPtr = NULL;
     mRebootLineButtonPtr = NULL;
     mRebootLineTextViewPtr = NULL;
     mRebootPowerButtonPtr = NULL;
@@ -223,6 +252,17 @@ const char* functionActivity::getAppName() const{
 //TAG:onCreate
 void functionActivity::onCreate() {
 	Activity::onCreate();
+    mNursingTimeBackButtonPtr = (ZKButton*)findControlByID(ID_FUNCTION_NursingTimeBackButton);
+    mNursingTimeButtonPtr = (ZKButton*)findControlByID(ID_FUNCTION_NursingTimeButton);
+    mUnitTextViewPtr = (ZKTextView*)findControlByID(ID_FUNCTION_UnitTextView);
+    mTimeTextViewPtr = (ZKTextView*)findControlByID(ID_FUNCTION_TimeTextView);
+    mTimeTextPainterPtr = (ZKPainter*)findControlByID(ID_FUNCTION_TimeTextPainter);
+    mReduce5ButtonPtr = (ZKButton*)findControlByID(ID_FUNCTION_Reduce5Button);
+    mReduce1ButtonPtr = (ZKButton*)findControlByID(ID_FUNCTION_Reduce1Button);
+    mAdd5ButtonPtr = (ZKButton*)findControlByID(ID_FUNCTION_Add5Button);
+    mAdd1ButtonPtr = (ZKButton*)findControlByID(ID_FUNCTION_Add1Button);
+    mTimeListViewPtr = (ZKListView*)findControlByID(ID_FUNCTION_TimeListView);if(mTimeListViewPtr!= NULL){mTimeListViewPtr->setListAdapter(this);mTimeListViewPtr->setItemClickListener(this);}
+    mNursingTimeWindowPtr = (ZKWindow*)findControlByID(ID_FUNCTION_NursingTimeWindow);
     mRebootLineButtonPtr = (ZKButton*)findControlByID(ID_FUNCTION_RebootLineButton);
     mRebootLineTextViewPtr = (ZKTextView*)findControlByID(ID_FUNCTION_RebootLineTextView);
     mRebootPowerButtonPtr = (ZKButton*)findControlByID(ID_FUNCTION_RebootPowerButton);

jni/activity/functionActivity.h

@@ -27,6 +27,17 @@
 #include "window/ZKSlideWindow.h"
 
 /*TAG:Macro宏ID*/
+#define ID_FUNCTION_NursingTimeBackButton    20022
+#define ID_FUNCTION_NursingTimeButton    20017
+#define ID_FUNCTION_UnitTextView    50023
+#define ID_FUNCTION_TimeTextView    50022
+#define ID_FUNCTION_TimeTextPainter    52009
+#define ID_FUNCTION_Reduce5Button    20021
+#define ID_FUNCTION_Reduce1Button    20020
+#define ID_FUNCTION_Add5Button    20018
+#define ID_FUNCTION_Add1Button    20019
+#define ID_FUNCTION_TimeListView    80002
+#define ID_FUNCTION_NursingTimeWindow    110010
 #define ID_FUNCTION_RebootLineButton    20013
 #define ID_FUNCTION_RebootLineTextView    50012
 #define ID_FUNCTION_RebootPowerButton    20012

jni/logic/functionLogic.cc

@@ -50,6 +50,24 @@ static base::MediaPlayer mediaPlayer;
 
 #define FUNCTION_TIMER_HANDLE 3	// 功能模块的定时器id
 
+static int chooseNursingTime = 0;
+static int nursingTime = 5;
+
+typedef struct {
+	const string mainText;
+} NURSINGTIME;
+
+static NURSINGTIME sNursingTime[] = {
+		{ LANGUAGEMANAGER->getValue("5Minutes") },
+		{ LANGUAGEMANAGER->getValue("10Minutes") },
+		{ LANGUAGEMANAGER->getValue("20Minutes") },
+		{ LANGUAGEMANAGER->getValue("30Minutes") },
+		{ LANGUAGEMANAGER->getValue("45Minutes") },
+		{ LANGUAGEMANAGER->getValue("60Minutes") },
+		{ LANGUAGEMANAGER->getValue("90Minutes") },
+		{ LANGUAGEMANAGER->getValue("120Minutes") },
+};
+
 void setFunctionTheme() {
     functionThemeInt = StoragePreferences::getInt(STORE_THEME, defaultThemeInt);
     if (functionThemeInt == 1) {
@@ -202,6 +220,8 @@ void nursingEnd(string functionText) {
 	mFunctionWindowPtr->showWnd();
 }
 
+
+
 void pwdWindowInfo() {
 	mPwdEditTextPtr->setText("");
 	mPwdPromptTextViewPtr->setTextColor(0xFF000000);
@@ -497,12 +517,15 @@ static bool onButtonClick_FunctionButton(ZKButton *pButton) {
 			_functionWindows == "roomPatrol"
 			) {
     	mActivityPtr->unregisterUserTimer(FUNCTION_TIMER_HANDLE);
+    	EASYUICONTEXT->closeActivity("functionActivity");
     }
     else if (_functionWindows == "nursing") {
-    	setNursing(true);
+//    	setNursing(true);
+    	mNursingTimeWindowPtr->showWnd();
     }
     else if (_functionWindows == "nursingEnd") {
-    	setNursing(false);
+    	setNursingFalse();
+    	EASYUICONTEXT->closeActivity("functionActivity");
     }
     else if (_functionWindows == "theme") {
     	if (_functionText == "蓝色") {
@@ -513,9 +536,9 @@ static bool onButtonClick_FunctionButton(ZKButton *pButton) {
     	}
 		sync();
 		reboot(RB_AUTOBOOT);
+		EASYUICONTEXT->closeActivity("functionActivity");
     }
 
-	EASYUICONTEXT->closeActivity("functionActivity");
     return false;
 }
 static bool onButtonClick_ConfirmLogoutButton(ZKButton *pButton) {
@@ -699,3 +722,119 @@ static bool onButtonClick_RebootLineButton(ZKButton *pButton) {
     TcpClient::instance()->sendMsg(req.c_str());
     return false;
 }
+static int getListItemCount_TimeListView(const ZKListView *pListView) {
+    //LOGD("getListItemCount_TimeListView !\n");
+    return sizeof(sNursingTime) / sizeof(NURSINGTIME);
+}
+
+static void obtainListItemData_TimeListView(ZKListView *pListView,ZKListView::ZKListItem *pListItem, int index) {
+    //LOGD(" obtainListItemData_ TimeListView  !!!\n");
+	pListItem->setText(sNursingTime[index].mainText);
+
+	if (index == chooseNursingTime) {
+		pListItem->setSelected(true);
+	}
+	else {
+		pListItem->setSelected(false);
+	}
+}
+
+static void onListItemClick_TimeListView(ZKListView *pListView, int index, int id) {
+    //LOGD(" onListItemClick_ TimeListView  !!!\n");
+
+	chooseNursingTime = index;
+	if (chooseNursingTime == 0) {
+		nursingTime = 5;
+		mTimeTextViewPtr->setText(nursingTime);
+	}
+	else if (chooseNursingTime == 1) {
+		nursingTime = 10;
+		mTimeTextViewPtr->setText(nursingTime);
+	}
+	else if (chooseNursingTime == 2) {
+		nursingTime = 20;
+		mTimeTextViewPtr->setText(nursingTime);
+	}
+	else if (chooseNursingTime == 3) {
+		nursingTime = 30;
+		mTimeTextViewPtr->setText(nursingTime);
+	}
+	else if (chooseNursingTime == 4) {
+		nursingTime = 45;
+		mTimeTextViewPtr->setText(nursingTime);
+	}
+	else if (chooseNursingTime == 5) {
+		nursingTime = 60;
+		mTimeTextViewPtr->setText(nursingTime);
+	}
+	else if (chooseNursingTime == 6) {
+		nursingTime = 90;
+		mTimeTextViewPtr->setText(nursingTime);
+	}
+	else if (chooseNursingTime == 7) {
+		nursingTime = 120;
+		mTimeTextViewPtr->setText(nursingTime);
+	}
+}
+
+static bool onButtonClick_Add1Button(ZKButton *pButton) {
+    LOGD(" ButtonClick Add1Button !!!\n");
+    nursingTime += 1;
+    if (nursingTime >= 1440) {
+    	nursingTime = 1440;
+    }
+	mTimeTextViewPtr->setText(nursingTime);
+    return false;
+}
+
+static bool onButtonClick_Add5Button(ZKButton *pButton) {
+    LOGD(" ButtonClick Add5Button !!!\n");
+    nursingTime -= 1;
+    if (nursingTime <= 1) {
+    	nursingTime = 1;
+    }
+	mTimeTextViewPtr->setText(nursingTime);
+    return false;
+}
+
+static bool onButtonClick_Reduce1Button(ZKButton *pButton) {
+    LOGD(" ButtonClick Reduce1Button !!!\n");
+    nursingTime -= 1;
+    if (nursingTime <= 1) {
+    	nursingTime = 1;
+    }
+	mTimeTextViewPtr->setText(nursingTime);
+    return false;
+}
+
+static bool onButtonClick_Reduce5Button(ZKButton *pButton) {
+    LOGD(" ButtonClick Reduce5Button !!!\n");
+    nursingTime -= 5;
+    if (nursingTime <= 1) {
+    	nursingTime = 1;
+    }
+	mTimeTextViewPtr->setText(nursingTime);
+    return false;
+}
+
+static bool onButtonClick_NursingTimeButton(ZKButton *pButton) {
+    LOGD(" ButtonClick NursingTimeButton !!!\n");
+	mNursingTimeWindowPtr->hideWnd();
+	EASYUICONTEXT->closeActivity("functionActivity");
+
+    setNursingTime(nursingTime);
+
+    chooseNursingTime = 0;
+    nursingTime = 5;
+    return false;
+}
+
+static bool onButtonClick_NursingTimeBackButton(ZKButton *pButton) {
+    LOGD(" ButtonClick NursingTimeBackButton !!!\n");
+    mNursingTimeWindowPtr->hideWnd();
+	EASYUICONTEXT->closeActivity("functionActivity");
+
+    chooseNursingTime = 0;
+    nursingTime = 5;
+    return false;
+}

jni/logic/medicalCareLogic.cc

@@ -53,6 +53,9 @@ static int medicalCareThemeInt = defaultThemeInt;
 static uint32_t medicalCareColor = buleDeepColour;
 
 
+#define NURSEING_TIME_HANDLE 12 // 护理
+
+
 void setMedicalCareTheme() {
     medicalCareThemeInt = StoragePreferences::getInt(STORE_THEME, defaultThemeInt);
     if (medicalCareThemeInt == 1) {
@@ -327,7 +330,6 @@ void setNursingButton(bool setNursing) {
 	}
 }
 
-
 void setNursing(bool setNursing) {
 	if (setNursing) {
 		setNursingButton(setNursing);
@@ -364,6 +366,19 @@ void setNursing(bool setNursing) {
 }
 
 
+void setNursingTime(int time) {
+	mActivityPtr->registerUserTimer(NURSEING_TIME_HANDLE, time * 60 * 1000);	// 300秒
+
+	setNursing(true);
+}
+
+void setNursingFalse() {
+	mActivityPtr->unregisterUserTimer(NURSEING_TIME_HANDLE);	// 300秒
+
+	setNursing(false);
+}
+
+
 void logoutMedicalCare() {
 	isChoose = false;
 	setPosition(false);
@@ -557,6 +572,11 @@ static void onProtocolDataUpdate(const SProtocolData &data) {
 static bool onUI_Timer(int id){
 	switch (id) {
 
+	case NURSEING_TIME_HANDLE:
+        logoutMedicalCare();
+    	goHome();
+		break;
+
 		default:
 			break;
 	}

jni/service/BusinessConfig.h

@@ -72,8 +72,8 @@ static uint32_t buleDeepColour = 0x3A78EF;
 static uint32_t whiteColour = 0xFFFFFF;
 static int defaultThemeInt = 1;
 
-static std::string versionCode = "v2.0.5";
-static int versionNo = 41;
+static std::string versionCode = "v2.0.7";
+static int versionNo = 43;
 static std::string serverIP = "172.28.100.100";
 static std::string tcpIP = "172.28.100.100";
 static int serverHttpPort = 8006;
@@ -160,6 +160,10 @@ void setNursingEnd();
 
 void setNursing(bool setNursing);
 
+void setNursingTime(int time);
+
+void setNursingFalse();
+
 const bool checkAddr(std::string addr);
 
 void openInitWindow();