Merge pull request #66 from jpush/dev

Dev

Author: huangminlinux

android/libs/jmessage-android_v2.4.1.jar

@@ -36,6 +36,7 @@ public class Constant {
     public static final String SERVER_ID = "serverMessageId";
     public static final String MESSAGE_ID = "messageId";
     public static final String GROUP_ID = "groupId";
+    public static final String GROUP_TYPE = "groupType";
     public static final String NAME = "name";
     public static final String DESC = "desc";
     public static final String LEVEL = "level";
@@ -47,6 +48,16 @@ public class Constant {
     public static final String LATEST_MESSAGE = "latestMessage";
     public static final String UNREAD_COUNT = "unreadCount";
     public static final String CONVERSATION_TYPE = "conversationType";
+    public static final String IS_INITIATIVE_APPLY = "isInitiativeApply";
+    public static final String SEND_APPLY_USER = "sendApplyUser";
+    public static final String JOIN_GROUP_USERS = "joinGroupUsers";
+    public static final String IS_AGREE = "isAgree";
+    public static final String GROUP_ADMIN = "groupAdmin";
+    public static final String USERS = "users";
+    public static final String GROUP_MANAGER = "groupManager";
+    public static final String START = "start";
+    public static final String COUNT = "count";
+    public static final String IS_RESPOND_INVITER = "isRespondInviter";
 
     /**
      * Message
@@ -94,11 +105,19 @@ public class Constant {
     static final String PROGRESS = "progress";
     public static final String UNRECEIPT_COUNT = "unreceiptCount";
     public static final String IS_DESCEND = "isDescend";
+
     /**
      * ChatRoom
      */
     public static final String ROOM_ID = "roomId";
     public static final String ROOM_IDS = "roomIds";
     public static final String ROOM_NAME = "roomName";
     public static final String MEMBER_COUNT = "memberCount";
+    /**
+     * Event
+     */
+    public static final String EVENT_ID = "eventId";
+    public static final String EVENTS = "events";
+    public static final String APPLY_EVENT_ID = "applyEventId";
+
 }

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

@@ -34,6 +34,7 @@
 import cn.jpush.im.android.api.enums.MessageDirect;
 import cn.jpush.im.android.api.model.ChatRoomInfo;
 import cn.jpush.im.android.api.model.Conversation;
+import cn.jpush.im.android.api.model.GroupBasicInfo;
 import cn.jpush.im.android.api.model.GroupInfo;
 import cn.jpush.im.android.api.model.Message;
 import cn.jpush.im.android.api.model.UserInfo;
@@ -119,6 +120,19 @@ public static WritableMap toJSObject(GroupInfo groupInfo) {
         return result;
     }
 
+    public static WritableMap toJSObject(GroupBasicInfo groupInfo) {
+        WritableMap result = Arguments.createMap();
+
+        result.putString(Constant.TYPE, Constant.TYPE_GROUP);
+        result.putString(Constant.ID, String.valueOf(groupInfo.getGroupID()));
+        result.putString(Constant.NAME, groupInfo.getGroupName());
+        result.putString(Constant.DESC, groupInfo.getGroupDescription());
+        result.putInt(Constant.LEVEL, groupInfo.getGroupLevel());
+        result.putString(Constant.AVATAR_THUMB_PATH, groupInfo.getAvatar());
+        result.putInt(Constant.MAX_MEMBER_COUNT, groupInfo.getMaxMemberCount());
+        return result;
+    }
+
     public static WritableMap toJSObject(Message msg) {
         WritableMap result = Arguments.createMap();
         try {
@@ -169,6 +183,7 @@ public static WritableMap toJSObject(Message msg) {
                 case file:
                     result.putString(Constant.TYPE, Constant.FILE);
                     FileContent fileContent = (FileContent) content;
+                    result.putString(Constant.PATH, fileContent.getLocalPath());
                     result.putString(Constant.FILE_NAME, fileContent.getFileName());
                     break;
                 case custom:
@@ -200,6 +215,9 @@ public static WritableMap toJSObject(Message msg) {
                             //群成员退群事件
                             result.putString(Constant.EVENT_TYPE, "group_member_exit");
                             break;
+                        case group_info_updated:
+                            result.putString(Constant.EVENT_TYPE, "group_info_updated");
+                            break;
                     }
                 default:
                     return null;
@@ -277,6 +295,8 @@ public static WritableArray toJSArray(List list) {
                     array.pushMap(toJSObject((UserInfo) object));
                 } else if (object instanceof GroupInfo) {
                     array.pushMap(toJSObject((GroupInfo) object));
+                } else if (object instanceof GroupBasicInfo) {
+                    array.pushMap(toJSObject((GroupBasicInfo) object));
                 } else if (object instanceof Message) {
                     array.pushMap(toJSObject((Message) object));
                 } else if (object instanceof Conversation) {

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

@@ -23,6 +23,16 @@ import JMessage from 'jmessage-react-plugin';
   - [updateMyInfo](#updatemyinfo)
   - [downloadThumbUserAvatar](#downloadthumbuseravatar)
   - [downloadOriginalUserAvatar](#downloadoriginaluseravatar)
+
+- [群组](#群组)
+  - [createGroup](#creategroup)
+  - [addGroupAdmins](#addgroupadmins)
+  - [removeGroupAdmins](#removegroupadmins)
+  - [changeGroupType](#changegrouptype)
+  - [getPublicGroupInfos](#getpublicgroupinfos)
+  - [applyJoinGroup](#applyjoingroup)
+  - [processApplyJoinGroup](#processapplyjoingroup)
+  - [dissolveGroup](#dissolvegroup)
 - [聊天](#聊天)
   - [createSendMessage](#createsendmessage)
   - [sendMessage](#sendmessage)
@@ -82,6 +92,21 @@ import JMessage from 'jmessage-react-plugin';
   - [登录状态变更](#addloginstatechangedlistener)
     - [addLoginStateChangedListener](#addloginstatechangedlistener)
     - [removeLoginStateChangedListener](#addloginstatechangedlistener)
+
+  - [监听接收入群申请事件](#addreceiveapplyjoingroupapprovallistener)
+    - [addReceiveApplyJoinGroupApprovalListener](#addreceiveapplyjoingroupapprovallistener)
+    - [removeReceiveApplyJoinGroupApprovalListener](#removereceiveapplyjoingroupapprovallistener)
+
+  - [监听管理员拒绝入群申请事件](#addreceivegroupadminrejectlistener)
+    - [addReceiveGroupAdminRejectListener](#addreceivegroupadminrejectlistener)
+    - [removeReceiveGroupAdminRejectListener](#removereceivegroupadminrejectlistener)
+
+  - [监听管理员同意入群申请事件](#addreceivegroupadminapprovallistener)
+    - [addReceiveGroupAdminApprovalListener](#addreceivegroupadminapprovallistener)
+    - [removeReceiveGroupAdminApprovalListener](#removereceivegroupadminapprovallistener)
+
+
+
   - [点击消息通知事件（Android Only）](#addclickmessagenotificationlistener)
     - [addClickMessageNotificationListener](#addclickmessagenotificationlistener)
     - [removeClickMessageNotificationListener](#addclickmessagenotificationlistener)
@@ -347,8 +372,151 @@ JMessage.createGroup({ name: 'group_name', desc: 'group_desc' },
 
 #### 参数说明
 
-- name: 群组名。不支持 "\n" 和 "\r" 字符，长度限制为 0 ~ 64 Byte。
-- desc: 群组描述。长度限制为 0 ~ 250 Byte。
+- name (string): 群组名。不支持 "\n" 和 "\r" 字符，长度限制为 0 ~ 64 Byte。
+- groupType (string): 指定创建群的类型，可以为 'private' 和 'public', 默认为 private。
+- desc (string): 群组描述。长度限制为 0 ~ 250 Byte。
+
+
+### dissolveGroup
+
+解散群
+
+#### 示例
+```js
+JMessage.dissolveGroup({ groupId: 'group_id' },
+  () => {  // 
+    // do something.
+
+  }, (error) => {
+    var code = error.code
+    var desc = error.description
+  })
+```
+
+#### 参数说明
+- groupId (string): 要解散的群组 id。
+
+
+### addGroupAdmins
+
+批量添加管理员
+
+#### 示例
+```js
+JMessage.addGroupAdmins({ groupId: 'group_id', usernames: ['ex_username1', 'ex_username2'] },
+  () => {  // 
+    // do something.
+
+  }, (error) => {
+    var code = error.code
+    var desc = error.description
+  })
+```
+
+#### 参数说明
+- groupId (string): 指定操作的群 groupId。
+- usernames (array<string>): 被添加的的用户名数组。
+
+### removeGroupAdmins
+
+批量删除管理员
+
+#### 示例
+```js
+JMessage.removeGroupAdmins({ groupId: 'group_id', usernames: ['ex_username1', 'ex_username2'] },
+  () => {  // 
+    // do something.
+
+  }, (error) => {
+    var code = error.code
+    var desc = error.description
+  })
+```
+
+#### 参数说明
+- groupId (string): 指定操作的群 groupId。
+- usernames (array<string>): 被移除的的用户名数组。
+
+### changeGroupType
+
+修改群类型
+
+#### 示例
+```js
+JMessage.changeGroupType({ groupId: 'group_id', type: 'public' },
+  () => {  // 
+    // do something.
+
+  }, (error) => {
+    var code = error.code
+    var desc = error.description
+  })
+```
+
+#### 参数说明
+- groupId (string): 指定操作的群 groupId。
+- type (string): 要修改的类型可以为如下值  'private' | 'public'
+
+### getPublicGroupInfos
+
+分页获取指定 appKey 下的共有群
+
+#### 示例
+```js
+JMessage.getPublicGroupInfos({ appKey: 'my_appkey', start: 0, count: 20 },
+  (groudArr) => {  //group = [{GroupInfo}] 
+    // do something.
+
+  }, (error) => {
+    var code = error.code
+    var desc = error.description
+  })
+```
+
+#### 参数说明
+- appKey (string): 获取指定 appkey
+- start (int): 开始的位置
+- count (int): 获取的数量
+
+### applyJoinGroup
+
+申请入群（公开群）
+
+#### 示例
+```js
+JMessage.applyJoinGroup({ appKey: 'group_id', reason: 'Hello I from ...' },
+  () => {  
+    // do something.
+
+  }, (error) => {
+    var code = error.code
+    var desc = error.description
+  })
+```
+
+#### 参数说明
+
+### processApplyJoinGroup
+
+批量处理入群（公开群）申请
+
+#### 示例
+```js
+JMessage.processApplyJoinGroup({ events: ['ex_event_id_1', 'ex_event_id_2'], reason: 'Hello I from ...' },
+  () => {  
+    // do something.
+
+  }, (error) => {
+    var code = error.code
+    var desc = error.description
+  })
+```
+
+#### 参数说明
+- events (array<string>): eventId 数组,当有用户申请入群的时候(或者被要求)会回调一个 event(通过 addReceiveApplyJoinGroupApprovalListener 监听)，每个 event 会有个 id，用于审核入群操作。
+- reason (string): 入群理由。
+
+
 
 ## 聊天
 
@@ -1464,3 +1632,71 @@ JMessage.removeUploadProgressListener(listener) // 移除监听(一般在 compon
 - result
   - messageId：消息 id。
   - progress：上传进度，从 0-1 float 类型。
+
+### 群组事件
+
+#### addReceiveApplyJoinGroupApprovalListener
+
+监听接收入群申请事件
+
+##### 示例
+
+```javascript
+var listener = (result) => { }
+
+JMessage.addReceiveApplyJoinGroupApprovalListener(listener) // 添加监听
+JMessage.removeReceiveApplyJoinGroupApprovalListener(listener) // 移除监听(一般在 componentWillUnmount 中调用)
+```
+
+##### 回调参数说明
+
+- event
+  - eventId (string)：消息 id。
+  - groupId (string)：申请入群的 groudId。
+  - isInitiativeApply (boolean)：是否是用户主动申请入群，YES：主动申请加入，NO：被邀请加入
+  - sendApplyUser ([{UserInfo}])：发送申请的用户
+  - reason (string)：入群原因
+
+#### addReceiveGroupAdminRejectListener
+
+监听管理员拒绝入群申请事件
+
+##### 示例
+
+```javascript
+var listener = (result) => { }
+
+JMessage.addReceiveGroupAdminRejectListener(listener) // 添加监听
+JMessage.removeReceiveGroupAdminRejectListener(listener) // 移除监听(一般在 componentWillUnmount 中调用)
+```
+
+##### 回调参数说明
+
+- result
+  - eventId (string): 消息 id。
+  - rejectReason (string): 拒绝原因。
+  - groupManager ({UserInfo}): 操作的管理员
+
+
+#### addReceiveGroupAdminApprovalListener
+
+监听管理员同意入群申请事件
+
+##### 示例
+
+```javascript
+var listener = (result) => { }
+
+JMessage.addReceiveGroupAdminApprovalListener(listener) // 添加监听
+JMessage.removeReceiveGroupAdminApprovalListener(listener) // 移除监听(一般在 componentWillUnmount 中调用)
+```
+
+##### 回调参数说明
+
+- result
+  - isAgreeApply (boolean): 管理员是否同意申请，YES：同意，NO：拒绝.
+  - applyEventID (string): 申请入群事件的事件 id.
+  - groupId (string): 群 gid.
+  - groupAdmin {GroupInfo}: 操作的管理员.
+  - users [{UserInfo}]: 申请或被邀请加入群的用户，即：实际入群的用户
+

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

@@ -12,6 +12,7 @@
   - [FileMessage](#filemessage)
   - [CustomMessage](#custommessage)
   - [EventMessage](#eventmessage)
+  
 
 ## UserInfo
 
@@ -38,15 +39,16 @@ isFriend:boolean            // 是否为好友
 ```js
 type: 'group',
 id: string,                 // 群组 id
-avatarThumbPath: string,    // 头像的缩略图地址
+groupType: string,          // 'public' | 'private'  公共群和私有群
+avatarThumbPath: string,    // 头像的缩略图地址，不过不存在可以调用 下载缩略图的相关接口
 name: string,               // 群组名称
 desc: string,               // 群组描述
-level: number,              // 群组等级，默认等级 4
-owner: string,              // 群主的 username
-ownerAppKey: string,        // 群主的 appKey
+level?: number,              // 群组等级，默认等级 4
+owner?: string,              // 群主的 username
+ownerAppKey?: string,        // 群主的 appKey
 maxMemberCount: number,     // 最大成员数
-isNoDisturb: boolean,       // 是否免打扰
-isBlocked: boolean          // 是否屏蔽群消息
+isNoDisturb?: boolean,       // 是否免打扰
+isBlocked?: boolean          // 是否屏蔽群消息
 ```
 
 ## ChatRoomInfo