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

Author: guangyao

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

@@ -30,6 +30,7 @@
 import com.netease.im.contact.FriendListService;
 import com.netease.im.contact.FriendObserver;
 import com.netease.im.login.LoginService;
+import com.netease.im.login.RecentContactObserver;
 import com.netease.im.login.SysMessageObserver;
 import com.netease.im.session.AudioMessageService;
 import com.netease.im.session.AudioPlayService;
@@ -471,6 +472,7 @@ public void setMessageNotify(String contactId, String mute, final Promise promis
                     @Override
                     public void onResult(int code, Void aVoid, Throwable throwable) {
                         if (code == ResponseCode.RES_SUCCESS) {
+                            RecentContactObserver.getInstance().refreshMessages(true);
                             promise.resolve("" + code);
                         } else {
                             promise.reject("" + code, "");
@@ -494,6 +496,7 @@ public void setTeamNotify(String teamId, String mute, final Promise promise) {
                     @Override
                     public void onResult(int code, Void aVoid, Throwable throwable) {
                         if (code == ResponseCode.RES_SUCCESS) {
+                            RecentContactObserver.getInstance().refreshMessages(true);
                             promise.resolve("" + code);
                         } else {
                             promise.reject("" + code, "");

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

@@ -105,7 +105,7 @@ private void queryRecentContacts() {
 
     volatile boolean hasRegister;
 
-    RecentContactObserver recentContactObserver = new RecentContactObserver();
+    RecentContactObserver recentContactObserver = RecentContactObserver.getInstance();
 //    SysMessageObserver sysMessageObserver = new SysMessageObserver();
 
     synchronized void registerObserver(boolean register) {

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

@@ -32,6 +32,18 @@
 
 public class RecentContactObserver {
     final static String TAG = "RecentContactObserver";
+
+    private RecentContactObserver() {
+
+    }
+
+    static class InstanceHolder {
+        final static RecentContactObserver instance = new RecentContactObserver();
+    }
+
+    public static RecentContactObserver getInstance() {
+        return InstanceHolder.instance;
+    }
     /*******************************最近会话********************************/
 
     private List<RecentContact> items = new ArrayList<>();
@@ -139,7 +151,7 @@ public void onResult(boolean success, Team result) {
 
     int unreadNum = 0;
 
-    private void refreshMessages(boolean unreadChanged) {
+    public void refreshMessages(boolean unreadChanged) {
         sortRecentContacts(items);
 
 

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.TeamDataCache;
 import com.netease.im.uikit.common.util.log.LogUtil;
 import com.netease.im.uikit.common.util.string.MD5;
 import com.netease.im.uikit.session.helper.MessageHelper;
@@ -28,6 +29,7 @@
 import com.netease.nimlib.sdk.Observer;
 import com.netease.nimlib.sdk.RequestCallbackWrapper;
 import com.netease.nimlib.sdk.ResponseCode;
+import com.netease.nimlib.sdk.friend.FriendService;
 import com.netease.nimlib.sdk.msg.MessageBuilder;
 import com.netease.nimlib.sdk.msg.MsgService;
 import com.netease.nimlib.sdk.msg.MsgServiceObserve;
@@ -44,6 +46,7 @@
 import com.netease.nimlib.sdk.msg.model.MemberPushOption;
 import com.netease.nimlib.sdk.msg.model.MessageReceipt;
 import com.netease.nimlib.sdk.msg.model.QueryDirectionEnum;
+import com.netease.nimlib.sdk.team.model.Team;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -78,6 +81,7 @@ public class SessionService {
     private IMMessage lastShowTimeItem; // 用于消息时间显示,判断和上条消息间的时间间隔
 
     private Handler handler;
+    private boolean mute = false;
 
     private SessionService() {
     }
@@ -131,7 +135,7 @@ public void onIncomingMessage(@NonNull List<IMMessage> messages) {
             updateShowTimeItem(addedListItems, false);
         }
         List<IMMessage> r = onQuery(addedListItems);
-        if (r.size() > 0) {
+        if (!this.mute && r.size() > 0) {
             AudioPlayService.getInstance().playAudio(handler, ReactCache.getReactContext(), AudioManager.STREAM_RING, "raw", "msg");
         }
         refreshMessageList(r);
@@ -529,7 +533,15 @@ public void startSession(Handler handler, String sessionId, String type) {
         clear();
         this.handler = handler;
         this.sessionId = sessionId;
+
         sessionTypeEnum = SessionUtil.getSessionType(type);
+
+        if (sessionTypeEnum == SessionTypeEnum.P2P) {
+            this.mute = !NIMClient.getService(FriendService.class).isNeedMessageNotify(sessionId);
+        } else {
+            Team t = TeamDataCache.getInstance().getTeamById(sessionId);
+            this.mute = t.mute();
+        }
         registerObservers(true);
         getMsgService().setChattingAccount(sessionId, sessionTypeEnum);
     }