change getNetWorkType util

Author: androidlgf

VideoOS/VenvyLibrary/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 25
+    compileSdkVersion 29
     buildToolsVersion '25.0.3'
     defaultConfig {
         minSdkVersion 16
@@ -42,14 +42,14 @@ dependencies {
     compile project(':venvy_processor_annotation')
     annotationProcessor project(':venvy_processor_compiler')
     provided 'org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.0.2'
-    provided "com.squareup.okhttp3:okhttp:3.8.0"
-    provided "com.facebook.fresco:fresco:1.8.0"
-    provided "com.facebook.fresco:animated-gif:1.8.0"
-    provided "com.facebook.fresco:animated-webp:1.8.0"
-    provided "com.facebook.fresco:webpsupport:1.8.0"
-    provided "com.github.bumptech.glide:glide:3.7.0"
-    provided "com.just.agentweb:agentweb:4.1.2"
-//  provided "com.github.bumptech.glide:glide:4.3.1"
-//  compile 'com.videoli:venvy_processor_annotation:1.0.0'
-//  annotationProcessor 'com.videoli:venvy_processor_compiler:1.0.1'
+    provided 'com.squareup.okhttp3:okhttp:3.8.0'
+    provided 'com.facebook.fresco:fresco:1.8.0'
+    provided 'com.facebook.fresco:animated-gif:1.8.0'
+    provided 'com.facebook.fresco:animated-webp:1.8.0'
+    provided 'com.facebook.fresco:webpsupport:1.8.0'
+    provided 'com.github.bumptech.glide:glide:3.7.0'
+    provided 'com.just.agentweb:agentweb:4.1.2'
+    //  provided "com.github.bumptech.glide:glide:4.3.1"
+    //  compile 'com.videoli:venvy_processor_annotation:1.0.0'
+    //  annotationProcessor 'com.videoli:venvy_processor_compiler:1.0.1'
 }

VideoOS/VenvyLibrary/src/main/java/cn/com/venvy/common/utils/VenvyDeviceUtil.java

@@ -390,6 +390,7 @@ public static int getNetWorkType(Context context) {
                     case TelephonyManager.NETWORK_TYPE_CDMA:
                     case TelephonyManager.NETWORK_TYPE_1xRTT:
                     case TelephonyManager.NETWORK_TYPE_IDEN: //api<8 : replace by 11
+                    case TelephonyManager.NETWORK_TYPE_GSM:  // api<25: replace by 16
                         strNetworkType = 2;
                         break;
                     case TelephonyManager.NETWORK_TYPE_UMTS:
@@ -398,15 +399,17 @@ public static int getNetWorkType(Context context) {
                     case TelephonyManager.NETWORK_TYPE_HSDPA:
                     case TelephonyManager.NETWORK_TYPE_HSUPA:
                     case TelephonyManager.NETWORK_TYPE_HSPA:
-                    case TelephonyManager.NETWORK_TYPE_EVDO_B: //api<9 : replace by 14
-                    case TelephonyManager.NETWORK_TYPE_EHRPD:  //api<11 : replace by 12
-                    case TelephonyManager.NETWORK_TYPE_HSPAP:  //api<13 : replace by 15
+                    case TelephonyManager.NETWORK_TYPE_EVDO_B:   // api< 9: replace by 12
+                    case TelephonyManager.NETWORK_TYPE_EHRPD:    // api<11: replace by 14
+                    case TelephonyManager.NETWORK_TYPE_HSPAP:    // api<13: replace by 15
+                    case TelephonyManager.NETWORK_TYPE_TD_SCDMA: // api<25: replace by 17
                         strNetworkType = 3;
                         break;
-                    case TelephonyManager.NETWORK_TYPE_LTE:    //api<11 : replace by 13
+                    case TelephonyManager.NETWORK_TYPE_LTE:      // api<11: replace by 13
+                    case TelephonyManager.NETWORK_TYPE_IWLAN:    // api<25: replace by 18
                         strNetworkType = 4;
                         break;
-                    case 0x00000014:
+                    case TelephonyManager.NETWORK_TYPE_NR:// api<29: replace by 20
                         strNetworkType = 5;
                         break;
                 }