diff --git a/app/src/main/cpp/PhoneDevice.cpp b/app/src/main/cpp/PhoneDevice.cpp index 09521b7e..764af250 100644 --- a/app/src/main/cpp/PhoneDevice.cpp +++ b/app/src/main/cpp/PhoneDevice.cpp @@ -3437,7 +3437,11 @@ void CPhoneDevice::SetStaticIp(const std::string& iface, const std::string& ip, } jstring jiface = env->NewStringUTF(iface.c_str()); +#ifdef USING_N938 + jstring jip = env->NewStringUTF("0.0.0.0"); +#else jstring jip = env->NewStringUTF(ip.c_str()); +#endif jstring jnetmask = env->NewStringUTF(netmask.c_str()); jstring jgw = env->NewStringUTF(gateway.c_str()); env->CallVoidMethod(m_javaService, mSetStaticIpMid, jiface, jip, jnetmask, jgw); diff --git a/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java b/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java index fba0cc2e..56fc4e05 100644 --- a/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java +++ b/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java @@ -1494,18 +1494,20 @@ public class MicroPhotoService extends Service { } } - Intent intent = new Intent(); - intent.putExtra("cmd", "setnet"); - intent.putExtra("staticip", true); - intent.putExtra("iface", iface); - intent.putExtra("ip", ip); - intent.putExtra("netmask", netmask); - if (!TextUtils.isEmpty(gateway)) { - intent.putExtra("gateway", gateway); + if (!TextUtils.equals("0.0.0.0", ip)) { + Intent intent = new Intent(); + intent.putExtra("cmd", "setnet"); + intent.putExtra("staticip", true); + intent.putExtra("iface", iface); + intent.putExtra("ip", ip); + intent.putExtra("netmask", netmask); + if (!TextUtils.isEmpty(gateway)) { + intent.putExtra("gateway", gateway); + } + // intent.putExtra("dns1", "8.8.8.8"); + // intent.putExtra("dns2", "192.168.19.1"); + sendBroadcast(getApplicationContext(), intent); } - // intent.putExtra("dns1", "8.8.8.8"); - // intent.putExtra("dns2", "192.168.19.1"); - sendBroadcast(getApplicationContext(), intent); } public static void sendBroadcast(Context context, Intent intent)