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

jni/activity/functionActivity.cpp

@@ -4,6 +4,7 @@
 #include "functionActivity.h"
 
 /*TAG:GlobalVariable全局变量*/
+static ZKButton* mFunctionBackButtonPtr;
 static ZKListView* mGainCallListViewPtr;
 static ZKButton* mGainCancelButtonPtr;
 static ZKButton* mGainCallButtonPtr;
@@ -100,6 +101,7 @@ typedef struct {
 
 /*TAG:ButtonCallbackTab按键映射表*/
 static S_ButtonCallback sButtonCallbackTab[] = {
+    ID_FUNCTION_FunctionBackButton, onButtonClick_FunctionBackButton,
     ID_FUNCTION_GainCancelButton, onButtonClick_GainCancelButton,
     ID_FUNCTION_GainCallButton, onButtonClick_GainCallButton,
     ID_FUNCTION_NursingTimeBackButton, onButtonClick_NursingTimeBackButton,
@@ -199,6 +201,7 @@ functionActivity::~functionActivity() {
     unregisterProtocolDataUpdateListener(onProtocolDataUpdate);
     onUI_quit();
     mActivityPtr = NULL;
+    mFunctionBackButtonPtr = NULL;
     mGainCallListViewPtr = NULL;
     mGainCancelButtonPtr = NULL;
     mGainCallButtonPtr = NULL;
@@ -267,6 +270,7 @@ const char* functionActivity::getAppName() const{
 //TAG:onCreate
 void functionActivity::onCreate() {
 	Activity::onCreate();
+    mFunctionBackButtonPtr = (ZKButton*)findControlByID(ID_FUNCTION_FunctionBackButton);
     mGainCallListViewPtr = (ZKListView*)findControlByID(ID_FUNCTION_GainCallListView);if(mGainCallListViewPtr!= NULL){mGainCallListViewPtr->setListAdapter(this);mGainCallListViewPtr->setItemClickListener(this);}
     mGainCancelButtonPtr = (ZKButton*)findControlByID(ID_FUNCTION_GainCancelButton);
     mGainCallButtonPtr = (ZKButton*)findControlByID(ID_FUNCTION_GainCallButton);

jni/activity/functionActivity.h

@@ -27,6 +27,7 @@
 #include "window/ZKSlideWindow.h"
 
 /*TAG:Macro宏ID*/
+#define ID_FUNCTION_FunctionBackButton    20016
 #define ID_FUNCTION_GainCallListView    80003
 #define ID_FUNCTION_GainCancelButton    20014
 #define ID_FUNCTION_GainCallButton    20015

jni/logic/functionLogic.cc

@@ -803,6 +803,8 @@ 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()));
 
 	deviceReboot();
     return false;
@@ -833,7 +835,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());
@@ -1026,3 +1028,8 @@ static bool onButtonClick_GainCancelButton(ZKButton *pButton) {
 	EASYUICONTEXT->closeActivity("functionActivity");
     return false;
 }
+static bool onButtonClick_FunctionBackButton(ZKButton *pButton) {
+    LOGD(" ButtonClick FunctionBackButton !!!\n");
+	EASYUICONTEXT->closeActivity("functionActivity");
+    return false;
+}

jni/service/BusinessConfig.h

@@ -80,8 +80,8 @@ static uint32_t whiteColour = 0xFFFFFFFF;
 static int defaultThemeInt = 1;
 static int defaultModeInt = 3;
 
-static std::string versionCode = "v2.0.16";
-static int versionNo = 63;
+static std::string versionCode = "v2.0.17";
+static int versionNo = 64;
 static std::string serverIP = "172.28.100.100";
 static std::string tcpIP = "172.28.100.100";
 static int serverHttpPort = 8006;