增加连接服务器参数ip

jni/logic/deviceInfoLogic.cc

@@ -77,10 +77,25 @@ NetworkConfiguration GetNetworkConfiguration() {
 	char gateway[64] = {0};
 	char dns1[64] = {0};
 	char dns2[64] = {0};
-	if (ETHERNETMANAGER->isAutoMode()) {
-		ETHERNETMANAGER->getConfigureInfo(ip, mask, gateway, dns1, dns2);
-	} else {
-		ETHERNETMANAGER->getStaticConfigureInfo(ip, mask, gateway, dns1, dns2);
+//	if (ETHERNETMANAGER->isAutoMode()) {
+//		ETHERNETMANAGER->getConfigureInfo(ip, mask, gateway, dns1, dns2);
+//	} else {
+//		ETHERNETMANAGER->getStaticConfigureInfo(ip, mask, gateway, dns1, dns2);
+//	}
+	if (ETHERNETMANAGER->isConnected()) {
+		if (ETHERNETMANAGER->isAutoMode()) {
+			ETHERNETMANAGER->getConfigureInfo(ip, mask, gateway, dns1, dns2);
+		} else {
+			ETHERNETMANAGER->getStaticConfigureInfo(ip, mask, gateway, dns1, dns2);
+		}
+	}
+	else if (WIFIMANAGER->isConnected()) {
+		if (WIFIMANAGER->isAutoMode()) {
+			WIFIMANAGER->getConfigureInfo(ip, mask, gateway, dns1, dns2);
+		}
+		else {
+			WIFIMANAGER->getStaticConfigureInfo(ip, mask, gateway, dns1, dns2);
+		}
 	}
 	return NetworkConfiguration{ip, mask, gateway};
 }
@@ -258,9 +273,16 @@ static void onUI_init(){
 	mDeviceCodePtr->setText(GetDeviceUid());
 	mDeviceMacPtr->setText(StoragePreferences::getString(STORE_MAC_ADDR, "0.0.0.0"));
 	if (ETHERNETMANAGER->isConnected() || WIFIMANAGER->isConnected()) {
-		mDeviceIpPtr->setText(ETHERNETMANAGER->getIp());
-		mNetMaskPtr->setText(GetNetworkConfiguration().sub_network_mask);
-		mGatewayPtr->setText(GetNetworkConfiguration().gateway);
+		if (WIFIMANAGER->isConnected()) {
+			mDeviceIpPtr->setText(WIFIMANAGER->getIp());
+			mNetMaskPtr->setText(GetNetworkConfiguration().sub_network_mask);
+			mGatewayPtr->setText(GetNetworkConfiguration().gateway);
+		}
+		else {
+			mDeviceIpPtr->setText(ETHERNETMANAGER->getIp());
+			mNetMaskPtr->setText(GetNetworkConfiguration().sub_network_mask);
+			mGatewayPtr->setText(GetNetworkConfiguration().gateway);
+		}
 	}
 	else {
 		mDeviceIpPtr->setText("0.0.0.0");

jni/net/tcp_client.cpp

@@ -20,6 +20,7 @@
 
 
 #define ETHERNETMANAGER		NETMANAGER->getEthernetManager()
+#define WIFIMANAGER			NETMANAGER->getWifiManager()
 
 void handleMsg(byte* msg);
 
@@ -103,6 +104,12 @@ public:
 			json["software_version"] = getVersionCode();
 			json["model"] = "linux_door";;
 			json["code"] = "SW10600101C-CM";
+            if (ETHERNETMANAGER->isConnected()) {
+                json["clientIp"] = ETHERNETMANAGER->getIp();
+            }
+            else if (WIFIMANAGER->isConnected()) {
+                json["clientIp"] = WIFIMANAGER->getIp();
+            }
 			tcpModel.json = json;
 
 			std::string req = getTcpModelString(tcpModel);

jni/service/BusinessConfig.h

@@ -75,8 +75,8 @@ static uint32_t whiteColour = 0xFFFFFFFF;
 static int defaultThemeInt = 1;
 static int defaultModeInt = 3;
 
-static std::string versionCode = "v2.0.13";
-static int versionNo = 60;
+static std::string versionCode = "v2.0.14";
+static int versionNo = 61;
 static std::string serverIP = "172.28.100.100";
 static std::string tcpIP = "172.28.100.100";
 static int serverHttpPort = 8006;