Merge pull request #49 from jpush/dev

Dev

Author: KenChoi1992

android/src/io/jchat/android/Constant.java

@@ -93,6 +93,7 @@ public class Constant {
     static final String MESSAGE_ARRAY = "messageArray";
     static final String PROGRESS = "progress";
     public static final String UNRECEIPT_COUNT = "unreceiptCount";
+    public static final String IS_DESCEND = "isDescend";
     /**
      * ChatRoom
      */

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

@@ -25,6 +25,7 @@
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -508,6 +509,14 @@ public void getHistoryMessages(ReadableMap map, Callback success, Callback fail)
             int from = map.getInt(Constant.FROM);
             int limit = map.getInt(Constant.LIMIT);
             List<Message> messages = conversation.getMessagesFromNewest(from, limit);
+            // Is descend 为 false，即默认按照时间顺序排列，2.3.5 新增字段
+            boolean isDescend = false;
+            if (map.hasKey(Constant.IS_DESCEND)) {
+                isDescend = map.getBoolean(Constant.IS_DESCEND);
+            }
+            if (!isDescend) {
+                Collections.reverse(messages);
+            }
             success.invoke(ResultUtils.toJSArray(messages));
         } catch (Exception e) {
             e.printStackTrace();

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

@@ -109,7 +109,9 @@ public static WritableMap toJSObject(GroupInfo groupInfo) {
         result.putString(Constant.DESC, groupInfo.getGroupDescription());
         result.putInt(Constant.LEVEL, groupInfo.getGroupLevel());
         result.putString(Constant.OWNER, groupInfo.getGroupOwner());
-        result.putString(Constant.AVATAR_THUMB_PATH, groupInfo.getAvatarFile().getAbsolutePath());
+        if (groupInfo.getAvatarFile() != null) {
+            result.putString(Constant.AVATAR_THUMB_PATH, groupInfo.getAvatarFile().getAbsolutePath());
+        }
         result.putString(Constant.OWNER_APP_KEY, groupInfo.getOwnerAppkey());
         result.putInt(Constant.MAX_MEMBER_COUNT, groupInfo.getMaxMemberCount());
         result.putBoolean(Constant.IS_NO_DISTURB, groupInfo.getNoDisturb() == 1);

document/API.md

@@ -699,6 +699,7 @@ JMessage.getHistoryMessages({ type: 'single', username: 'username',
 - groupId: 对象群组 id。当 `type` 为 'group' 时，`groupId` 为必填。
 - from: 第一条消息对应的下标，起始为 0。
 - limit: 消息数。当 from = 0 并且 limit = -1 时，返回所有的历史消息。
+- isDescend: 是否降序（消息时间戳从大到小排序），默认为 false。
 
 ### downloadOriginalImage
 

example/android/app/app.iml

@@ -84,28 +84,17 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/sourceFolderJavaResources" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 25 Platform (2)" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
@@ -140,6 +129,7 @@
     <orderEntry type="library" name="com.facebook.fbui.textlayoutbuilder:staticlayout-proxy:1.0@jar" level="project" />
     <orderEntry type="library" name="com.android.support:appcompat-v7-25.3.1" level="project" />
     <orderEntry type="library" name="__local_aars__:/Users/caiyg/Desktop/github/jmessage-react-plugin/example/node_modules/jcore-react-native/android/libs/jcore-android-1.1.8.jar:unspecified@jar" level="project" />
+    <orderEntry type="library" name="__local_aars__:/Users/caiyg/Desktop/github/jmessage-react-plugin/example/node_modules/jmessage-react-plugin/android/libs/jmessage-android_v2.5.0.jar:unspecified@jar" level="project" />
     <orderEntry type="library" name="org.greenrobot:eventbus:3.0.0@jar" level="project" />
     <orderEntry type="library" name="com.android.support:support-vector-drawable-25.3.1" level="project" />
     <orderEntry type="library" name="com.facebook.fbui.textlayoutbuilder:textlayoutbuilder-1.0.0" level="project" />

example/android/app/src/main/java/com/sample/application/MainApplication.java

@@ -50,6 +50,7 @@ public void onCreate() {
         SoLoader.init(this, /* native exopackage */ false);
         Log.i("MainApplication", "Init JMessageClient");
         JMessageClient.setDebugMode(true);
-//        JMessageClient.init(this, true);
+        // JMessage SDK 2.5.0 后必须在 MainApplication 中初始化
+        JMessageClient.init(this, true);
     }
 }

example/app/routes/Home/ConversationList/ConversationListStore.js

@@ -35,7 +35,9 @@ class ConversationListStore {
                 })
             }
         } else if (item.type === "group") {
-            item.appKey = conversation.target.ownerAppKey
+            if (conversation.target.ownerAppKey != undefined) {
+                item.appKey = conversation.target.ownerAppKey
+            }
             item.groupId = conversation.target.id
             item.displayName = conversation.target.name
             item.avatarThumbPath = conversation.target.avatarThumbPath

example/app/routes/Home/ConversationList/index.js

@@ -238,10 +238,10 @@ export default class ConversationList extends React.Component {
                             <Button
                                 onPress={() => {
 
-                                    JMessage.createGroup({ name: this.state.modalText, desc: "" }, (group) => {
+                                    JMessage.createGroup({ name: this.state.modalText, desc: "" }, (groupId) => {
                                         var params = {}
                                         params.type = 'group'
-                                        params.groupId = group.id
+                                        params.groupId = groupId
                                         this.setState({ isShowModal: false })
                                         this.createConversation(params)
                                     }, (error) => {

example/package.json

@@ -9,7 +9,7 @@
     "babel-plugin-transform-decorators-legacy": "^1.3.4",
     "babel-preset-react-native-stage-0": "^1.0.1",
     "jcore-react-native": "^1.2.3",
-    "jmessage-react-plugin": "^2.3.0",
+    "jmessage-react-plugin": "^2.3.5",
     "mobx": "^3.4.1",
     "mobx-react": "^4.3.5",
     "react": "^16.0.0",

index.js

@@ -322,6 +322,7 @@ export default class JMessage {
      *  'appKey': String,          // 当 type = single 时，用于指定对象所属应用的 appKey。如果为空，默认为当前应用。
      *  'from': Number,            // 开始的消息下标。
      *  'limit': Number            // 要获取的消息数。比如当 from = 0, limit = 10 时，是获取第 0 - 9 条历史消息。
+     *  'isDescend': Bool          // 2.3.5 新增。如果设置为 true，则返回的消息列表按照时间降序排列，反之，按照时间顺序排列。
      * }
      * @param {function} success = function (messageArray)) {}  // 以参数形式返回历史消息对象数组
      * @param {function} error = function ({'code': '错误码', 'description': '错误信息'}) {}