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

Author: guangyao

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

@@ -135,8 +135,14 @@ public void onIncomingMessage(@NonNull List<IMMessage> messages) {
             updateShowTimeItem(addedListItems, false);
         }
         List<IMMessage> r = onQuery(addedListItems);
-        if (!this.mute && r.size() > 0) {
-            AudioPlayService.getInstance().playAudio(handler, ReactCache.getReactContext(), AudioManager.STREAM_RING, "raw", "msg");
+        if (r.size() > 0) {
+            IMMessage m = messages.get(0);
+            if (!this.mute && m.getDirect() == MsgDirectionEnum.In) {
+                if(!(m.getMsgType() == MsgTypeEnum.notification||m.getMsgType() == MsgTypeEnum.tip)){
+                    AudioPlayService.getInstance().playAudio(handler, ReactCache.getReactContext(), AudioManager.STREAM_RING, "raw", "msg");
+                }
+
+            }
         }
         refreshMessageList(r);
 

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

@@ -91,7 +91,7 @@ public static void sendAddFriendNotification(String account, String content) {
     }
 
     public static void receiver(NotificationManager manager, CustomNotification customNotification) {
-        LogUtil.i("SessionUtil", customNotification.getFromAccount());
+        LogUtil.i("SessionUtil", customNotification.getContent());
         Map<String, Object> map = customNotification.getPushPayload();
         if (map != null && map.containsKey("type")) {
             String type = (String) map.get("type");
@@ -105,34 +105,34 @@ public static void receiver(NotificationManager manager, CustomNotification cust
                 builder.setContentIntent(contentIntent);
                 builder.setSmallIcon(IMApplication.getNotify_msg_drawable_id());
                 manager.notify((int) System.currentTimeMillis(), builder.build());
-            } else {
-                String content = customNotification.getContent();
-                if (!TextUtils.isEmpty(content)) {
-                    JSONObject object = JSON.parseObject(content);
-                    JSONObject data = object.getJSONObject("data");
-
-                    JSONObject dict = data.getJSONObject("dict");
-                    String sendId = dict.getString("sendId");
-                    String openId = dict.getString("openId");
-                    String hasRedPacket = dict.getString("hasRedPacket");
-                    String serialNo = dict.getString("serialNo");
-
-                    String timestamp = data.getString("timestamp");
-                    long t = 0L;
-                    try {
-                        t = Long.parseLong(timestamp);
-                    } catch (NumberFormatException e) {
-                        t = System.currentTimeMillis() / 1000;
-                        e.printStackTrace();
-                    }
+            }
+        } else {
+            String content = customNotification.getContent();
+            if (!TextUtils.isEmpty(content)) {
+                JSONObject object = JSON.parseObject(content);
+                JSONObject data = object.getJSONObject("data");
+
+                JSONObject dict = data.getJSONObject("dict");
+                String sendId = dict.getString("sendId");
+                String openId = dict.getString("openId");
+                String hasRedPacket = dict.getString("hasRedPacket");
+                String serialNo = dict.getString("serialNo");
+
+                String timestamp = data.getString("timestamp");
+                long t = 0L;
+                try {
+                    t = Long.parseLong(timestamp);
+                } catch (NumberFormatException e) {
+                    t = System.currentTimeMillis() / 1000;
+                    e.printStackTrace();
+                }
 //                LogUtil.i("timestamp","timestamp:"+timestamp);
 //                LogUtil.i("timestamp","t:"+t);
 //                LogUtil.i("timestamp",""+data);
-                    String sessionId = (String) data.get("sessionId");
-                    String sessionType = (String) data.get("sessionType");
-                    final String id = getSessionType(sessionType) == SessionTypeEnum.P2P ? openId : sessionId;
-                    sendRedPacketOpenLocal(id, getSessionType(sessionType), sendId, openId, hasRedPacket, serialNo, t);
-                }
+                String sessionId = data.getString("sessionId");
+                String sessionType = data.getString("sessionType");
+                final String id = getSessionType(sessionType) == SessionTypeEnum.P2P ? openId : sessionId;
+                sendRedPacketOpenLocal(id, getSessionType(sessionType), sendId, openId, hasRedPacket, serialNo, t);
             }
         }