增加端口号的输入，避免服务器修改端口号错误，导致设备彻底无法请求服务器

i18n/zh_CN.tr

@@ -92,7 +92,9 @@
     <string name="VersionNo">版本号</string>
     <string name="GetVersionFailed">获取版本失败，错误码</string>
     <string name="ServerIP">服务器IP</string>
+    <string name="ServerPort">服务器端口</string>
     <string name="ServerIPWrong">服务器地址填写有误</string>
+    <string name="ServerPortWrong">服务器端口为空</string>
     <string name="InputPassword">输入密码</string>
     <string name="PasswordWrong">密码错误</string>
     <string name="PasswordTag">3位密码</string>

jni/activity/ui3Activity.cpp

@@ -4,6 +4,8 @@
 #include "ui3Activity.h"
 
 /*TAG:GlobalVariable全局变量*/
+static ZKTextView* mServerPortTextViewPtr;
+static ZKEditText* mEditTextServerPortPtr;
 static ZKTextView* mSettingErrorTextViewPtr;
 static ZKButton* mSettingConfirmButtonPtr;
 static ZKTextView* mSettingPasswordTextViewPtr;
@@ -137,6 +139,7 @@ typedef struct {
 }S_EditTextInputCallback;
 /*TAG:EditTextInputCallback*/
 static S_EditTextInputCallback SEditTextInputCallbackTab[] = {
+    ID_UI3_EditTextServerPort, onEditTextChanged_EditTextServerPort,
     ID_UI3_SettingPasswordEditText, onEditTextChanged_SettingPasswordEditText,
     ID_UI3_EditTextServerIP, onEditTextChanged_EditTextServerIP,
     ID_UI3_EditTextPwd, onEditTextChanged_EditTextPwd,
@@ -166,6 +169,8 @@ ui3Activity::~ui3Activity() {
     EASYUICONTEXT->unregisterGlobalTouchListener(this);
     onUI_quit();
     unregisterProtocolDataUpdateListener(onProtocolDataUpdate);
+    mServerPortTextViewPtr = NULL;
+    mEditTextServerPortPtr = NULL;
     mSettingErrorTextViewPtr = NULL;
     mSettingConfirmButtonPtr = NULL;
     mSettingPasswordTextViewPtr = NULL;
@@ -218,6 +223,8 @@ const char* ui3Activity::getAppName() const{
 //TAG:onCreate
 void ui3Activity::onCreate() {
 	Activity::onCreate();
+    mServerPortTextViewPtr = (ZKTextView*)findControlByID(ID_UI3_ServerPortTextView);
+    mEditTextServerPortPtr = (ZKEditText*)findControlByID(ID_UI3_EditTextServerPort);if(mEditTextServerPortPtr!= NULL){mEditTextServerPortPtr->setTextChangeListener(this);}
     mSettingErrorTextViewPtr = (ZKTextView*)findControlByID(ID_UI3_SettingErrorTextView);
     mSettingConfirmButtonPtr = (ZKButton*)findControlByID(ID_UI3_SettingConfirmButton);
     mSettingPasswordTextViewPtr = (ZKTextView*)findControlByID(ID_UI3_SettingPasswordTextView);

jni/activity/ui3Activity.h

@@ -26,6 +26,8 @@
 #include "window/ZKSlideWindow.h"
 
 /*TAG:Macro宏ID*/
+#define ID_UI3_ServerPortTextView    50027
+#define ID_UI3_EditTextServerPort    51004
 #define ID_UI3_SettingErrorTextView    50026
 #define ID_UI3_SettingConfirmButton    20008
 #define ID_UI3_SettingPasswordTextView    50025

jni/logic/ui3Logic.cc

@@ -390,8 +390,14 @@ static bool onButtonClick_BtnServerIPConfirm(ZKButton *pButton) {
     	mServerIPMsgPtr->setTextTr("ServerIPWrong");
     	return false;
     }
+    string port = mEditTextServerIPPtr->getText();
+    if (port == "") {
+    	mServerIPMsgPtr->setTextTr("ServerPortWrong");
+    	return false;
+    }
 
     StoragePreferences::putString(STORE_GATEWAY, mEditTextServerIPPtr->getText().c_str());
+    StoragePreferences::putInt(STORE_HTTP_PORT, std::atoi(mEditTextServerPortPtr->getText().c_str()));
 
     //mWindowServerIPPtr->hideWnd();
 
@@ -455,3 +461,6 @@ static bool onButtonClick_SettingConfirmButton(ZKButton *pButton) {
 
     return false;
 }
+static void onEditTextChanged_EditTextServerPort(const std::string &text) {
+    //LOGD(" onEditTextChanged_ EditTextServerPort %s !!!\n", text.c_str());
+}

jni/service/BusinessConfig.h

@@ -62,8 +62,8 @@
 
 #define STORE_MAC_ADDR "mac_addr"
 
-static std::string version = "v1.0.42";
-static int versionNo = 42;
+static std::string version = "v1.0.43";
+static int versionNo = 43;
 static std::string serverIP = "172.28.100.100";
 static std::string tcpIP = "172.28.100.100";
 static int serverHttpPort = 8006;