增加模式2

i18n/zh_CN.tr

@@ -35,7 +35,7 @@
     <string name="Save">保存</string>
     <string name="Back">返回</string>
     <string name="CallBed">呼叫床位</string>
-    <string name="CallNurse">呼叫护士站</string>
+    <string name="CallNurse">呼叫</string>
     <string name="CallCencel">取消呼叫</string>
     <string name="CallInfo">发起呼叫</string>
     <string name="SOSCallInfo">发起紧急呼叫</string>
@@ -90,6 +90,9 @@
 	<string name="ThemeBlue">是否将主题颜色切换成蓝色</string>
     <string name="ThemeRed">是否主题颜色切换成红色</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>
@@ -179,6 +182,7 @@
     <string name="ThemeChoice">选择主题颜色</string>
     <string name="Blue">蓝</string>
     <string name="Red">红</string>
+    <string name="ModeChoice">选择显示模式</string>
     <!-- 测试界面 -->
     <string name="DebugText">设备调试</string>
     <string name="InputSip">请输入目标SIP账号</string>

jni/activity/mainActivity.cpp

@@ -4,6 +4,8 @@
 #include "mainActivity.h"
 
 /*TAG:GlobalVariable全局变量*/
+static ZKListView* mBedListView3Ptr;
+static ZKListView* mBedListView2Ptr;
 static ZKListView* mBedListViewPtr;
 static ZKPainter* mInBedPicPainterPtr;
 static ZKPainter* mEmptyBedPrcPainterPtr;
@@ -78,6 +80,8 @@ typedef struct {
 }S_ListViewFunctionsCallback;
 /*TAG:ListViewFunctionsCallback*/
 static S_ListViewFunctionsCallback SListViewFunctionsCallbackTab[] = {
+    ID_MAIN_BedListView3, getListItemCount_BedListView3, obtainListItemData_BedListView3, onListItemClick_BedListView3,
+    ID_MAIN_BedListView2, getListItemCount_BedListView2, obtainListItemData_BedListView2, onListItemClick_BedListView2,
     ID_MAIN_BedListView, getListItemCount_BedListView, obtainListItemData_BedListView, onListItemClick_BedListView,
 };
 
