Merge branch 'master' of https://github.com/reactnativecomponent/react-native-netease-im

# Conflicts:
#	Utils.js

Author: guangyao

Utils.js

@@ -62,6 +62,12 @@ class Utils{
     sortPinYin(o,key){
         return PinYin.sortPinYin(o,key);
     }
+
+
+    fetchNetInfo(){
+        return RNNeteaseIm.fetchNetInfo();
+    }
+    
     /**
      * 设置webview UA
      * @returns {*}
@@ -71,6 +77,5 @@ class Utils{
             RNNeteaseIm.setupWebViewUserAgent();
         }
     }
-}
 module.exports = new Utils();
 

android/src/main/java/com/netease/im/RNNeteaseImModule.java

@@ -42,6 +42,7 @@
 import com.netease.im.uikit.cache.SimpleCallback;
 import com.netease.im.uikit.cache.TeamDataCache;
 import com.netease.im.uikit.common.util.log.LogUtil;
+import com.netease.im.uikit.common.util.sys.NetworkUtil;
 import com.netease.im.uikit.contact.core.model.ContactDataList;
 import com.netease.im.uikit.permission.MPermission;
 import com.netease.im.uikit.permission.annotation.OnMPermissionDenied;
@@ -1139,8 +1140,8 @@ public int onResult(int code, IMMessage message) {
     }
 
     @ReactMethod
-    public void sendCardMessage(String type, String name, String imgPath,String sessionId, final Promise promise){
-        sessionService.sendCardMessage(type,  name,  imgPath, sessionId, new SessionService.OnSendMessageListener() {
+    public void sendCardMessage(String type, String name, String imgPath, String sessionId, final Promise promise) {
+        sessionService.sendCardMessage(type, name, imgPath, sessionId, new SessionService.OnSendMessageListener() {
             @Override
             public int onResult(int code, IMMessage message) {
                 return 0;
@@ -1989,6 +1990,30 @@ public void getLaunch(Promise promise) {
         }
     }
 
+    @ReactMethod
+    public void fetchNetInfo(Promise promise) {
+        int networkType = NetworkUtil.getNetworkClass(reactContext);
+        String networkString = "";
+        switch (networkType) {
+            case NetworkUtil.NETWORK_CLASS_2_G:
+                networkString = "2g";
+                break;
+            case NetworkUtil.NETWORK_CLASS_3_G:
+                networkString = "3g";
+                break;
+            case NetworkUtil.NETWORK_CLASS_4_G:
+                networkString = "4g";
+                break;
+            case NetworkUtil.NETWORK_CLASS_WIFI:
+                networkString = "wifi";
+                break;
+            case NetworkUtil.NETWORK_CLASS_UNKNOWN:
+                networkString = "unknown";
+                break;
+        }
+        promise.resolve(networkString);
+    }
+
     @Override
     public void onHostResume() {