增加模式3

i18n/zh_CN.tr

@@ -73,6 +73,8 @@
 	<string name="Detail">参数</string>
     <string name="ResponsibleDoctor">责任医生</string>
     <string name="ResponsibleNurse">责任护士</string>
+    <string name="Director">科主任</string>
+    <string name="HeadNurse">护士长</string>
     <!-- 导航栏 -->
     <!-- 功能界面 -->
     <string name="CallableBeds">当前可呼叫床位</string>
@@ -92,6 +94,7 @@
     <string name="ThemeConfirm">确认切换主题颜色后，本机会重启</string>
     <string name="Mode1">是否切换成模式1</string>
     <string name="Mode2">是否切换成模式2</string>
+    <string name="Mode3">是否切换成模式3</string>
     <string name="ModeConfirm">确认切换模式后，本机会重启</string>
     <!-- 医护界面 -->
     <string name="MedicalLoginMsg">请输入正确的密码，进入医护功能</string>

jni/activity/mainActivity.cpp

@@ -4,6 +4,15 @@
 #include "mainActivity.h"
 
 /*TAG:GlobalVariable全局变量*/
+static ZKListView* mBedListView4Ptr;
+static ZKTextView* mNurseHeadTextViewPtr;
+static ZKTextView* mNurseTitleTextViewPtr;
+static ZKPainter* mNurseHeadLinePainterPtr;
+static ZKPainter* mNurseHeadPainterPtr;
+static ZKTextView* mDirectorTextViewPtr;
+static ZKTextView* mDirectorTitleTextViewPtr;
+static ZKPainter* mDirectLinePainterPtr;
+static ZKPainter* mDirectorPainterPtr;
 static ZKListView* mBedListView3Ptr;
 static ZKListView* mBedListView2Ptr;
 static ZKListView* mBedListViewPtr;
