add mobile type

* newCache/blackVideos: (105 commits)
  [connectivity] Fix reachability stream for iOS (flutter#2281)
  [google_sign_in] Port plugin to use the federated Platform Interface (flutter#2266)
  [webview_flutter] Add async NavigationDelegates (flutter#2257)
  Update cirrus to create IOS simulator on 13.2 an xCode 11 (flutter#2275)
  [battery] Update and migrate iOS example project (flutter#2089)
  [url_launcher] DartDoc and test improvements (flutter#2274)
  [google_maps_flutter] Define clang module for iOS, fix analyzer warnings (flutter#2182)
  [video_player] Add v2 embedding support (flutter#2226)
  [path_provider] Update and migrate iOS example project (flutter#2099)
  [sensors] Documentation and test improvements (flutter#2272)
  [image_picker] Lint for public DartDocs (flutter#2270)
  [connectivity] Lint for public DartDocs (flutter#2269)
  [shared_preferences] Update and migrate iOS example project (flutter#2103)
  [quick_actions] Update and migrate iOS example project (flutter#2100)
  [infra] Ignore analyzer issues in CI (flutter#2271)
  [android_intent] Add missing DartDocs (flutter#2268)
  Bump google_maps_flutter pubspec to match CHANGELOG (flutter#2267)
  [google_sign_in] Handle new style URLs in GoogleUserCircleAvatar (flutter#2252)
  [google_sign_in] Move plugin to its subdir to allow for federated implementations. Add platform interface. (flutter#2244)
  Make setMockInitialValues handle non-prefixed keys (flutter#2260)
  ...

# Conflicts:
#	packages/video_player/CHANGELOG.md
#	packages/video_player/android/src/main/java/io/flutter/plugins/videoplayer/VideoPlayerPlugin.java
#	packages/video_player/ios/video_player.podspec
#	packages/video_player/pubspec.yaml
#	packages/video_player/test/video_player_test.dart

Author: huangjingchao

packages/connectivity/android/src/main/java/io/flutter/plugins/connectivity/Connectivity.java

@@ -11,6 +11,8 @@
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
 import android.os.Build;
+import android.telephony.TelephonyManager;
+import android.content.Context;
 
 /** Reports connectivity related information such as connectivity type and wifi information. */
 class Connectivity {
@@ -34,7 +36,31 @@ String getNetworkType() {
         return "wifi";
       }
       if (capabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR)) {
-        return "mobile";
+        TelephonyManager telephonyManager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
+        int networkType = telephonyManager.getNetworkType();
+
+        switch (networkType) {
+          case TelephonyManager.NETWORK_TYPE_GPRS:
+          case TelephonyManager.NETWORK_TYPE_CDMA:
+          case TelephonyManager.NETWORK_TYPE_EDGE:
+          case TelephonyManager.NETWORK_TYPE_1xRTT:
+          case TelephonyManager.NETWORK_TYPE_IDEN:
+            return "2G";
+          case TelephonyManager.NETWORK_TYPE_EVDO_A:
+          case TelephonyManager.NETWORK_TYPE_UMTS:
+          case TelephonyManager.NETWORK_TYPE_EVDO_0:
+          case TelephonyManager.NETWORK_TYPE_HSDPA:
+          case TelephonyManager.NETWORK_TYPE_HSUPA:
+          case TelephonyManager.NETWORK_TYPE_HSPA:
+          case TelephonyManager.NETWORK_TYPE_EVDO_B:
+          case TelephonyManager.NETWORK_TYPE_EHRPD:
+          case TelephonyManager.NETWORK_TYPE_HSPAP:
+            return "3G";
+          case TelephonyManager.NETWORK_TYPE_LTE:
+            return "4G";
+          default:
+            return "mobile";
+        }
       }
     }
 

packages/connectivity/ios/Classes/FLTConnectivityPlugin.m

@@ -10,6 +10,9 @@
 #import "FLTConnectivityLocationHandler.h"
 #import "SystemConfiguration/CaptiveNetwork.h"
 
+#import <CoreTelephony/CTCarrier.h>
+#import <CoreTelephony/CTTelephonyNetworkInfo.h>
+
 #include <ifaddrs.h>
 
 #include <arpa/inet.h>
@@ -99,10 +102,26 @@ - (NSString*)statusFromReachability:(Reachability*)reachability {
     case ReachableViaWiFi:
       return @"wifi";
     case ReachableViaWWAN:
-      return @"mobile";
+      return [self getMobile];
   }
 }
 
+- (NSString*)getMobile {
+           CTTelephonyNetworkInfo *info = [[CTTelephonyNetworkInfo alloc] init];
+        NSString *currentStatus = info.currentRadioAccessTechnology;
+    NSString *netconnType = @"mobile";
+    if ([currentStatus isEqualToString:@"CTRadioAccessTechnologyGPRS"] || [currentStatus isEqualToString:@"CTRadioAccessTechnologyEdge"] || [currentStatus isEqualToString:@"CTRadioAccessTechnologyCDMA1x"]) {
+                    netconnType = @"2G";
+                }else if ([currentStatus isEqualToString:@"CTRadioAccessTechnologyWCDMA"] || [currentStatus isEqualToString:@"CTRadioAccessTechnologyHSDPA"] || [currentStatus isEqualToString:@"CTRadioAccessTechnologyHSUPA"] || [currentStatus isEqualToString:@"CTRadioAccessTechnologyCDMAEVDORev0"] || [currentStatus isEqualToString:@"CTRadioAccessTechnologyCDMAEVDORevA"] || [currentStatus isEqualToString:@"CTRadioAccessTechnologyCDMAEVDORevB"]){
+
+                    netconnType = @"3G";
+                }else if ([currentStatus isEqualToString:@"CTRadioAccessTechnologyLTE"]){
+                    netconnType = @"4G";
+                }
+    info = nil;
+    return netconnType;
+}
+
 - (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
   if ([call.method isEqualToString:@"check"]) {
     // This is supposed to be quick. Another way of doing this would be to

packages/connectivity/lib/connectivity.dart

@@ -15,6 +15,9 @@ enum ConnectivityResult {
 
   /// Mobile: Device connected to cellular network
   mobile,
+  moblie_4G,
+  moblie_3G,
+  moblie_2G,
 
   /// None: Device not connected to any network
   none
@@ -229,6 +232,12 @@ ConnectivityResult _parseConnectivityResult(String state) {
       return ConnectivityResult.wifi;
     case 'mobile':
       return ConnectivityResult.mobile;
+    case '4G':
+      return ConnectivityResult.moblie_4G;
+    case '3G':
+      return ConnectivityResult.moblie_3G;
+    case '2G':
+      return ConnectivityResult.moblie_2G;
     case 'none':
     default:
       return ConnectivityResult.none;