prepare release 2.0.0-beta3

Author: KenChoi

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

@@ -104,7 +104,7 @@ public boolean canOverrideExistingModule() {
     }
 
     @ReactMethod
-    public void init(ReadableMap map) {
+    public void setup(ReadableMap map) {
         try {
             boolean isOpenMessageRoaming = map.getBoolean(Constant.IS_OPEN_MESSAGE_ROAMING);
             JMessageClient.init(getReactApplicationContext(), isOpenMessageRoaming);

android/src/io/jchat/android/utils/ResultUtils.java

@@ -59,7 +59,7 @@ public static WritableMap toJSObject(Map<String, String> map) {
 
     public static WritableMap toJSObject(final UserInfo userInfo) {
         if (userInfo == null) {
-            return null;
+            return Arguments.createMap();
         }
         final WritableMap result = Arguments.createMap();
         result.putString("type", "user");
@@ -109,7 +109,7 @@ public static WritableMap toJSObject(GroupInfo groupInfo) {
     public static WritableMap toJSObject(Message msg) {
         WritableMap result = Arguments.createMap();
         try {
-            result.putInt("id", msg.getId());
+            result.putString("id", String.valueOf(msg.getId()));
             result.putMap("from", toJSObject(msg.getFromUser()));
 
             if (msg.getDirect() == MessageDirect.send) {
@@ -127,8 +127,6 @@ public static WritableMap toJSObject(Message msg) {
             MessageContent content = msg.getContent();
             if (content.getStringExtras() != null) {
                 result.putMap("extras", toJSObject(content.getStringExtras()));
-            } else {
-                result.putNull("extras");
             }
 
             result.putDouble("createTime", msg.getCreateTime());
@@ -195,13 +193,11 @@ public static WritableMap toJSObject(Conversation conversation) {
 
         try {
             map.putString("title", conversation.getTitle());
-            map.putString("conversationType", conversation.getType().getLabel());
+            map.putString("conversationType", conversation.getType().name());
             map.putInt("unreadCount", conversation.getUnReadMsgCnt());
 
             if (conversation.getLatestMessage() != null) {
                 map.putMap("latestMessage", toJSObject(conversation.getLatestMessage()));
-            } else {
-                map.putNull("latestMessage");
             }
 
             if (conversation.getType() == ConversationType.single) {

index.js

@@ -154,7 +154,7 @@ export default class JMessage {
 
     /**
      * @param {object} params = {
-     *  'id': Number,                                  // message id
+     *  'id': String,                                  // message id
      *  'type': String,                                // 'single' / 'group'
      *  'groupId': String,                             // 当 type = group 时，groupId 不能为空
      *  'username': String,                            // 当 type = single 时，username 不能为空
@@ -869,20 +869,20 @@ export default class JMessage {
     }
 
     static removeMessageRetractListener(listener) {
-        if (!listeners[listener]) {
-            return;
+            if (!listeners[listener]) {
+                return;
+            }
+            listeners[listener].remove();
+            listeners[listener] = null;
         }
-        listeners[listener].remove();
-        listeners[listener] = null;
-    }
-    /**
-     * 
-     * @param {function} listener  = function (result) {}
-     * result = {
-     *  messageId = String, // 消息 Id
-     *  progress = Float // 消息文件上传的进度
-     * }
-     */
+        /**
+         * 
+         * @param {function} listener  = function (result) {}
+         * result = {
+         *  messageId = String, // 消息 Id
+         *  progress = Float // 消息文件上传的进度
+         * }
+         */
     static addUploadProgressListener(listener) {
         listeners[listener] = DeviceEventEmitter.addListener(uploadProgress,
             (message) => {
@@ -897,5 +897,5 @@ export default class JMessage {
         listeners[listener].remove();
         listeners[listener] = null;
     }
-    
+
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "jmessage-react-plugin",
-  "version": "2.0.0-beta2",
+  "version": "2.0.0-beta3",
   "description": "a jmessage plugin for react native application",
   "main": "index.js",
   "repository": {
@@ -41,5 +41,8 @@
       ]
     }
   },
-  "homepage": "https://github.com/jpush/jmessage-react-plugin#readme"
+  "homepage": "https://github.com/jpush/jmessage-react-plugin#readme",
+  "dependencies": {
+    "jcore-react-native": "^1.1.8-beta2"
+  }
 }