Sfoglia il codice sorgente

网络检测更新

weizhengliang 1 anno fa
parent
commit
807f93a7bf

+ 3 - 1
common/src/main/code/com/wdkl/ncs/android/lib/netdetection/ui/NetDetectActivity.java

@@ -71,7 +71,9 @@ public class NetDetectActivity extends AppCompatActivity implements TaskCallBack
         exitButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                traceTask.stop();
+                if (traceTask != null) {
+                    traceTask.stop();
+                }
                 finish();
             }
         });

+ 3 - 0
common/src/main/code/com/wdkl/ncs/android/lib/netdetection/util/LDNetUtil.java

@@ -35,6 +35,7 @@ public class LDNetUtil {
     public static final String NETWORKTYPE_INVALID = "UNKNOWN";// 没有网络
     public static final String NETWORKTYPE_WAP = "WAP"; // wap网络
     public static final String NETWORKTYPE_WIFI = "WIFI"; // wifi网络
+    public static final String NETWORKTYPE_ETHE = "Ethernet"; // 以太网
 
     @SuppressWarnings({"deprecation"})
     public static String getNetWorkType(Context context) {
@@ -56,6 +57,8 @@ public class LDNetUtil {
                 } else {
                     mNetWorkType = NETWORKTYPE_WAP;
                 }
+            } else if (type.equalsIgnoreCase("Ethernet")) {
+                mNetWorkType = NETWORKTYPE_ETHE;
             }
         } else {
             mNetWorkType = NETWORKTYPE_INVALID;