add group fuc

2021-07-08 18:41:00 +08:00
parent 073b91ba99
commit 3acbacda6d
26 changed files with 536 additions and 141 deletions
--- a/lib/src/manager/im_conversation_manager.dart
+++ b/lib/src/manager/im_conversation_manager.dart
@@ -20,8 +20,8 @@ class ConversationManager {
        .then((value) => _toList(value));
  }

-  /// sourceID 若为单聊则为userID,若为群聊则为groupID
-  /// sessionType 若为单聊则为1,若为群聊则为2
+  /// sourceID:     userID(single chat) ,groupID(group chat)
+  /// sessionType:  1(single chat) ,2(group chat)
  Future<ConversationInfo> getSingleConversation(
      {required String sourceID, required String sessionType}) {
    return _channel
--- a/lib/src/manager/im_group_manager.dart
+++ b/lib/src/manager/im_group_manager.dart
@@ -1,13 +1,20 @@
 import 'dart:convert';

 import 'package:flutter/services.dart';
+import 'package:flutter_openim_sdk/src/listener/group_listener.dart';
 import 'package:flutter_openim_sdk/src/models/group_info.dart';

 class GroupManager {
  MethodChannel _channel;
+  late GroupListener groupListener;

  GroupManager(this._channel);

+  void setGroupListener(GroupListener listener) {
+    this.groupListener = listener;
+    _channel.invokeMethod('setGroupListener', _buildParam({}));
+  }
+
  Future<List<GroupInviteResult>> inviteUserToGroup({
    required String groupId,
    required List<String> uidList,
@@ -21,7 +28,7 @@ class GroupManager {
              'reason': reason,
              'uidList': uidList,
            }))
-        .then((value) => _formatJson(value)
+        .then((value) => (_formatJson(value) as List)
            .map((e) => GroupInviteResult.fromJson(e))
            .toList());
  }
@@ -55,7 +62,7 @@ class GroupManager {
              'gid': groupId,
              'uidList': uidList,
            }))
-        .then((value) => _formatJson(value)
+        .then((value) => (_formatJson(value) as List)
            .map((e) => GroupMembersInfo.fromJson(e))
            .toList());
  }
@@ -80,22 +87,27 @@ class GroupManager {

  Future<List<GroupInfo>> getJoinedGroupList() {
    return _channel.invokeMethod('getJoinedGroupList', _buildParam({})).then(
-        (value) =>
-            _formatJson(value).map((e) => GroupInfo.fromJson(e)).toList());
+        (value) => (_formatJson(value) as List)
+            .map((e) => GroupInfo.fromJson(e))
+            .toList());
  }