@@ -125,6 +129,8 @@ mainActivity::~mainActivity() {
     EASYUICONTEXT->unregisterGlobalTouchListener(this);
     onUI_quit();
     unregisterProtocolDataUpdateListener(onProtocolDataUpdate);
+    mBedListView3Ptr = NULL;
+    mBedListView2Ptr = NULL;
     mBedListViewPtr = NULL;
     mInBedPicPainterPtr = NULL;
     mEmptyBedPrcPainterPtr = NULL;
@@ -147,6 +153,8 @@ const char* mainActivity::getAppName() const{
 //TAG:onCreate
 void mainActivity::onCreate() {
 	Activity::onCreate();
+    mBedListView3Ptr = (ZKListView*)findControlByID(ID_MAIN_BedListView3);if(mBedListView3Ptr!= NULL){mBedListView3Ptr->setListAdapter(this);mBedListView3Ptr->setItemClickListener(this);}
+    mBedListView2Ptr = (ZKListView*)findControlByID(ID_MAIN_BedListView2);if(mBedListView2Ptr!= NULL){mBedListView2Ptr->setListAdapter(this);mBedListView2Ptr->setItemClickListener(this);}
     mBedListViewPtr = (ZKListView*)findControlByID(ID_MAIN_BedListView);if(mBedListViewPtr!= NULL){mBedListViewPtr->setListAdapter(this);mBedListViewPtr->setItemClickListener(this);}
     mInBedPicPainterPtr = (ZKPainter*)findControlByID(ID_MAIN_InBedPicPainter);
     mEmptyBedPrcPainterPtr = (ZKPainter*)findControlByID(ID_MAIN_EmptyBedPrcPainter);

jni/activity/mainActivity.h

@@ -27,6 +27,24 @@
 #include "window/ZKSlideWindow.h"
 
 /*TAG:Macro宏ID*/
+#define ID_MAIN_NurseTitleSubItem3    24026
+#define ID_MAIN_DoctorTitleSubItem3    24025
+#define ID_MAIN_NurseSubItem3    24024
+#define ID_MAIN_DoctorSubItem3    24023
+#define ID_MAIN_SexSubItem3    24022
+#define ID_MAIN_AgeSubItem3    24021
+#define ID_MAIN_CustomerNameSubItem3    24020
+#define ID_MAIN_BedNumSubItem3    24019
+#define ID_MAIN_BedListView3    80003
+#define ID_MAIN_NurseTitleSubItem2    24018
+#define ID_MAIN_DoctorTitleSubItem2    24017
+#define ID_MAIN_NurseSubItem2    24016
+#define ID_MAIN_DoctorSubItem2    24015
+#define ID_MAIN_SexSubItem2    24014
+#define ID_MAIN_AgeSubItem2    24013
+#define ID_MAIN_CustomerNameSubItem2    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

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,10 @@
 #include "window/ZKSlideWindow.h"
 
 /*TAG:Macro宏ID*/
+#define ID_SETTING_ModeRadioButton2    22004
+#define ID_SETTING_ModeRadioButton1    22003
+#define ID_SETTING_ModeRadioGroup    94002
+#define ID_SETTING_ModeTextView    50005
 #define ID_SETTING_ThemeRadioButton2    22002
 #define ID_SETTING_ThemeRadioButton1    22001
 #define ID_SETTING_ThemeRadioGroup    94001

jni/logic/functionLogic.cc

@@ -256,6 +256,28 @@ 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");
+    }
+    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();
+}
+
+
 
 
 /**
@@ -338,6 +360,10 @@ static void onUI_intent(const Intent *intentPtr) {
 			_functionText = intentPtr->getExtra(functionText);
 			theme(_functionText);
 		}
+        else if (_functionWindows == "mode") {
+            _functionText = intentPtr->getExtra(functionText);
+            mode(_functionText);
+        }
     }
 }
 
@@ -538,6 +564,16 @@ static bool onButtonClick_FunctionButton(ZKButton *pButton) {
 		reboot(RB_AUTOBOOT);
 		EASYUICONTEXT->closeActivity("functionActivity");
     }
+    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);
+    }
 
     return false;
 }

jni/logic/mainLogic.cc

@@ -69,6 +69,7 @@ static bool serverInfo = true;	// 判断是否需要从服务器获取服务器
 static int inBedCount = 0;
 static int emptyBedCount = 0;
 static int mainThemeInt = StoragePreferences::getInt(STORE_THEME, defaultThemeInt);
+static int mainModeInt = StoragePreferences::getInt(STORE_MODE, defaultModeInt);
 
 
 
@@ -94,8 +95,6 @@ void setMainTheme() {
     }
 }
 
-
-
 static void getServerInfo(){
 
 	string url = getHttpGateway() + "/ncs_url/server_info";
@@ -162,7 +161,30 @@ static void getFrameRoom(int frame_id) {
 		}
 
 		if (mBedListViewPtr != NULL) {
-			mBedListViewPtr->refreshListView();
+			if (mainModeInt == 1) {
+				mBedListViewPtr->refreshListView();
+			}
+			else {
+				if (frameBedList.size() <= 3) {
+					mBedListViewPtr->refreshListView();
+					mBedListViewPtr->setVisible(true);
+					mBedListView2Ptr->setVisible(false);
+					mBedListView3Ptr->setVisible(false);
+				}
+				else if (frameBedList.size() > 3 && frameBedList.size() <= 6) {
+					mBedListView2Ptr->refreshListView();
+					mBedListViewPtr->setVisible(false);
+					mBedListView2Ptr->setVisible(true);
+					mBedListView3Ptr->setVisible(false);
+
+				}
+				else {
+					mBedListView3Ptr->refreshListView();
+					mBedListViewPtr->setVisible(false);
+					mBedListView2Ptr->setVisible(false);
+					mBedListView3Ptr->setVisible(true);
+				}
+			}
 		}
 	}
 }
@@ -569,6 +591,11 @@ static int getListItemCount_BedListView(const ZKListView *pListView) {
 static void obtainListItemData_BedListView(ZKListView *pListView,ZKListView::ZKListItem *pListItem, int index) {
     //LOGD(" obtainListItemData_ BedListView  !!!\n");
 
+	if (mainModeInt == 2) {
+		if (frameBedList.size() > 3) {
+			return;
+		}
+	}
 	if (frameBedList.size() > 0) {
 		ZKListView::ZKListSubItem* bedNum = pListItem->findSubItemByID(ID_MAIN_BedNumSubItem);
 		ZKListView::ZKListSubItem* name = pListItem->findSubItemByID(ID_MAIN_CustomerNameSubItem);
@@ -580,10 +607,10 @@ static void obtainListItemData_BedListView(ZKListView *pListView,ZKListView::ZKL
 		ZKListView::ZKListSubItem* nurse = pListItem->findSubItemByID(ID_MAIN_NurseSubItem);
 
 		if (mainThemeInt == 1) {
-			bedNum->setBackgroundPic("/main/chuanghao-bg.png");
+			bedNum->setBackgroundPic("/9/chuanghao_bg.9.png");
 		}
 		else if (mainThemeInt == 2) {
-			bedNum->setBackgroundPic("/main/chuanghao-bg-pink.png");
+			bedNum->setBackgroundPic("/9/chuanghao_bg_pink.9.png");
 		}
 
 
@@ -623,17 +650,17 @@ static void obtainListItemData_BedListView(ZKListView *pListView,ZKListView::ZKL
 		if (customerSex == "0") {	// 如果性别为女性，替换成女性，底色为粉色
 			sex->setText(LANGUAGEMANAGER->getValue("Woman"));
 			sex->setTextColor(0xFF9F9F);
-			sex->setBackgroundPic("main/woman.png");
+			sex->setBackgroundPic("9/lightRed.9.png");
 		}
 		else if (customerSex == "1") {
 			sex->setText(LANGUAGEMANAGER->getValue("Man"));
 			sex->setTextColor(0x3A78EF);
-			sex->setBackgroundPic("main/man.png");
+			sex->setBackgroundPic("9/lightBlue.9.png");
 		}
 		else {
 			sex->setText(LANGUAGEMANAGER->getValue("Unknown"));
 			sex->setTextColor(0x37B643);
-			sex->setBackgroundPic("main/age.png");
+			sex->setBackgroundPic("9/lightGreen.9.png");
 		}
 
 
@@ -708,3 +735,205 @@ 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 (mainModeInt == 2) {
+		if (frameBedList.size() <= 3 || frameBedList.size() > 6) {
+			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 (mainThemeInt == 1) {
+			bedNum->setBackgroundPic("/9/chuanghao_bg.9.png");
+		}
+		else if (mainThemeInt == 2) {
+			bedNum->setBackgroundPic("/9/chuanghao_bg_pink.9.png");
+		}
+
+
+		string frameBedName = frameBedList[index]["frame_bed"]["full_name"].asString();
+		if (frameBedName == "") {
+			bedNum->setText(LANGUAGEMANAGER->getValue("EmptyBed"));
+		} else {
+			int nPos = frameBedName.find("-");
+			if (nPos != -1) {
+				frameBedName = frameBedName.substr(nPos + 1, frameBedName.length());
+			}
+			bedNum->setText(frameBedName);
+		}
+
+		// 用户相关
+		string customerName = frameBedList[index]["customer_name"].asString();
+		if (customerName == "") {
+			name->setText(LANGUAGEMANAGER->getValue("EmptyCustomer"));
+		} else {
+			name->setText(customerName);
+		}
+
+
+		if (partSetting.customerAgeHiddenOnDoor != 0) {
+			if (frameBedList[index]["customer_age"].asString() == "") {
+				age->setText("");
+			} else {
+				age->setText("*" + frameBedList[index]["customer_age_unit"].asString());
+			}
+		}
+		else {
+			age->setText(frameBedList[index]["customer_age"].asString() + frameBedList[index]["customer_age_unit"].asString());
+		}
+
+
+		string customerSex = frameBedList[index]["customer_sex"].asString();
+		if (customerSex == "0") {	// 如果性别为女性，替换成女性，底色为粉色
+			sex->setText(LANGUAGEMANAGER->getValue("Woman"));
+			sex->setTextColor(0xFF9F9F);
+			sex->setBackgroundPic("9/lightRed.9.png");
+		}
+		else if (customerSex == "1") {
+			sex->setText(LANGUAGEMANAGER->getValue("Man"));
+			sex->setTextColor(0x3A78EF);
+			sex->setBackgroundPic("9/lightBlue.9.png");
+		}
+		else {
+			sex->setText(LANGUAGEMANAGER->getValue("Unknown"));
+			sex->setTextColor(0x37B643);
+			sex->setBackgroundPic("9/lightGreen.9.png");
+		}
+
+
+		// 医生护士相关
+		if (rightTitleInfo["doctor_valid"] != 1){
+			doctorTitle->setVisible(false);
+		} else {
+			doctorTitle->setText(rightTitleInfo["doctor_title"].asString());
+		}
+
+		if (rightTitleInfo["nurse_valid"] != 1){
+			nurseTitle->setVisible(false);
+		} else {
+			nurseTitle->setText(rightTitleInfo["nurse_title"].asString());
+		}
+		doctor->setText(frameBedList[index]["doctor_name"].asString());
+		nurse->setText(frameBedList[index]["nurse_name"].asString());
+	}
+
+}
+
+static void onListItemClick_BedListView2(ZKListView *pListView, int index, int id) {
+    //LOGD(" onListItemClick_ BedListView2  !!!\n");
+}
+static int getListItemCount_BedListView3(const ZKListView *pListView) {
+    //LOGD("getListItemCount_BedListView3 !\n");
+    return frameBedList.size();
+}
+
+static void obtainListItemData_BedListView3(ZKListView *pListView,ZKListView::ZKListItem *pListItem, int index) {
+    //LOGD(" obtainListItemData_ BedListView3  !!!\n");
+	if (mainModeInt == 2) {
+		if (frameBedList.size() <= 6) {
+			return;
+		}
+	}
+
+	if (frameBedList.size() > 0) {
+		ZKListView::ZKListSubItem* bedNum = pListItem->findSubItemByID(ID_MAIN_BedNumSubItem3);
+		ZKListView::ZKListSubItem* name = pListItem->findSubItemByID(ID_MAIN_CustomerNameSubItem3);
+		ZKListView::ZKListSubItem* age = pListItem->findSubItemByID(ID_MAIN_AgeSubItem3);
+		ZKListView::ZKListSubItem* sex = pListItem->findSubItemByID(ID_MAIN_SexSubItem3);
+		ZKListView::ZKListSubItem* doctorTitle = pListItem->findSubItemByID(ID_MAIN_DoctorTitleSubItem3);
+		ZKListView::ZKListSubItem* nurseTitle = pListItem->findSubItemByID(ID_MAIN_NurseTitleSubItem3);
+		ZKListView::ZKListSubItem* doctor = pListItem->findSubItemByID(ID_MAIN_DoctorSubItem3);
+		ZKListView::ZKListSubItem* nurse = pListItem->findSubItemByID(ID_MAIN_NurseSubItem3);
+
+		if (mainThemeInt == 1) {
+			bedNum->setBackgroundPic("/9/chuanghao_bg.9.png");
+		}
+		else if (mainThemeInt == 2) {
+			bedNum->setBackgroundPic("/9/chuanghao_bg_pink.9.png");
+		}
+
+
+		string frameBedName = frameBedList[index]["frame_bed"]["full_name"].asString();
+		if (frameBedName == "") {
+			bedNum->setText(LANGUAGEMANAGER->getValue("EmptyBed"));
+		} else {
+			int nPos = frameBedName.find("-");
+			if (nPos != -1) {
+				frameBedName = frameBedName.substr(nPos + 1, frameBedName.length());
+			}
+			bedNum->setText(frameBedName);
+		}
+
+		// 用户相关
+		string customerName = frameBedList[index]["customer_name"].asString();
+		if (customerName == "") {
+			name->setText(LANGUAGEMANAGER->getValue("EmptyCustomer"));
+		} else {
+			name->setText(customerName);
+		}
+
+
+		if (partSetting.customerAgeHiddenOnDoor != 0) {
+			if (frameBedList[index]["customer_age"].asString() == "") {
+				age->setText("");
+			} else {
+				age->setText("*" + frameBedList[index]["customer_age_unit"].asString());
+			}
+		}
+		else {
+			age->setText(frameBedList[index]["customer_age"].asString() + frameBedList[index]["customer_age_unit"].asString());
+		}
+
+
+		string customerSex = frameBedList[index]["customer_sex"].asString();
+		if (customerSex == "0") {	// 如果性别为女性，替换成女性，底色为粉色
+			sex->setText(LANGUAGEMANAGER->getValue("Woman"));
+			sex->setTextColor(0xFF9F9F);
+			sex->setBackgroundPic("9/lightRed.9.png");
+		}
+		else if (customerSex == "1") {
+			sex->setText(LANGUAGEMANAGER->getValue("Man"));
+			sex->setTextColor(0x3A78EF);
+			sex->setBackgroundPic("9/lightBlue.9.png");
+		}
+		else {
+			sex->setText(LANGUAGEMANAGER->getValue("Unknown"));
+			sex->setTextColor(0x37B643);
+			sex->setBackgroundPic("9/lightGreen.9.png");
+		}
+
+
+		// 医生护士相关
+		if (rightTitleInfo["doctor_valid"] != 1){
+			doctorTitle->setVisible(false);
+		} else {
+			doctorTitle->setText(rightTitleInfo["doctor_title"].asString());
+		}
+
+		if (rightTitleInfo["nurse_valid"] != 1){
+			nurseTitle->setVisible(false);
+		} else {
+			nurseTitle->setText(rightTitleInfo["nurse_title"].asString());
+		}
+		doctor->setText(frameBedList[index]["doctor_name"].asString());
+		nurse->setText(frameBedList[index]["nurse_name"].asString());
+	}
+}
+
+static void onListItemClick_BedListView3(ZKListView *pListView, int index, int id) {
+    //LOGD(" onListItemClick_ BedListView3  !!!\n");
+}

jni/logic/settingLogic.cc

@@ -187,3 +187,22 @@ 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/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
 
@@ -65,15 +66,16 @@
 
 #define STORE_MAC_ADDR "mac_addr"
 
-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 uint32_t redLightColour = 0xFFFEB8BF;
+static uint32_t redDeepColour = 0xFFF78B8F;
+static uint32_t buleLightColour = 0xFF759FFF;
+static uint32_t buleDeepColour = 0xFF3A78EF;
+static uint32_t whiteColour = 0xFFFFFFFF;
 static int defaultThemeInt = 1;
+static int defaultModeInt = 2;
 
-static std::string versionCode = "v2.0.7";
-static int versionNo = 43;
+static std::string versionCode = "v2.0.8";
+static int versionNo = 44;
 static std::string serverIP = "172.28.100.100";
 static std::string tcpIP = "172.28.100.100";
 static int serverHttpPort = 8006;