Merge remote-tracking branch 'upstream/master'

Author: JoshLipan

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

@@ -105,7 +105,7 @@ public class JMessageModule extends ReactContextBaseJavaModule {
 
     private Context mContext;
     private JMessageUtils mJMessageUtils;
-    private static HashMap<String, GroupApprovalEvent> groupApprovalEventHashMap;
+    public static HashMap<String, GroupApprovalEvent> groupApprovalEventHashMap;
 
     public JMessageModule(ReactApplicationContext reactContext, boolean shutdownToast) {
         super(reactContext);
@@ -1874,7 +1874,7 @@ public void processApplyJoinGroup(final ReadableMap map, final Callback success,
             Boolean isRespondInviter = map.getBoolean(Constant.IS_RESPOND_INVITER);
             ReadableArray array = map.getArray(Constant.EVENTS);
 
-            List<GroupApprovalEvent> groupApprovalEventList = new ArrayList<>();
+            final List<GroupApprovalEvent> groupApprovalEventList = new ArrayList<>();
 
             for (int i = 0; i < array.size(); i++) {
                 GroupApprovalEvent groupApprovalEvent = groupApprovalEventHashMap.get(array.getString(i));
@@ -1900,8 +1900,23 @@ public void gotResult(int status, String desc) {
                         });
 
             } else {
-                // 忽略拒绝处理，直接返回成功信息
-                mJMessageUtils.handleCallback(0, "", success, fail);
+                // 批量处理只有接受，插件做循环单拒绝
+                for (int i = 0; i < groupApprovalEventList.size(); i++) {
+                    GroupApprovalEvent groupApprovalEvent = groupApprovalEventList.get(i);
+                    final int finalI = i;
+                    groupApprovalEvent.refuseGroupApproval(groupApprovalEvent.getFromUsername(),
+                            groupApprovalEvent.getfromUserAppKey(),
+                            reason,
+                            new BasicCallback() {
+                                @Override
+                                public void gotResult(int status, String desc) {
+                                    // 统一返回最后一个拒绝结果
+                                    if(finalI == groupApprovalEventList.size()-1){
+                                        mJMessageUtils.handleCallback(status, desc, success, fail);
+                                    }
+                                }
+                            });
+                }
             }
         } catch (Exception e) {
             e.printStackTrace();

document/API.md

@@ -35,6 +35,9 @@ import JMessage from 'jmessage-react-plugin';
   - [dissolveGroup](#dissolvegroup)
   - [getGroupIds](#getgroupids)
   - [getGroupInfo](#getgroupinfo)
+  - [updateGroupInfo](#updategroupinfo)
+  - [addGroupMembers](#addgroupmembers)
+  - [removeGroupMembers](#removegroupmembers)
 - [聊天](#聊天)
   - [createSendMessage](#createsendmessage)
   - [sendMessage](#sendmessage)
@@ -460,6 +463,71 @@ JMessage.getGroupInfo(
 
 - id(string): 指定群组
 
+### updateGroupInfo
+
+更新群组信息。
+
+#### 示例
+
+```js
+JMessage.updateGroupInfo({ id: 'groupId' ,newName: 'group_name', newDesc: 'group_desc' },
+  () => {  
+    // do something.
+
+  }, (error) => {
+    var code = error.code
+    var desc = error.description
+  })
+```
+
+#### 参数说明
+
+- id (string): 指定操作的群 groupId
+- newName (string): 群组名。不支持 "\n" 和 "\r" 字符，长度限制为 0 ~ 64 Byte。
+- newDesc (string): 群组描述。长度限制为 0 ~ 250 Byte。
+
+### addGroupMembers
+
+批量添加群成员
+
+#### 示例
+```js
+JMessage.addGroupAdmins({ id: 'group_id', usernameArray: ['ex_username1', 'ex_username2'], appKey: 'appkey' },
+  () => {  // 
+    // do something.
+
+  }, (error) => {
+    var code = error.code
+    var desc = error.description
+  })
+```
+
+#### 参数说明
+- id (string): 指定操作的群 groupId
+- usernameArray (array<string>): 被添加的的用户名数组。
+- appKey: 被添加用户所属应用的 AppKey。如果不填，默认为当前应用。
+
+### removeGroupMembers
+
+批量删除群成员
+
+#### 示例
+```js
+JMessage.removeGroupMembers({ id: 'group_id', usernameArray: ['ex_username1', 'ex_username2'], appKey: 'appkey' },
+  () => {  // 
+    // do something.
+
+  }, (error) => {
+    var code = error.code
+    var desc = error.description
+  })
+```
+
+#### 参数说明
+- id (string): 指定操作的群 groupId
+- usernameArray (array<string>): 被添加的的用户名数组。
+- appKey: 被添加用户所属应用的 AppKey。如果不填，默认为当前应用。
+
 ### addGroupAdmins
 
 批量添加管理员
@@ -547,7 +615,7 @@ JMessage.getPublicGroupInfos({ appKey: 'my_appkey', start: 0, count: 20 },
 
 #### 示例
 ```js
-JMessage.applyJoinGroup({ appKey: 'group_id', reason: 'Hello I from ...' },
+JMessage.applyJoinGroup({ groupId: 'group_id', reason: 'Hello I from ...' },
   () => {  
     // do something.
 

index.js

@@ -1203,15 +1203,8 @@ export default class JMessage {
     static getChatRoomConversationList(callback) {
         JMessageModule.getChatRoomConversationList(callback);
     }
-
-
 
 
-
-
-
-
-
     /**
      * 获取所有会话未读消息总数
      * @param {function} callback = function([{count: number}])

package.json

@@ -1,6 +1,6 @@
 {
   "name": "jmessage-react-plugin",
-  "version": "2.5.1",
+  "version": "2.5.3",
   "description": "a jmessage plugin for react native application",
   "main": "index.js",
   "repository": {