|
@@ -36,6 +36,7 @@ import com.wdkl.callingbed.util.SharedPreferencesUtil;
|
|
import com.wdkl.callingbed.util.StringUtils;
|
|
import com.wdkl.callingbed.util.StringUtils;
|
|
import com.wdkl.callingbed.util.ToastUtil;
|
|
import com.wdkl.callingbed.util.ToastUtil;
|
|
import com.wdkl.callingbed.util.UdpSendUtil;
|
|
import com.wdkl.callingbed.util.UdpSendUtil;
|
|
|
|
+import com.wdkl.callingbed.util.ethernetwifiwithsipconnectstatus.WifiNet;
|
|
import com.wdkl.callingbed.util.sendcommand.CallingBedSendCommand;
|
|
import com.wdkl.callingbed.util.sendcommand.CallingBedSendCommand;
|
|
import com.zhy.http.okhttp.OkHttpUtils;
|
|
import com.zhy.http.okhttp.OkHttpUtils;
|
|
import com.zhy.http.okhttp.callback.StringCallback;
|
|
import com.zhy.http.okhttp.callback.StringCallback;
|
|
@@ -82,6 +83,8 @@ public class InitActivity extends BaseActivity implements SerialPortUtil.ISerial
|
|
SerialPortUtil serialPortUtil;
|
|
SerialPortUtil serialPortUtil;
|
|
private static int countsReboot;//重启计数
|
|
private static int countsReboot;//重启计数
|
|
|
|
|
|
|
|
+ private boolean wifiEnabled;
|
|
|
|
+
|
|
@Override
|
|
@Override
|
|
public int getLayoutId() {
|
|
public int getLayoutId() {
|
|
return R.layout.activity_init_layout;
|
|
return R.layout.activity_init_layout;
|
|
@@ -101,6 +104,8 @@ public class InitActivity extends BaseActivity implements SerialPortUtil.ISerial
|
|
serialPortUtil = MyApplication.serialPortUtil;
|
|
serialPortUtil = MyApplication.serialPortUtil;
|
|
serialPortUtil.setOnDataReceiveListener(this);
|
|
serialPortUtil.setOnDataReceiveListener(this);
|
|
serialPortUtil.setOnDataReceiveStringListener(this);
|
|
serialPortUtil.setOnDataReceiveStringListener(this);
|
|
|
|
+
|
|
|
|
+ startEnableWifi();
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
@@ -121,7 +126,11 @@ public class InitActivity extends BaseActivity implements SerialPortUtil.ISerial
|
|
|
|
|
|
@OnClick(R.id.activity_init_layout_rl)
|
|
@OnClick(R.id.activity_init_layout_rl)
|
|
public void init(View view) {
|
|
public void init(View view) {
|
|
- isNewWork();
|
|
|
|
|
|
+ //isNewWork();
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ private void startEnableWifi() {
|
|
|
|
+ wifiEnabled = WifiNet.getInstance().enableWifi();
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -165,14 +174,21 @@ public class InitActivity extends BaseActivity implements SerialPortUtil.ISerial
|
|
* 无网络显示错误页面
|
|
* 无网络显示错误页面
|
|
*/
|
|
*/
|
|
public void isNewWork() {
|
|
public void isNewWork() {
|
|
|
|
+ //尝试连接wifi
|
|
|
|
+ if (wifiEnabled) {
|
|
|
|
+ boolean connect = WifiNet.getInstance().connectWifi("NCS", "23456789");
|
|
|
|
+ }
|
|
|
|
+
|
|
if (cm != null) {
|
|
if (cm != null) {
|
|
//ethreboot();//wuyq add
|
|
//ethreboot();//wuyq add
|
|
String ipStr = NetUtil.getLocalIP();
|
|
String ipStr = NetUtil.getLocalIP();
|
|
NetworkInfo networkInfo = cm.getActiveNetworkInfo();
|
|
NetworkInfo networkInfo = cm.getActiveNetworkInfo();
|
|
|
|
+ LogUtil.d("initwifi", "network info: " + networkInfo);
|
|
if (networkInfo != null && networkInfo.isConnected()) { //wuyq modify
|
|
if (networkInfo != null && networkInfo.isConnected()) { //wuyq modify
|
|
|
|
+ LogUtil.d("Initwifi", "network type: " + networkInfo.getType() + ", network typeName: " + networkInfo.getTypeName());
|
|
if (networkInfo.getType() == ConnectivityManager.TYPE_WIFI || networkInfo.getType() == ConnectivityManager.TYPE_ETHERNET) {
|
|
if (networkInfo.getType() == ConnectivityManager.TYPE_WIFI || networkInfo.getType() == ConnectivityManager.TYPE_ETHERNET) {
|
|
CallingBedSendCommand.setSipStatus(serialPortUtil, "2");
|
|
CallingBedSendCommand.setSipStatus(serialPortUtil, "2");
|
|
- getInitData();
|
|
|
|
|
|
+ getInitData(networkInfo.getTypeName());
|
|
countsReboot = 0; //wuyq add
|
|
countsReboot = 0; //wuyq add
|
|
} else {
|
|
} else {
|
|
updateHandler.sendEmptyMessageDelayed(404, DATEREFRESH_DELAYMILLIS);
|
|
updateHandler.sendEmptyMessageDelayed(404, DATEREFRESH_DELAYMILLIS);
|
|
@@ -184,8 +200,8 @@ public class InitActivity extends BaseActivity implements SerialPortUtil.ISerial
|
|
//updateHandler.sendEmptyMessageDelayed(404, DATEREFRESH_DELAYMILLIS);//wuyq remove
|
|
//updateHandler.sendEmptyMessageDelayed(404, DATEREFRESH_DELAYMILLIS);//wuyq remove
|
|
updateHandler.sendEmptyMessageDelayed(4444, DATEREFRESH_DELAYMILLIS);//wuyq add
|
|
updateHandler.sendEmptyMessageDelayed(4444, DATEREFRESH_DELAYMILLIS);//wuyq add
|
|
CallingBedSendCommand.setSipStatus(serialPortUtil, "0");
|
|
CallingBedSendCommand.setSipStatus(serialPortUtil, "0");
|
|
- showNetErrorView("MAC地址: " + macAddress + " IP地址: " + ipStr + "\nError:无网络连接;以太网是否连接正常?");//网络信息初始化错误
|
|
|
|
- ToastUtil.showToast("无网络连接;以太网是否连接正常?");//网络信息初始化错误
|
|
|
|
|
|
+ showNetErrorView("MAC地址: " + macAddress + " IP地址: " + ipStr + "\nError:无网络连接;网络是否连接正常?");//网络信息初始化错误
|
|
|
|
+ ToastUtil.showToast("无网络连接;网络是否连接正常?");//网络信息初始化错误
|
|
//autoReboot();//wuyq remove
|
|
//autoReboot();//wuyq remove
|
|
|
|
|
|
resetEthernet();
|
|
resetEthernet();
|
|
@@ -262,7 +278,7 @@ public class InitActivity extends BaseActivity implements SerialPortUtil.ISerial
|
|
/**
|
|
/**
|
|
* 获取初始化信息
|
|
* 获取初始化信息
|
|
*/
|
|
*/
|
|
- private void getInitData() {
|
|
|
|
|
|
+ private void getInitData(final String type) {
|
|
LogUtil.d("getInitData", "URL==" + Constants.URL + Constants.URL_END + Constants.CALLINGBED_INIT);
|
|
LogUtil.d("getInitData", "URL==" + Constants.URL + Constants.URL_END + Constants.CALLINGBED_INIT);
|
|
final String ipStr = NetUtil.getLocalIP();
|
|
final String ipStr = NetUtil.getLocalIP();
|
|
//网络恢复正常,重置重启计数
|
|
//网络恢复正常,重置重启计数
|
|
@@ -280,7 +296,7 @@ public class InitActivity extends BaseActivity implements SerialPortUtil.ISerial
|
|
public void onError(Call call, Exception e, int id) {
|
|
public void onError(Call call, Exception e, int id) {
|
|
ivLoading.setVisibility(View.INVISIBLE);
|
|
ivLoading.setVisibility(View.INVISIBLE);
|
|
dismissNurseBrightness();
|
|
dismissNurseBrightness();
|
|
- showNetErrorView("MAC地址: " + macAddress + " IP地址: " + ipStr + "\nError:" + "初始化数据请求错误[MAC地址是否注册?]");
|
|
|
|
|
|
+ showNetErrorView("MAC地址: " + macAddress + " IP地址: " + ipStr + "\nError:" + "初始化数据请求错误[MAC地址是否注册?], " + type);
|
|
//updateHandler.sendEmptyMessageDelayed(404, DATEREFRESH_DELAYMILLIS);//wuyq remove
|
|
//updateHandler.sendEmptyMessageDelayed(404, DATEREFRESH_DELAYMILLIS);//wuyq remove
|
|
updateHandler.sendEmptyMessageDelayed(4444, DATEREFRESH_DELAYMILLIS);//wuyq add
|
|
updateHandler.sendEmptyMessageDelayed(4444, DATEREFRESH_DELAYMILLIS);//wuyq add
|
|
ToastUtil.showToast("初始化数据请求错误");
|
|
ToastUtil.showToast("初始化数据请求错误");
|
|
@@ -296,7 +312,7 @@ public class InitActivity extends BaseActivity implements SerialPortUtil.ISerial
|
|
JSONObject object = new JSONObject(data);
|
|
JSONObject object = new JSONObject(data);
|
|
if (object.getString("Code").equals("ERROR!")) {
|
|
if (object.getString("Code").equals("ERROR!")) {
|
|
dismissNurseBrightness();
|
|
dismissNurseBrightness();
|
|
- showNetErrorView("MAC地址: " + macAddress + " IP地址: " + ipStr + "\nError:" + "数据错误异常[ERROR!]");
|
|
|
|
|
|
+ showNetErrorView("MAC地址: " + macAddress + " IP地址: " + ipStr + "\nError:" + "数据错误异常[ERROR!], " + type);
|
|
updateHandler.sendEmptyMessageDelayed(404, DATEREFRESH_DELAYMILLIS);
|
|
updateHandler.sendEmptyMessageDelayed(404, DATEREFRESH_DELAYMILLIS);
|
|
ToastUtil.showToast("数据请求失败");
|
|
ToastUtil.showToast("数据请求失败");
|
|
} else {
|
|
} else {
|
|
@@ -311,7 +327,7 @@ public class InitActivity extends BaseActivity implements SerialPortUtil.ISerial
|
|
InitActivity.this.finish();
|
|
InitActivity.this.finish();
|
|
} else {
|
|
} else {
|
|
dismissNurseBrightness();
|
|
dismissNurseBrightness();
|
|
- showNetErrorView("MAC地址: " + macAddress + " IP地址: " + ipStr + "\nError: " + "设备未启用");
|
|
|
|
|
|
+ showNetErrorView("MAC地址: " + macAddress + " IP地址: " + ipStr + "\nError: " + "设备未启用, " + type);
|
|
updateHandler.sendEmptyMessageDelayed(404, DATEREFRESH_DELAYMILLIS);
|
|
updateHandler.sendEmptyMessageDelayed(404, DATEREFRESH_DELAYMILLIS);
|
|
ToastUtil.showToast("设备未启用");
|
|
ToastUtil.showToast("设备未启用");
|
|
}
|
|
}
|
|
@@ -612,7 +628,7 @@ public class InitActivity extends BaseActivity implements SerialPortUtil.ISerial
|
|
}
|
|
}
|
|
};
|
|
};
|
|
|
|
|
|
- public static final long DATEREFRESH_DELAYMILLIS = 3000;
|
|
|
|
|
|
+ public static final long DATEREFRESH_DELAYMILLIS = 10000;
|
|
|
|
|
|
@Subscribe(threadMode = ThreadMode.MAIN)
|
|
@Subscribe(threadMode = ThreadMode.MAIN)
|
|
public void onMoonEvent(MessageEvent messageEvent) {
|
|
public void onMoonEvent(MessageEvent messageEvent) {
|