增加红蓝两色主题，增加重启本机电源的功能，修复调用声音错误的问题

jni/activity/navibar.cpp

@@ -2,6 +2,7 @@
 #include "entry/EasyUIContext.h"
 
 /*TAG:GlobalVariable全局变量*/
+static ZKPainter* mBgPainterPtr;
 static ZKButton* mHomeButtonPtr;
 static ZKPainter* mCallBedPicPainterPtr;
 static ZKPainter* mCallNursePicPainterPtr;
@@ -131,6 +132,7 @@ navibar::~navibar() {
     unregisterProtocolDataUpdateListener(onProtocolDataUpdate);
     onUI_quit();
     mnavibarPtr = NULL;
+    mBgPainterPtr = NULL;
     mHomeButtonPtr = NULL;
     mCallBedPicPainterPtr = NULL;
     mCallNursePicPainterPtr = NULL;
@@ -149,6 +151,7 @@ const char* navibar::getAppName() const{
 //TAG:onCreate
 void navibar::onCreate() {
 	BaseApp::onCreate();
+    mBgPainterPtr = (ZKPainter*)findControlByID(ID_NAVIBAR_BgPainter);
     mHomeButtonPtr = (ZKButton*)findControlByID(ID_NAVIBAR_HomeButton);
     mCallBedPicPainterPtr = (ZKPainter*)findControlByID(ID_NAVIBAR_CallBedPicPainter);
     mCallNursePicPainterPtr = (ZKPainter*)findControlByID(ID_NAVIBAR_CallNursePicPainter);

jni/activity/navibar.h

@@ -23,6 +23,7 @@
 #include "control/ZKRadioGroup.h"
 #include "window/ZKSlideWindow.h"
 /*TAG:Macro宏ID*/
+#define ID_NAVIBAR_BgPainter    52004
 #define ID_NAVIBAR_HomeButton    20001
 #define ID_NAVIBAR_CallBedPicPainter    52003
 #define ID_NAVIBAR_CallNursePicPainter    52002

jni/logic/callLogic.cc

@@ -202,10 +202,8 @@ static S_ACTIVITY_TIMEER REGISTER_ACTIVITY_TIMER_TAB[] = {
  * 当界面构造时触发
  */
 static void onUI_init(){
-	CallingStatus::instance()->setBusy(true);
 
-	EASYUICONTEXT->hideStatusBar();
-	EASYUICONTEXT->hideNaviBar();
+	CallingStatus::instance()->setBusy(true);
 
 //	GetTelephone()->SetInputPcmGainSize(10.0);
 
@@ -230,18 +228,19 @@ static void onUI_init(){
     mTextViewInputPtr->setVisible(isVolume);
 
 	//打开时的声音大小
-	int serverVol = StoragePreferences::getInt(STORE_DAY_VOL,PartSetting::dayBedVol);
+	int serverVol = StoragePreferences::getInt(STORE_DAY_VOL,PartSetting::dayDoorVol);
 	if (checkIsDay()){
-		serverVol = StoragePreferences::getInt(STORE_NIGHT_VOL,PartSetting::nightBedVol);
+		serverVol = StoragePreferences::getInt(STORE_NIGHT_VOL,PartSetting::nightDoorVol);
 	}
-	double percent = (double)serverVol/(double)100;
+	LOGD("serverVol == %d", serverVol);
+	double percent = (double) serverVol / (double)100;
 	int vol = (int)(zk_audio_output_volume_native_max()*percent);
 	LOGD("bed vol is %d. server is %d. max is %d",vol,serverVol, zk_audio_output_volume_native_max());
 	zk_audio_output_set_volume_native(vol);
 
 	mSeekBarOutputVolumePtr->setProgress(vol);
 	mTextViewOutputVolumePtr->setTouchPass(true);
-
+//
 	mSeekBarGainPtr->setProgress(StoragePreferences::getInt(STORE_GAIN_SIZE, 2));
 	mTextViewGainPtr->setTouchPass(true);
 
@@ -258,6 +257,7 @@ static void onUI_init(){
  */
 static void onUI_intent(const Intent *intentPtr) {
 	if(intentPtr != NULL) {
+		LOGD("打开通话页面，进行通话");
 		BRIGHTNESSHELPER->screenOn();
 		_isSleepTimerRegistered = getSleepTimerRegistered();
 		setSleepTimerRegistered(false);
@@ -348,6 +348,8 @@ static void onUI_intent(const Intent *intentPtr) {
  * 当界面显示时触发
  */
 static void onUI_show() {
+	EASYUICONTEXT->hideStatusBar();
+	EASYUICONTEXT->hideNaviBar();
 }
 
 /*
@@ -362,6 +364,7 @@ static void onUI_hide() {
 static void onUI_quit() {
 	if (StoragePreferences::getString(STORE_SIGNAL_TYPE, SIGNAL_TYPE) == "TCP"){
 		EASYUICONTEXT->showNaviBar();
+		EASYUICONTEXT->showStatusBar();
 
 		CallingStatus::instance()->setBusy(false);
 		CallingStatus::instance()->clearTcpModel();
@@ -375,8 +378,6 @@ static void onUI_quit() {
 		}
 	}
 
-	EASYUICONTEXT->showStatusBar();
-	EASYUICONTEXT->showNaviBar();
 
     mediaPlayer.Stop();
 	mActivityPtr->unregisterUserTimer(goBack);

jni/logic/deviceInfoLogic.cc

@@ -48,6 +48,22 @@
 */
 
 
+void setDeviceInfoTheme() {
+    int deviceInfoThemeInt = StoragePreferences::getInt(STORE_THEME, defaultThemeInt);
+    if (deviceInfoThemeInt == 1) {
+    	mDebugPicPainterPtr->setBackgroundPic("/deviceInfo/shbei.png");
+    	mDeviceInfoPicPainterPtr->setBackgroundPic("/deviceInfo/xinxi.png");
+    	mQRCodePicPainterPtr->setBackgroundPic("/deviceInfo/saom.png");
+    }
+    else if (deviceInfoThemeInt == 2) {
+    	mDebugPicPainterPtr->setBackgroundPic("/deviceInfo/shbei-pink.png");
+    	mDeviceInfoPicPainterPtr->setBackgroundPic("/deviceInfo/xinxi-pink.png");
+    	mQRCodePicPainterPtr->setBackgroundPic("/deviceInfo/saom-pink.png");
+
+    }
+
+}
+
 using namespace std;
 
 struct NetworkConfiguration {
@@ -279,7 +295,9 @@ static void onUI_intent(const Intent *intentPtr) {
  * 当界面显示时触发
  */
 static void onUI_show() {
-
+    EASYUICONTEXT->showStatusBar();
+    EASYUICONTEXT->showNaviBar();
+    setDeviceInfoTheme();
 }
 
 /*

jni/logic/functionLogic.cc

@@ -45,13 +45,10 @@ static string _warnText;
 static string _goActivity;
 static int functionThemeInt = defaultThemeInt;
 static uint32_t functionColor = buleDeepColour;
-static bool isNetreset = false;
-static int netresetInt = 0;
 
 static base::MediaPlayer mediaPlayer;
 
 #define FUNCTION_TIMER_HANDLE 3	// 功能模块的定时器id
-#define NETRESET_TIMER_HANDLE 101
 
 void setFunctionTheme() {
     functionThemeInt = StoragePreferences::getInt(STORE_THEME, defaultThemeInt);
@@ -349,8 +346,8 @@ static void onUI_quit() {
 	mLogoutWindowPtr->hideWnd();
 
 
-    EASYUICONTEXT->showStatusBar();
-    EASYUICONTEXT->showNaviBar();
+//    EASYUICONTEXT->showStatusBar();
+//    EASYUICONTEXT->showNaviBar();
 
 }
 
@@ -378,17 +375,6 @@ static bool onUI_Timer(int id){
 			EASYUICONTEXT->closeActivity("functionActivity");
 			return false;
 			break;
-		case NETRESET_TIMER_HANDLE:
-			netresetInt += 1;
-			LOGD("netresetInt ===========> %d", netresetInt);
-		    lightControl("NETRESET", "1F");
-
-		    if (netresetInt == 15) {
-		    	//重启
-		    	sync();
-		    	reboot(RB_AUTOBOOT);
-		    }
-			break;
 		default:
 			break;
 	}
@@ -695,12 +681,7 @@ static bool onButtonClick_RebootDeviceButton(ZKButton *pButton) {
 
 static bool onButtonClick_RebootPowerButton(ZKButton *pButton) {
     LOGD(" ButtonClick RebootPowerButton !!!\n");
-    if (!isNetreset) {
-    	isNetreset = true;
-        lightControl("CALLLED", "000F");
-
-    	mActivityPtr->registerUserTimer(NETRESET_TIMER_HANDLE, 1000);
-    }
+    systemRestart();
     return false;
 }
 

jni/logic/mainLogic.cc

@@ -68,6 +68,7 @@ Json::Value painterInfoList;
 static bool serverInfo = true;	// 判断是否需要从服务器获取服务器信息，第一次要，后续不要
 static int inBedCount = 0;
 static int emptyBedCount = 0;
+static int mainThemeInt = StoragePreferences::getInt(STORE_THEME, defaultThemeInt);
 
 
 
@@ -78,20 +79,19 @@ static int emptyBedCount = 0;
 
 
 void setMainTheme() {
-    int themeInt = StoragePreferences::getInt(STORE_THEME, defaultThemeInt);
-//    LOGD("themeInt =====> %d", themeInt);
-//    if (themeInt == 1) {
-//        mRoomPainterPtr->setBackgroundPic("/main/roomBg.png");
-//        mRoomPrcPainterPtr->setBackgroundPic("/main/fang.png");
-//        mInBedNumTextViewPtr->setTextColor(buleDeepColour);
-//        mInBedPicPainterPtr->setBackgroundPic("/main/chuang-l.png");
-//    }
-//    else if (themeInt == 2) {
-//        mRoomPainterPtr->setBackgroundPic("/main/roomBg-pink.png");
-//        mRoomPrcPainterPtr->setBackgroundPic("/main/fang-pink.png");
-//        mInBedNumTextViewPtr->setTextColor(redDeepColour);
-//        mInBedPicPainterPtr->setBackgroundPic("/main/chuang-l-pink.png");
-//    }
+    LOGD("mainThemeInt =====> %d", mainThemeInt);
+    if (mainThemeInt == 1) {
+        mRoomPainterPtr->setBackgroundPic("/main/fang-bg.png");
+        mRoomPrcPainterPtr->setBackgroundPic("/main/fang.png");
+        mInBedNumTextViewPtr->setTextColor(buleDeepColour);
+        mInBedPicPainterPtr->setBackgroundPic("/main/chuang-l.png");
+    }
+    else if (mainThemeInt == 2) {
+        mRoomPainterPtr->setBackgroundPic("/main/fang-bg-pink.png");
+        mRoomPrcPainterPtr->setBackgroundPic("/main/fang-pink.png");
+        mInBedNumTextViewPtr->setTextColor(redDeepColour);
+        mInBedPicPainterPtr->setBackgroundPic("/main/chuang-l-pink.png");
+    }
 }
 
 
@@ -262,12 +262,12 @@ static void getPartSetting(string partId){
 
 		StoragePreferences::putString(STORE_DAY_START, partSetting.dayStart);
 		StoragePreferences::putInt(STORE_DAY_LIGHT,partSetting.dayLight);
-		StoragePreferences::putInt(STORE_DAY_VOL,partSetting.dayBedVol);
+		StoragePreferences::putInt(STORE_DAY_VOL,partSetting.dayDoorVol);
 		StoragePreferences::putInt(STORE_DAY_RING_TIMES,partSetting.dayRingTimes);
 
 		StoragePreferences::putString(STORE_NIGHT_START, partSetting.nightStart);
 		StoragePreferences::putInt(STORE_NIGHT_LIGHT,partSetting.nightLight);
-		StoragePreferences::putInt(STORE_NIGHT_VOL,partSetting.nightBedVol);
+		StoragePreferences::putInt(STORE_NIGHT_VOL,partSetting.nightDoorVol);
 		StoragePreferences::putInt(STORE_NIGHT_RING_TIMES,partSetting.nightRingTimes);
 
 		StoragePreferences::putInt(STORE_SLEEP_TIME, partSetting.sleepSecondsDoor);
@@ -491,6 +491,10 @@ static void onUI_intent(const Intent *intentPtr) {
  * 当界面显示时触发
  */
 static void onUI_show() {
+    EASYUICONTEXT->showStatusBar();
+    EASYUICONTEXT->showNaviBar();
+
+	setMainTheme();
 
 }
 
@@ -575,6 +579,14 @@ 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 (mainThemeInt == 1) {
+			bedNum->setBackgroundPic("/main/chuanghao-bg.png");
+		}
+		else if (mainThemeInt == 2) {
+			bedNum->setBackgroundPic("/main/chuanghao-bg-pink.png");
+		}
+
+
 		string frameBedName = frameBedList[index]["frame_bed"]["full_name"].asString();
 		if (frameBedName == "") {
 			bedNum->setText(LANGUAGEMANAGER->getValue("EmptyBed"));

jni/logic/medicalCareLogic.cc

@@ -49,6 +49,38 @@ static int roomCheckItId = 0;
 static int authItId = 0;
 static int chooseId = 0;
 static bool isChoose = false;
+static int medicalCareThemeInt = defaultThemeInt;
+static uint32_t medicalCareColor = buleDeepColour;
+
+
+void setMedicalCareTheme() {
+    medicalCareThemeInt = StoragePreferences::getInt(STORE_THEME, defaultThemeInt);
+    if (medicalCareThemeInt == 1) {
+    	mLoginMsgPicPainterPtr->setBackgroundPic("/medicalCare/yanz.png");
+    	mLoginPicPainterPtr->setBackgroundPic("/medicalCare/dianhua.png");
+    	mPasswordEditTextPtr->setBackgroundPic("/medicalCare/input_253x44.png");
+    	mEnteringMedicalCareButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_bule.png");
+    	mNfcPicPainterPtr->setBackgroundPic("/medicalCare/nfc.png");
+    	mChooseMsgPicPainterPtr->setBackgroundPic("/medicalCare/yanz.png");
+    	mEnteringButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_bule.png");
+    	mLogoutButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_bule2.png");
+    	mPromptPainterPtr->setBackgroundPic("/medicalCare/tishi.png");
+    	medicalCareColor = buleDeepColour;
+    }
+    else if (medicalCareThemeInt == 2) {
+    	mLoginMsgPicPainterPtr->setBackgroundPic("/medicalCare/yanz-pink.png");
+    	mLoginPicPainterPtr->setBackgroundPic("/medicalCare/dianhua-pink.png");
+    	mPasswordEditTextPtr->setBackgroundPic("/medicalCare/input_pink_253x44.png");
+    	mEnteringMedicalCareButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_pink.png");
+    	mNfcPicPainterPtr->setBackgroundPic("/medicalCare/nfc-pink.png");
+    	mChooseMsgPicPainterPtr->setBackgroundPic("/medicalCare/yanz-pink.png");
+    	mEnteringButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_pink.png");
+    	mLogoutButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_pink2.png");
+    	mPromptPainterPtr->setBackgroundPic("/medicalCare/tishi-pink.png");
+    	medicalCareColor = redDeepColour;
+    }
+	mHelloTextViewPtr->setTextColor(medicalCareColor);
+}
 
 
 static void getClerkList() {
@@ -486,6 +518,10 @@ static void onUI_show() {
 		mMedicalCareWindowPtr->hideWnd();
 	}
 
+    EASYUICONTEXT->showStatusBar();
+    EASYUICONTEXT->showNaviBar();
+    setMedicalCareTheme();
+
 }
 
 /*
@@ -652,6 +688,13 @@ static int getListItemCount_ClerkListView(const ZKListView *pListView) {
 
 static void obtainListItemData_ClerkListView(ZKListView *pListView,ZKListView::ZKListItem *pListItem, int index) {
     //LOGD(" obtainListItemData_ ClerkListView  !!!\n");
+	if (medicalCareThemeInt == 1) {
+		pListItem->setButtonStatusPic(ZK_CONTROL_STATUS_SELECTED, "/medicalCare/blue_250x48.png");
+	}
+	else if (medicalCareThemeInt == 2) {
+		pListItem->setButtonStatusPic(ZK_CONTROL_STATUS_SELECTED, "/medicalCare/pink_250x48.png");
+	}
+	pListItem->setTextStatusColor(ZK_CONTROL_STATUS_SELECTED, medicalCareColor);
 	pListItem->setText(clerkList[index]["clerk_name"].asCString());
 
 	if (index == chooseId) {

jni/logic/moreLogic.cc

@@ -33,6 +33,20 @@
 */
 
 Json::Value deviceMenus;
+static std::string deviceInfoPic = "/more/shebi.png";
+
+void setDeviceMenuTheme() {
+    int deviceMenuThemeInt = StoragePreferences::getInt(STORE_THEME, defaultThemeInt);
+    if (deviceMenuThemeInt == 1) {
+    	deviceInfoPic = "/more/shebi.png";
+    }
+    else if (deviceMenuThemeInt == 2) {
+    	deviceInfoPic = "/more/shebi-pink.png";
+    }
+
+	deviceMenus[0]["icon_src"] = deviceInfoPic;
+	mDeviceMenuListViewPtr->refreshListView();
+}
 
 void getDeviceMenu() {
 	std::string url = getHttpGateway() + "/deviceBed/get_device_menu_list/" + StoragePreferences::getString(STORE_PARTID, "") + "/4";
@@ -57,13 +71,13 @@ void getDeviceMenu() {
 			for (int i = 0; i < root.size(); i++) {
 				if (root[i]["act_name"].asString() == "deviceInfoActivity") {
 					count += 1;
-					root[i]["icon_src"] = "/more/shebi.png";
+					root[i]["icon_src"] = deviceInfoPic;
 					deviceMenus.append(root[i]);
 				}
 			}
 			if (count == 0) {
 				Json::Value deviceInfo;
-				deviceInfo["icon_src"] = "/more/shebi.png";
+				deviceInfo["icon_src"] = deviceInfoPic;
 				deviceInfo["name"] = "设备信息";
 				deviceInfo["introduction"] = "查看信息和设置";
 				deviceInfo["act_name"] = "deviceInfoActivity";
@@ -90,7 +104,7 @@ static S_ACTIVITY_TIMEER REGISTER_ACTIVITY_TIMER_TAB[] = {
 static void onUI_init(){
     //Tips :添加 UI初始化的显示代码到这里,如:mText1Ptr->setText("123");
 
-	deviceMenus[0]["icon_src"] ="/more/shebi.png";
+	deviceMenus[0]["icon_src"] = deviceInfoPic;
 	deviceMenus[0]["name"] = "设备信息";
 	deviceMenus[0]["introduction"] = "查看信息和设置";
 	deviceMenus[0]["act_name"] = "deviceInfoActivity";
@@ -123,6 +137,9 @@ static void onUI_intent(const Intent *intentPtr) {
  * 当界面显示时触发
  */
 static void onUI_show() {
+    EASYUICONTEXT->showStatusBar();
+    EASYUICONTEXT->showNaviBar();
+    setDeviceMenuTheme();
 
 }
 

jni/logic/navibar.cc

@@ -36,13 +36,31 @@
 
 */
 
+static uint32_t navibarButtonColor = buleDeepColour;
+
+void setNavibarTheme() {
+    int themeInt = StoragePreferences::getInt(STORE_THEME, defaultThemeInt);
+	if (themeInt == 1) {
+		mBgPainterPtr->setBackgroundPic("/navibar/bg.png");
+		mHelpButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/square_bule.png");
+		navibarButtonColor = buleDeepColour;
+		mHomeButtonPtr->setTextColor(navibarButtonColor);
+	}
+	else if (themeInt == 2) {
+		mBgPainterPtr->setBackgroundPic("/navibar/bg-pink.png");
+		mHelpButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/square_pink.png");
+		navibarButtonColor = redDeepColour;
+		mHomeButtonPtr->setTextColor(navibarButtonColor);
+	}
+}
+
 void goHome() {
 	mHomeButtonPtr->setBackgroundPic("button/elliptic_white.png");
-	mHomeButtonPtr->setTextColor(0x3A78EF);
+	mHomeButtonPtr->setTextColor(navibarButtonColor);
     mHealthCareButtonPtr->setBackgroundPic("");
-    mHealthCareButtonPtr->setTextColor(0xFFFFFF);
+    mHealthCareButtonPtr->setTextColor(whiteColour);
     mMoreButtonPtr->setBackgroundPic("");
-    mMoreButtonPtr->setTextColor(0xFFFFFF);
+    mMoreButtonPtr->setTextColor(whiteColour);
 
     EASYUICONTEXT->openActivity("mainActivity");
     EASYUICONTEXT->closeActivity("moreActivity");
@@ -51,11 +69,11 @@ void goHome() {
 
 void goMore() {
 	mHomeButtonPtr->setBackgroundPic("");
-	mHomeButtonPtr->setTextColor(0xFFFFFF);
+	mHomeButtonPtr->setTextColor(whiteColour);
 	mHealthCareButtonPtr->setBackgroundPic("");
-	mHealthCareButtonPtr->setTextColor(0xFFFFFF);
+	mHealthCareButtonPtr->setTextColor(whiteColour);
 	mMoreButtonPtr->setBackgroundPic("button/elliptic_white.png");
-	mMoreButtonPtr->setTextColor(0x3A78EF);
+	mMoreButtonPtr->setTextColor(navibarButtonColor);
 
 	EASYUICONTEXT->openActivity("moreActivity");
 //	EASYUICONTEXT->closeActivity("mainActivity");
@@ -64,11 +82,11 @@ void goMore() {
 
 void goCare() {
 	mHomeButtonPtr->setBackgroundPic("");
-	mHomeButtonPtr->setTextColor(0xFFFFFF);
+	mHomeButtonPtr->setTextColor(whiteColour);
     mHealthCareButtonPtr->setBackgroundPic("button/elliptic_white.png");
-    mHealthCareButtonPtr->setTextColor(0x3A78EF);
+    mHealthCareButtonPtr->setTextColor(navibarButtonColor);
     mMoreButtonPtr->setBackgroundPic("");
-    mMoreButtonPtr->setTextColor(0xFFFFFF);
+    mMoreButtonPtr->setTextColor(whiteColour);
 
     EASYUICONTEXT->openActivity("medicalCareActivity");
 //    EASYUICONTEXT->closeActivity("mainActivity");
@@ -119,6 +137,7 @@ static S_ACTIVITY_TIMEER REGISTER_ACTIVITY_TIMER_TAB[] = {
 static void onUI_init(){
     //Tips :添加 UI初始化的显示代码到这里,如:mText1->setText("123");
 	callBedButtonSetVisible();
+	setNavibarTheme();
 }
 
 /*

jni/logic/promptLogic.cc

@@ -40,10 +40,60 @@ static string promptText = LANGUAGEMANAGER->getValue("BeQuiet");
 static int promptTime = 10;
 static int chooseId = 0;
 static int promptTimeItId = 0;
+static int promptThemeInt = defaultThemeInt;
+static int promptColor = buleDeepColour;
 
 
 #define PROMPT_TIME_HANDLE 11	// 提示语
 
+void setPromptTheme() {
+	promptThemeInt = StoragePreferences::getInt(STORE_THEME, defaultThemeInt);
+	if (promptThemeInt == 1) {
+		msys_backPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/back_bule.png");
+		mCustomInputEditTextPtr->setBackgroundPic("/prompt/customInput.png");
+		mStartPromptButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_bule_491x61.png");
+		mExitPromptButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/back_white.png");
+		mPromptWindowPtr->setBackgroundPic("/prompt/blueBg.png");
+		mPromptPainterPtr->setBackgroundPic("/prompt/prompt-bg.png");
+
+		mSetPromptTimeRadioGroupPtr->getRadioItem(0)->setButtonStatusPic(ZK_CONTROL_STATUS_SELECTED, "/prompt/bule_270x48.png");
+		mSetPromptTimeRadioGroupPtr->getRadioItem(1)->setButtonStatusPic(ZK_CONTROL_STATUS_SELECTED, "/prompt/bule_270x48.png");
+		mSetPromptTimeRadioGroupPtr->getRadioItem(2)->setButtonStatusPic(ZK_CONTROL_STATUS_SELECTED, "/prompt/bule_270x48.png");
+		mSetPromptTimeRadioGroupPtr->getRadioItem(3)->setButtonStatusPic(ZK_CONTROL_STATUS_SELECTED, "/prompt/bule_270x48.png");
+		mSetPromptTimeRadioGroupPtr->getRadioItem(4)->setButtonStatusPic(ZK_CONTROL_STATUS_SELECTED, "/prompt/bule_270x48.png");
+		mSetPromptTimeRadioGroupPtr->getRadioItem(5)->setButtonStatusPic(ZK_CONTROL_STATUS_SELECTED, "/prompt/bule_270x48.png");
+		promptColor = buleDeepColour;
+
+	}
+	else if (promptThemeInt == 2) {
+		msys_backPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/back_pink.png");
+		mCustomInputEditTextPtr->setBackgroundPic("/prompt/customInput-pink.png");
+		mStartPromptButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_pink_491x61.png");
+		mExitPromptButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/back_white_pink.png");
+		mPromptWindowPtr->setBackgroundPic("/prompt/pinkBg.png");
+		mPromptPainterPtr->setBackgroundPic("/prompt/prompt-bg-pink.png");
+
+		mSetPromptTimeRadioGroupPtr->getRadioItem(0)->setButtonStatusPic(ZK_CONTROL_STATUS_SELECTED, "/prompt/pink_270x48.png");
+		mSetPromptTimeRadioGroupPtr->getRadioItem(1)->setButtonStatusPic(ZK_CONTROL_STATUS_SELECTED, "/prompt/pink_270x48.png");
+		mSetPromptTimeRadioGroupPtr->getRadioItem(2)->setButtonStatusPic(ZK_CONTROL_STATUS_SELECTED, "/prompt/pink_270x48.png");
+		mSetPromptTimeRadioGroupPtr->getRadioItem(3)->setButtonStatusPic(ZK_CONTROL_STATUS_SELECTED, "/prompt/pink_270x48.png");
+		mSetPromptTimeRadioGroupPtr->getRadioItem(4)->setButtonStatusPic(ZK_CONTROL_STATUS_SELECTED, "/prompt/pink_270x48.png");
+		mSetPromptTimeRadioGroupPtr->getRadioItem(5)->setButtonStatusPic(ZK_CONTROL_STATUS_SELECTED, "/prompt/pink_270x48.png");
+		promptColor = redDeepColour;
+	}
+	mCustomInputStartTextViewPtr->setTextColor(promptColor);
+	mQuickPromptStartTextViewPtr->setTextColor(promptColor);
+	mSetPromptTimeStartTextViewPtr->setTextColor(promptColor);
+	mExitPromptButtonPtr->setTextColor(promptColor);
+
+	mSetPromptTimeRadioGroupPtr->getRadioItem(0)->setTextStatusColor(ZK_CONTROL_STATUS_SELECTED, promptColor);
+	mSetPromptTimeRadioGroupPtr->getRadioItem(1)->setTextStatusColor(ZK_CONTROL_STATUS_SELECTED, promptColor);
+	mSetPromptTimeRadioGroupPtr->getRadioItem(2)->setTextStatusColor(ZK_CONTROL_STATUS_SELECTED, promptColor);
+	mSetPromptTimeRadioGroupPtr->getRadioItem(3)->setTextStatusColor(ZK_CONTROL_STATUS_SELECTED, promptColor);
+	mSetPromptTimeRadioGroupPtr->getRadioItem(4)->setTextStatusColor(ZK_CONTROL_STATUS_SELECTED, promptColor);
+	mSetPromptTimeRadioGroupPtr->getRadioItem(5)->setTextStatusColor(ZK_CONTROL_STATUS_SELECTED, promptColor);
+}
+
 
 void setPromptTimeItId(int id) {
 	promptTimeItId = id;
@@ -135,6 +185,10 @@ static void onUI_show() {
 
 	chooseId = 0;
 
+    EASYUICONTEXT->hideStatusBar();
+    EASYUICONTEXT->hideNaviBar();
+    setPromptTheme();
+
 }
 
 /*
@@ -228,6 +282,14 @@ static int getListItemCount_QuickPromptListView(const ZKListView *pListView) {
 
 static void obtainListItemData_QuickPromptListView(ZKListView *pListView,ZKListView::ZKListItem *pListItem, int index) {
     //LOGD(" obtainListItemData_ QuickPromptListView  !!!\n");
+	if (promptThemeInt == 1) {
+		pListItem->setButtonStatusPic(ZK_CONTROL_STATUS_SELECTED, "/prompt/bule_270x48.png");
+	}
+	else if (promptThemeInt == 2) {
+		pListItem->setButtonStatusPic(ZK_CONTROL_STATUS_SELECTED, "/prompt/pink_270x48.png");
+	}
+	pListItem->setTextStatusColor(ZK_CONTROL_STATUS_SELECTED, promptColor);
+
 	if (promptList.size() != 0) {
 		pListItem->setText(promptList[index]["show_text"].asCString());
 	}

jni/logic/sipTestLogic.cc

@@ -38,6 +38,33 @@
 * 在Eclipse编辑器中  使用 “alt + /”  快捷键可以打开智能提示
 */
 
+void setSipTestTheme() {
+    int sipTestThemeInt = StoragePreferences::getInt(STORE_THEME, defaultThemeInt);
+    if (sipTestThemeInt == 1) {
+    	msip_backPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/back_bule.png");
+    	mSipPicPainterPtr->setBackgroundPic("/medicalCare/dianhua.png");
+    	mEditTextDestURIPtr->setBackgroundPic("/function/input.png");
+    	mCallButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_blue_383x52.png");
+    	mHandleKeysCheckboxPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_blue_383x52.png");
+    	mPanelCallKeysCheckboxPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_blue_383x52.png");
+    	mPanelCancelKeysCheckboxPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_blue_383x52.png");
+    	mRecordTestButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_blue_383x52.png");
+    	mColorTestButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_blue_383x52.png");
+
+    }
+    else if (sipTestThemeInt == 2) {
+    	msip_backPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/back_pink.png");
+    	mSipPicPainterPtr->setBackgroundPic("/medicalCare/dianhua-pink.png");
+    	mEditTextDestURIPtr->setBackgroundPic("/function/input-pink.png");
+    	mCallButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_pink_383x52.png");
+    	mHandleKeysCheckboxPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_pink_383x52.png");
+    	mPanelCallKeysCheckboxPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_pink_383x52.png");
+    	mPanelCancelKeysCheckboxPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_pink_383x52.png");
+    	mRecordTestButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_pink_383x52.png");
+    	mColorTestButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_pink_383x52.png");
+    }
+}
+
 
 static base::MediaPlayer media_player;
 
@@ -142,8 +169,40 @@ static RecordTest recordTest;
 
 
 static bool panelCallKeysCheckbox = false;
+static bool handleKeysCheckbox = false;
+static bool panelCancelKeysCheckbox = false;
 
 void setCheckbox(std::string check) {
+	if (check == "KEY5") {
+		if (panelCallKeysCheckbox) {
+			panelCallKeysCheckbox = false;
+			mPanelCallKeysCheckboxPtr->setChecked(false);
+		}
+		else {
+			panelCallKeysCheckbox = true;
+			mPanelCallKeysCheckboxPtr->setChecked(true);
+		}
+	}
+	else if (check == "KEY6") {
+		if (handleKeysCheckbox) {
+			handleKeysCheckbox = false;
+			mHandleKeysCheckboxPtr->setChecked(false);
+		}
+		else {
+			handleKeysCheckbox = true;
+			mHandleKeysCheckboxPtr->setChecked(true);
+		}
+	}
+	else if (check == "KEY>") {
+		if (panelCancelKeysCheckbox) {
+			panelCancelKeysCheckbox = false;
+			mPanelCancelKeysCheckboxPtr->setChecked(false);
+		}
+		else {
+			panelCancelKeysCheckbox = true;
+			mPanelCancelKeysCheckboxPtr->setChecked(true);
+		}
+	}
 	if (check == "KEY<") {
 		if (panelCallKeysCheckbox) {
 			panelCallKeysCheckbox = false;
@@ -189,6 +248,7 @@ static void onUI_intent(const Intent *intentPtr) {
 static void onUI_show() {
 	EASYUICONTEXT->hideNaviBar();
 	EASYUICONTEXT->hideStatusBar();
+	setSipTestTheme();
 	// 切换成SIP模式
 	StoragePreferences::putString(STORE_SIGNAL_TYPE, "SIP");
 

jni/logic/startLogic.cc

@@ -22,13 +22,15 @@ static bool sosTimerRegistered = true;
 static bool isSleepTimerRegistered = false;		// 是否开启息屏定时任务
 static bool isSleep = false;	// 是否在息屏
 static bool isNursing = false;	// 用于启动时判断是否处于护理状态
+static bool isNetreset = false;
+static int netresetInt = 0;
 static string callTid = "";
 #define FUNCTION_TIMER_HANDLE 3	// 增援的定时器id
 #define SOS_CLICK_TIME_HANDLE 4	// sos的定时器id
 #define SOS_LAMP_TIME_HANDLE 5	// sos的门灯定时器id
 #define EVENT_TIME_HANDLE 8		// 事件定时器
 #define SLEEP_STRAT_TIME_HANDLE 9	// 息屏
-#define SYS_RESTART 10	// 重启
+#define SYS_RESTART_TIME_HANDLE 10	// 重启
 #define PROMPT_TIME_HANDLE 11	// 提示语
 
 #define HTTP_SERVER_PORT  80
@@ -151,6 +153,15 @@ namespace {
 }
 
 
+void systemRestart() {
+    if (!isNetreset) {
+    	isNetreset = true;
+        lightControl("CALLLED", "000F");
+
+    	mActivityPtr->registerUserTimer(SYS_RESTART_TIME_HANDLE, 1000);
+    }
+}
+
 // 门灯还原
 void lightControl(std::string typeStr, std::string lightColorStr) {
 	// 类型是门灯，并且还原成白色灯
@@ -198,9 +209,9 @@ void handleMsg(byte* inBytes){
 		if (tcpModel.action == TimeAction::SYNC) {
 			string serverTime = "";
 			if (tcpModel.data != ""){
-			serverTime = tcpModel.data;
+				serverTime = tcpModel.data;
 			} else {
-			serverTime = tcpModel.json["time"].asString();
+				serverTime = tcpModel.json["time"].asString();
 			}
 			LOGD("sync time ： %s", serverTime.c_str());
 
@@ -761,6 +772,11 @@ static void onProtocolDataUpdate(const SProtocolData &data) {
 		//按下
 		if (data.state=="0"){    // 0表示正被按下，1表示短按松开，2表示长按松开。
 			if (data.cmd == "KEY5") {	// key5是面板拨号按钮
+				if (StoragePreferences::getString(STORE_SIGNAL_TYPE, SIGNAL_TYPE) == "SIP") {
+					setCheckbox("KEY5");
+					return;
+				}
+
 				if (!StoragePreferences::getInt(STORE_SCREEN_LIGHT, 0)) {
 					if (isSleep) {
 						scrrenOn();
@@ -991,6 +1007,18 @@ static bool onUI_Timer(int id){
 		}
 	}
 		break;
+
+	case SYS_RESTART_TIME_HANDLE:
+		netresetInt += 1;
+	    lightControl("NETRESET", "1F");
+
+	    if (netresetInt == 5) {
+	    	LOGD("网卡重启无效，程序内部重启");
+	    	//重启
+	    	sync();
+	    	reboot(RB_AUTOBOOT);
+	    }
+		break;
 	default:
 		break;
 	}

jni/logic/statusbar.cc

@@ -74,8 +74,6 @@ void statusLight() {
 #define ETHERNETMANAGER		NETMANAGER->getEthernetManager()
 #define WIFIMANAGER			NETMANAGER->getWifiManager()
 
-#define SYS_RESTART 10	// 重启
-
 static bool isLight = false;
 static net::DhcpClient _s_wifi_dhcp_client;
 static net::DhcpClient _s_eth_dhcp_client;
@@ -151,6 +149,22 @@ static void _dhcp_lease_cb(dhcp_lease_type_e type, void *data) {
 
 
 
+void setStatusTheme() {
+    int themeInt = StoragePreferences::getInt(STORE_THEME, defaultThemeInt);
+	if (themeInt == 1) {
+		mPartNamePtr->setTextColor(buleDeepColour);
+		mDateViewPtr->setTextColor(buleDeepColour);
+		mTimePicPainterPtr->setBackgroundPic("/icon/shijian.png");
+	}
+	else if (themeInt == 2) {
+		mPartNamePtr->setTextColor(redDeepColour);
+		mDateViewPtr->setTextColor(redDeepColour);
+		mTimePicPainterPtr->setBackgroundPic("/icon/shijian-pink.png");
+	}
+}
+
+
+
 void NavibarSetPartName(const std::string& partName){
 	mPartNamePtr->setText(partName);
 }
@@ -185,18 +199,19 @@ static void updateNetState(){
 
 			// 网卡重启
 			LOGD("断网300秒，网卡断电重启");
-			std::string heartStr = "NETRESET,1F";
-			LOGD("=====> the heartStr == %s", heartStr.c_str());
-			const char* sendMsg = heartStr.c_str();
-			sendProtocolTo(UART_TTYS2, (byte*)(sendMsg), strlen(sendMsg));
-
-			//重启
-			sleep(3);
-			LOGD("网卡重启无效，程序内部重启");
-
-		    lightControl("CALLLED", "000F");
-			sync();
-			reboot(RB_AUTOBOOT);
+//			std::string heartStr = "NETRESET,1F";
+//			LOGD("=====> the heartStr == %s", heartStr.c_str());
+//			const char* sendMsg = heartStr.c_str();
+//			sendProtocolTo(UART_TTYS2, (byte*)(sendMsg), strlen(sendMsg));
+//
+//			//重启
+//			sleep(5);
+//			LOGD("网卡重启无效，程序内部重启");
+//
+//		    lightControl("CALLLED", "000F");
+//			sync();
+//			reboot(RB_AUTOBOOT);
+			systemRestart();
 		}
 	}
 
@@ -567,6 +582,8 @@ static void onUI_init(){
 
     StoragePreferences::putBool(STORE_LIGHT, true);
 	isLight = StoragePreferences::getBool(STORE_LIGHT, false);
+
+	setStatusTheme();
 }
 
 /*

jni/service/BusinessConfig.h

@@ -70,10 +70,10 @@ static uint32_t redDeepColour = 0xF78B8F;
 static uint32_t buleLightColour = 0x759FFF;
 static uint32_t buleDeepColour = 0x3A78EF;
 static uint32_t whiteColour = 0xFFFFFF;
-static int defaultThemeInt = 2;
+static int defaultThemeInt = 1;
 
-static std::string versionCode = "v2.0.3";
-static int versionNo = 38;
+static std::string versionCode = "v2.0.4";
+static int versionNo = 40;
 static std::string serverIP = "172.28.100.100";
 static std::string tcpIP = "172.28.100.100";
 static int serverHttpPort = 8006;
@@ -183,10 +183,10 @@ std::string getClerkPassNo();
 
 void setClerk(std::string clerk_name, std::string pass_no, int _authItid);
 
-void goHome();
-
 void nfcLogin(std::string revStr);
 
+void systemRestart();
+
 enum CallFinishType {
 	CANCEL,
 	REJECT,