Merge pull request #110 from jpush/master

merge master

Author: JoshLipan

android/libs/jmessage-sdk-android-2.7.0.jar

@@ -2060,7 +2060,7 @@ public void onEventMainThread(ChatRoomMessageEvent event) {
         List<Message> list = event.getMessages();
         Log.d(TAG, "收到聊天室消息");
         getReactApplicationContext().getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
-                .emit(RECEIVE_MSG_EVENT, ResultUtils.toJSArray(list));
+                .emit(RECEIVE_CHAT_ROOM_MSG_EVENT, ResultUtils.toJSArray(list));
     }
 
     public void onEvent(GroupApprovalEvent event) {

android/libs/jmessage-sdk-android-2.7.1.jar

@@ -404,6 +404,14 @@ export default class Chat extends Component {
       AuroraIController.scrollToBottom(true)
       this.setMessageTarget(msg)
       Alert.alert('send text', JSON.stringify(msg))
+
+      msg.messageSendingOptions = {
+        isShowNotification:  true,
+        isRetainOffline:  true,
+        isCustomNotificationEnabled:  true,
+        notificationTitle: "Title Test",
+        notificationText: "context"
+      };
 
       JMessage.sendMessage(msg, (jmessage) => {
         var auroraMsg = this.convertJMessageToAuroraMsg(jmessage)

android/src/io/jchat/android/JMessageModule.java

@@ -6,18 +6,18 @@
   },
   "dependencies": {
     "aurora-imui-react-native": "^0.10.12",
-    "babel-plugin-transform-decorators-legacy": "^1.3.4",
+    "babel-plugin-transform-decorators-legacy": "^1.3.5",
     "babel-preset-react-native-stage-0": "^1.0.1",
-    "jcore-react-native": "^ 1.2.9",
-    "jmessage-react-plugin": "^2.4.2",
+    "jcore-react-native": "^1.2.11",
+    "jmessage-react-plugin": "^2.4.5",
     "mobx": "^3.4.1",
     "mobx-react": "^4.3.5",
-    "react": "^16.0.0",
+    "react": "^16.6.0",
     "react-native": "^0.51.0",
-    "react-native-fs": "^2.8.5",
-    "react-navigation": "^1.0.0-beta.11",
-    "react-redux": "^5.0.7",
-    "react-timer-mixin": "^0.13.3",
+    "react-native-fs": "^2.12.1",
+    "react-navigation": "^1.6.1",
+    "react-redux": "^5.1.0",
+    "react-timer-mixin": "^0.13.4",
     "redux": "^3.7.2"
   },
   "devDependencies": {

example/app/routes/Chat/index.js

@@ -1,6 +1,6 @@
 {
   "name": "jmessage-react-plugin",
-  "version": "2.4.5",
+  "version": "2.4.6",
   "description": "a jmessage plugin for react native application",
   "main": "index.js",
   "repository": {
@@ -18,7 +18,7 @@
     "url": "https://github.com/jpush/jmessage-react-plugin/issues"
   },
   "peerDependencies": {
-    "jcore-react-native": ">= 1.2.9"
+    "jcore-react-native": ">= 1.2.10"
   },
   "rnpm": {
     "ios": {
@@ -43,6 +43,6 @@
   },
   "homepage": "https://github.com/jpush/jmessage-react-plugin#readme",
   "dependencies": {
-    "jcore-react-native": "^1.1.8-beta2"
+    "jcore-react-native": "^1.2.10"
   }
 }