增加绿色主题，首页增加两种模式选择

i18n/zh_CN.tr

@@ -89,7 +89,11 @@
     <string name="RebootLine">重启线路电源</string>
     <string name="ThemeBlue">是否将主题颜色切换成蓝色</string>
     <string name="ThemeRed">是否主题颜色切换成红色</string>
+    <string name="ThemeGreen">是否主题颜色切换成绿色</string>
     <string name="ThemeConfirm">确认切换主题颜色后，本机会重启</string>
+    <string name="Mode1">是否切换成模式1</string>
+    <string name="Mode2">是否切换成模式2</string>
+    <string name="ModeConfirm">确认切换模式后，本机会重启</string>
     <!-- 医护界面 -->
     <string name="MedicalLoginMsg">请输入正确的密码，进入医护功能</string>
     <string name="InputMedicalPassword">输入密码进入医护</string>
@@ -177,6 +181,11 @@
     <string name="SettingText">设备设置</string>
     <string name="IsLight">是否常亮</string>
     <string name="IsVolume">开启音量控制</string>
+    <string name="ThemeText">选择主题颜色</string>
+    <string name="ThemeBule">蓝</string>
+    <string name="ThemeRed">红</string>
+    <string name="ThemeGreen">绿</string>
+    <string name="ModeText">选择显示模式</string>
     <!-- 测试界面 -->
     <string name="DebugText">设备调试</string>
     <string name="InputSip">请输入目标SIP账号</string>

jni/activity/mainActivity.cpp

@@ -4,6 +4,7 @@
 #include "mainActivity.h"
 
 /*TAG:GlobalVariable全局变量*/
+static ZKListView* mBedListView2Ptr;
 static ZKListView* mBedListViewPtr;
 static ZKPainter* mInBedPicPainterPtr;
 static ZKPainter* mEmptyBedPrcPainterPtr;
@@ -78,6 +79,7 @@ typedef struct {
 }S_ListViewFunctionsCallback;
 /*TAG:ListViewFunctionsCallback*/
 static S_ListViewFunctionsCallback SListViewFunctionsCallbackTab[] = {
+    ID_MAIN_BedListView2, getListItemCount_BedListView2, obtainListItemData_BedListView2, onListItemClick_BedListView2,
     ID_MAIN_BedListView, getListItemCount_BedListView, obtainListItemData_BedListView, onListItemClick_BedListView,
 };
 
@@ -125,6 +127,7 @@ mainActivity::~mainActivity() {
     EASYUICONTEXT->unregisterGlobalTouchListener(this);
     onUI_quit();
     unregisterProtocolDataUpdateListener(onProtocolDataUpdate);
+    mBedListView2Ptr = NULL;
     mBedListViewPtr = NULL;
     mInBedPicPainterPtr = NULL;
     mEmptyBedPrcPainterPtr = NULL;
@@ -147,6 +150,7 @@ const char* mainActivity::getAppName() const{
 //TAG:onCreate
 void mainActivity::onCreate() {
 	Activity::onCreate();
+    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);}
     mInBedPicPainterPtr = (ZKPainter*)findControlByID(ID_MAIN_InBedPicPainter);
     mEmptyBedPrcPainterPtr = (ZKPainter*)findControlByID(ID_MAIN_EmptyBedPrcPainter);

jni/activity/mainActivity.h

@@ -27,12 +27,22 @@
 #include "window/ZKSlideWindow.h"
 
 /*TAG:Macro宏ID*/
+#define ID_MAIN_NurseTitleSubItem2    24019
+#define ID_MAIN_DoctorTitleSubItem2    24018
+#define ID_MAIN_NurseSubItem2    24017
+#define ID_MAIN_DoctorSubItem2    24016
+#define ID_MAIN_SexSubItem2    24015
+#define ID_MAIN_AgeSubItem2    24014
+#define ID_MAIN_CustomerNameSubItem2    24013
+#define ID_MAIN_BedNameSubItem2    24012
+#define ID_MAIN_BedNumSubItem2    24011
+#define ID_MAIN_BedListView2    80002
 #define ID_MAIN_CustomerNameSubItem    24010
 #define ID_MAIN_NurseSubItem    24008
 #define ID_MAIN_BedListView    80001
 #define ID_MAIN_InBedPicPainter    52005
 #define ID_MAIN_NurseTitleSubItem    24009
-#define ID_MAIN_DoctorTitileSubItem    24006
+#define ID_MAIN_DoctorTitleSubItem    24006
 #define ID_MAIN_DoctorSubItem    24007
 #define ID_MAIN_NurseConfigSubItem    24005
 #define ID_MAIN_SexSubItem    24004
@@ -116,4 +126,4 @@ private:
 
 };
 
