fix：播放本地音乐,最近会话显示

fix：播放本地音乐,最近会话显示

Author: xhp

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

@@ -1453,7 +1453,7 @@ public void startSession(String sessionId, String type, final Promise promise) {
 
             return;
         }
-        sessionService.startSession(sessionId, type);
+        sessionService.startSession(handler, sessionId, type);
     }
 
     /**
@@ -1653,7 +1653,13 @@ public void play(String audioFile, Promise promise) {
     public void playLocal(String resourceFile, String type, Promise promise) {
 
         Uri uri = Uri.parse(resourceFile);
-        audioPlayService.playAudio(handler, reactContext, AudioManager.STREAM_MUSIC, uri.getScheme(), uri.getPath());
+        LogUtil.i(TAG, "scheme:" + uri.getScheme());
+        String filePath = uri.getPath();
+        if(filePath.startsWith("/")){
+            filePath = filePath.substring(1);
+        }
+        LogUtil.i(TAG, "path:" + filePath);
+        audioPlayService.playAudio(handler, reactContext, AudioManager.STREAM_RING, uri.getScheme(), filePath);
     }
 
     /**

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

@@ -190,11 +190,9 @@ public static Object createRecentList(List<RecentContact> recents, int unreadNum
                 map.putString("nick", fromNick);
                 String teamNick = "";
                 if (contact.getSessionType() == SessionTypeEnum.Team && !TextUtils.equals(LoginService.getInstance().getAccount(), fromAccount)) {
-
+                    String tid = contact.getContactId();
+                    teamNick = getTeamUserDisplayName(tid, fromAccount)+": ";
                     if ((contact.getAttachment() instanceof NotificationAttachment)) {
-                        String tid = contact.getContactId();
-                        teamNick = getTeamUserDisplayName(tid, fromAccount);
-                        teamNick += ": ";
                         if (AitHelper.hasAitExtention(contact)) {
                             if (contact.getUnreadCount() == 0) {
                                 AitHelper.clearRecentContactAited(contact);

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

@@ -52,9 +52,11 @@ public void playAudio(Handler handler, ReactContext context, int audioStreamType
         if (TextUtils.isEmpty(filePath)) {
             return;
         }
-
+        LogUtil.i(type, "path:" + filePath);
         if (audioStreamType == -1) {
             register(context, true);
+        }else {
+            currentAudioStreamType = audioStreamType;
         }
         if (isPlayingAudio()) {
             stopAudio(handler);
@@ -70,7 +72,9 @@ public void playAudio(Handler handler, ReactContext context, int audioStreamType
         }
 //        ReactCache.emit(ReactCache.observeAudioRecord, ReactCache.createAudioPlay("Volume", context.getCurrentActivity().getVolumeControlStream()));
 
-        context.getCurrentActivity().setVolumeControlStream(currentAudioStreamType); // 默认使用听筒播放
+        if (context.getCurrentActivity() != null) {
+            context.getCurrentActivity().setVolumeControlStream(currentAudioStreamType); // 默认使用听筒播放
+        }
         if (TextUtils.equals(type, SCHEME_FILE)) {
             currentAudioPlayer.setDataSource(filePath);
         } else if (TextUtils.equals(type, SCHEME_RAW)) {

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

@@ -2,6 +2,7 @@
 
 import android.content.Context;
 import android.content.res.AssetFileDescriptor;
+import android.content.res.Resources;
 import android.media.AudioManager;
 import android.media.AudioManager.OnAudioFocusChangeListener;
 import android.media.MediaPlayer;
@@ -110,15 +111,18 @@ public final void setDataSource(String var1) {
     }
 
     public final void setDataSource(Type defType, String name) {
+        type = defType;
         if (defType == Type.file) {
             setDataSource(name);
         } else if (defType == Type.raw) {
-            type = Type.raw;
             int resid = mContext.getResources().getIdentifier(name, "raw", mContext.getPackageName());
-            assetFileDescriptor = mContext.getResources().openRawResourceFd(resid);
+            try {
+                assetFileDescriptor = mContext.getResources().openRawResourceFd(resid);
+            } catch (Resources.NotFoundException e) {
+                e.printStackTrace();
+            }
         } else if (defType == Type.assets) {
             try {
-                type = Type.assets;
                 assetFileDescriptor = mContext.getAssets().openFd(name);
             } catch (IOException e) {
                 e.printStackTrace();
@@ -228,12 +232,16 @@ public boolean onError(MediaPlayer var1, int var2, int var3) {
         });
 
         try {
-            if (this.mAudioFile != null) {
+            if ((type == Type.file && this.mAudioFile != null) || assetFileDescriptor != null) {
                 if (type == Type.file) {
                     this.mPlayer.setDataSource(this.mAudioFile);
                 } else {
-                    AssetFileDescriptor afd = assetFileDescriptor;
-                    this.mPlayer.setDataSource(afd.getFileDescriptor(), afd.getStartOffset(), afd.getLength());
+                    AssetFileDescriptor fd = assetFileDescriptor;
+                    if (fd.getDeclaredLength() < 0) {
+                        this.mPlayer.setDataSource(fd.getFileDescriptor());
+                    } else {
+                        this.mPlayer.setDataSource(fd.getFileDescriptor(), fd.getStartOffset(), fd.getDeclaredLength());
+                    }
                 }
                 this.mPlayer.prepare();
                 this.mPlayer.start();

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

@@ -1,6 +1,8 @@
 package com.netease.im.session;
 
+import android.media.AudioManager;
 import android.net.Uri;
+import android.os.Handler;
 import android.support.annotation.NonNull;
 import android.text.TextUtils;
 
@@ -75,6 +77,8 @@ public class SessionService {
     private Set<String> timedItems = new HashSet<>(); // 需要显示消息时间的消息ID
     private IMMessage lastShowTimeItem; // 用于消息时间显示,判断和上条消息间的时间间隔
 
+    private Handler handler;
+
     private SessionService() {
     }
 
@@ -127,6 +131,9 @@ public void onIncomingMessage(@NonNull List<IMMessage> messages) {
             updateShowTimeItem(addedListItems, false);
         }
         List<IMMessage> r = onQuery(addedListItems);
+        if (r.size() > 0) {
+            AudioPlayService.getInstance().playAudio(handler, ReactCache.getReactContext(), AudioManager.STREAM_RING, "raw", "msg");
+        }
         refreshMessageList(r);
 
     }
@@ -518,8 +525,9 @@ public int compare(IMMessage o1, IMMessage o2) {
 
     /****************************** 消息处理 ***********************************/
 
-    public void startSession(String sessionId, String type) {
+    public void startSession(Handler handler, String sessionId, String type) {
         clear();
+        this.handler = handler;
         this.sessionId = sessionId;
         sessionTypeEnum = SessionUtil.getSessionType(type);
         registerObservers(true);

android/src/main/java/com/netease/im/session/extension/RedPacketOpenAttachement.java

@@ -10,6 +10,16 @@
 
 /**
  * Created by dowin on 2017/6/12.
+ * <p>
+ * {
+ * "msgtype": "redpacketOpen",
+ * "data": {
+ * "sendId": "",发红包的ID
+ * "openId": "",拆红包的ID
+ * "hasRedPacket": "",是否还有红包 '0' '1'是已经拆完
+ * "serialNo": ""红包ID
+ * }
+ * }
  */
 
 public class RedPacketOpenAttachement extends CustomAttachment {
@@ -67,7 +77,7 @@ public String getTipMsg(boolean show) {
             sendName = NimUserInfoCache.getInstance().getUserDisplayNameYou(sendId);
         }
         String end = "";
-        if (show&&"1".equals(hasRedPacket) && TextUtils.equals(LoginService.getInstance().getAccount(), sendId)) {
+        if (show && "1".equals(hasRedPacket) && TextUtils.equals(LoginService.getInstance().getAccount(), sendId)) {
             end = "，你的红包已被领完";
         }
         return openName + "领取了" + sendName + "的红包" + end;