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

Author: guangyao

README.md

@@ -3,7 +3,7 @@ React Native的网易云信插件
 ## Demo
 [react-native-chat-demo](https://github.com/reactnativecomponent/react-native-chat-demo)
 
-#### 注意: react-native版本需要0.40.0及以上
+#### 注意: react-native版本需要0.47.0及以上NIMSDK版本4.0以上
 
 ## 如何安装
 
@@ -215,21 +215,13 @@ import NIM from 'react-native-netease-im';
 ```
 
 ### API
-#### NIM.login()
-```javascript
-// 登录参数 
-{
-	accid: "", //云信注册帐号
-    token:"" //登录的token
-}
-```
-返回一个`Promise`对象
+
+参考[index.js](https://github.com/reactnativecomponent/react-native-netease-im/blob/master/index.js)
 
 #### 监听会话
 ```
 NativeAppEventEmitter.addListener("observeRecentContact",(data)=>{
   console.log(data); //返回内容android和ios有区别
 })；
 ```
-更多接口请参阅`index.js`,或者参考Demo
 

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

@@ -88,7 +88,7 @@ public static class Link {
     public static class Location {
         public final static String LATITUDE = "latitude";
         public final static String LONGITUDE = "longitude";
-        public final static String ADDRESS = "address";
+        public final static String ADDRESS = "title";
     }
 
     public static class MediaFile {

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

@@ -1945,11 +1945,20 @@ public void onNewIntent(Intent intent) {
 
     }
 
+    public static String status = "";
+
     @Override
     public void onHostResume() {
         if (reactContext.getCurrentActivity() != null)
             LogUtil.w(TAG, reactContext.getCurrentActivity().getClass().getPackage().getName());
         LogUtil.w(TAG, "onHostResume");
+
+        if (!TextUtils.isEmpty(status)) {
+            WritableMap r = Arguments.createMap();
+            r.putString("status", status);
+            ReactCache.emit(ReactCache.observeOnKick, r);
+            status = "";
+        }
     }
 
     @Override

android/src/main/java/com/netease/im/login/RecentContactObserver.java

@@ -4,6 +4,7 @@
 
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.WritableMap;
+import com.netease.im.RNNeteaseImModule;
 import com.netease.im.ReactCache;
 import com.netease.im.uikit.cache.SimpleCallback;
 import com.netease.im.uikit.cache.TeamDataCache;
@@ -279,6 +280,7 @@ public void onEvent(LoginSyncStatus loginSyncStatus) {
 
         @Override
         public void onEvent(StatusCode code) {
+            RNNeteaseImModule.status = "";
             if (code != PWD_ERROR && code.wontAutoLogin()) {
                 WritableMap r = Arguments.createMap();
                 String status = "";
@@ -293,6 +295,7 @@ public void onEvent(StatusCode code) {
                         status = "2";
                         break;
                 }
+                RNNeteaseImModule.status = status;
                 r.putString("status", status);
                 ReactCache.emit(ReactCache.observeOnKick, r);
             }

package.json

@@ -1,7 +1,7 @@
 
 {
   "name": "react-native-netease-im",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "网易云信ReactNative插件",
   "main": "index.js",
   "scripts": {