Merge branch 'feature/clerk-20231122' into feature/nurseOption-20231208

# Conflicts:
#	jni/activity/mainActivity.cpp
#	jni/activity/mainActivity.h
#	libs/armeabi/libzkgui.so
#	obj/activity/callActivity.o
#	obj/activity/mainActivity.o
#	obj/activity/settingActivity.o
#	obj/activity/sipTestActivity.o
#	obj/activity/startActivity.o
#	obj/activity/statusbar.o
#	obj/activity/ui3Activity.o
#	obj/activity/updateActivity.o
#	obj/activity/warnActivity.o
#	obj/core/update_assistant.o
#	obj/net/tcp_client.o
#	obj/server/http_server.o
#	obj/service/BusinessConfig.o
#	obj/service/time.o
#	ui/main.ftu

i18n/zh_CN.tr

@@ -75,6 +75,8 @@
 	<string name="Detail">参数</string>
     <string name="ResponsibleDoctor">责任医生</string>
     <string name="ResponsibleNurse">责任护士</string>
+    <string name="Director">科主任</string>
+    <string name="HeadNurse">护士长</string>
     <!-- 系统信息 -->
     <string name="Null">无</string>
     <string name="InDate">入院日期</string>

jni/activity/mainActivity.h

@@ -27,8 +27,6 @@
 #include "window/ZKSlideWindow.h"
 
 /*TAG:Macro宏ID*/
-#define ID_MAIN_NursePortrait    24017
-#define ID_MAIN_NurseOption6    24032
 #define ID_MAIN_CallBedCancel    20009
 #define ID_MAIN_CallBedBtn    24027
 #define ID_MAIN_CallBedName    24026
@@ -48,6 +46,7 @@
 #define ID_MAIN_CallBedButton    20001
 #define ID_MAIN_NurseName    24025
 #define ID_MAIN_NurseText    24024
+#define ID_MAIN_NursePortrait    24017
 #define ID_MAIN_NurseBg    24030
 #define ID_MAIN_DoctorName    24023
 #define ID_MAIN_DoctorText    24022
@@ -57,6 +56,7 @@
 #define ID_MAIN_CustomerSex    24020
 #define ID_MAIN_CustomerName    24019
 #define ID_MAIN_CustomerPortrait    24018
+#define ID_MAIN_NurseOption6    24032
 #define ID_MAIN_NurseOption5    24015
 #define ID_MAIN_NurseOption4    24013
 #define ID_MAIN_NurseOption3    24011

jni/logic/mainLogic.cc

@@ -117,6 +117,7 @@ public:
 			getFrameInfo();
 			//getPartSetting(StoragePreferences::getString(STORE_PARTID, ""));
 			reinforceDispaly();
+			setDirectorAndHeadNurse();
 			return;
 		}
 		string url = getHttpGateway() + "/deviceRoom/get_device_by_eth_mac/" + StoragePreferences::getString(STORE_MAC_ADDR, "0.0.0.0");
@@ -231,6 +232,8 @@ public:
 			partSetting.doctorValid = root["doctor_valid"].asInt();
 			partSetting.nurseTitle = root["nurse_title"].asString();
 			partSetting.nurseValid = root["nurse_valid"].asInt();
+			partSetting.partDirector = root["part_director"].asString();
+			partSetting.partNurseHead = root["part_nurse_head"].asString();
 			partSetting.doorNurseTitle = root["door_nurse_title"].asString();
 			partSetting.doorNurseValid = root["door_nurse_valid"].asInt();
 			partSetting.doorNursingTitle = root["door_nursing_title"].asString();
@@ -280,6 +283,7 @@ public:
 
 			setRightTitle(root);
 			callBedButtonSetVisible();
+			setDirectorAndHeadNurse();
 
 			getFrameRoom(frameInfo["frame_id"].asInt());
 
@@ -320,6 +324,10 @@ public:
 		rightTitleInfo["nurse_valid"] = partSetting["nurse_valid"].asInt();
 	}
 
+	static void setDirectorAndHeadNurse() {
+		mDirectorTextViewPtr->setText(partSetting.partDirector);
+		mHeadNurseTextViewPtr->setText(partSetting.partNurseHead);
+	}
 
 	static void getVersion() {
 		std::string url = getHttpGateway() + "/deviceRoom/get_app_version?device_type=303&part_id=" + StoragePreferences::getString(STORE_PARTID, "");

jni/service/BusinessConfig.h

@@ -60,6 +60,8 @@
 #define STORE_VOLUME_NATIVE "volume_native"
 #define STORE_GAIN_SIZE "gain_size"
 
+#define STORE_TEMPLATE "template"
+
 #define STORE_MAC_ADDR "mac_addr"
 
 static std::string version = "v1.0.52";
@@ -241,6 +243,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;