fix 踢出提示

Author: xhp

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

@@ -150,6 +150,7 @@ public void login(String contactId, String token, final Promise promise) {
 //        LogUtil.w(TAG, "md5:" + MD5.getStringMD5(token));
 
         NIMClient.getService(AuthService.class).openLocalCache(contactId);
+        LogUtil.w(TAG, "s:" + NIMClient.getStatus().name());
         LoginService.getInstance().login(new LoginInfo(contactId, token), new RequestCallback<LoginInfo>() {
             @Override
             public void onSuccess(LoginInfo loginInfo) {
@@ -174,7 +175,6 @@ public void onException(Throwable throwable) {
 
             }
         });
-
     }
 
     /**
@@ -183,6 +183,7 @@ public void onException(Throwable throwable) {
     @ReactMethod
     public void logout() {
         LogUtil.w(TAG, "logout");
+        status = "";
         LoginService.getInstance().logout();
 
     }
@@ -1963,20 +1964,24 @@ public void getLaunch(Promise promise) {
 
     @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 = "";
+
+        LogUtil.w(TAG, "onHostResume:" + status);
+
+        if (!TextUtils.isEmpty(status) && !"onHostPause".equals(status)) {
+            if (NIMClient.getStatus().wontAutoLogin()) {
+                WritableMap r = Arguments.createMap();
+                r.putString("status", status);
+                ReactCache.emit(ReactCache.observeOnKick, r);
+            }
         }
+        status = "";
     }
 
     @Override
     public void onHostPause() {
+        if (TextUtils.isEmpty(status)) {
+            status = "onHostPause";
+        }
         LogUtil.w(TAG, "onHostPause");
     }
 

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

@@ -11,6 +11,7 @@
 import com.netease.im.session.extension.CustomAttachmentType;
 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.nimlib.sdk.NIMClient;
 import com.netease.nimlib.sdk.Observer;
 import com.netease.nimlib.sdk.RequestCallbackWrapper;
@@ -306,7 +307,6 @@ 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 = "";
@@ -321,10 +321,17 @@ public void onEvent(StatusCode code) {
                         status = "2";
                         break;
                 }
-                RNNeteaseImModule.status = status;
+                if ("onHostPause".equals(RNNeteaseImModule.status)) {
+                    RNNeteaseImModule.status = status;
+                }else {
+                    RNNeteaseImModule.status = "";
+                }
                 r.putString("status", status);
                 ReactCache.emit(ReactCache.observeOnKick, r);
+            } else {
+                RNNeteaseImModule.status = "";
             }
+
             WritableMap r = Arguments.createMap();
             String codeValue;
             switch (code) {
@@ -336,6 +343,8 @@ public void onEvent(StatusCode code) {
                     break;
             }
             r.putString("status", codeValue);
+            LogUtil.w(TAG, "onHostStatus1:" + RNNeteaseImModule.status);
+            LogUtil.w(TAG, "onHostStatus2:" + codeValue);
             ReactCache.emit(ReactCache.observeOnlineStatus, r);
         }
     };