添加黑名单不能重发，进入会话添加被踢出提示

Author: xhp

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

@@ -33,6 +33,7 @@
 import com.netease.nimlib.sdk.SDKOptions;
 import com.netease.nimlib.sdk.StatusBarNotificationConfig;
 import com.netease.nimlib.sdk.auth.LoginInfo;
+import com.netease.nimlib.sdk.mixpush.MixPushService;
 import com.netease.nimlib.sdk.mixpush.NIMPushClient;
 import com.netease.nimlib.sdk.msg.MessageNotifierCustomization;
 import com.netease.nimlib.sdk.msg.MsgService;
@@ -89,8 +90,9 @@ public static void init(Context context, Class mainActivityClass, @DrawableRes i
         IMApplication.notify_msg_drawable_id = notify_msg_drawable_id;
 
         // 注册小米推送appID 、appKey 以及在云信管理后台添加的小米推送证书名称，该逻辑放在 NIMClient init 之前
-        if (miPushConfig != null)
+        if (miPushConfig != null) {
             NIMPushClient.registerMiPush(context, miPushConfig.certificate, miPushConfig.appID, miPushConfig.appKey);
+        }
 
         NIMClient.init(context, getLoginInfo(), getOptions(context));
         // crash handler
@@ -102,6 +104,9 @@ public static void init(Context context, Class mainActivityClass, @DrawableRes i
             PinYin.init(context);
             PinYin.validate();
 
+            if (miPushConfig != null) {
+                NIMClient.getService(MixPushService.class).enable(true);
+            }
             // 初始化Kit模块
             initKit();
 

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

@@ -1974,6 +1974,9 @@ public void onHostResume() {
                 ReactCache.emit(ReactCache.observeOnKick, r);
             }
         }
+//        if (NIMClient.getStatus().wontAutoLogin()) {
+//            Toast.makeText(IMApplication.getContext(), "您的帐号已在别的设备登录，请重新登陆", Toast.LENGTH_SHORT).show();
+//        }
         status = "";
     }
 

android/src/main/java/com/netease/im/receiver/NetworkReceiver.java

@@ -32,7 +32,7 @@ public void onReceive(Context context, Intent intent) {
         } else {
             WritableMap r = Arguments.createMap();
             r.putString("status", Integer.toString(StatusCode.NET_BROKEN.getValue()));
-            ReactCache.emit(ReactCache.observeOnKick, r);
+            ReactCache.emit(ReactCache.observeOnlineStatus, r);
         }
     }
 }

android/src/main/java/com/netease/im/session/SessionService.java

@@ -5,9 +5,12 @@
 import android.os.Handler;
 import android.support.annotation.NonNull;
 import android.text.TextUtils;
+import android.widget.Toast;
 
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.common.MapBuilder;
+import com.netease.im.IMApplication;
 import com.netease.im.MessageConstant;
 import com.netease.im.MessageUtil;
 import com.netease.im.ReactCache;
@@ -558,6 +561,9 @@ public void startSession(Handler handler, String sessionId, String type) {
         this.handler = handler;
         this.sessionId = sessionId;
 
+        if (NIMClient.getStatus().wontAutoLogin()) {
+            Toast.makeText(IMApplication.getContext(), "您的帐号已在别的设备登录，请重新登陆", Toast.LENGTH_SHORT).show();
+        }
         sessionTypeEnum = SessionUtil.getSessionType(type);
 
         if (sessionTypeEnum == SessionTypeEnum.P2P) {
@@ -609,6 +615,12 @@ public void resendMessage(String messageId) {
         queryMessage(messageId, new OnMessageQueryListener() {
             @Override
             public int onResult(int code, IMMessage message) {
+                Map<String, Object> map = message.getLocalExtension();
+                if (map != null) {
+                    if (map.containsKey("resend")) {
+                        return -1;
+                    }
+                }
                 IMMessage item = message;
                 item.setStatus(MsgStatusEnum.sending);
                 deleteItem(item, true);
@@ -888,6 +900,10 @@ public void onSuccess(Void aVoid) {
             public void onFailed(int code) {
                 LogUtil.w(TAG, "code:" + code);
                 if (code == ResponseCode.RES_IN_BLACK_LIST) {
+                    Map<String, Object> map = MapBuilder.newHashMap();
+                    map.put("resend", false);
+                    message.setLocalExtension(map);
+                    getMsgService().updateIMMessage(message);
                     sendTipMessage("消息已发出，但被对方拒收了。", null, true, false);
                 }
             }