-#endif
+#endif

jni/activity/settingActivity.cpp

@@ -4,6 +4,8 @@
 #include "settingActivity.h"
 
 /*TAG:GlobalVariable全局变量*/
+static ZKRadioGroup* mModeRadioGroupPtr;
+static ZKTextView* mModeTextViewPtr;
 static ZKRadioGroup* mThemeRadioGroupPtr;
 static ZKTextView* mThemeTextViewPtr;
 static ZKCheckBox* mVolumeCheckboxPtr;
@@ -130,6 +132,7 @@ typedef struct {
 }S_RadioGroupCallback;
 /*TAG:RadioGroupCallbackTab*/
 static S_RadioGroupCallback SRadioGroupCallbackTab[] = {
+    ID_SETTING_ModeRadioGroup, onCheckedChanged_ModeRadioGroup,
     ID_SETTING_ThemeRadioGroup, onCheckedChanged_ThemeRadioGroup,
 };
 
@@ -146,6 +149,8 @@ settingActivity::~settingActivity() {
     unregisterProtocolDataUpdateListener(onProtocolDataUpdate);
     onUI_quit();
     mActivityPtr = NULL;
+    mModeRadioGroupPtr = NULL;
+    mModeTextViewPtr = NULL;
     mThemeRadioGroupPtr = NULL;
     mThemeTextViewPtr = NULL;
     mVolumeCheckboxPtr = NULL;
@@ -165,6 +170,8 @@ const char* settingActivity::getAppName() const{
 //TAG:onCreate
 void settingActivity::onCreate() {
 	Activity::onCreate();
+    mModeRadioGroupPtr = (ZKRadioGroup*)findControlByID(ID_SETTING_ModeRadioGroup);if(mModeRadioGroupPtr!= NULL){mModeRadioGroupPtr->setCheckedChangeListener(this);}
+    mModeTextViewPtr = (ZKTextView*)findControlByID(ID_SETTING_ModeTextView);
     mThemeRadioGroupPtr = (ZKRadioGroup*)findControlByID(ID_SETTING_ThemeRadioGroup);if(mThemeRadioGroupPtr!= NULL){mThemeRadioGroupPtr->setCheckedChangeListener(this);}
     mThemeTextViewPtr = (ZKTextView*)findControlByID(ID_SETTING_ThemeTextView);
     mVolumeCheckboxPtr = (ZKCheckBox*)findControlByID(ID_SETTING_VolumeCheckbox);if(mVolumeCheckboxPtr!= NULL){mVolumeCheckboxPtr->setCheckedChangeListener(this);}

jni/activity/settingActivity.h

@@ -29,6 +29,11 @@
 #include "window/ZKSlideWindow.h"
 
 /*TAG:Macro宏ID*/
+#define ID_SETTING_ModeRadioButton2    22005
+#define ID_SETTING_ModeRadioButton1    22004
+#define ID_SETTING_ModeRadioGroup    94002
+#define ID_SETTING_ModeTextView    50005
+#define ID_SETTING_ThemeRadioButton3    22003
 #define ID_SETTING_ThemeRadioButton2    22002
 #define ID_SETTING_ThemeRadioButton1    22001
 #define ID_SETTING_ThemeRadioGroup    94001

jni/logic/deviceInfoLogic.cc

@@ -64,6 +64,13 @@ void setDeviceInfoTheme() {
     	mQRCodePicPainterPtr->setBackgroundPic("/deviceInfo/saom-pink.png");
 
     }
+    else if (deviceInfoThemeInt == 3) {
+    	msys_backPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/back_green.png");
+    	mDebugPicPainterPtr->setBackgroundPic("/deviceInfo/shbei-green.png");
+    	mDeviceInfoPicPainterPtr->setBackgroundPic("/deviceInfo/xinxi-green.png");
+    	mQRCodePicPainterPtr->setBackgroundPic("/deviceInfo/saom-green.png");
+
+    }
 
 }
 

jni/logic/functionLogic.cc

@@ -89,6 +89,43 @@ void setFunctionTheme() {
 
 		functionColor = redDeepColour;
 	}
+	else if (functionThemeInt == 2) {
+		mCallBedPicPainterPtr->setBackgroundPic("/function/chuangwei-pink.png");
+		mConfirmCallButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "button/elliptic_pink.png");
+		mConfirmLogoutButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "button/elliptic_pink2.png");
+		mLogoutPicPainterPtr->setBackgroundPic("/medicalCare/dianhua-pink.png");
+		mPwdPainterPtr->setBackgroundPic("/medicalCare/dianhua-pink.png");
+		mPwdEditTextPtr->setBackgroundPic("/function/input-pink.png");
+		mPwdConfirmButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "button/elliptic_pink2.png");
+		mServerPainterPtr->setBackgroundPic("/medicalCare/dianhua-pink.png");
+		mServerIpEditTextPtr->setBackgroundPic("/function/input-pink.png");
+		mServerPortEditTextPtr->setBackgroundPic("/function/input-pink.png");
+		mServerConfirmButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "button/elliptic_pink2.png");
+		mRebootPowerButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "button/elliptic_pink2.png");
+		mRebootDeviceButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "button/elliptic_pink2.png");
+		mRebootLineButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "button/elliptic_pink2.png");
+
+		functionColor = redDeepColour;
+	}
+	else if (functionThemeInt == 3) {
+		mCallBedPicPainterPtr->setBackgroundPic("/function/chuangwei-green.png");
+		mConfirmCallButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "button/elliptic_green_402x48.png");
+		mConfirmLogoutButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "button/elliptic_green2.png");
+		mLogoutPicPainterPtr->setBackgroundPic("/medicalCare/dianhua-green.png");
+		mPwdPainterPtr->setBackgroundPic("/medicalCare/dianhua-green.png");
+		mPwdEditTextPtr->setBackgroundPic("/function/input-green.png");
+		mPwdConfirmButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "button/elliptic_green2.png");
+		mServerPainterPtr->setBackgroundPic("/medicalCare/dianhua-green.png");
+		mServerIpEditTextPtr->setBackgroundPic("/function/input-green.png");
+		mServerPortEditTextPtr->setBackgroundPic("/function/input-green.png");
+		mServerConfirmButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "button/elliptic_green2.png");
+		mRebootPowerButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "button/elliptic_green2.png");
+		mRebootDeviceButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "button/elliptic_green2.png");
+		mRebootLineButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "button/elliptic_green2.png");
+
+		functionColor = greenDeepColour;
+
+	}
 
 }
 
