938直接使用系统默认IP

hdrplus
Matthew 7 months ago
parent 2a8a9e6074
commit c271753dec

@ -3437,7 +3437,11 @@ void CPhoneDevice::SetStaticIp(const std::string& iface, const std::string& ip,
} }
jstring jiface = env->NewStringUTF(iface.c_str()); 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()); jstring jip = env->NewStringUTF(ip.c_str());
#endif
jstring jnetmask = env->NewStringUTF(netmask.c_str()); jstring jnetmask = env->NewStringUTF(netmask.c_str());
jstring jgw = env->NewStringUTF(gateway.c_str()); jstring jgw = env->NewStringUTF(gateway.c_str());
env->CallVoidMethod(m_javaService, mSetStaticIpMid, jiface, jip, jnetmask, jgw); env->CallVoidMethod(m_javaService, mSetStaticIpMid, jiface, jip, jnetmask, jgw);

@ -1494,18 +1494,20 @@ public class MicroPhotoService extends Service {
} }
} }
Intent intent = new Intent(); if (!TextUtils.equals("0.0.0.0", ip)) {
intent.putExtra("cmd", "setnet"); Intent intent = new Intent();
intent.putExtra("staticip", true); intent.putExtra("cmd", "setnet");
intent.putExtra("iface", iface); intent.putExtra("staticip", true);
intent.putExtra("ip", ip); intent.putExtra("iface", iface);
intent.putExtra("netmask", netmask); intent.putExtra("ip", ip);
if (!TextUtils.isEmpty(gateway)) { intent.putExtra("netmask", netmask);
intent.putExtra("gateway", gateway); 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) public static void sendBroadcast(Context context, Intent intent)

Loading…
Cancel
Save