Merge pull request #202 from ksvc/NetState

FirmianaRain · web-flow · commit bfb26d3c1c5c · 2017-11-22T06:33:57.000-06:00
NetSate NULL Point
diff --git a/KsyunPlayerDemo/newplayerdemo/src/main/java/com/ksyun/player/now/model/NetState.java b/KsyunPlayerDemo/newplayerdemo/src/main/java/com/ksyun/player/now/model/NetState.java
@@ -22,12 +22,12 @@ public static int getNetWorkState(Context context) {
         NetworkInfo wifiNetworkInfo = connMgr.getNetworkInfo(ConnectivityManager.TYPE_WIFI);
 
         NetworkInfo dataNetworkInfo = connMgr.getNetworkInfo(ConnectivityManager.TYPE_MOBILE);
-       if (wifiNetworkInfo.isConnected() && !dataNetworkInfo.isConnected()) {
+        if (wifiNetworkInfo != null && wifiNetworkInfo.isConnected()) {
             return NETWORK_WIFI;
-        } else if (!wifiNetworkInfo.isConnected() && dataNetworkInfo.isConnected()) {
+        }
+        if (dataNetworkInfo != null && dataNetworkInfo.isConnected()) {
             return NETWORK_MOBILE;
-        } else {
-            return NETWORK_NONE;
         }
+        return NETWORK_NONE;
     }
 }
diff --git a/KsyunPlayerDemo/oldplayerdemo/src/main/java/com/ksyun/player/old/model/NetState.java b/KsyunPlayerDemo/oldplayerdemo/src/main/java/com/ksyun/player/old/model/NetState.java
@@ -22,12 +22,12 @@ public static int getNetWorkState(Context context) {
         NetworkInfo wifiNetworkInfo = connMgr.getNetworkInfo(ConnectivityManager.TYPE_WIFI);
 
         NetworkInfo dataNetworkInfo = connMgr.getNetworkInfo(ConnectivityManager.TYPE_MOBILE);
-       if (wifiNetworkInfo.isConnected() && !dataNetworkInfo.isConnected()) {
+        if (wifiNetworkInfo != null && wifiNetworkInfo.isConnected()) {
             return NETWORK_WIFI;
-        } else if (!wifiNetworkInfo.isConnected() && dataNetworkInfo.isConnected()) {
+        }
+        if (dataNetworkInfo != null && dataNetworkInfo.isConnected()) {
             return NETWORK_MOBILE;
-        } else {
-            return NETWORK_NONE;
         }
+        return NETWORK_NONE;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -22,12 +22,12 @@ public static int getNetWorkState(Context context) {`
`22`	`22`	`NetworkInfo wifiNetworkInfo = connMgr.getNetworkInfo(ConnectivityManager.TYPE_WIFI);`
`23`	`23`
`24`	`24`	`NetworkInfo dataNetworkInfo = connMgr.getNetworkInfo(ConnectivityManager.TYPE_MOBILE);`
`25`		`- if (wifiNetworkInfo.isConnected() && !dataNetworkInfo.isConnected()) {`
	`25`	`+ if (wifiNetworkInfo != null && wifiNetworkInfo.isConnected()) {`
`26`	`26`	`return NETWORK_WIFI;`
`27`		`- } else if (!wifiNetworkInfo.isConnected() && dataNetworkInfo.isConnected()) {`
	`27`	`+ }`
	`28`	`+ if (dataNetworkInfo != null && dataNetworkInfo.isConnected()) {`
`28`	`29`	`return NETWORK_MOBILE;`
`29`		`- } else {`
`30`		`- return NETWORK_NONE;`
`31`	`30`	`}`
	`31`	`+ return NETWORK_NONE;`
`32`	`32`	`}`
`33`	`33`	`}`