@@ -123,6 +160,11 @@ static void help() {
 		mIconPainterPtr->setBackgroundPic("icon/zengyuan2-pink.png");
 		mFunctionButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "button/elliptic_pink2.png");
 	}
+	else if (functionThemeInt == 3) {
+		mIconPainterPtr->setBackgroundPic("icon/zengyuan2-green.png");
+		mFunctionButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "button/elliptic_green2.png");
+
+	}
 	mFunctionTextViewPtr->setText(LANGUAGEMANAGER->getValue("HelpInfo"));
 	mStateTextViewPtr->setVisible(false);
 	mFunctionButtonPtr->setText(LANGUAGEMANAGER->getValue("Confirm"));
@@ -220,12 +262,19 @@ void theme(string functionText) {
 		mIconPainterPtr->setBackgroundPic("icon/zengyuan2-pink.png");
 		mFunctionButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "button/elliptic_pink2.png");
 	}
+	else if (functionThemeInt == 3) {
+		mIconPainterPtr->setBackgroundPic("icon/zengyuan2-green.png");
+		mFunctionButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "button/elliptic_green2.png");
+	}
 	if (functionText == "蓝色") {
 		mFunctionTextViewPtr->setText(LANGUAGEMANAGER->getValue("ThemeBlue"));
 	}
 	else if (functionText == "红色") {
 		mFunctionTextViewPtr->setText(LANGUAGEMANAGER->getValue("ThemeRed"));
 	}
+	else if (functionText == "绿色") {
+		mFunctionTextViewPtr->setText(LANGUAGEMANAGER->getValue("ThemeGreen"));
+	}
 	mStateTextViewPtr->setVisible(true);
 	mStateTextViewPtr->setText(LANGUAGEMANAGER->getValue("ThemeConfirm"));
 	mFunctionButtonPtr->setText(LANGUAGEMANAGER->getValue("Confirm"));
@@ -233,6 +282,32 @@ void theme(string functionText) {
 }
 
 
