增加红蓝两色主题切换的功能

i18n/zh_CN.tr

@@ -86,6 +86,9 @@
 	<string name="PromptQuit">提示语已结束</string>
     <string name="RebootDevice">重启本机</string>
     <string name="RebootPower">重启线路电源</string>
+    <string name="ThemeBlue">是否将主题颜色切换成蓝色</string>
+    <string name="ThemeRed">是否主题颜色切换成红色</string>
+    <string name="ThemeConfirm">确认切换主题颜色后，本机会重启</string>
     <!-- 医护界面 -->
     <string name="MedicalLoginMsg">请输入正确的密码，进入医护功能</string>
     <string name="InputMedicalPassword">输入密码进入医护</string>

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/activity/settingActivity.cpp

@@ -4,6 +4,8 @@
 #include "settingActivity.h"
 
 /*TAG:GlobalVariable全局变量*/
+static ZKRadioGroup* mThemeRadioGroupPtr;
+static ZKTextView* mThemeTextViewPtr;
 static ZKCheckBox* mVolumeCheckboxPtr;
 static ZKTextView* mVolumeTextViewPtr;
 static ZKTextView* mTitleTextViewPtr;
@@ -121,6 +123,16 @@ static S_CheckboxCallback SCheckboxCallbackTab[] = {
     ID_SETTING_LightCheckbox, onCheckedChanged_LightCheckbox,
 };
 
+typedef void (*RadioGroupCallback)(ZKRadioGroup*, int);
+typedef struct {
+  int id;
+  RadioGroupCallback onCheckedChanged;
+}S_RadioGroupCallback;
+/*TAG:RadioGroupCallbackTab*/
+static S_RadioGroupCallback SRadioGroupCallbackTab[] = {
+    ID_SETTING_ThemeRadioGroup, onCheckedChanged_ThemeRadioGroup,
+};
+
 settingActivity::settingActivity() {
 	//todo add init code here
 	mVideoLoopIndex = -1;
@@ -134,6 +146,8 @@ settingActivity::~settingActivity() {
     unregisterProtocolDataUpdateListener(onProtocolDataUpdate);
     onUI_quit();
     mActivityPtr = NULL;
+    mThemeRadioGroupPtr = NULL;
+    mThemeTextViewPtr = NULL;
     mVolumeCheckboxPtr = NULL;
     mVolumeTextViewPtr = NULL;
     mTitleTextViewPtr = NULL;
@@ -151,6 +165,8 @@ const char* settingActivity::getAppName() const{
 //TAG:onCreate
 void settingActivity::onCreate() {
 	Activity::onCreate();
+    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);}
     mVolumeTextViewPtr = (ZKTextView*)findControlByID(ID_SETTING_VolumeTextView);
     mTitleTextViewPtr = (ZKTextView*)findControlByID(ID_SETTING_TitleTextView);
@@ -437,4 +453,13 @@ void settingActivity::onCheckedChanged(ZKCheckBox* pCheckBox, bool isChecked) {
             break;
         }
     }
+}
+void settingActivity::onCheckedChanged(ZKRadioGroup* pRadioGroup, int checkedID) {
+    int tablen = sizeof(SRadioGroupCallbackTab) / sizeof(S_RadioGroupCallback);
+    for (int i = 0; i < tablen; ++i) {
+        if (SRadioGroupCallbackTab[i].id == pRadioGroup->getID()) {
+        	SRadioGroupCallbackTab[i].onCheckedChanged(pRadioGroup, checkedID);
+            break;
+        }
+    }
 }

jni/activity/settingActivity.h

@@ -25,9 +25,14 @@
 #include "control/ZKEditText.h"
 #include "control/ZKVideoView.h"
 #include "control/ZKCheckbox.h"
+#include "control/ZKRadioGroup.h"
 #include "window/ZKSlideWindow.h"
 
 /*TAG:Macro宏ID*/
+#define ID_SETTING_ThemeRadioButton2    22002
+#define ID_SETTING_ThemeRadioButton1    22001
+#define ID_SETTING_ThemeRadioGroup    94001
+#define ID_SETTING_ThemeTextView    50004
 #define ID_SETTING_VolumeCheckbox    21002
 #define ID_SETTING_VolumeTextView    50003
 #define ID_SETTING_TitleTextView    50002
