修复服务器地址变更，导致无法连接的问题

jni/activity/functionActivity.cpp

@@ -4,6 +4,7 @@
 #include "functionActivity.h"
 
 /*TAG:GlobalVariable全局变量*/
+static ZKButton* mFunctionBackButtonPtr;
 static ZKButton* mRebootLineButtonPtr;
 static ZKTextView* mRebootLineTextViewPtr;
 static ZKButton* mRebootDeviceButtonPtr;
@@ -83,6 +84,7 @@ typedef struct {
 
 /*TAG:ButtonCallbackTab按键映射表*/
 static S_ButtonCallback sButtonCallbackTab[] = {
+    ID_FUNCTION_FunctionBackButton, onButtonClick_FunctionBackButton,
     ID_FUNCTION_RebootLineButton, onButtonClick_RebootLineButton,
     ID_FUNCTION_RebootDeviceButton, onButtonClick_RebootDeviceButton,
     ID_FUNCTION_RebootPowerButton, onButtonClick_RebootPowerButton,
@@ -172,6 +174,7 @@ functionActivity::~functionActivity() {
     unregisterProtocolDataUpdateListener(onProtocolDataUpdate);
     onUI_quit();
     mActivityPtr = NULL;
+    mFunctionBackButtonPtr = NULL;
     mRebootLineButtonPtr = NULL;
     mRebootLineTextViewPtr = NULL;
     mRebootDeviceButtonPtr = NULL;
@@ -223,6 +226,7 @@ const char* functionActivity::getAppName() const{
 //TAG:onCreate
 void functionActivity::onCreate() {
 	Activity::onCreate();
+    mFunctionBackButtonPtr = (ZKButton*)findControlByID(ID_FUNCTION_FunctionBackButton);
     mRebootLineButtonPtr = (ZKButton*)findControlByID(ID_FUNCTION_RebootLineButton);
     mRebootLineTextViewPtr = (ZKTextView*)findControlByID(ID_FUNCTION_RebootLineTextView);
     mRebootDeviceButtonPtr = (ZKButton*)findControlByID(ID_FUNCTION_RebootDeviceButton);

jni/activity/functionActivity.h

@@ -27,6 +27,7 @@
 #include "window/ZKSlideWindow.h"
 
 /*TAG:Macro宏ID*/
+#define ID_FUNCTION_FunctionBackButton    20015
 #define ID_FUNCTION_RebootLineButton    20011
 #define ID_FUNCTION_RebootPowerButton    20013
 #define ID_FUNCTION_RebootLineTextView    50012

jni/logic/functionLogic.cc

@@ -608,8 +608,7 @@ static bool onButtonClick_FunctionButton(ZKButton *pButton) {
     	else if (_functionText == "绿色") {
             StoragePreferences::putInt(STORE_THEME, 3);
     	}
-		sync();
-		reboot(RB_AUTOBOOT);
+    	deviceReboot();
     }
     else if (_functionWindows == "mode") {
     	if (_functionText == "模式1") {
@@ -618,8 +617,7 @@ static bool onButtonClick_FunctionButton(ZKButton *pButton) {
     	else if (_functionText == "模式2") {
             StoragePreferences::putInt(STORE_MODE, 2);
     	}
-		sync();
-		reboot(RB_AUTOBOOT);
+    	deviceReboot();
 
     }
 
@@ -757,14 +755,10 @@ static bool onButtonClick_ServerConfirmButton(ZKButton *pButton) {
 
     StoragePreferences::putString(STORE_GATEWAY, mServerIpEditTextPtr->getText().c_str());
     StoragePreferences::putInt(STORE_HTTP_PORT, std::atoi(mServerPortEditTextPtr->getText().c_str()));
+    StoragePreferences::putString(STORE_TCP_LOCAL_IP, mServerIpEditTextPtr->getText().c_str());
+    StoragePreferences::putInt(STORE_TCP_PORT, std::atoi(mServerPortEditTextPtr->getText().c_str()));
 
-	const char* req = "-1";
-	TcpClient::instance()->sendMsg(req);
-
-    lightControl("CALLLED", "000F");
-    //重启
-    sync();
-    reboot(RB_AUTOBOOT);
+    deviceReboot();
     return false;
 }
 
@@ -777,13 +771,7 @@ static bool onButtonClick_ServerCancelButton(ZKButton *pButton) {
 }
 static bool onButtonClick_RebootDeviceButton(ZKButton *pButton) {
     LOGD(" ButtonClick RebootDeviceButton !!!\n");
-	const char* req = "-1";
-	TcpClient::instance()->sendMsg(req);
-
-    lightControl("CALLLED", "000F");
-	//重启
-	sync();
-	reboot(RB_AUTOBOOT);
+    deviceReboot();
     return false;
 }
 
@@ -798,7 +786,7 @@ static bool onButtonClick_RebootLineButton(ZKButton *pButton) {
 	tcpModel.type = TcpType::DEVICE;
 	tcpModel.action = DeviceAction::POWER_RESET;
 	tcpModel.from_id = StoragePreferences::getInt(STORE_DEVICE_ID,0);
-	tcpModel.to_id = NULL;
+	tcpModel.to_id = 0;
 
 	std::string req = getTcpModelString(tcpModel);
 	LOGD("TCP DEVICE : %s",req.c_str());
@@ -806,3 +794,8 @@ static bool onButtonClick_RebootLineButton(ZKButton *pButton) {
     TcpClient::instance()->sendMsg(req.c_str());
     return false;
 }
+static bool onButtonClick_FunctionBackButton(ZKButton *pButton) {
+    LOGD(" ButtonClick FunctionBackButton !!!\n");
+	EASYUICONTEXT->closeActivity("functionActivity");
+    return false;
+}

jni/logic/startLogic.cc

@@ -178,6 +178,16 @@ namespace {
     }
 }
 
+void deviceReboot() {
+    LOGD("Device Reboot!");
+    const char* req = "-1";
+    TcpClient::instance()->sendMsg(req);
+
+    lightControl("CALLLED", "000F");
+    sync();
+    reboot(RB_AUTOBOOT);
+}
+
 void systemRestart() {
     if (!isNetreset) {
     	isNetreset = true;
@@ -277,21 +287,10 @@ void handleMsg(byte* inBytes){
 			EASYUICONTEXT->openActivity("updateActivity", intent);
 		}
 		else if (tcpModel.action == DeviceAction::RESTART) {	// 重启设备
-			const char* req = "-1";
-			TcpClient::instance()->sendMsg(req);
-
-		    lightControl("CALLLED", "000F");
-			sync();
-			reboot(RB_AUTOBOOT);
+			deviceReboot();
 		}
         else if (tcpModel.action == DeviceAction::REBOOT) {
-            const char* req = "-1";
-            TcpClient::instance()->sendMsg(req);
-
-		    lightControl("CALLLED", "000F");
-            //重启
-            sync();
-            reboot(RB_AUTOBOOT);
+        	deviceReboot();
         }
 		else if (tcpModel.action == DeviceAction::DEVICE_REFRESH) {	// 设备刷新
 			dataRefresh();
@@ -303,13 +302,7 @@ void handleMsg(byte* inBytes){
 			StoragePreferences::putString(STORE_GATEWAY, tcpModel.json["server_ip"].asCString());
 			StoragePreferences::putString(STORE_HTTP_PORT, tcpModel.json["server_port"].asCString());
 
-			const char* req = "-1";
-			TcpClient::instance()->sendMsg(req);
-
-		    lightControl("CALLLED", "000F");
-			//重启
-			sync();
-			reboot(RB_AUTOBOOT);
+			deviceReboot();
 		}
 	} else if (tcpModel.type == TcpType::DATA){
 		if (tcpModel.action == DataAction::REFRESH){	// 刷新数据
@@ -1071,8 +1064,7 @@ static bool onUI_Timer(int id){
 	    if (netresetInt == 5) {
 	    	LOGD("网卡重启无效，程序内部重启");
 	    	//重启
-	    	sync();
-	    	reboot(RB_AUTOBOOT);
+	    	deviceReboot();
 	    }
 		break;
     case SIP_RECONNECT_TIME_HANDLE: {

jni/service/BusinessConfig.h

@@ -79,8 +79,8 @@ static uint32_t whiteColour = 0xFFFFFF;
 static int defaultThemeInt = 1;
 static int defaultModeInt = 1;
 
-static std::string versionCode = "v1.0.50";
-static int versionNo = 50;
+static std::string versionCode = "v1.0.51";
+static int versionNo = 51;
 static std::string serverIP = "172.28.100.100";
 static std::string tcpIP = "172.28.100.100";
 static int serverHttpPort = 8006;
@@ -193,6 +193,7 @@ void setClerk(std::string clerk_name, std::string pass_no, int _authItid);
 
 void goHome();
 
+void deviceReboot();
 void systemRestart();
 bool isConnectServer();