|
|
|
@ -1,6 +1,11 @@
|
|
|
|
|
package com.xypower.mpmaster;
|
|
|
|
|
|
|
|
|
|
import android.content.Context;
|
|
|
|
|
import android.net.ConnectivityManager;
|
|
|
|
|
import android.net.Network;
|
|
|
|
|
import android.net.NetworkCapabilities;
|
|
|
|
|
import android.net.NetworkInfo;
|
|
|
|
|
import android.net.NetworkRequest;
|
|
|
|
|
import android.os.Environment;
|
|
|
|
|
import android.os.PowerManager;
|
|
|
|
|
import android.os.SystemClock;
|
|
|
|
@ -103,10 +108,63 @@ public class AppMaster {
|
|
|
|
|
@Override
|
|
|
|
|
public void run() {
|
|
|
|
|
|
|
|
|
|
final boolean separateNetwork = mService.isSeparateNetwork();
|
|
|
|
|
|
|
|
|
|
// mMasterUrl = "http://192.168.50.100/mntn/";
|
|
|
|
|
if (separateNetwork) {
|
|
|
|
|
try {
|
|
|
|
|
SysApi.selectSimCard4Data(mService.getApplicationContext(), 2);
|
|
|
|
|
Thread.sleep(100);
|
|
|
|
|
|
|
|
|
|
boolean connected = false;
|
|
|
|
|
ConnectivityManager connectivityManager = (ConnectivityManager) mService.getSystemService(Context.CONNECTIVITY_SERVICE);
|
|
|
|
|
|
|
|
|
|
for (int idx = 0; idx < 8; idx++) {
|
|
|
|
|
Network[] networks = connectivityManager.getAllNetworks();
|
|
|
|
|
if (networks != null && networks.length > 0) {
|
|
|
|
|
for (Network nw : networks) {
|
|
|
|
|
NetworkInfo ni = connectivityManager.getNetworkInfo(nw);
|
|
|
|
|
|
|
|
|
|
if (ni.getType() == 0) {
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (connected) {
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Thread.sleep(1000);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
try {
|
|
|
|
|
runImpl();
|
|
|
|
|
} catch (Exception ex) {
|
|
|
|
|
ex.printStackTrace();
|
|
|
|
|
} finally {
|
|
|
|
|
try {
|
|
|
|
|
SysApi.selectSimCard4Data(mService.getApplicationContext(), 1);
|
|
|
|
|
} catch (Exception ex) {
|
|
|
|
|
ex.printStackTrace();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} catch (Exception ex) {
|
|
|
|
|
ex.printStackTrace();
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
try {
|
|
|
|
|
runImpl();
|
|
|
|
|
} catch (Exception ex) {
|
|
|
|
|
ex.printStackTrace();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}).start();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private void runImpl() {
|
|
|
|
|
String masterUrl = mMasterUrl;
|
|
|
|
|
|
|
|
|
|
if (TextUtils.isEmpty(masterUrl)) {
|
|
|
|
@ -207,8 +265,6 @@ public class AppMaster {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
}).start();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private String getBatteryVoltage() {
|
|
|
|
|
int val = 0;
|
|
|
|
|