-  Future<String> createGroup({
-    required GroupInfo groupInfo,
+  Future<bool> isJoinedGroup({required String gid}) {
+    return getJoinedGroupList()
+        .then((list) => list.where((e) => e.groupID == gid).length > 0);
+  }
+
+  Future<dynamic> createGroup({
+    GroupInfo? groupInfo,
    required List<GroupMemberRole> list,
  }) {
-    return _channel
-        .invokeMethod(
-            'createGroup',
-            _buildParam({
-              'gInfo': groupInfo.toJson(),
-              'memberList': list.map((e) => e.toJson()).toList()
-            }))
-        .then((value) => _formatJson(value)['groupID']);
+    return _channel.invokeMethod(
+        'createGroup',
+        _buildParam({
+          'gInfo': groupInfo?.toJson(),
+          'memberList': list.map((e) => e.toJson()).toList()
+        }));
+    /*.then((value) => _formatJson(value)['groupID'])*/
  }

  Future<dynamic> setGroupInfo({
@@ -113,13 +125,15 @@ class GroupManager {
  }) {
    return _channel
        .invokeMethod('getGroupsInfo', _buildParam({'gidList': gidList}))
-        .then((value) =>
-            _formatJson(value).map((e) => GroupInfo.fromJson(e)).toList());
+        .then((value) {
+      List list = _formatJson(value) ?? [];
+      return list.map((e) => GroupInfo.fromJson(e)).toList();
+    });
  }

  Future<dynamic> joinGroup({
    required String gid,
-    required String reason,
+    String? reason,
  }) {
    return _channel.invokeMethod(
        'joinGroup',
--- a/lib/src/manager/im_manager.dart
+++ b/lib/src/manager/im_manager.dart
@@ -12,6 +12,7 @@ class IMManager {
  late OfflinePushManager offlinePushManager;
  late SignalingManager signalingManager;
  late InitSDKListener _initSDKListener;
+  late String logUid;

  IMManager(this._channel) {
    conversationManager = ConversationManager(_channel);
@@ -55,71 +56,83 @@ class IMManager {
        } else if (call.method == ListenerType.groupListener) {
          var args = call.arguments;
          String type = args['type'];
-          Map<String, dynamic> params = args['data'] == null
-              ? new Map<String, dynamic>()
-              : new Map<String, dynamic>.from(args['data']);
-
-          String groupID = params['groupID'] == null ? '' : params['groupID'];
-          String opReason =
-              params['opReason'] == null ? '' : params['opReason'];
-          bool isAgreeJoin =
-              params['isAgreeJoin'] == null ? false : params['isAgreeJoin'];
-          String customData =
-              params['customData'] == null ? '' : params['customData'];
-
-          Map<String, String> groupAttributeMap =
-              params['groupAttributeMap'] == null
-                  ? new Map<String, String>()
-                  : new Map<String, String>.from(params['groupAttributeMap']);
-
-          List<Map<String, dynamic>> memberListMap =
-              params['memberList'] == null
-                  ? List.empty(growable: true)
-                  : List.from(params['memberList']);
-
-          List<Map<String, dynamic>> groupMemberChangeInfoListMap =
-              params['groupMemberChangeInfoList'] == null
-                  ? List.empty(growable: true)
-                  : List.from(params['groupMemberChangeInfoList']);
-
-          List<Map<String, dynamic>> groupChangeInfoListMap =
-              params['groupChangeInfoList'] == null
-                  ? List.empty(growable: true)
-                  : List.from(params['groupChangeInfoList']);
-
+          Map<dynamic, dynamic> map = args['data'];
          switch (type) {
            case 'onMemberEnter':
+              groupManager.groupListener.onMemberEnter(
+                map['groupId'],
+                (_formatJson(map['memberList']) as List)
+                    .map((e) => GroupMembersInfo.fromJson(e))
+                    .toList(),
+              );
              break;
            case 'onMemberLeave':
+              groupManager.groupListener.onMemberLeave(
+                map['groupId'],
+                GroupMembersInfo.fromJson(_formatJson(map['member'])),
+              );
              break;
            case 'onMemberInvited':
+              groupManager.groupListener.onMemberInvited(
+                map['groupId'],
+                GroupMembersInfo.fromJson(_formatJson(map['opUser'])),
+                (_formatJson(map['memberList']) as List)
+                    .map((e) => GroupMembersInfo.fromJson(e))
+                    .toList(),
+              );
              break;
            case 'onMemberKicked':
-              break;
-            case 'onMemberInfoChanged':
+              groupManager.groupListener.onMemberKicked(
+                map['groupId'],
+                GroupMembersInfo.fromJson(_formatJson(map['opUser'])),
+                (_formatJson(map['memberList']) as List)
+                    .map((e) => GroupMembersInfo.fromJson(e))
+                    .toList(),
+              );
              break;
            case 'onGroupCreated':
-              break;
-            case 'onGroupDismissed':
-              break;
-            case 'onGroupRecycled':
+              groupManager.groupListener.onGroupCreated(
+                map['groupId'],
+              );
              break;
            case 'onGroupInfoChanged':
+              groupManager.groupListener.onGroupInfoChanged(
+                map['groupId'],
+                GroupInfo.fromJson(_formatJson(map['groupInfo'])),
+              );
              break;
            case 'onReceiveJoinApplication':
+              groupManager.groupListener.onReceiveJoinApplication(
+                map['groupId'],
+                GroupMembersInfo.fromJson(_formatJson(map['opUser'])),
+                map['opReason'],
+              );
              break;
            case 'onApplicationProcessed':
+              groupManager.groupListener.onApplicationProcessed(
+                map['groupId'],
+                GroupMembersInfo.fromJson(_formatJson(map['opUser'])),
+                map['agreeOrReject'],
+                map['opReason'],
+              );
              break;
-            case 'onGrantAdministrator':
-              break;
-            case 'onRevokeAdministrator':
-              break;
-            case 'onQuitFromGroup':
-              break;
-            case 'onReceiveRESTCustomData':
-              break;
-            case 'onGroupAttributeChanged':
-              break;
+            // case 'onMemberInfoChanged':
+            //   break;
+            // case 'onGroupDismissed':
+            //   break;
+            // case 'onGroupRecycled':
+            //   break;
+            //
+            // case 'onGrantAdministrator':
+            //   break;
+            // case 'onRevokeAdministrator':
+            //   break;
+            // case 'onQuitFromGroup':
+            //   break;
+            // case 'onReceiveRESTCustomData':
+            //   break;
+            // case 'onGroupAttributeChanged':
+            //   break;
          }
        } else if (call.method == ListenerType.advancedMsgListener) {
          var type = call.arguments['type'];
@@ -266,6 +279,7 @@ class IMManager {
  }

  Future<dynamic> login({required String uid, required String token}) {
+    this.logUid = uid;
    return _channel.invokeMethod(
      'login',
      _buildParam({'uid': uid, 'token': token}),
--- a/lib/src/manager/im_message_manager.dart
+++ b/lib/src/manager/im_message_manager.dart
@@ -103,6 +103,11 @@ class MessageManager {
        'markSingleMessageHasRead', _buildParam({'userID': userID}));
  }

+  Future<dynamic> markGroupMessageHasRead({required String groupID}) {
+    return _channel.invokeMethod(
+        'markGroupMessageHasRead', _buildParam({'groupID': groupID}));
+  }
+
  Future<Message> createTextMessage({required String text}) {
    return _channel
        .invokeMethod('createTextMessage', _buildParam({'text': text}))