@@ -44,6 +49,7 @@ class settingActivity : public Activity,
                      public ZKListView::AbsListAdapter,
                      public ZKSlideWindow::ISlideItemClickListener,
                      public EasyUIContext::ITouchListener,
+                     public ZKRadioGroup::ICheckedChangeListener,
                      public ZKCheckBox::ICheckedChangeListener,
                      public ZKEditText::ITextChangeListener,
                      public ZKVideoView::IVideoPlayerMessageListener
@@ -84,6 +90,7 @@ protected:
     virtual void onSlideItemClick(ZKSlideWindow *pSlideWindow, int index);
 
     virtual bool onTouchEvent(const MotionEvent &ev);
+    virtual void onCheckedChanged(ZKRadioGroup* pRadioGroup, int checkedID);
     virtual void onCheckedChanged(ZKCheckBox* pCheckBox, bool isChecked);
 
     virtual void onTextChanged(ZKTextView *pTextView, const string &text);

jni/logic/deviceInfoLogic.cc

@@ -48,8 +48,26 @@
 */
 
 
-using namespace std;
 
+void setDeviceInfoTheme() {
+    int deviceInfoThemeInt = StoragePreferences::getInt(STORE_THEME, defaultThemeInt);
+    if (deviceInfoThemeInt == 1) {
+    	msys_backPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/back_bule.png");
+    	mDebugPicPainterPtr->setBackgroundPic("/deviceInfo/shbei.png");
+    	mDeviceInfoPicPainterPtr->setBackgroundPic("/deviceInfo/xinxi.png");
+    	mQRCodePicPainterPtr->setBackgroundPic("/deviceInfo/saom.png");
+    }
+    else if (deviceInfoThemeInt == 2) {
+    	msys_backPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/back_pink.png");
+    	mDebugPicPainterPtr->setBackgroundPic("/deviceInfo/shbei-pink.png");
+    	mDeviceInfoPicPainterPtr->setBackgroundPic("/deviceInfo/xinxi-pink.png");
+    	mQRCodePicPainterPtr->setBackgroundPic("/deviceInfo/saom-pink.png");
+
+    }
+
+}
+
+using namespace std;
 struct NetworkConfiguration {
 	std::string ip;
 	std::string sub_network_mask;
@@ -281,6 +299,7 @@ static void onUI_intent(const Intent *intentPtr) {
 static void onUI_show() {
     EASYUICONTEXT->hideStatusBar();
     EASYUICONTEXT->hideNaviBar();
+    setDeviceInfoTheme();
 
 }
 

jni/logic/functionLogic.cc

@@ -43,12 +43,55 @@ static string _functionText;
 static string _nursingText;
 static string _warnText;
 static string _goActivity;
+static int functionThemeInt = defaultThemeInt;
+static uint32_t functionColor = buleDeepColour;
 
 static base::MediaPlayer mediaPlayer;
 
 #define FUNCTION_TIMER_HANDLE 3	// 增援的定时器id
 
 
+void setFunctionTheme() {
+	functionThemeInt = StoragePreferences::getInt(STORE_THEME, defaultThemeInt);
+	if (functionThemeInt == 1) {
+		mCallBedPicPainterPtr->setBackgroundPic("/function/chuangwei.png");
+		mConfirmCallButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "button/elliptic_bule.png");
+		mConfirmLogoutButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "button/elliptic_bule2.png");
+		mLogoutPicPainterPtr->setBackgroundPic("/medicalCare/dianhua.png");
+		mPwdPainterPtr->setBackgroundPic("/medicalCare/dianhua.png");
+		mPwdEditTextPtr->setBackgroundPic("/function/input.png");
+		mPwdConfirmButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "button/elliptic_bule2.png");
+		mServerPainterPtr->setBackgroundPic("/medicalCare/dianhua.png");
+		mServerIpEditTextPtr->setBackgroundPic("/function/input.png");
+		mServerPortEditTextPtr->setBackgroundPic("/function/input.png");
+		mServerConfirmButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "button/elliptic_bule2.png");
+		mRebootPowerButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "button/elliptic_bule2.png");
+		mRebootDeviceButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "button/elliptic_bule2.png");
+
+
+		functionColor = buleDeepColour;
+	}
+	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");
+
+
+		functionColor = redDeepColour;
+	}
+
+}
+
 
 static void callBed() {
 	Json::Value _frameRoom = getFrame();
@@ -72,10 +115,16 @@ static void callBed() {
 
 
 static void help() {
-	mIconPainterPtr->setBackgroundPic("icon/zengyuan2.png");
+	if (functionThemeInt == 1) {
+		mIconPainterPtr->setBackgroundPic("icon/zengyuan2.png");
+		mFunctionButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "button/elliptic_bule2.png");
+	}
+	else if (functionThemeInt == 2) {
+		mIconPainterPtr->setBackgroundPic("icon/zengyuan2-pink.png");
+		mFunctionButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "button/elliptic_pink2.png");
+	}
 	mFunctionTextViewPtr->setText(LANGUAGEMANAGER->getValue("HelpInfo"));
 	mStateTextViewPtr->setVisible(false);
-	mFunctionButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "button/elliptic_bule2.png");
 	mFunctionButtonPtr->setText(LANGUAGEMANAGER->getValue("Confirm"));
 	mFunctionWindowPtr->showWnd();
 
