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

Author: guangyao

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

@@ -1,5 +1,6 @@
 package com.netease.im;
 
+import android.app.NotificationManager;
 import android.content.Context;
 import android.graphics.Color;
 import android.location.LocationProvider;
@@ -14,6 +15,7 @@
 import com.netease.im.contact.DefalutUserInfoProvider;
 import com.netease.im.contact.DefaultContactProvider;
 import com.netease.im.login.LoginService;
+import com.netease.im.session.SessionUtil;
 import com.netease.im.session.extension.CustomAttachParser;
 import com.netease.im.uikit.LoginSyncDataStatusObserver;
 import com.netease.im.uikit.cache.DataCacheManager;
@@ -25,12 +27,15 @@
 import com.netease.im.uikit.contact.core.ContactProvider;
 import com.netease.im.uikit.contact.core.query.PinYin;
 import com.netease.nimlib.sdk.NIMClient;
+import com.netease.nimlib.sdk.Observer;
 import com.netease.nimlib.sdk.SDKOptions;
 import com.netease.nimlib.sdk.StatusBarNotificationConfig;
 import com.netease.nimlib.sdk.auth.LoginInfo;
 import com.netease.nimlib.sdk.mixpush.NIMPushClient;
 import com.netease.nimlib.sdk.msg.MessageNotifierCustomization;
 import com.netease.nimlib.sdk.msg.MsgService;
+import com.netease.nimlib.sdk.msg.MsgServiceObserve;
+import com.netease.nimlib.sdk.msg.model.CustomNotification;
 import com.netease.nimlib.sdk.msg.model.IMMessage;
 import com.netease.nimlib.sdk.uinfo.UserInfoProvider;
 
