暂存

jni/logic/deviceInfoLogic.cc

@@ -378,12 +378,16 @@ static bool onButtonClick_VersionButton(ZKButton *pButton) {
 static bool onButtonClick_RestartButton(ZKButton *pButton) {
     LOGD(" ButtonClick RestartButton !!!\n");
 
-	const char* req = "-1";
-	TcpClient::instance()->sendMsg(req);
+    Intent* intent = new Intent();
+	intent->putExtra(functionWindows, "reboot");
+	EASYUICONTEXT->openActivity("functionActivity", intent);
 
-    lightControl("CALLLED", "000F");
-    //重启
-	sync();
-	reboot(RB_AUTOBOOT);
+//	const char* req = "-1";
+//	TcpClient::instance()->sendMsg(req);
+//
+//    lightControl("CALLLED", "000F");
+//    //重启
+//	sync();
+//	reboot(RB_AUTOBOOT);
     return false;
 }

jni/logic/functionLogic.cc

@@ -348,6 +348,10 @@ static void onUI_quit() {
 	mWarnWindowPtr->hideWnd();
 	mLogoutWindowPtr->hideWnd();
 
+
+    EASYUICONTEXT->showStatusBar();
+    EASYUICONTEXT->showNaviBar();
+
 }
 
 /**
@@ -376,6 +380,7 @@ static bool onUI_Timer(int id){
 			break;
 		case NETRESET_TIMER_HANDLE:
 			netresetInt += 1;
+			LOGD("netresetInt ===========> %d", netresetInt);
 		    lightControl("NETRESET", "1F");
 
 		    if (netresetInt == 15) {
@@ -693,6 +698,7 @@ static bool onButtonClick_RebootPowerButton(ZKButton *pButton) {
     if (!isNetreset) {
     	isNetreset = true;
         lightControl("CALLLED", "000F");
+
     	mActivityPtr->registerUserTimer(NETRESET_TIMER_HANDLE, 1000);
     }
     return false;

jni/logic/mainLogic.cc

@@ -78,7 +78,7 @@ static int emptyBedCount = 0;
 
 
 void setMainTheme() {
-//    int themeInt = StoragePreferences::getInt(STORE_THEME, defaultThemeInt);
+    int themeInt = StoragePreferences::getInt(STORE_THEME, defaultThemeInt);
 //    LOGD("themeInt =====> %d", themeInt);
 //    if (themeInt == 1) {
 //        mRoomPainterPtr->setBackgroundPic("/main/roomBg.png");