@@ -134,7 +183,7 @@ void nursing(string functionText, string nursingText) {
 	mFunctionTextViewPtr->setText(functionText);
 	mStateTextViewPtr->setVisible(true);
 	mStateTextViewPtr->setText(nursingText + " " + LANGUAGEMANAGER->getValue("SetNursingMsg"));
-	mFunctionButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "button/elliptic_pink.png");
+	mFunctionButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "button/elliptic_pink2.png");
 	mFunctionButtonPtr->setText(LANGUAGEMANAGER->getValue("Nursing"));
 	mFunctionWindowPtr->showWnd();
 }
@@ -145,7 +194,7 @@ void nursingEnd(string functionText) {
 	mFunctionTextViewPtr->setText(functionText);
 	mStateTextViewPtr->setVisible(true);
 	mStateTextViewPtr->setText(LANGUAGEMANAGER->getValue("SetNursingEndMsg"));
-	mFunctionButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "button/elliptic_pink.png");
+	mFunctionButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "button/elliptic_pink2.png");
 	mFunctionButtonPtr->setText(LANGUAGEMANAGER->getValue("NursingEnd"));
 	mFunctionWindowPtr->showWnd();
 }
@@ -162,6 +211,26 @@ void pwdWindowInfo() {
 	mPwdPromptTextViewPtr->setTextColor(0xFF000000);
 }
 
+void theme(string functionText) {
+	if (functionThemeInt == 1) {
+		mIconPainterPtr->setBackgroundPic("icon/zengyuan2.png");
+		mFunctionButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "button/elliptic_bule2.png");
+	}
+	else if (functionThemeInt == 2) {
+		mIconPainterPtr->setBackgroundPic("icon/zengyuan2-pink.png");
+		mFunctionButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "button/elliptic_pink2.png");
+	}
+	if (functionText == "蓝色") {
+		mFunctionTextViewPtr->setText(LANGUAGEMANAGER->getValue("ThemeBlue"));
+	}
+	else if (functionText == "红色") {
+		mFunctionTextViewPtr->setText(LANGUAGEMANAGER->getValue("ThemeRed"));
+	}
+	mStateTextViewPtr->setVisible(true);
+	mStateTextViewPtr->setText(LANGUAGEMANAGER->getValue("ThemeConfirm"));
+	mFunctionButtonPtr->setText(LANGUAGEMANAGER->getValue("Confirm"));
+	mFunctionWindowPtr->showWnd();
+}
 
 
 
@@ -241,6 +310,10 @@ static void onUI_intent(const Intent *intentPtr) {
 				_functionWindows == "reboot") {
 			pwdWindowInfo();
 		}
+		else if (_functionWindows == "theme") {
+			_functionText = intentPtr->getExtra(functionText);
+			theme(_functionText);
+		}
     }
 }
 
