2 change to DG102

This commit is contained in:
zhangsheng 2024-11-14 19:46:55 +08:00
parent 0fabe08c9d
commit 8080f0b6ce

View File

@ -176,9 +176,6 @@ std::string JsonData::JsonCmd_25(Param_25 &param) {
bFlag4 = true; bFlag4 = true;
} }
zlog_info(zct, "bFlag1 = %d,bFlag2 = %d,bFlag3 = %d,bFlag4 = %d", bFlag1, bFlag2, bFlag3, bFlag4); zlog_info(zct, "bFlag1 = %d,bFlag2 = %d,bFlag3 = %d,bFlag4 = %d", bFlag1, bFlag2, bFlag3, bFlag4);
#ifdef IMX6UL_GATEWAY
param.mNet = "Net";
#endif
if (0 == param.mMode && (bFlag1 && bFlag2 && bFlag3 && bFlag4) && param.mNetworkPortStatus == "STATIC") { if (0 == param.mMode && (bFlag1 && bFlag2 && bFlag3 && bFlag4) && param.mNetworkPortStatus == "STATIC") {
WriteStr2Config(NETWORKCONFIG, param.mNet, "dnsName", param.mDnsName); WriteStr2Config(NETWORKCONFIG, param.mNet, "dnsName", param.mDnsName);
WriteStr2Config(NETWORKCONFIG, param.mNet, "networkPortStatus", param.mNetworkPortStatus); WriteStr2Config(NETWORKCONFIG, param.mNet, "networkPortStatus", param.mNetworkPortStatus);
@ -187,11 +184,6 @@ std::string JsonData::JsonCmd_25(Param_25 &param) {
WriteStr2Config(NETWORKCONFIG, param.mNet, "ipAddress", param.mIp); WriteStr2Config(NETWORKCONFIG, param.mNet, "ipAddress", param.mIp);
WriteStr2Config(NETWORKCONFIG, param.mNet, "hostName", param.mHostName); WriteStr2Config(NETWORKCONFIG, param.mNet, "hostName", param.mHostName);
#ifdef IMX6UL_GATEWAY
char GateWay[100] = {0x00};
sprintf(GateWay, "sed -i '7c route add default gw %s' /etc/init.d/S90start_userapp.sh", param.mGateway.c_str());
system(GateWay);
#endif
PlatformInit::EquipIpInit(param.mNet); PlatformInit::EquipIpInit(param.mNet);
} else if (0 == param.mMode && param.mNetworkPortStatus == "DHCP") { } else if (0 == param.mMode && param.mNetworkPortStatus == "DHCP") {
@ -202,9 +194,6 @@ std::string JsonData::JsonCmd_25(Param_25 &param) {
WriteStr2Config(NETWORKCONFIG, param.mNet, "ipAddress", ""); WriteStr2Config(NETWORKCONFIG, param.mNet, "ipAddress", "");
WriteStr2Config(NETWORKCONFIG, param.mNet, "hostName", ""); WriteStr2Config(NETWORKCONFIG, param.mNet, "hostName", "");
#ifdef IMX6UL_GATEWAY
system("sed -i '7c udhcpc -i eth0 > /dev/null &' /etc/init.d/S90start_userapp.sh");
#endif
PlatformInit::EquipIpInit(param.mNet); PlatformInit::EquipIpInit(param.mNet);
} else if (0 == param.mMode && (!bFlag1 || !bFlag2 || !bFlag3 || !bFlag4) && param.mNetworkPortStatus == "STATIC") { } else if (0 == param.mMode && (!bFlag1 || !bFlag2 || !bFlag3 || !bFlag4) && param.mNetworkPortStatus == "STATIC") {