@@ -80,6 +89,7 @@ typedef struct {
 }S_ListViewFunctionsCallback;
 /*TAG:ListViewFunctionsCallback*/
 static S_ListViewFunctionsCallback SListViewFunctionsCallbackTab[] = {
+    ID_MAIN_BedListView4, getListItemCount_BedListView4, obtainListItemData_BedListView4, onListItemClick_BedListView4,
     ID_MAIN_BedListView3, getListItemCount_BedListView3, obtainListItemData_BedListView3, onListItemClick_BedListView3,
     ID_MAIN_BedListView2, getListItemCount_BedListView2, obtainListItemData_BedListView2, onListItemClick_BedListView2,
     ID_MAIN_BedListView, getListItemCount_BedListView, obtainListItemData_BedListView, onListItemClick_BedListView,
@@ -129,6 +139,15 @@ mainActivity::~mainActivity() {
     EASYUICONTEXT->unregisterGlobalTouchListener(this);
     onUI_quit();
     unregisterProtocolDataUpdateListener(onProtocolDataUpdate);
+    mBedListView4Ptr = NULL;
+    mNurseHeadTextViewPtr = NULL;
+    mNurseTitleTextViewPtr = NULL;
+    mNurseHeadLinePainterPtr = NULL;
+    mNurseHeadPainterPtr = NULL;
+    mDirectorTextViewPtr = NULL;
+    mDirectorTitleTextViewPtr = NULL;
+    mDirectLinePainterPtr = NULL;
+    mDirectorPainterPtr = NULL;
     mBedListView3Ptr = NULL;
     mBedListView2Ptr = NULL;
     mBedListViewPtr = NULL;
@@ -153,6 +172,15 @@ const char* mainActivity::getAppName() const{
 //TAG:onCreate
 void mainActivity::onCreate() {
 	Activity::onCreate();
+    mBedListView4Ptr = (ZKListView*)findControlByID(ID_MAIN_BedListView4);if(mBedListView4Ptr!= NULL){mBedListView4Ptr->setListAdapter(this);mBedListView4Ptr->setItemClickListener(this);}
+    mNurseHeadTextViewPtr = (ZKTextView*)findControlByID(ID_MAIN_NurseHeadTextView);
+    mNurseTitleTextViewPtr = (ZKTextView*)findControlByID(ID_MAIN_NurseTitleTextView);
+    mNurseHeadLinePainterPtr = (ZKPainter*)findControlByID(ID_MAIN_NurseHeadLinePainter);
+    mNurseHeadPainterPtr = (ZKPainter*)findControlByID(ID_MAIN_NurseHeadPainter);
+    mDirectorTextViewPtr = (ZKTextView*)findControlByID(ID_MAIN_DirectorTextView);
+    mDirectorTitleTextViewPtr = (ZKTextView*)findControlByID(ID_MAIN_DirectorTitleTextView);
+    mDirectLinePainterPtr = (ZKPainter*)findControlByID(ID_MAIN_DirectLinePainter);
+    mDirectorPainterPtr = (ZKPainter*)findControlByID(ID_MAIN_DirectorPainter);
     mBedListView3Ptr = (ZKListView*)findControlByID(ID_MAIN_BedListView3);if(mBedListView3Ptr!= NULL){mBedListView3Ptr->setListAdapter(this);mBedListView3Ptr->setItemClickListener(this);}
     mBedListView2Ptr = (ZKListView*)findControlByID(ID_MAIN_BedListView2);if(mBedListView2Ptr!= NULL){mBedListView2Ptr->setListAdapter(this);mBedListView2Ptr->setItemClickListener(this);}
     mBedListViewPtr = (ZKListView*)findControlByID(ID_MAIN_BedListView);if(mBedListViewPtr!= NULL){mBedListViewPtr->setListAdapter(this);mBedListViewPtr->setItemClickListener(this);}

jni/activity/mainActivity.h

@@ -27,6 +27,23 @@
 #include "window/ZKSlideWindow.h"
 
 /*TAG:Macro宏ID*/
+#define ID_MAIN_NurseTitleSubItem4    24034
+#define ID_MAIN_DoctorTitleSubItem4    24033
+#define ID_MAIN_NurseSubItem4    24032
+#define ID_MAIN_DoctorSubItem4    24031
+#define ID_MAIN_SexSubItem4    24030
+#define ID_MAIN_AgeSubItem4    24029
+#define ID_MAIN_CustomerNameSubItem4    24028
+#define ID_MAIN_BedNumSubItem4    24027
+#define ID_MAIN_BedListView4    80004
+#define ID_MAIN_NurseHeadTextView    50009
+#define ID_MAIN_NurseTitleTextView    50007
+#define ID_MAIN_NurseHeadLinePainter    52010
+#define ID_MAIN_NurseHeadPainter    52008
+#define ID_MAIN_DirectorTextView    50008
+#define ID_MAIN_DirectorTitleTextView    50006
+#define ID_MAIN_DirectLinePainter    52009
+#define ID_MAIN_DirectorPainter    52007
 #define ID_MAIN_NurseTitleSubItem3    24026
 #define ID_MAIN_DoctorTitleSubItem3    24025
 #define ID_MAIN_NurseSubItem3    24024

jni/activity/settingActivity.h

@@ -29,6 +29,7 @@
 #include "window/ZKSlideWindow.h"
 
 /*TAG:Macro宏ID*/
+#define ID_SETTING_ModeRadioButton3    22005
 #define ID_SETTING_ModeRadioButton2    22004
 #define ID_SETTING_ModeRadioButton1    22003
 #define ID_SETTING_ModeRadioGroup    94002

jni/logic/functionLogic.cc

@@ -271,6 +271,9 @@ void mode(string functionText) {
     else if (functionText == "模式2") {
         mFunctionTextViewPtr->setText(LANGUAGEMANAGER->getValue("Mode2"));
     }
+    else if (functionText == "模式3") {
+        mFunctionTextViewPtr->setText(LANGUAGEMANAGER->getValue("Mode3"));
+    }
     mStateTextViewPtr->setVisible(true);
     mStateTextViewPtr->setText(LANGUAGEMANAGER->getValue("ModeConfirm"));
     mFunctionButtonPtr->setText(LANGUAGEMANAGER->getValue("Confirm"));
@@ -571,6 +574,9 @@ static bool onButtonClick_FunctionButton(ZKButton *pButton) {
         else if (_functionText == "模式2") {
             StoragePreferences::putInt(STORE_MODE, 2);
         }
+        else if (_functionText == "模式3") {
+            StoragePreferences::putInt(STORE_MODE, 3);
+        }
         sync();
         reboot(RB_AUTOBOOT);
     }

jni/logic/mainLogic.cc

@@ -95,6 +95,19 @@ void setMainTheme() {
     }
 }
 
+void setMainMode() {
+	if (mainModeInt == 3) {
+		mDirectorPainterPtr->setVisible(true);
+		mDirectLinePainterPtr->setVisible(true);
+		mDirectorTitleTextViewPtr->setVisible(true);
+		mDirectorTextViewPtr->setVisible(true);
+		mNurseHeadPainterPtr->setVisible(true);
+		mNurseHeadLinePainterPtr->setVisible(true);
+		mNurseTitleTextViewPtr->setVisible(true);
+		mNurseHeadTextViewPtr->setVisible(true);
+	}
+}
+
 static void getServerInfo(){
 
 	string url = getHttpGateway() + "/ncs_url/server_info";
@@ -164,7 +177,7 @@ static void getFrameRoom(int frame_id) {
 			if (mainModeInt == 1) {
 				mBedListViewPtr->refreshListView();
 			}
-			else {
+			else if (mainModeInt == 2) {
 				if (frameBedList.size() <= 3) {
 					mBedListViewPtr->refreshListView();
 					mBedListViewPtr->setVisible(true);
@@ -185,6 +198,11 @@ static void getFrameRoom(int frame_id) {
 					mBedListView3Ptr->setVisible(true);
 				}
 			}
+			else if (mainModeInt == 3) {
+				mBedListView4Ptr->refreshListView();
+				mBedListViewPtr->setVisible(false);
+				mBedListView4Ptr->setVisible(true);
+			}
 		}
 	}
 }
@@ -198,6 +216,10 @@ static void setRightTitle(Json::Value partSetting) {
 	rightTitleInfo["nurse_valid"] = partSetting["nurse_valid"].asInt();
 }
 
+static void setDirectorAndHeadNurse() {
+	mDirectorTextViewPtr->setText(partSetting.partDirector);
+	mNurseHeadTextViewPtr->setText(partSetting.partNurseHead);
+}
 
 
 static void getPartSetting(string partId){
@@ -259,6 +281,8 @@ static void getPartSetting(string partId){
 		partSetting.doorNurseValid = root["door_nurse_valid"].asInt();
 		partSetting.doorNursingTitle = root["door_nursing_title"].asString();
 		partSetting.doorNursingValid = root["door_nursing_valid"].asInt();
+		partSetting.partDirector = root["part_director"].asString();
+		partSetting.partNurseHead = root["part_nurse_head"].asString();
 		partSetting.upSeconds = root["up_seconds"].asInt();
 		partSetting.autoAccept = root["auto_accept"].asInt();
 		partSetting.eventForward = root["event_forward"].asInt();
@@ -307,6 +331,7 @@ static void getPartSetting(string partId){
 
 		setRightTitle(root);
 		callBedButtonSetVisible();
+		setDirectorAndHeadNurse();
 
 		getFrameRoom(frameInfo["frame_id"].asInt());
 
@@ -412,6 +437,7 @@ static void getDeviceInfo(){
 	if (dataInit){
 		getFrameInfo();
 		getBedCount();
+		setDirectorAndHeadNurse();
 		return;
 	}
 	string url = getHttpGateway() + "/deviceRoom/get_device_by_eth_mac/" + StoragePreferences::getString(STORE_MAC_ADDR, "0.0.0.0");
@@ -497,6 +523,7 @@ static void onUI_init(){
 		}
 		getDeviceInfo();
 	}
+	setMainMode();
 
 }
 
@@ -591,11 +618,6 @@ static int getListItemCount_BedListView(const ZKListView *pListView) {
 static void obtainListItemData_BedListView(ZKListView *pListView,ZKListView::ZKListItem *pListItem, int index) {
     //LOGD(" obtainListItemData_ BedListView  !!!\n");
 
-	if (mainModeInt == 2) {
-		if (frameBedList.size() > 3) {
-			return;
-		}
-	}
 	if (frameBedList.size() > 0) {
 		ZKListView::ZKListSubItem* bedNum = pListItem->findSubItemByID(ID_MAIN_BedNumSubItem);
 		ZKListView::ZKListSubItem* name = pListItem->findSubItemByID(ID_MAIN_CustomerNameSubItem);
@@ -606,6 +628,13 @@ static void obtainListItemData_BedListView(ZKListView *pListView,ZKListView::ZKL
 		ZKListView::ZKListSubItem* doctor = pListItem->findSubItemByID(ID_MAIN_DoctorSubItem);
 		ZKListView::ZKListSubItem* nurse = pListItem->findSubItemByID(ID_MAIN_NurseSubItem);
 
+
+		if (mainModeInt == 2) {
+			if (frameBedList.size() > 3) {
+				return;
+			}
+		}
+
 		if (mainThemeInt == 1) {
 			bedNum->setBackgroundPic("/9/chuanghao_bg.9.png");
 		}
@@ -937,3 +966,98 @@ static void obtainListItemData_BedListView3(ZKListView *pListView,ZKListView::ZK
 static void onListItemClick_BedListView3(ZKListView *pListView, int index, int id) {
     //LOGD(" onListItemClick_ BedListView3  !!!\n");
 }
+static int getListItemCount_BedListView4(const ZKListView *pListView) {
+    //LOGD("getListItemCount_BedListView4 !\n");
+    return frameBedList.size();
+}
+
+static void obtainListItemData_BedListView4(ZKListView *pListView,ZKListView::ZKListItem *pListItem, int index) {
+    //LOGD(" obtainListItemData_ BedListView4  !!!\n");
+	if (mainModeInt == 3 && frameBedList.size()> 0) {
+		ZKListView::ZKListSubItem* bedNum = pListItem->findSubItemByID(ID_MAIN_BedNumSubItem4);
+		ZKListView::ZKListSubItem* name = pListItem->findSubItemByID(ID_MAIN_CustomerNameSubItem4);
+		ZKListView::ZKListSubItem* age = pListItem->findSubItemByID(ID_MAIN_AgeSubItem4);
+		ZKListView::ZKListSubItem* sex = pListItem->findSubItemByID(ID_MAIN_SexSubItem4);
+		ZKListView::ZKListSubItem* doctorTitle = pListItem->findSubItemByID(ID_MAIN_DoctorTitleSubItem4);
+		ZKListView::ZKListSubItem* nurseTitle = pListItem->findSubItemByID(ID_MAIN_NurseTitleSubItem4);
+		ZKListView::ZKListSubItem* doctor = pListItem->findSubItemByID(ID_MAIN_DoctorSubItem4);
+		ZKListView::ZKListSubItem* nurse = pListItem->findSubItemByID(ID_MAIN_NurseSubItem4);
+
+		if (mainThemeInt == 1) {
+			bedNum->setBackgroundPic("/9/chuanghao_bg.9.png");
+		}
+		else if (mainThemeInt == 2) {
+			bedNum->setBackgroundPic("/9/chuanghao_bg_pink.9.png");
+		}
+
+
+		string frameBedName = frameBedList[index]["frame_bed"]["full_name"].asString();
+		if (frameBedName == "") {
+			bedNum->setText(LANGUAGEMANAGER->getValue("EmptyBed"));
+		} else {
+			int nPos = frameBedName.find("-");
+			if (nPos != -1) {
+				frameBedName = frameBedName.substr(nPos + 1, frameBedName.length());
+			}
+			bedNum->setText(frameBedName);
+		}
+
+		// 用户相关
+		string customerName = frameBedList[index]["customer_name"].asString();
+		if (customerName == "") {
+			name->setText(LANGUAGEMANAGER->getValue("EmptyCustomer"));
+		} else {
+			name->setText(customerName);
+		}
+
+
+		if (partSetting.customerAgeHiddenOnDoor != 0) {
+			if (frameBedList[index]["customer_age"].asString() == "") {
+				age->setText("");
+			} else {
+				age->setText("*" + frameBedList[index]["customer_age_unit"].asString());
+			}
+		}
+		else {
+			age->setText(frameBedList[index]["customer_age"].asString() + frameBedList[index]["customer_age_unit"].asString());
+		}
+
+
+		string customerSex = frameBedList[index]["customer_sex"].asString();
+		if (customerSex == "0") {	// 如果性别为女性，替换成女性，底色为粉色
+			sex->setText(LANGUAGEMANAGER->getValue("Woman"));
+			sex->setTextColor(0xFF9F9F);
+			sex->setBackgroundPic("9/lightRed.9.png");
+		}
+		else if (customerSex == "1") {
+			sex->setText(LANGUAGEMANAGER->getValue("Man"));
+			sex->setTextColor(0x3A78EF);
+			sex->setBackgroundPic("9/lightBlue.9.png");
+		}
+		else {
+			sex->setText(LANGUAGEMANAGER->getValue("Unknown"));
+			sex->setTextColor(0x37B643);
+			sex->setBackgroundPic("9/lightGreen.9.png");
+		}
+
+
+		// 医生护士相关
+		if (rightTitleInfo["doctor_valid"] != 1){
+			doctorTitle->setVisible(false);
+		} else {
+			doctorTitle->setText(rightTitleInfo["doctor_title"].asString());
+		}
+
+		if (rightTitleInfo["nurse_valid"] != 1){
+			nurseTitle->setVisible(false);
+		} else {
+			nurseTitle->setText(rightTitleInfo["nurse_title"].asString());
+		}
+		doctor->setText(frameBedList[index]["doctor_name"].asString());
+		nurse->setText(frameBedList[index]["nurse_name"].asString());
+	}
+}
+
+static void onListItemClick_BedListView4(ZKListView *pListView, int index, int id) {
+    //LOGD(" onListItemClick_ BedListView4  !!!\n");
+}

jni/logic/settingLogic.cc

@@ -199,6 +199,11 @@ static void onCheckedChanged_ModeRadioGroup(ZKRadioGroup* pRadioGroup, int check
         LOGD("选择模式2");
         modeStr = "模式2";
         break;
+    case ID_SETTING_ModeRadioButton3:
+        LOGD("选择模式3");
+        modeStr = "模式3";
+        break;
+
     }
 
     Intent* intent = new Intent();

jni/service/BusinessConfig.h

@@ -72,10 +72,10 @@ static uint32_t buleLightColour = 0xFF759FFF;
 static uint32_t buleDeepColour = 0xFF3A78EF;
 static uint32_t whiteColour = 0xFFFFFFFF;
 static int defaultThemeInt = 1;
-static int defaultModeInt = 1;
+static int defaultModeInt = 3;
 
-static std::string versionCode = "v2.0.8";
-static int versionNo = 44;
+static std::string versionCode = "v2.0.9";
+static int versionNo = 45;
 static std::string serverIP = "172.28.100.100";
 static std::string tcpIP = "172.28.100.100";
 static int serverHttpPort = 8006;
@@ -264,6 +264,8 @@ public:
 	inline static int doorNurseValid;
 	inline static std::string doorNursingTitle;
 	inline static int doorNursingValid;
+	inline static std::string partDirector;
+	inline static std::string partNurseHead;
 	inline static int upSeconds;
 	inline static int autoAccept;
 	inline static bool boardShowEmptyBed;