Merge pull request #78 from dogbutcat/master

FIX #77: getAllUnreadCount返回数据结构不一致

Author: JoshLipan

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

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

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

@@ -1710,10 +1710,10 @@ public void createChatRoomConversation(String roomId, Callback success) {
      */
     @ReactMethod
     public void getAllUnreadCount(Callback success) {
-        WritableMap map = Arguments.createMap();
+        // WritableMap map = Arguments.createMap();
         int count = JMessageClient.getAllUnReadMsgCount();
-        map.putInt("count", count);
-        success.invoke(map);
+        // map.putInt("count", count);
+        success.invoke(count);
     }
 
     @ReactMethod

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

@@ -243,8 +243,9 @@ public static WritableMap toJSObject(Message msg) {
                             result.putString(Constant.EVENT_TYPE, "group_type_changed");
                             break;
                     }
+                    break;
                 default:
-                    return null;
+                    result.putString(Constant.TYPE, Constant.UNKNOW);
             }
         } catch (Exception e) {
             e.printStackTrace();

document/API.md

@@ -33,6 +33,8 @@ import JMessage from 'jmessage-react-plugin';
   - [applyJoinGroup](#applyjoingroup)
   - [processApplyJoinGroup](#processapplyjoingroup)
   - [dissolveGroup](#dissolvegroup)
+  - [getGroupIds](#getgroupids)
+  - [getGroupInfo](#getgroupinfo)
 - [聊天](#聊天)
   - [createSendMessage](#createsendmessage)
   - [sendMessage](#sendmessage)
@@ -55,6 +57,7 @@ import JMessage from 'jmessage-react-plugin';
   - [exitConversation](#exitconversation)
   - [getConversation](#getconversation)
   - [getConversations](#getconversations)
+  - [getAllUnreadCount](#getallunreadcount)
   - [resetUnreadMessageCount](#resetunreadmessagecount)
 - [聊天室](#聊天室)
   - [getChatRoomListByApp](#getchatroomlistbyapp)
@@ -397,6 +400,65 @@ JMessage.dissolveGroup({ groupId: 'group_id' },
 #### 参数说明
 - groupId (string): 要解散的群组 id。
 
+### getGroupIds
+
+获取当前用户群组
+
+#### 示例
+```js
+JMessage.getGroupIds(
+  (result) => {
+    /**
+     * result {Array[Number]} 当前用户所加入的群组的groupID的list
+     */
+  }, (error) => {
+    /**
+     * error {Object} {code:Number,desc:String}
+     */
+  }
+)
+```
+
+#### 参数说明
+
+无
+
+### getGroupInfo
+
+根据群组id获取群组信息
+
+#### 示例
+
+```js
+JMessage.getGroupInfo(
+  { id: "1234567" },
+  (result) => {
+    /**
+     * result {Object} 群组信息
+        {
+          desc:""
+          id:"1234567"
+          isBlocked:false
+          isNoDisturb:false
+          level:0
+          maxMemberCount:500
+          name:"China no 1"
+          owner:"1234"
+          ownerAppKey:"abcdef..."
+          type:"group" // or single
+        }
+     */
+  }, (error) => {
+    /**
+     * error {Object} {code:Number,desc:String}
+     */
+  }
+)
+```
+
+#### 参数说明
+
+- id(string): 指定群组
 
 ### addGroupAdmins
 
@@ -1157,6 +1219,28 @@ JMessage.getConversations((conArr) => { // conArr: 会话数组。
 })
 ```
 
+### getAllUnreadCount
+
+当前用户所有会话的未读消息总数
+
+- ⚠️  截止jmessage-sdk-2.6.1 返回的数量为会话列表的未读总数即包括了被移除的群组、好友的未读.
+
+#### 示例
+
+```js
+JMessage.getAllUnreadCount(
+  (result) => {
+    /**
+     * result {Number} 当前用户所有会话的未读消息总数
+     */
+  }
+)
+```
+
+#### 参数说明
+
+无
+
 ### resetUnreadMessageCount
 
 重置会话的未读消息数。