@@ -41,8 +46,6 @@
 public class IMApplication {
 
 
-
-
     public static class MiPushConfig {
 
         public String certificate;
@@ -78,7 +81,7 @@ public MiPushConfig(String certificate, String appID, String appKey) {
     private static ImageLoaderKit imageLoaderKit;
     private static StatusBarNotificationConfig statusBarNotificationConfig;
 
-    public static void init(Context context, Class mainActivityClass,@DrawableRes int notify_msg_drawable_id, MiPushConfig miPushConfig) {
+    public static void init(Context context, Class mainActivityClass, @DrawableRes int notify_msg_drawable_id, MiPushConfig miPushConfig) {
         IMApplication.context = context.getApplicationContext();
         IMApplication.mainActivityClass = mainActivityClass;
         IMApplication.notify_msg_drawable_id = notify_msg_drawable_id;
@@ -101,8 +104,17 @@ public static void init(Context context, Class mainActivityClass,@DrawableRes in
             initKit();
 
         }
+        NIMClient.getService(MsgServiceObserve.class).observeCustomNotification(notificationObserver, true);
     }
 
+    private static Observer<CustomNotification> notificationObserver = new Observer<CustomNotification>() {
+        @Override
+        public void onEvent(CustomNotification customNotification) {
+            NotificationManager notificationManager = (NotificationManager) IMApplication.getContext().getSystemService(Context.NOTIFICATION_SERVICE);
+            SessionUtil.receiver(notificationManager,customNotification);
+        }
+    };
+
     private static boolean inMainProcess(Context context) {
         String packageName = context.getPackageName();
         String processName = SystemUtil.getProcessName(context);
@@ -130,7 +142,7 @@ private static SDKOptions getOptions(Context context) {
         SDKOptions options = new SDKOptions();
 
         // 如果将新消息通知提醒托管给SDK完成，需要添加以下配置。
-        initStatusBarNotificationConfig(options,context);
+        initStatusBarNotificationConfig(options, context);
 
         // 配置保存图片，文件，log等数据的目录
         String sdkPath = Environment.getExternalStorageDirectory() + "/" + context.getPackageName() + "/nim";
@@ -156,6 +168,7 @@ private static SDKOptions getOptions(Context context) {
 
         return options;
     }
+
     // 这里开发者可以自定义该应用初始的 StatusBarNotificationConfig
     private static StatusBarNotificationConfig loadStatusBarNotificationConfig(Context context) {
         StatusBarNotificationConfig config = new StatusBarNotificationConfig();
@@ -164,7 +177,7 @@ private static StatusBarNotificationConfig loadStatusBarNotificationConfig(Conte
         config.notificationSmallIconId = notify_msg_drawable_id;
 
         // 通知铃声的uri字符串
-        config.notificationSound = "android.resource://"+context.getPackageName()+"/raw/msg";
+        config.notificationSound = "android.resource://" + context.getPackageName() + "/raw/msg";
 
         // 呼吸灯配置
         config.ledARGB = Color.GREEN;
@@ -175,6 +188,7 @@ private static StatusBarNotificationConfig loadStatusBarNotificationConfig(Conte
         setStatusBarNotificationConfig(config);
         return config;
     }
+
     private static void initStatusBarNotificationConfig(SDKOptions options, Context context) {
         // load 应用的状态栏配置
         StatusBarNotificationConfig config = loadStatusBarNotificationConfig(context);
@@ -194,6 +208,7 @@ private static void initStatusBarNotificationConfig(SDKOptions options, Context
         // SDK statusBarNotificationConfig 生效
         options.statusBarNotificationConfig = userConfig;
     }
+
     private static MessageNotifierCustomization messageNotifierCustomization = new MessageNotifierCustomization() {
         @Override
         public String makeNotifyContent(String nick, IMMessage message) {
@@ -207,10 +222,8 @@ public String makeTicker(String nick, IMMessage message) {
     };
 
 
-
-
     /*********************/
-    public static void initKit(){
+    public static void initKit() {
         NIMClient.getService(MsgService.class).registerCustomAttachmentParser(new CustomAttachParser());
         initUserInfoProvider(userInfoProvider);
         initContactProvider(contactProvider);
@@ -236,6 +249,7 @@ public static void initKit(){
 
 
     }
+
     // 初始化用户信息提供者
     private static void initUserInfoProvider(UserInfoProvider userInfoProvider) {
 
@@ -255,13 +269,15 @@ private static void initContactProvider(ContactProvider contactProvider) {
 
         IMApplication.contactProvider = contactProvider;
     }
+
     public static UserInfoProvider getUserInfoProvider() {
         return userInfoProvider;
     }
 
     public static ContactProvider getContactProvider() {
         return contactProvider;
     }
+
     public static ImageLoaderKit getImageLoaderKit() {
         return imageLoaderKit;
     }

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

@@ -37,7 +37,6 @@
 import com.netease.im.uikit.cache.SimpleCallback;
 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.contact.core.model.ContactDataList;
 import com.netease.im.uikit.permission.MPermission;
 import com.netease.im.uikit.permission.annotation.OnMPermissionDenied;
@@ -140,9 +139,9 @@ public void init(Promise promise) {
      */
     @ReactMethod
     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));
+//        LogUtil.i(TAG, "contactId:" + contactId);
+//        LogUtil.i(TAG, "token:" + token);
+//        LogUtil.i(TAG, "md5:" + MD5.getStringMD5(token));
         LoginService.getInstance().login(new LoginInfo(contactId, token), new RequestCallback<LoginInfo>() {
             @Override
             public void onSuccess(LoginInfo loginInfo) {
@@ -1031,13 +1030,27 @@ public void onResult(int code, Void aVoid, Throwable throwable) {
     /**
      * 发送文本消息
      *
-     * @param content 文本内容
+     * @param content   文本内容
+     * @param atUserIds
      * @param promise
      */
     @ReactMethod
+    public void sendTextMessage(String content, ReadableArray atUserIds, final Promise promise) {
+        LogUtil.i(TAG, "sendTextMessage" + content);
+
+        List<String> atUserIdList = array2ListString(atUserIds);
+        sessionService.sendTextMessage(content, atUserIdList, new SessionService.OnSendMessageListener() {
+            @Override
+            public int onResult(int code, IMMessage message) {
+//                promise.resolve(ReactCache.createMessage(message,null));
+                return 0;
+            }
+        });
+    }
+
     public void sendTextMessage(String content, final Promise promise) {
         LogUtil.i(TAG, "sendTextMessage" + content);
-        sessionService.sendTextMessage(content, new SessionService.OnSendMessageListener() {
+        sessionService.sendTextMessage(content, null, new SessionService.OnSendMessageListener() {
             @Override
             public int onResult(int code, IMMessage message) {
 //                promise.resolve(ReactCache.createMessage(message,null));

android/src/main/java/com/netease/im/receiver/CustomNotificationReceiver.java

@@ -7,10 +7,8 @@
 import android.os.Bundle;
 
 import com.netease.im.IMApplication;
-import com.netease.im.session.SessionUtil;
 import com.netease.im.uikit.common.util.log.LogUtil;
 import com.netease.nimlib.sdk.NimIntent;
-import com.netease.nimlib.sdk.msg.model.CustomNotification;
 
 /**
  * 自定义通知消息广播接收器
@@ -26,12 +24,12 @@ public void onReceive(Context context, Intent intent) {
         if (action.equals(intent.getAction())) {
 
             // 从intent中取出自定义通知
-            try {
-                CustomNotification notification = (CustomNotification) intent.getSerializableExtra(NimIntent.EXTRA_BROADCAST_MSG);
-                SessionUtil.receiver(getNotificationManager(), notification);
-            } catch (Exception e) {
-                LogUtil.e("CustomNotificationReceiver", e.getMessage());
-            }
+//            try {
+//                CustomNotification notification = (CustomNotification) intent.getSerializableExtra(NimIntent.EXTRA_BROADCAST_MSG);
+//                SessionUtil.receiver(getNotificationManager(), notification);
+//            } catch (Exception e) {
+//                LogUtil.e("CustomNotificationReceiver", e.getMessage());
+//            }
         }
     }
     public NotificationManager getNotificationManager() {

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

@@ -34,6 +34,7 @@
 import com.netease.nimlib.sdk.msg.model.AttachmentProgress;
 import com.netease.nimlib.sdk.msg.model.CustomMessageConfig;
 import com.netease.nimlib.sdk.msg.model.IMMessage;
+import com.netease.nimlib.sdk.msg.model.MemberPushOption;
 import com.netease.nimlib.sdk.msg.model.MessageReceipt;
 import com.netease.nimlib.sdk.msg.model.QueryDirectionEnum;
 
@@ -558,9 +559,14 @@ public int onResult(int code, IMMessage message) {
     /**
      * @param content
      */
-    public void sendTextMessage(String content, OnSendMessageListener onSendMessageListener) {
+    public void sendTextMessage(String content, List<String> selectedMembers, OnSendMessageListener onSendMessageListener) {
 
         IMMessage message = MessageBuilder.createTextMessage(sessionId, sessionTypeEnum, content);
+
+        if (selectedMembers != null && !selectedMembers.isEmpty()) {
+            MemberPushOption option = createMemPushOption(selectedMembers, message);
+            message.setMemberPushOption(option);
+        }
         sendMessage(message, onSendMessageListener);
     }
 
@@ -770,6 +776,18 @@ private void appendPushConfig(IMMessage message) {
 //        }
     }
 
+    private MemberPushOption createMemPushOption(List<String> selectedMembers, IMMessage message) {
+
+        if (selectedMembers.isEmpty()) {
+            return null;
+        }
+
+        MemberPushOption memberPushOption = new MemberPushOption();
+        memberPushOption.setForcePush(true);
+        memberPushOption.setForcePushContent(message.getContent());
+        memberPushOption.setForcePushList(selectedMembers);
+        return memberPushOption;
+    }
     private boolean isOriginImageHasDownloaded(final IMMessage message) {
 
         if (message.getAttachStatus() == AttachStatusEnum.transferred) {

index.js

@@ -276,6 +276,7 @@ export default class NIM{
     /**
      *1.发送文本消息
      * @param content 文本内容
+     * @param atUserIds @的群成员ID ["abc","abc12"]
      */
     static sendTextMessage(content,atUserIds){
         return RNNeteaseIm.sendTextMessage(content,atUserIds);