修改进入设备信息的密码逻辑

jni/logic/deviceInfoLogic.cc

@@ -366,16 +366,19 @@ static bool ondeviceInfoActivityTouchEvent(const MotionEvent &ev) {
 
 static bool onButtonClick_SettingButton(ZKButton *pButton) {
     LOGD(" ButtonClick SettingButton !!!\n");
-    Intent* intent = new Intent();
-	intent->putExtra(functionWindows, "setting");
-	EASYUICONTEXT->openActivity("functionActivity", intent);
+//    Intent* intent = new Intent();
+//	intent->putExtra(functionWindows, "setting");
+//	EASYUICONTEXT->openActivity("functionActivity", intent);
+
+	EASYUICONTEXT->openActivity("sipTestActivity");
     return false;
 }
 
 static bool onButtonClick_ServerButton(ZKButton *pButton) {
     LOGD(" ButtonClick ServerButton !!!\n");
     Intent* intent = new Intent();
-	intent->putExtra(functionWindows, "serverChange");
+//	intent->putExtra(functionWindows, "serverChange");
+	intent->putExtra(functionWindows, "serverChange2");
 	EASYUICONTEXT->openActivity("functionActivity", intent);
     return false;
 }
@@ -397,7 +400,8 @@ static bool onButtonClick_RestartButton(ZKButton *pButton) {
     LOGD(" ButtonClick RestartButton !!!\n");
 
     Intent* intent = new Intent();
-	intent->putExtra(functionWindows, "reboot");
+//	intent->putExtra(functionWindows, "reboot");
+	intent->putExtra(functionWindows, "reboot2");
 	EASYUICONTEXT->openActivity("functionActivity", intent);
 
 //	const char* req = "-1";

jni/logic/functionLogic.cc

@@ -562,7 +562,8 @@ static void onUI_intent(const Intent *intentPtr) {
 				_functionWindows == "init" ||
 				_functionWindows == "reboot" ||
 				_functionWindows == "nursing2" ||
-				_functionWindows == "deviceAdd"
+				_functionWindows == "deviceAdd" ||
+				_functionWindows == "deviceInfo"
 				) {
 			pwdWindowInfo();
 		}
@@ -621,6 +622,18 @@ static void onUI_intent(const Intent *intentPtr) {
 			_functionText = intentPtr->getExtra(functionText);
 			 setLanguage(_functionText);
 		}
+		else if (_functionWindows == "serverChange2") {
+			mServerWindowPtr->showWnd();
+
+			string serverIp = StoragePreferences::getString(STORE_GATEWAY, "172.28.100.100");
+			int serverPort = StoragePreferences::getInt(STORE_HTTP_PORT, 8006);
+			mServerIpEditTextPtr->setText(serverIp);
+			mServerPortEditTextPtr->setText(to_string(serverPort));
+		}
+		else if (_functionWindows == "reboot2") {
+			// 打开初始化界面
+			mRebootWindowPtr->showWnd();
+		}
     }
 }
 
@@ -1008,7 +1021,25 @@ static void onEditTextChanged_PwdEditText(const std::string &text) {
 			mPwdPromptTextViewPtr->setTextTr("PasswordWrong");
 			mPwdPromptTextViewPtr->setTextColor(0xFFFF0000);
 		}
-
+	}
+	else if (_functionWindows == "deviceInfo") {
+		if (pwd == "888"){
+			// 关闭密码输入界面
+			mPwdWindowPtr->hideWnd();
+			EASYUICONTEXT->closeActivity("functionActivity");
+			EASYUICONTEXT->openActivity("deviceInfoActivity");
+		}
+		else if (pwd == "999") {
+			// 关闭密码输入界面
+			mPwdWindowPtr->hideWnd();
+			EASYUICONTEXT->closeActivity("functionActivity");
+			// 打开设置界面
+			EASYUICONTEXT->openActivity("settingActivity");
+		}
+		else {
+			mPwdPromptTextViewPtr->setTextTr("PasswordWrong");
+			mPwdPromptTextViewPtr->setTextColor(0xFFFF0000);
+		}
 	}
 }
 

jni/logic/moreLogic.cc

@@ -246,7 +246,11 @@ static void onListItemClick_DeviceMenuListView(ZKListView *pListView, int index,
 
 	string actName = deviceMenus[index]["act_name"].asString();
 	if (actName == "deviceInfoActivity") {
-		EASYUICONTEXT->openActivity("deviceInfoActivity");
+//		EASYUICONTEXT->openActivity("deviceInfoActivity");
+
+		Intent* intent = new Intent();
+		intent->putExtra(functionWindows, "deviceInfo");
+		EASYUICONTEXT->openActivity("functionActivity", intent);
 	}
 	else if (actName == "callBedActivity") {
 		Intent* intent = new Intent();