add 黑名单提示，不是好友提示

Author: xhp

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

@@ -456,6 +456,7 @@ public static Object createUserInfo(NimUserInfo userInfo) {
         if (userInfo != null) {
 
             writableMap.putString("isMyFriend", boolean2String(FriendDataCache.getInstance().isMyFriend(userInfo.getAccount())));
+//            writableMap.putString("isMyFriend", boolean2String(NIMClient.getService(FriendService.class).isMyFriend(userInfo.getAccount())));
             writableMap.putString("isMe", boolean2String(userInfo.getAccount() != null && userInfo.getAccount().equals(LoginService.getInstance().getAccount())));
             writableMap.putString("isInBlackList", boolean2String(NIMClient.getService(FriendService.class).isInBlackList(userInfo.getAccount())));
             writableMap.putString("mute", boolean2String(NIMClient.getService(FriendService.class).isNeedMessageNotify(userInfo.getAccount())));

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

@@ -17,6 +17,7 @@
 import com.netease.im.session.extension.DefaultCustomAttachment;
 import com.netease.im.session.extension.RedPacketAttachement;
 import com.netease.im.session.extension.RedPacketOpenAttachement;
+import com.netease.im.uikit.cache.NimUserInfoCache;
 import com.netease.im.uikit.cache.TeamDataCache;
 import com.netease.im.uikit.common.util.file.FileUtil;
 import com.netease.im.uikit.common.util.log.LogUtil;
@@ -29,6 +30,7 @@
 import com.netease.nimlib.sdk.AbortableFuture;
 import com.netease.nimlib.sdk.NIMClient;
 import com.netease.nimlib.sdk.Observer;
+import com.netease.nimlib.sdk.RequestCallback;
 import com.netease.nimlib.sdk.RequestCallbackWrapper;
 import com.netease.nimlib.sdk.ResponseCode;
 import com.netease.nimlib.sdk.friend.FriendService;
@@ -87,8 +89,8 @@ public class SessionService {
     private Handler handler;
     private boolean mute = false;
 
+    private String sessionName = "";
     private boolean isFriend = true;
-    private boolean isInBlackList = false;
 
     private SessionService() {
     }
@@ -558,8 +560,8 @@ public void startSession(Handler handler, String sessionId, String type) {
         sessionTypeEnum = SessionUtil.getSessionType(type);
 
         if (sessionTypeEnum == SessionTypeEnum.P2P) {
+            sessionName = NimUserInfoCache.getInstance().getUserName(sessionId);
             isFriend = NIMClient.getService(FriendService.class).isMyFriend(sessionId);
-            isInBlackList = NIMClient.getService(FriendService.class).isInBlackList(sessionId);
 
             this.mute = !NIMClient.getService(FriendService.class).isNeedMessageNotify(sessionId);
         } else {
@@ -637,6 +639,10 @@ public void sendTextMessage(String content, List<String> selectedMembers, OnSend
      * @param content
      */
     public void sendTipMessage(String content, OnSendMessageListener onSendMessageListener) {
+        sendTipMessage(content, onSendMessageListener, false);
+    }
+
+    public void sendTipMessage(String content, OnSendMessageListener onSendMessageListener, boolean local) {
         CustomMessageConfig config = new CustomMessageConfig();
         config.enablePush = false; // 不推送
         IMMessage message = MessageBuilder.createTipMessage(sessionId, sessionTypeEnum);
@@ -651,7 +657,12 @@ public void sendTipMessage(String content, OnSendMessageListener onSendMessageLi
 
             message.setContent(content);
             message.setConfig(config);
-            sendMessageSelf(message, onSendMessageListener, false);
+            if (local) {
+                message.setStatus(MsgStatusEnum.success);
+                getMsgService().saveMessageToLocal(message, true);
+            } else {
+                sendMessageSelf(message, onSendMessageListener, false);
+            }
         }
     }
 
@@ -843,18 +854,42 @@ public void updateMessage(final IMMessage message, MsgStatusEnum statusEnum) {
         getMsgService().updateIMMessageStatus(message);
     }
 
-    public void sendMessageSelf(final IMMessage message, final OnSendMessageListener onSendMessageListener, boolean send) {
+    public void sendMessageSelf(final IMMessage message, final OnSendMessageListener onSendMessageListener, boolean resend) {
 
 
         appendPushConfig(message);
-        if(isInBlackList){
+        if (sessionTypeEnum == SessionTypeEnum.P2P) {
+            sessionName = NimUserInfoCache.getInstance().getUserName(sessionId);
 
-        }
-        if(!isFriend){
 
+            isFriend = NIMClient.getService(FriendService.class).isMyFriend(sessionId);
+            LogUtil.w(TAG, "isFriend:" + isFriend);
+            if (!isFriend) {
+                sendTipMessage(sessionName + "开启了朋友验证，你还不是他(她)朋友。请先发送朋友验证请求，对方验证后，才能聊天。发送朋友验证", null, true);
+                message.setStatus(MsgStatusEnum.fail);
+                getMsgService().saveMessageToLocal(message, true);
+                return;
+            }
         }
+        getMsgService().sendMessage(message, resend).setCallback(new RequestCallback<Void>() {
+            @Override
+            public void onSuccess(Void aVoid) {
 
-        getMsgService().sendMessage(message, send);
+            }
+
+            @Override
+            public void onFailed(int code) {
+                LogUtil.w(TAG, "code:" + code);
+                if (code == ResponseCode.RES_IN_BLACK_LIST) {
+                    sendTipMessage("消息已发出，但被对方拒收了。", null, true);
+                }
+            }
+
+            @Override
+            public void onException(Throwable throwable) {
+//                LogUtil.w(TAG, "throwable:" + throwable.getLocalizedMessage());
+            }
+        });
         onMessageStatusChange(message, true);
 
     }
@@ -868,7 +903,7 @@ private void appendPushConfig(IMMessage message) {
         Map<String, Object> payload = new HashMap<>();
         Map<String, Object> body = new HashMap<>();
 
-        body.put("sessionType", message.getSessionType().getValue());
+        body.put("sessionType", String.valueOf(message.getSessionType().getValue()));
         if (message.getSessionType() == SessionTypeEnum.P2P) {
             body.put("sessionId", LoginService.getInstance().getAccount());
         } else if (message.getSessionType() == SessionTypeEnum.Team) {