@@ -250,6 +323,7 @@ static void onUI_intent(const Intent *intentPtr) {
 static void onUI_show() {
     EASYUICONTEXT->hideStatusBar();
     EASYUICONTEXT->hideNaviBar();
+    setFunctionTheme();
 }
 
 /*
@@ -333,6 +407,13 @@ static int getListItemCount_CallBedListView(const ZKListView *pListView) {
 
 static void obtainListItemData_CallBedListView(ZKListView *pListView,ZKListView::ZKListItem *pListItem, int index) {
     //LOGD(" obtainListItemData_ CallBedListView  !!!\n");
+	if (functionThemeInt == 1) {
+		pListItem->setButtonStatusPic(ZK_CONTROL_STATUS_SELECTED, "/function/chooseBed.png");
+	}
+	else if (functionThemeInt == 2) {
+		pListItem->setButtonStatusPic(ZK_CONTROL_STATUS_SELECTED, "/function/chooseBed-pink.png");
+	}
+	pListItem->setTextStatusColor(ZK_CONTROL_STATUS_SELECTED, functionColor);
 
 	if (bedList.size() > 0) {
 		string frameBedName = bedList[index]["frame_bed"]["full_name"].asString();
@@ -415,6 +496,16 @@ static bool onButtonClick_FunctionButton(ZKButton *pButton) {
     else if (_functionWindows == "nursingEnd") {
     	setNursing(false);
     }
+    else if (_functionWindows == "theme") {
+    	if (_functionText == "蓝色") {
+            StoragePreferences::putInt(STORE_THEME, 1);
+    	}
+    	else if (_functionText == "红色") {
+            StoragePreferences::putInt(STORE_THEME, 2);
+    	}
+		sync();
+		reboot(RB_AUTOBOOT);
+    }
 
 	EASYUICONTEXT->closeActivity("functionActivity");
     return false;

jni/logic/mainLogic.cc

@@ -70,13 +70,29 @@ static int inBedCount = 0;
 static int emptyBedCount = 0;
 
 
-
-
 #define HELP_TIMER_HANDLE 3	// 增援的定时器id
 #define EVENT_TIME_HANDLE 8		// 事件定时器
 #define SLEEP_STRAT_TIME_HANDLE 9	// 息屏
 
 
+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");
+    }
+}
+
+
 static void getServerInfo(){
 
 	string url = getHttpGateway() + "/ncs_url/server_info";
@@ -476,6 +492,7 @@ static void onUI_show() {
     EASYUICONTEXT->showStatusBar();
     EASYUICONTEXT->showNaviBar();
 
+    setMainTheme();
 }
 
 /*
@@ -559,6 +576,16 @@ static void obtainListItemData_BedListView(ZKListView *pListView,ZKListView::ZKL
 		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");
+		}
+
+
 		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_283x44.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_283x44.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,7 @@ static void onUI_show() {
 
     EASYUICONTEXT->showStatusBar();
     EASYUICONTEXT->showNaviBar();
+    setMedicalCareTheme();
 }
 
 /*
@@ -652,7 +685,15 @@ 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, "/prompt/bule_150x48.png");
+	}
+	else if (medicalCareThemeInt == 2) {
+		pListItem->setButtonStatusPic(ZK_CONTROL_STATUS_SELECTED, "/prompt/pink_150x48.png");
+
+	}
 	pListItem->setText(clerkList[index]["clerk_name"].asCString());
+	pListItem->setTextStatusColor(ZK_CONTROL_STATUS_SELECTED, medicalCareColor);
 
 	if (index == chooseId) {
 		pListItem->setSelected(true);

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";
@@ -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";
@@ -125,6 +139,7 @@ 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,11 +40,62 @@ 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;
 }
@@ -137,6 +188,7 @@ static void onUI_show() {
 
     EASYUICONTEXT->hideStatusBar();
     EASYUICONTEXT->hideNaviBar();
+    setPromptTheme();
 }
 
 /*
@@ -230,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/settingLogic.cc

@@ -33,6 +33,18 @@
 * 在Eclipse编辑器中  使用 “alt + /”  快捷键可以打开智能提示
 */
 
+static int themeRadioButton = StoragePreferences::getInt(STORE_THEME, defaultThemeInt);
+
+void setSettingTheme() {
+	if (themeRadioButton == 1) {
+		msys_backPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/back_bule.png");
+		mTestButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_bule2.png");
+	}
+	else if (themeRadioButton == 2) {
+		msys_backPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/back_pink.png");
+		mTestButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_pink2.png");
+	}
+}
 
 /**
  * 注册定时器
@@ -49,8 +61,6 @@ static S_ACTIVITY_TIMEER REGISTER_ACTIVITY_TIMER_TAB[] = {
  */
 static void onUI_init(){
     //Tips :添加 UI初始化的显示代码到这里,如:mText1Ptr->setText("123");
-	mLightCheckboxPtr->setChecked(StoragePreferences::getBool(STORE_LIGHT, false));
-    mVolumeCheckboxPtr->setChecked(StoragePreferences::getBool(STORE_VOLUME, false));
 }
 
 /**
@@ -66,8 +76,20 @@ static void onUI_intent(const Intent *intentPtr) {
  * 当界面显示时触发
  */
 static void onUI_show() {
+
+	mLightCheckboxPtr->setChecked(StoragePreferences::getBool(STORE_LIGHT, false));
+    mVolumeCheckboxPtr->setChecked(StoragePreferences::getBool(STORE_VOLUME, false));
+
+//    if (themeRadioButton == 2) {
+//        mThemeRadioGroupPtr->setCheckedID(ID_SETTING_ThemeRadioButton2);
+//    }
+//    else {
+//        mThemeRadioGroupPtr->setCheckedID(ID_SETTING_ThemeRadioButton1);
+//    }
+
     EASYUICONTEXT->hideStatusBar();
     EASYUICONTEXT->hideNaviBar();
+    setSettingTheme();
 
 }
 
@@ -151,3 +173,22 @@ static void onCheckedChanged_VolumeCheckbox(ZKCheckBox* pCheckBox, bool isChecke
     LOGD(" Checkbox VolumeCheckbox checked %d", isChecked);
     StoragePreferences::putBool(STORE_VOLUME, isChecked);
 }
+static void onCheckedChanged_ThemeRadioGroup(ZKRadioGroup* pRadioGroup, int checkedID) {
+    LOGD(" RadioGroup ThemeRadioGroup checked %d", checkedID);
+    string themeStr = "蓝色";
+    switch (checkedID) {
+    case ID_SETTING_ThemeRadioButton1:
+        LOGD("选择蓝色");
+        themeStr = "蓝色";
+        break;
+    case ID_SETTING_ThemeRadioButton2:
+        LOGD("选择红色");
+        themeStr = "红色";
+        break;
+    }
+
+	Intent* intent = new Intent();
+	intent->putExtra(functionWindows, "theme");
+	intent->putExtra(functionText, themeStr);
+	EASYUICONTEXT->openActivity("functionActivity", intent);
+}

jni/logic/sipTestLogic.cc

@@ -41,6 +41,35 @@
 
 static base::MediaPlayer media_player;
 
+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");
+    	mButton1Ptr->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");
+    	mButton1Ptr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_pink_383x52.png");
+
+
+    }
+}
+
 namespace {
 FILE* file = NULL;
 
@@ -189,6 +218,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

@@ -677,6 +677,8 @@ static void onUI_init(){
 //		sendProtocolTo(UART_TTYS3, (byte*)(sendMsg), strlen(sendMsg));
 //	}
 
+	lightControl("CALLLED", "011F");
+
 #if 0
 	std::thread backend([](){
 		while (true) {

jni/logic/statusbar.cc

@@ -124,6 +124,20 @@ 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);
@@ -507,6 +521,8 @@ static void onUI_init(){
 
     StoragePreferences::putBool(STORE_LIGHT, true);
 	isLight = StoragePreferences::getBool(STORE_LIGHT, false);
+
+	setStatusTheme();
 }
 
 /*

jni/logic/updateLogic.cc

@@ -44,6 +44,37 @@
 *
 * 在Eclipse编辑器中  使用 “alt + /”  快捷键可以打开智能提示
 */
+static int updateThemeInt = StoragePreferences::getInt(STORE_THEME, defaultThemeInt);
+static uint32_t updateColor = buleDeepColour;
+
+void setUpdateTheme() {
+    updateThemeInt = StoragePreferences::getInt(STORE_THEME, defaultThemeInt);
+    if (updateThemeInt == 1) {
+    	msys_backPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/back_bule.png");
+    	mDeviceUpdatePicPainterPtr->setBackgroundPic("/function/dianhua.png");
+    	mUpdateButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_blue_383x52.png");
+    	mInitButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_blue_383x52.png");
+    	mFindNewPainterPtr->setBackgroundPic("/function/dianhua.png");
+    	mInstantlyButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_blue_383x52.png");
+    	mDialogPainterPtr->setBackgroundPic("/function/dianhua.png");
+    	mDialogButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_blue_383x52.png");
+    	mInitUpdateButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_blue_383x52.png");
+    	updateColor = buleDeepColour;
+    }
+    else if (updateThemeInt == 2) {
+    	msys_backPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/back_pink.png");
+    	mDeviceUpdatePicPainterPtr->setBackgroundPic("/function/dianhua-pink.png");
+    	mUpdateButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_pink_383x52.png");
+    	mInitButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_pink_383x52.png");
+    	mFindNewPainterPtr->setBackgroundPic("/function/dianhua-pink.png");
+    	mInstantlyButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_pink_383x52.png");
+    	mDialogPainterPtr->setBackgroundPic("/function/dianhua-pink.png");
+    	mDialogButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_pink_383x52.png");
+    	mInitUpdateButtonPtr->setButtonStatusPic(ZK_CONTROL_STATUS_NORMAL, "/button/elliptic_pink_383x52.png");
+    	updateColor = redDeepColour;
+    }
+}
+
 namespace {
 	base::UpdateAssistant assistant;
 	base::VersionInfo info;
@@ -58,7 +89,6 @@ namespace {
 Json::Value linuxVersionList;
 string updateUrl;
 int chooseVersionId;
-
 static void getLinuxVersionList() {
 		std::string url = getHttpGateway() + "/util/get_linux_version_list";
 
@@ -259,6 +289,7 @@ static void onUI_intent(const Intent *intentPtr) {
 static void onUI_show() {
     EASYUICONTEXT->hideStatusBar();
     EASYUICONTEXT->hideNaviBar();
+    setUpdateTheme();
 
 }
 
@@ -346,21 +377,29 @@ static int getListItemCount_DeviceTypeListView(const ZKListView *pListView) {
 
 static void obtainListItemData_DeviceTypeListView(ZKListView *pListView,ZKListView::ZKListItem *pListItem, int index) {
     //LOGD(" obtainListItemData_ DeviceTypeListView  !!!\n");
+	if (updateThemeInt == 1) {
+		pListItem->setButtonStatusPic(ZK_CONTROL_STATUS_SELECTED, "/deviceUpdate/choose.png");
+	}
+	else if (updateThemeInt == 2) {
+		pListItem->setButtonStatusPic(ZK_CONTROL_STATUS_SELECTED, "/deviceUpdate/choose-pink.png");
+	}
+	pListItem->setTextStatusColor(ZK_CONTROL_STATUS_SELECTED, updateColor);
+
 	string version = linuxVersionList[index]["type_name"].asString() + "         " + linuxVersionList[index]["version_code"].asString();
-		if (version != "         ") {
-			pListItem->setText(version);
-		}
-		else {
-			pListItem->setText("");
-		}
+	if (version != "         ") {
+		pListItem->setText(version);
+	}
+	else {
+		pListItem->setText("");
+	}
 
-		if (index == chooseVersionId) {
-			updateUrl = linuxVersionList[chooseVersionId]["app_path"].asString();
-			pListItem->setSelected(true);
-		}
-		else {
-			pListItem->setSelected(false);
-		}
+	if (index == chooseVersionId) {
+		updateUrl = linuxVersionList[chooseVersionId]["app_path"].asString();
+		pListItem->setSelected(true);
+	}
+	else {
+		pListItem->setSelected(false);
+	}
 }
 
 static void onListItemClick_DeviceTypeListView(ZKListView *pListView, int index, int id) {

jni/service/BusinessConfig.h

@@ -56,6 +56,7 @@
 
 #define STORE_LIGHT "light"
 #define STORE_VOLUME "volume"
+#define STORE_THEME "theme"
 
 #define SIGNAL_TYPE "TCP" //TCP,SIP
 
@@ -64,8 +65,16 @@
 
 #define STORE_MAC_ADDR "mac_addr"
 
-static std::string versionCode = "v1.0.38";
-static int versionNo = 38;
+
+static uint32_t redLightColour = 0xFEB8BF;
+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 std::string versionCode = "v1.0.39";
+static int versionNo = 39;
 static std::string serverIP = "172.28.100.100";
 static std::string tcpIP = "172.28.100.100";
 static int serverHttpPort = 8006;