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

Author: guangyao

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

@@ -79,7 +79,7 @@ public void onGetStatsCompleted(PackageStats pStats, boolean succeeded) throws R
                         result += pStats.externalCacheSize;
 //                        LogUtil.i(TAG, "result" + ":" + FileUtil.formatFileSize(result));
                         if (observer != null) {
-                            observer.onGetCacheSize(FileUtil.formatFileSize(result));
+                            observer.onGetCacheSize(Long.toString(result / (1024 * 1024)));
                         }
                     }
                 });

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

@@ -138,8 +138,12 @@ public void onIncomingMessage(@NonNull List<IMMessage> messages) {
         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");
+                if (showMsg(m)) {
+                    if (m.getAttachment() != null && (m.getAttachment() instanceof RedPacketAttachement)) {
+                        AudioPlayService.getInstance().playAudio(handler, ReactCache.getReactContext(), AudioManager.STREAM_RING, "raw", "rp");
+                    } else {
+                        AudioPlayService.getInstance().playAudio(handler, ReactCache.getReactContext(), AudioManager.STREAM_RING, "raw", "msg");
+                    }
                 }
 
             }
@@ -148,6 +152,10 @@ public void onIncomingMessage(@NonNull List<IMMessage> messages) {
 
     }
 
+    boolean showMsg(IMMessage m) {
+        return !(m.getMsgType() == MsgTypeEnum.notification || m.getMsgType() == MsgTypeEnum.tip
+                || (m.getAttachment() != null && (m.getAttachment() instanceof RedPacketOpenAttachement);
+    }
 
     public boolean isMyMessage(IMMessage message) {
         return message.getSessionType() == sessionTypeEnum

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

@@ -118,14 +118,14 @@ public static void receiver(NotificationManager manager, CustomNotification cust
                 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();
-                }
+//                String timestamp = data.getString("timestamp");
+                long t = customNotification.getTime() / 1000;
+//                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);