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

Author: guangyao

README.md

@@ -57,6 +57,15 @@ public class MainActivity extends ReactActivity {
 
  ......
 
+  @Override
+     protected void onCreate(Bundle savedInstanceState) {
+         super.onCreate(savedInstanceState);
+         if(ReceiverMsgParser.checkOpen(getIntent())){//在后台时处理点击推送消息
+             ReactCache.emit(ReactCache.observeLaunchPushEvent, ReceiverMsgParser.getWritableMap(getIntent()));
+             RNNeteaseImModule.launch = getIntent();
+         }
+     }
+
  @Override
  public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
         MPermission.onRequestPermissionsResult(this, requestCode, permissions, grantResults);
@@ -134,9 +143,18 @@ Run `pod install`
 ...
 [self setupNIMSDK];
 [self registerAPNs];
+if (launchOptions) {//未启动时，点击推送消息
+    NSDictionary * remoteNotification = [launchOptions objectForKey:UIApplicationLaunchOptionsRemoteNotificationKey];
+    if (remoteNotification) {
+      [self performSelector:@selector(clickSendObserve:) withObject:remoteNotification afterDelay:0.5];
+    }
+  }
 ...
 return YES;
 }
+- (void)clickSendObserve:(NSDictionary *)dict{
+  [[NSNotificationCenter defaultCenter]postNotificationName:@"ObservePushNotification" object:@{@"dict":dict,@"type":@"launch"}];
+}
 - (void)setupNIMSDK
 {
 //在注册 NIMSDK appKey 之前先进行配置信息的注册，如是否使用新路径,是否要忽略某些通知，是否需要多端同步未读数
@@ -159,20 +177,20 @@ UIUserNotificationSettings *settings = [UIUserNotificationSettings settingsForTy
 
 - (void)application:(UIApplication *)app didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken
 {
-[[NIMSDK sharedSDK] updateApnsToken:deviceToken];
+  [[NIMSDK sharedSDK] updateApnsToken:deviceToken];
 }
-
+//在后台时处理点击推送消息
 - (void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo{
-NSLog(@"receive remote notification:  %@", userInfo);
-}
 
+  [[NSNotificationCenter defaultCenter]postNotificationName:@"ObservePushNotification" object:@{@"dict":userInfo,@"type":@"background"}];
+}
 - (void)application:(UIApplication *)app didFailToRegisterForRemoteNotificationsWithError:(NSError *)error
 {
-NSLog(@"fail to get apns token :%@",error);
+  NSLog(@"fail to get apns token :%@",error);
 }
-
-- (BOOL)application:(UIApplication *)application openURL:(NSURL *)url sourceApplication:(NSString *)sourceApplication annotation:(id)annotation {
-  return [RCTLinkingManager application:application openURL:url sourceApplication:sourceApplication annotation:annotation];
+- (void)applicationDidEnterBackground:(UIApplication *)application {
+  NSInteger count = [[[NIMSDK sharedSDK] conversationManager] allUnreadCount];
+  [[UIApplication sharedApplication] setApplicationIconBadgeNumber:count];
 }
 ```
 
@@ -225,7 +243,28 @@ import NIM from 'react-native-netease-im';
 #### 监听会话
 ```
 NativeAppEventEmitter.addListener("observeRecentContact",(data)=>{
-  console.log(data); //返回内容android和ios有区别
+  console.log(data); //返回会话列表和未读数
 })；
 ```
+#### 推送
+```
+//程序运行时获取的推送点击事件
+NativeAppEventEmitter.addListener("observeLaunchPushEvent",(data)=>{
+  console.log(data);
+})；
+//程序后台时获取的推送点击事件
+NativeAppEventEmitter.addListener("observeBackgroundPushEvent",(data)=>{
+  console.log(data); 
+})；
+//推送数据格式
+{
+    ...
+    sessionBody：{
+        sessionId:"",
+        sessionType:"",
+        sessionName:""
+    }
+}
+
+```
 

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

@@ -88,6 +88,8 @@
 import java.util.Map;
 import java.util.Set;
 
+import static com.netease.im.ReceiverMsgParser.getIntent;
+
 
 public class RNNeteaseImModule extends ReactContextBaseJavaModule implements LifecycleEventListener, ActivityEventListener {
 
@@ -1938,14 +1940,26 @@ public void onNewIntent(Intent intent) {
 
         LogUtil.w(TAG, "onNewIntent:" + intent.getExtras());
 //        ReceiverMsgParser.openIntent(intent);
-        if (reactContext.getCurrentActivity() != null && ReceiverMsgParser.checkOpen(ReceiverMsgParser.getIntent())) {
-            intent.putExtras(ReceiverMsgParser.getIntent());
+        if (reactContext.getCurrentActivity() != null && ReceiverMsgParser.checkOpen(intent)) {
+            intent.putExtras(getIntent());
             reactContext.getCurrentActivity().setIntent(intent);
+            ReactCache.emit(ReactCache.observeBackgroundPushEvent, ReceiverMsgParser.getWritableMap(intent));
         }
 
     }
 
     public static String status = "";
+    public static Intent launch = null;
+
+    @ReactMethod
+    public void getLaunch(Promise promise) {
+        if (launch == null) {
+            promise.resolve(null);
+        } else {
+            promise.resolve(ReceiverMsgParser.getWritableMap(launch));
+            launch = null;
+        }
+    }
 
     @Override
     public void onHostResume() {

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

@@ -82,6 +82,8 @@ public class ReactCache {
     public final static String observeAttachmentProgress = "observeAttachmentProgress";//'上传下载进度'
     public final static String observeOnKick = "observeOnKick";//'被踢出'
     public final static String observeAccountNotice = "observeAccountNotice";//'账户变动通知'
+    public final static String observeLaunchPushEvent = "observeLaunchPushEvent";//''
+    public final static String observeBackgroundPushEvent = "observeBackgroundPushEvent";//''
 
     final static String TAG = "ReactCache";
     private static ReactContext reactContext;
@@ -454,6 +456,7 @@ public static Object createUserInfo(NimUserInfo userInfo) {
         if (userInfo != null) {
 
             writableMap.putString("isMyFriend", boolean2String(FriendDataCache.getInstance().isMyFriend(userInfo.getAccount())));
+//            writableMap.putString("isMyFriend", boolean2String(NIMClient.getService(FriendService.class).isMyFriend(userInfo.getAccount())));
             writableMap.putString("isMe", boolean2String(userInfo.getAccount() != null && userInfo.getAccount().equals(LoginService.getInstance().getAccount())));
             writableMap.putString("isInBlackList", boolean2String(NIMClient.getService(FriendService.class).isInBlackList(userInfo.getAccount())));
             writableMap.putString("mute", boolean2String(NIMClient.getService(FriendService.class).isNeedMessageNotify(userInfo.getAccount())));

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

@@ -7,7 +7,9 @@
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.WritableMap;
 import com.netease.im.common.push.Extras;
+import com.netease.im.session.SessionUtil;
 import com.netease.im.uikit.common.util.log.LogUtil;
+import com.netease.nimlib.sdk.NIMClient;
 import com.netease.nimlib.sdk.NimIntent;
 import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum;
 import com.netease.nimlib.sdk.msg.model.IMMessage;
@@ -55,6 +57,7 @@ public static Bundle openIntent(Intent intent) {
                     result.putString("type", "session");
                     result.putString("sessionType", Integer.toString(message.getSessionType().getValue()));
                     result.putString("sessionId", message.getSessionId());
+                    result.putString("sessionName", message.getSessionId());
                 }
             } else if (intent.hasExtra(Extras.EXTRA_JUMP_P2P)) {
                 Intent data = intent.getParcelableExtra(Extras.EXTRA_DATA);
@@ -63,6 +66,7 @@ public static Bundle openIntent(Intent intent) {
                     result.putString("type", "session");
                     result.putString("sessionType", Integer.toString(SessionTypeEnum.P2P.getValue()));
                     result.putString("sessionId", account);
+                    result.putString("sessionName", account);
                 }
             }
 
@@ -74,40 +78,52 @@ public static Bundle openIntent(Intent intent) {
     }
 
     public static WritableMap getWritableMap(Intent intent) {
-        WritableMap r = Arguments.createMap();
+        WritableMap rr = Arguments.createMap();
         if (intent != null && canAutoLogin()) {
+            WritableMap r = Arguments.createMap();
             if (intent.hasExtra(NimIntent.EXTRA_NOTIFY_CONTENT)) {
                 ArrayList<IMMessage> messages = (ArrayList<IMMessage>) intent.getSerializableExtra(NimIntent.EXTRA_NOTIFY_CONTENT);
                 if (messages == null || messages.size() > 1) {
-                    r.putString("type", "sessionList");
+                    rr.putString("type", "sessionList");
                 } else {
                     IMMessage message = messages.get(0);
-                    r.putString("type", "session");
+                    rr.putString("type", "session");
                     r.putString("sessionType", Integer.toString(message.getSessionType().getValue()));
                     r.putString("sessionId", message.getSessionId());
+                    r.putString("sessionName", SessionUtil.getSessionName(message.getSessionId(), message.getSessionType(), false));
                 }
             } else if (intent.hasExtra(Extras.EXTRA_JUMP_P2P)) {
                 Intent data = intent.getParcelableExtra(Extras.EXTRA_DATA);
                 String account = data.getStringExtra(Extras.EXTRA_ACCOUNT);
                 if (!TextUtils.isEmpty(account)) {
-                    r.putString("type", "session");
+                    rr.putString("type", "session");
                     r.putString("sessionType", Integer.toString(SessionTypeEnum.P2P.getValue()));
                     r.putString("sessionId", account);
+                    r.putString("sessionName", SessionUtil.getSessionName(account, SessionTypeEnum.P2P, false));
                 }
             }
-
-            LogUtil.w("ReceiverMsgParser", intent + "");
+            rr.putMap("sessionBody", r);
+            printIntent(intent);
         }
 
-        LogUtil.w("ReceiverMsgParser", result + "");
-        return r;
+        LogUtil.w("ReceiverMsgParser", rr + "");
+        return rr;
+    }
+
+    static void printIntent(Intent intent) {
+        LogUtil.w("ReceiverMsgParser", intent + "");
+        Bundle extra = intent.getExtras();
+        for (String key : extra.keySet()) {
+            LogUtil.w("ReceiverMsgParser", "key:" + key);
+            LogUtil.w("ReceiverMsgParser", "v:" + extra.get(key));
+        }
     }
 
     /**
      * 已经登陆过，自动登陆
      */
     private static boolean canAutoLogin() {
-
-        return true;//!TextUtils.isEmpty(account) && !TextUtils.isEmpty(token);
+        return !NIMClient.getStatus().wontAutoLogin();
+//        return true;//!TextUtils.isEmpty(account) && !TextUtils.isEmpty(token);
     }
 }