Skip to content

huangzhicong / SmartCanteen

Go to a project
Commit a768d877 by patpat
Options

禁用网络切换功能

parent d1924aa9
Showing with 13 additions and 12 deletions
app/src/main/java/com/bgycc/smartcanteen/manager/NetworkManager.kt
...@@ -14,11 +14,12 @@ object NetworkManager { ...@@ -14,11 +14,12 @@ object NetworkManager {
val currentTypeString: String val currentTypeString: String
get() { get() {
return when (mTransportType) { return ""
NetworkCapabilities.TRANSPORT_ETHERNET -> "以太网" // return when (mTransportType) {
NetworkCapabilities.TRANSPORT_WIFI -> "Wifi" // NetworkCapabilities.TRANSPORT_ETHERNET -> "以太网"
else -> "未知" // NetworkCapabilities.TRANSPORT_WIFI -> "Wifi"
} // else -> "未知"
// }
} }
private var mConnectivityManager : ConnectivityManager? = null private var mConnectivityManager : ConnectivityManager? = null
......
app/src/main/java/com/bgycc/smartcanteen/server/websocket/MainWebSocket.java
...@@ -62,15 +62,15 @@ public class MainWebSocket extends WebSocketClient { ...@@ -62,15 +62,15 @@ public class MainWebSocket extends WebSocketClient {
@Override @Override
public void run(long id, boolean isLastTime) { public void run(long id, boolean isLastTime) {
if (sInstance.isClosed()) { if (sInstance.isClosed()) {
if (sReconnectTimes < 3) { // if (sReconnectTimes < 3) {
sReconnectTimes++; // sReconnectTimes++;
sInstance.reconnect(); sInstance.reconnect();
EventBus.getDefault().post(new ConnectStateEvent(ConnectStateEvent.RECONNECTING)); EventBus.getDefault().post(new ConnectStateEvent(ConnectStateEvent.RECONNECTING));
} else { // } else {
sReconnectTimes = 0; // sReconnectTimes = 0;
NetworkManager.INSTANCE.switchNetwork(); // NetworkManager.INSTANCE.switchNetwork();
EventBus.getDefault().post(new ConnectStateEvent(ConnectStateEvent.CHANGE_NETWORK)); // EventBus.getDefault().post(new ConnectStateEvent(ConnectStateEvent.CHANGE_NETWORK));
} // }
} }
} }
}, 2000); }, 2000);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment