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

Author: guangyao

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

@@ -26,6 +26,7 @@
 import com.netease.im.uikit.common.util.sys.ScreenUtil;
 import com.netease.im.uikit.contact.core.ContactProvider;
 import com.netease.im.uikit.contact.core.query.PinYin;
+import com.netease.im.uikit.session.helper.MessageHelper;
 import com.netease.nimlib.sdk.NIMClient;
 import com.netease.nimlib.sdk.Observer;
 import com.netease.nimlib.sdk.SDKOptions;
@@ -104,7 +105,7 @@ public static void init(Context context, Class mainActivityClass, @DrawableRes i
             initKit();
 
         }
-        NIMClient.getService(MsgServiceObserve.class).observeCustomNotification(notificationObserver, true);
+
     }
 
     private static Observer<CustomNotification> notificationObserver = new Observer<CustomNotification>() {
@@ -243,13 +244,30 @@ public static void initKit() {
         StorageUtil.init(context, null);
         ScreenUtil.init(context);
 
+        // 注册消息撤回监听器
+        registerMsgRevokeObserver();
+
+//        NIMClient.getService(MsgServiceObserve.class).observeCustomNotification(notificationObserver, true);
+
         // init log
         String path = StorageUtil.getDirectoryByDirType(StorageType.TYPE_LOG);
         LogUtil.init(path, Log.DEBUG);
 
 
     }
 
+    private static void registerMsgRevokeObserver() {
+        NIMClient.getService(MsgServiceObserve.class).observeRevokeMessage(new Observer<IMMessage>() {
+            @Override
+            public void onEvent(IMMessage message) {
+                if (message == null) {
+                    return;
+                }
+
+                MessageHelper.getInstance().onRevokeMessage(message);
+            }
+        }, true);
+    }
     // 初始化用户信息提供者
     private static void initUserInfoProvider(UserInfoProvider userInfoProvider) {
 

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

@@ -4,6 +4,8 @@
 import android.Manifest;
 import android.app.Activity;
 import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
 import android.text.TextUtils;
@@ -142,6 +144,7 @@ public void login(String contactId, String token, final Promise promise) {
 //        LogUtil.i(TAG, "contactId:" + contactId);
 //        LogUtil.i(TAG, "token:" + token);
 //        LogUtil.i(TAG, "md5:" + MD5.getStringMD5(token));
+//        NIMClient.getService(AuthService.class).openLocalCache(contactId);
         LoginService.getInstance().login(new LoginInfo(contactId, token), new RequestCallback<LoginInfo>() {
             @Override
             public void onSuccess(LoginInfo loginInfo) {
@@ -1598,7 +1601,15 @@ public void run() {
                         WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
             }
         });
-        audioMessageService.startAudioRecord(reactContext);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            if (getCurrentActivity().checkSelfPermission(Manifest.permission.RECORD_AUDIO) == PackageManager.PERMISSION_GRANTED) {
+                audioMessageService.startAudioRecord(reactContext);
+            } else {
+                requestBasicPermission();
+            }
+        } else {
+            audioMessageService.startAudioRecord(reactContext);
+        }
     }
 
     @ReactMethod

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

@@ -4,6 +4,7 @@
 import android.content.Context;
 
 import com.netease.im.IMApplication;
+import com.netease.im.session.SessionUtil;
 import com.netease.im.team.TeamListService;
 import com.netease.im.uikit.LoginSyncDataStatusObserver;
 import com.netease.im.uikit.cache.DataCacheManager;
@@ -14,6 +15,7 @@
 import com.netease.nimlib.sdk.auth.AuthService;
 import com.netease.nimlib.sdk.auth.LoginInfo;
 import com.netease.nimlib.sdk.friend.model.AddFriendNotify;
+import com.netease.nimlib.sdk.msg.MsgServiceObserve;
 import com.netease.nimlib.sdk.msg.constant.SystemMessageType;
 import com.netease.nimlib.sdk.msg.model.CustomNotification;
 import com.netease.nimlib.sdk.msg.model.SystemMessage;
@@ -115,15 +117,15 @@ synchronized void registerObserver(boolean register) {
         recentContactObserver.registerRecentContactObserver(register);
 //        sysMessageObserver.registerSystemObserver(register);
 //        NIMClient.getService(SystemMessageObserver.class).observeReceiveSystemMsg(systemMessageObserver, register);
-//        NIMClient.getService(MsgServiceObserve.class).observeCustomNotification(notificationObserver, register);
+        NIMClient.getService(MsgServiceObserve.class).observeCustomNotification(notificationObserver, register);
     }
 
     private NotificationManager notificationManager;
     private Observer<CustomNotification> notificationObserver = new Observer<CustomNotification>() {
         @Override
         public void onEvent(CustomNotification customNotification) {
 
-//            SessionUtil.receiver(getNotificationManager(),customNotification);
+            SessionUtil.receiver(getNotificationManager(),customNotification);
         }
     };
 

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

@@ -57,6 +57,9 @@ public void loadMessages(boolean refresh) {
             List<SystemMessage> temps = NIMClient.getService(SystemMessageService.class)
                     .querySystemMessagesBlock(loadOffset, LOAD_MESSAGE_COUNT);
 
+            if (temps == null) {
+                break;
+            }
             loadOffset += temps.size();
             loadCompleted = temps.size() < LOAD_MESSAGE_COUNT;
 

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

@@ -371,6 +371,7 @@ public void onEvent(IMMessage message) {
             }
 
             deleteItem(message, false);
+            MessageHelper.getInstance().onRevokeMessage(message);
         }
     };
     private UserInfoObservable.UserInfoObserver uinfoObserver;
@@ -565,6 +566,7 @@ public void sendTextMessage(String content, List<String> selectedMembers, OnSend
 
         if (selectedMembers != null && !selectedMembers.isEmpty()) {
             MemberPushOption option = createMemPushOption(selectedMembers, message);
+            message.setPushContent("有人@了你");
             message.setMemberPushOption(option);
         }
         sendMessage(message, onSendMessageListener);