+void mode(string functionText) {
+	if (functionThemeInt == 1) {
+		mIconPainterPtr->setBackgroundPic("icon/chenggong.png");
+		mFunctionButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "button/elliptic_bule2.png");
+	}
+	else if (functionThemeInt == 2) {
+		mIconPainterPtr->setBackgroundPic("icon/chenggong-pink.png");
+		mFunctionButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "button/elliptic_pink2.png");
+	}
+	else if (functionThemeInt == 3) {
+		mIconPainterPtr->setBackgroundPic("icon/chenggong-green.png");
+		mFunctionButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "button/elliptic_green2.png");
+
+	}
+	if (functionText == "模式1") {
+		mFunctionTextViewPtr->setText(LANGUAGEMANAGER->getValue("Mode1"));
+	}
+	else if (functionText == "模式2") {
+		mFunctionTextViewPtr->setText(LANGUAGEMANAGER->getValue("Mode2"));
+	}
+	mStateTextViewPtr->setVisible(true);
+	mStateTextViewPtr->setText(LANGUAGEMANAGER->getValue("ModeConfirm"));
+	mFunctionButtonPtr->setText(LANGUAGEMANAGER->getValue("Confirm"));
+	mFunctionWindowPtr->showWnd();
+}
+
 
 /**
  * 注册定时器
@@ -314,6 +389,10 @@ static void onUI_intent(const Intent *intentPtr) {
 			_functionText = intentPtr->getExtra(functionText);
 			theme(_functionText);
 		}
+		else if (_functionWindows == "mode") {
+			_functionText = intentPtr->getExtra(functionText);
+			mode(_functionText);
+		}
     }
 }
 
@@ -413,6 +492,9 @@ static void obtainListItemData_CallBedListView(ZKListView *pListView,ZKListView:
 	else if (functionThemeInt == 2) {
 		pListItem->setButtonStatusPic(ZK_CONTROL_STATUS_SELECTED, "/function/chooseBed-pink.png");
 	}
+	else if (functionThemeInt == 3) {
+		pListItem->setButtonStatusPic(ZK_CONTROL_STATUS_SELECTED, "/function/chooseBed-green.png");
+	}
 	pListItem->setTextStatusColor(ZK_CONTROL_STATUS_SELECTED, functionColor);
 
 	if (bedList.size() > 0) {
@@ -503,9 +585,23 @@ static bool onButtonClick_FunctionButton(ZKButton *pButton) {
     	else if (_functionText == "红色") {
             StoragePreferences::putInt(STORE_THEME, 2);
     	}
+    	else if (_functionText == "绿色") {
+            StoragePreferences::putInt(STORE_THEME, 3);
+    	}
 		sync();
 		reboot(RB_AUTOBOOT);
     }
+    else if (_functionWindows == "mode") {
+    	if (_functionText == "模式1") {
+            StoragePreferences::putInt(STORE_MODE, 1);
+    	}
+    	else if (_functionText == "模式2") {
+            StoragePreferences::putInt(STORE_MODE, 2);
+    	}
+		sync();
+		reboot(RB_AUTOBOOT);
+
+    }
 
 	EASYUICONTEXT->closeActivity("functionActivity");
     return false;

jni/logic/mainLogic.cc

@@ -68,6 +68,8 @@ Json::Value painterInfoList;
 static bool serverInfo = true;	// 判断是否需要从服务器获取服务器信息，第一次要，后续不要
 static int inBedCount = 0;
 static int emptyBedCount = 0;
+static int themeInt = 1;
+static int modeInt = 1;
 
 
 #define HELP_TIMER_HANDLE 3	// 增援的定时器id
@@ -76,7 +78,7 @@ static int emptyBedCount = 0;
 
 
 void setMainTheme() {
-    int themeInt = StoragePreferences::getInt(STORE_THEME, defaultThemeInt);
+    themeInt = StoragePreferences::getInt(STORE_THEME, defaultThemeInt);
     LOGD("themeInt =====> %d", themeInt);
     if (themeInt == 1) {
     	mRoomPainterPtr->setBackgroundPic("/main/roomBg.png");
@@ -90,6 +92,24 @@ void setMainTheme() {
     	mInBedNumTextViewPtr->setTextColor(redDeepColour);
     	mInBedPicPainterPtr->setBackgroundPic("/main/chuang-l-pink.png");
     }
+    else if (themeInt == 3) {
+    	mRoomPainterPtr->setBackgroundPic("/main/roomBg-green.png");
+    	mRoomPrcPainterPtr->setBackgroundPic("/main/fang-green.png");
+    	mInBedNumTextViewPtr->setTextColor(yellowDeepColour);
+    	mInBedPicPainterPtr->setBackgroundPic("/main/chuang-l-yellow.png");
+    }
+}
+
+void setMainMode() {
+	modeInt = StoragePreferences::getInt(STORE_MODE, defaultModeInt);
+	if (modeInt == 1) {
+		mBedListViewPtr->setVisible(true);
+		mBedListView2Ptr->setVisible(false);
+	}
+	else if (modeInt == 2) {
+		mBedListViewPtr->setVisible(false);
+		mBedListView2Ptr->setVisible(true);
+	}
 }
 
 
@@ -493,6 +513,7 @@ static void onUI_show() {
     EASYUICONTEXT->showNaviBar();
 
     setMainTheme();
+    setMainMode();
 }
 
 /*
@@ -566,24 +587,29 @@ static int getListItemCount_BedListView(const ZKListView *pListView) {
 static void obtainListItemData_BedListView(ZKListView *pListView,ZKListView::ZKListItem *pListItem, int index) {
     //LOGD(" obtainListItemData_ BedListView  !!!\n");
 
+	if (modeInt != 1) {
+		return;
+	}
+
 	if (frameBedList.size() > 0) {
 		ZKListView::ZKListSubItem* bedNum = pListItem->findSubItemByID(ID_MAIN_BedNumSubItem);
 		ZKListView::ZKListSubItem* name = pListItem->findSubItemByID(ID_MAIN_CustomerNameSubItem);
 		ZKListView::ZKListSubItem* age = pListItem->findSubItemByID(ID_MAIN_AgeSubItem);
 		ZKListView::ZKListSubItem* sex = pListItem->findSubItemByID(ID_MAIN_SexSubItem);
-		ZKListView::ZKListSubItem* doctorTitle = pListItem->findSubItemByID(ID_MAIN_DoctorTitileSubItem);
+		ZKListView::ZKListSubItem* doctorTitle = pListItem->findSubItemByID(ID_MAIN_DoctorTitleSubItem);
 		ZKListView::ZKListSubItem* nurseTitle = pListItem->findSubItemByID(ID_MAIN_NurseTitleSubItem);
 		ZKListView::ZKListSubItem* doctor = pListItem->findSubItemByID(ID_MAIN_DoctorSubItem);
 		ZKListView::ZKListSubItem* nurse = pListItem->findSubItemByID(ID_MAIN_NurseSubItem);
 
-
-	    int themeInt = StoragePreferences::getInt(STORE_THEME, defaultThemeInt);
 		if (themeInt == 1) {
 			bedNum->setBackgroundPic("/main/bedNameBg.png");
 		}
 		else if (themeInt == 2) {
 			bedNum->setBackgroundPic("/main/bedNameBg-pink.png");
 		}
+		else if (themeInt == 3) {
+			bedNum->setBackgroundPic("/main/bedNameBg-green.png");
+		}
 
 
 		string frameBedName = frameBedList[index]["frame_bed"]["full_name"].asString();
@@ -705,3 +731,106 @@ static void onListItemClick_BedListView(ZKListView *pListView, int index, int id
     //LOGD(" onListItemClick_ BedListView  !!!\n");
 }
 
+static int getListItemCount_BedListView2(const ZKListView *pListView) {
+    //LOGD("getListItemCount_BedListView2 !\n");
+	return frameBedList.size();
+}
+
+static void obtainListItemData_BedListView2(ZKListView *pListView,ZKListView::ZKListItem *pListItem, int index) {
+    //LOGD(" obtainListItemData_ BedListView2  !!!\n");
+
+	if (modeInt != 2) {
+		return;
+	}
+
+
+	if (frameBedList.size() > 0) {
+		ZKListView::ZKListSubItem* bedNum = pListItem->findSubItemByID(ID_MAIN_BedNumSubItem2);
+		ZKListView::ZKListSubItem* name = pListItem->findSubItemByID(ID_MAIN_CustomerNameSubItem2);
+		ZKListView::ZKListSubItem* age = pListItem->findSubItemByID(ID_MAIN_AgeSubItem2);
+		ZKListView::ZKListSubItem* sex = pListItem->findSubItemByID(ID_MAIN_SexSubItem2);
+		ZKListView::ZKListSubItem* doctorTitle = pListItem->findSubItemByID(ID_MAIN_DoctorTitleSubItem2);
+		ZKListView::ZKListSubItem* nurseTitle = pListItem->findSubItemByID(ID_MAIN_NurseTitleSubItem2);
+		ZKListView::ZKListSubItem* doctor = pListItem->findSubItemByID(ID_MAIN_DoctorSubItem2);
+		ZKListView::ZKListSubItem* nurse = pListItem->findSubItemByID(ID_MAIN_NurseSubItem2);
+
+
+		if (themeInt == 1) {
+			bedNum->setBackgroundPic("/main/bedNameBg2.png");
+		}
+		else if (themeInt == 2) {
+			bedNum->setBackgroundPic("/main/bedNameBg2-pink.png");
+		}
+		else if (themeInt == 3) {
+			bedNum->setBackgroundPic("/main/bedNameBg2-green.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("main/woman.png");
+		}
+		else if (customerSex == "1") {
+			sex->setText(LANGUAGEMANAGER->getValue("Man"));
+			sex->setTextColor(0x3A78EF);
+			sex->setBackgroundPic("main/man.png");
+		}
+		else {
+			sex->setText(LANGUAGEMANAGER->getValue("Unknown"));
+			sex->setTextColor(0x37B643);
+			sex->setBackgroundPic("main/age.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_BedListView2(ZKListView *pListView, int index, int id) {
+    //LOGD(" onListItemClick_ BedListView2  !!!\n");
+}

jni/logic/medicalCareLogic.cc

@@ -79,6 +79,18 @@ void setMedicalCareTheme() {
     	mPromptPainterPtr->setBackgroundPic("/medicalCare/tishi-pink.png");
     	medicalCareColor = redDeepColour;
     }
+    else if (medicalCareThemeInt == 3) {
+    	mLoginMsgPicPainterPtr->setBackgroundPic("/medicalCare/yanz-green.png");
+    	mLoginPicPainterPtr->setBackgroundPic("/medicalCare/dianhua-green.png");
+    	mPasswordEditTextPtr->setBackgroundPic("/medicalCare/input_green_283x44.png");
+    	mEnteringMedicalCareButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_green_402x48.png");
+    	mNfcPicPainterPtr->setBackgroundPic("/medicalCare/nfc-green.png");
+    	mChooseMsgPicPainterPtr->setBackgroundPic("/medicalCare/yanz-green.png");
+    	mEnteringButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_green_402x48.png");
+    	mLogoutButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_green2.png");
+    	mPromptPainterPtr->setBackgroundPic("/medicalCare/tishi-green.png");
+    	medicalCareColor = greenDeepColour;
+    }
 	mHelloTextViewPtr->setTextColor(medicalCareColor);
 }
 
@@ -690,6 +702,9 @@ static void obtainListItemData_ClerkListView(ZKListView *pListView,ZKListView::Z
 	}
 	else if (medicalCareThemeInt == 2) {
 		pListItem->setButtonStatusPic(ZK_CONTROL_STATUS_SELECTED, "/prompt/pink_150x48.png");
+	}
+	else if (medicalCareThemeInt == 3) {
+		pListItem->setButtonStatusPic(ZK_CONTROL_STATUS_SELECTED, "/prompt/green_150x48.png");
 
 	}
 	pListItem->setText(clerkList[index]["clerk_name"].asCString());

jni/logic/moreLogic.cc

@@ -43,6 +43,9 @@ void setDeviceMenuTheme() {
     else if (deviceMenuThemeInt == 2) {
     	deviceInfoPic = "/more/shebi-pink.png";
     }
+    else if (deviceMenuThemeInt == 3) {
+    	deviceInfoPic = "/more/shebi-green.png";
+    }
 
 	deviceMenus[0]["icon_src"] = deviceInfoPic;
 	mDeviceMenuListViewPtr->refreshListView();

jni/logic/navibar.cc

@@ -52,6 +52,12 @@ void setNavibarTheme() {
 		navibarButtonColor = redDeepColour;
 		mHomeButtonPtr->setTextColor(navibarButtonColor);
 	}
+	else if (themeInt == 3) {
+		mBgPainterPtr->setBackgroundPic("/navibar/bg-green.png");
+		mHelpButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/square_green2.png");
+		navibarButtonColor = greenDeepColour;
+		mHomeButtonPtr->setTextColor(navibarButtonColor);
+	}
 }
 
 void goHome() {

jni/logic/promptLogic.cc

@@ -82,6 +82,22 @@ void setPromptTheme() {
 		mSetPromptTimeRadioGroupPtr->getRadioItem(5)->setButtonStatusPic(ZK_CONTROL_STATUS_SELECTED, "/prompt/pink_270x48.png");
 		promptColor = redDeepColour;
 	}
+	else if (promptThemeInt == 3) {
+		msys_backPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/back_green.png");
+		mCustomInputEditTextPtr->setBackgroundPic("/prompt/customInput-green.png");
+		mStartPromptButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_green_491x61.png");
+		mExitPromptButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/back_white_green.png");
+		mPromptWindowPtr->setBackgroundPic("/prompt/greenBg.png");
+		mPromptPainterPtr->setBackgroundPic("/prompt/prompt-bg-green.png");
+
+		mSetPromptTimeRadioGroupPtr->getRadioItem(0)->setButtonStatusPic(ZK_CONTROL_STATUS_SELECTED, "/prompt/green_270x48.png");
+		mSetPromptTimeRadioGroupPtr->getRadioItem(1)->setButtonStatusPic(ZK_CONTROL_STATUS_SELECTED, "/prompt/green_270x48.png");
+		mSetPromptTimeRadioGroupPtr->getRadioItem(2)->setButtonStatusPic(ZK_CONTROL_STATUS_SELECTED, "/prompt/green_270x48.png");
+		mSetPromptTimeRadioGroupPtr->getRadioItem(3)->setButtonStatusPic(ZK_CONTROL_STATUS_SELECTED, "/prompt/green_270x48.png");
+		mSetPromptTimeRadioGroupPtr->getRadioItem(4)->setButtonStatusPic(ZK_CONTROL_STATUS_SELECTED, "/prompt/green_270x48.png");
+		mSetPromptTimeRadioGroupPtr->getRadioItem(5)->setButtonStatusPic(ZK_CONTROL_STATUS_SELECTED, "/prompt/green_270x48.png");
+		promptColor = greenDeepColour;
+	}
 	mCustomInputStartTextViewPtr->setTextColor(promptColor);
 	mQuickPromptStartTextViewPtr->setTextColor(promptColor);
 	mSetPromptTimeStartTextViewPtr->setTextColor(promptColor);
@@ -288,6 +304,9 @@ static void obtainListItemData_QuickPromptListView(ZKListView *pListView,ZKListV
 	else if (promptThemeInt == 2) {
 		pListItem->setButtonStatusPic(ZK_CONTROL_STATUS_SELECTED, "/prompt/pink_270x48.png");
 	}
+	else if (promptThemeInt == 3) {
+		pListItem->setButtonStatusPic(ZK_CONTROL_STATUS_SELECTED, "/prompt/green_270x48.png");
+	}
 	pListItem->setTextStatusColor(ZK_CONTROL_STATUS_SELECTED, promptColor);
 
 	if (promptList.size() != 0) {

jni/logic/settingLogic.cc

@@ -44,6 +44,10 @@ void setSettingTheme() {
 		msys_backPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/back_pink.png");
 		mTestButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_pink2.png");
 	}
+	else if (themeRadioButton == 3) {
+		msys_backPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/back_green.png");
+		mTestButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_green2.png");
+	}
 }
 
 /**
@@ -185,6 +189,10 @@ static void onCheckedChanged_ThemeRadioGroup(ZKRadioGroup* pRadioGroup, int chec
         LOGD("选择红色");
         themeStr = "红色";
         break;
+    case ID_SETTING_ThemeRadioButton3:
+        LOGD("选择绿色");
+        themeStr = "绿色";
+		break;
     }
 
 	Intent* intent = new Intent();
@@ -192,3 +200,23 @@ static void onCheckedChanged_ThemeRadioGroup(ZKRadioGroup* pRadioGroup, int chec
 	intent->putExtra(functionText, themeStr);
 	EASYUICONTEXT->openActivity("functionActivity", intent);
 }
+static void onCheckedChanged_ModeRadioGroup(ZKRadioGroup* pRadioGroup, int checkedID) {
+    LOGD(" RadioGroup ModeRadioGroup checked %d", checkedID);
+    string modeStr = "模式1";
+    switch (checkedID) {
+    case ID_SETTING_ModeRadioButton1:
+    	LOGD("选择模式1");
+    	modeStr = "模式1";
+    	break;
+    case ID_SETTING_ModeRadioButton2:
+    	LOGD("选择模式2");
+    	modeStr = "模式2";
+    	break;
+    }
+
+	Intent* intent = new Intent();
+	intent->putExtra(functionWindows, "mode");
+	intent->putExtra(functionText, modeStr);
+	EASYUICONTEXT->openActivity("functionActivity", intent);
+
+}

jni/logic/sipTestLogic.cc

@@ -68,8 +68,19 @@ void setSipTestTheme() {
     	mRecordTestButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_pink_383x52.png");
     	mDoorLightTestButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_pink_383x52.png");
     	mColorTestButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_pink_383x52.png");
-
-
+    }
+    else if (sipTestThemeInt == 3) {
+    	msip_backPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/back_green.png");
+    	mSipPicPainterPtr->setBackgroundPic("/medicalCare/dianhua-green.png");
+    	mEditTextDestURIPtr->setBackgroundPic("/function/input-green.png");
+    	mCallButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_green2_383x52.png");
+    	mHandleKeysCheckboxPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_green2_383x52.png");
+    	mPanelCallKeysCheckboxPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_green2_383x52.png");
+    	mPanelCancelKeysCheckboxPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_green2_383x52.png");
+    	mSosKeysCheckboxPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_green2_383x52.png");
+    	mRecordTestButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_green2_383x52.png");
+    	mDoorLightTestButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_green2_383x52.png");
+    	mColorTestButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_green2_383x52.png");
     }
 }
 

jni/logic/statusbar.cc

@@ -162,6 +162,11 @@ void setStatusTheme() {
 		mDateViewPtr->setTextColor(redDeepColour);
 		mTimePicPainterPtr->setBackgroundPic("/icon/shijian-pink.png");
 	}
+	else if (themeInt == 3) {
+		mPartNamePtr->setTextColor(greenDeepColour);
+		mDateViewPtr->setTextColor(greenDeepColour);
+		mTimePicPainterPtr->setBackgroundPic("/icon/shijian-green.png");
+	}
 }
 
 

jni/logic/updateLogic.cc

@@ -73,6 +73,18 @@ void setUpdateTheme() {
     	mInitUpdateButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_pink_383x52.png");
     	updateColor = redDeepColour;
     }
+    else if (updateThemeInt == 3) {
+    	msys_backPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/back_green.png");
+    	mDeviceUpdatePicPainterPtr->setBackgroundPic("/function/dianhua-green.png");
+    	mUpdateButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_green2_383x52.png");
+    	mInitButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_green2_383x52.png");
+    	mFindNewPainterPtr->setBackgroundPic("/function/dianhua-green.png");
+    	mInstantlyButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_green2_383x52.png");
+    	mDialogPainterPtr->setBackgroundPic("/function/dianhua-green.png");
+    	mDialogButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_green2_383x52.png");
+    	mInitUpdateButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_green2_383x52.png");
+    	updateColor = greenDeepColour;
+    }
 }
 
 namespace {
@@ -383,6 +395,9 @@ static void obtainListItemData_DeviceTypeListView(ZKListView *pListView,ZKListVi
 	else if (updateThemeInt == 2) {
 		pListItem->setButtonStatusPic(ZK_CONTROL_STATUS_SELECTED, "/deviceUpdate/choose-pink.png");
 	}
+	else if (updateThemeInt == 3) {
+		pListItem->setButtonStatusPic(ZK_CONTROL_STATUS_SELECTED, "/deviceUpdate/choose-green.png");
+	}
 	pListItem->setTextStatusColor(ZK_CONTROL_STATUS_SELECTED, updateColor);
 
 	string version = linuxVersionList[index]["type_name"].asString() + "         " + linuxVersionList[index]["version_code"].asString();

jni/service/BusinessConfig.h

@@ -57,6 +57,7 @@
 #define STORE_LIGHT "light"
 #define STORE_VOLUME "volume"
 #define STORE_THEME "theme"
+#define STORE_MODE "mode"
 
 #define SIGNAL_TYPE "TCP" //TCP,SIP
 
@@ -70,11 +71,15 @@ static uint32_t redLightColour = 0xFEB8BF;
 static uint32_t redDeepColour = 0xF78B8F;
 static uint32_t buleLightColour = 0x759FFF;
 static uint32_t buleDeepColour = 0x3A78EF;
+static uint32_t greenLightColour = 0x15B525;
+static uint32_t greenDeepColour = 0x379891;
+static uint32_t yellowDeepColour = 0xE68024;
 static uint32_t whiteColour = 0xFFFFFF;
 static int defaultThemeInt = 1;
+static int defaultModeInt = 1;
 
-static std::string versionCode = "v1.0.42";
-static int versionNo = 42;
+static std::string versionCode = "v1.0.43";
+static int versionNo = 43;
 static std::string serverIP = "172.28.100.100";
 static std::string tcpIP = "172.28.100.100";
 static int serverHttpPort = 8006;