3.2.2

3 years ago · cd06c3bb5a
parent a6aea5496a
commit cd06c3bb5a
10 changed files with 180 additions and 62 deletions
--- a/.idea/libraries/Dart_SDK.xml
+++ b/.idea/libraries/Dart_SDK.xml
@ -1,26 +1,25 @@
 <component name="libraryTable">
  <library name="Dart SDK">
    <CLASSES>
-      <root url="file://$USER_HOME$/Development/flutter/bin/cache/dart-sdk/lib/async" />
-      <root url="file://$USER_HOME$/Development/flutter/bin/cache/dart-sdk/lib/cli" />
-      <root url="file://$USER_HOME$/Development/flutter/bin/cache/dart-sdk/lib/collection" />
-      <root url="file://$USER_HOME$/Development/flutter/bin/cache/dart-sdk/lib/convert" />
-      <root url="file://$USER_HOME$/Development/flutter/bin/cache/dart-sdk/lib/core" />
-      <root url="file://$USER_HOME$/Development/flutter/bin/cache/dart-sdk/lib/developer" />
-      <root url="file://$USER_HOME$/Development/flutter/bin/cache/dart-sdk/lib/ffi" />
-      <root url="file://$USER_HOME$/Development/flutter/bin/cache/dart-sdk/lib/html" />
-      <root url="file://$USER_HOME$/Development/flutter/bin/cache/dart-sdk/lib/indexed_db" />
-      <root url="file://$USER_HOME$/Development/flutter/bin/cache/dart-sdk/lib/io" />
-      <root url="file://$USER_HOME$/Development/flutter/bin/cache/dart-sdk/lib/isolate" />
-      <root url="file://$USER_HOME$/Development/flutter/bin/cache/dart-sdk/lib/js" />
-      <root url="file://$USER_HOME$/Development/flutter/bin/cache/dart-sdk/lib/js_util" />
-      <root url="file://$USER_HOME$/Development/flutter/bin/cache/dart-sdk/lib/math" />
-      <root url="file://$USER_HOME$/Development/flutter/bin/cache/dart-sdk/lib/mirrors" />
-      <root url="file://$USER_HOME$/Development/flutter/bin/cache/dart-sdk/lib/svg" />
-      <root url="file://$USER_HOME$/Development/flutter/bin/cache/dart-sdk/lib/typed_data" />
-      <root url="file://$USER_HOME$/Development/flutter/bin/cache/dart-sdk/lib/web_audio" />
-      <root url="file://$USER_HOME$/Development/flutter/bin/cache/dart-sdk/lib/web_gl" />
-      <root url="file://$USER_HOME$/Development/flutter/bin/cache/dart-sdk/lib/web_sql" />
+      <root url="file://$PROJECT_DIR$/../../flutter/bin/cache/dart-sdk/lib/async" />
+      <root url="file://$PROJECT_DIR$/../../flutter/bin/cache/dart-sdk/lib/cli" />
+      <root url="file://$PROJECT_DIR$/../../flutter/bin/cache/dart-sdk/lib/collection" />
+      <root url="file://$PROJECT_DIR$/../../flutter/bin/cache/dart-sdk/lib/convert" />
+      <root url="file://$PROJECT_DIR$/../../flutter/bin/cache/dart-sdk/lib/core" />
+      <root url="file://$PROJECT_DIR$/../../flutter/bin/cache/dart-sdk/lib/developer" />
+      <root url="file://$PROJECT_DIR$/../../flutter/bin/cache/dart-sdk/lib/ffi" />
+      <root url="file://$PROJECT_DIR$/../../flutter/bin/cache/dart-sdk/lib/html" />
+      <root url="file://$PROJECT_DIR$/../../flutter/bin/cache/dart-sdk/lib/indexed_db" />
+      <root url="file://$PROJECT_DIR$/../../flutter/bin/cache/dart-sdk/lib/io" />
+      <root url="file://$PROJECT_DIR$/../../flutter/bin/cache/dart-sdk/lib/isolate" />
+      <root url="file://$PROJECT_DIR$/../../flutter/bin/cache/dart-sdk/lib/js" />
+      <root url="file://$PROJECT_DIR$/../../flutter/bin/cache/dart-sdk/lib/js_util" />
+      <root url="file://$PROJECT_DIR$/../../flutter/bin/cache/dart-sdk/lib/math" />
+      <root url="file://$PROJECT_DIR$/../../flutter/bin/cache/dart-sdk/lib/mirrors" />
+      <root url="file://$PROJECT_DIR$/../../flutter/bin/cache/dart-sdk/lib/svg" />
+      <root url="file://$PROJECT_DIR$/../../flutter/bin/cache/dart-sdk/lib/typed_data" />
+      <root url="file://$PROJECT_DIR$/../../flutter/bin/cache/dart-sdk/lib/web_audio" />
+      <root url="file://$PROJECT_DIR$/../../flutter/bin/cache/dart-sdk/lib/web_gl" />
    </CLASSES>
    <JAVADOC />
    <SOURCES />
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,3 +1,9 @@
+## 2.3.2
+
+- Fix bug
+- Add createAdvancedQuoteMessage method for MessageManager
+- Add createAdvancedTextMessage method for MessageManager
+
 ## 2.3.0+1

 - Fix bug
@ -189,33 +195,42 @@ Fix bug
 2. Add createFileMessageFromFullPath method

 ## 0.0.9+4
+
 Fix ios friendship params error

 ## 0.0.9+3
+
 Ios native remove method 'removeAdvancedMsgListener'

 ## 0.0.9+2
+
 1. Fix bug
 2. Upgrade sdk

 ## 0.0.9+1
+
 Fix bug

 ## 0.0.9
+
 Add ios support

 ## 0.0.8
+
 Upgrade sdk to 0.0.14 </br>
 Sending a message adds a retry mechanism

 ## 0.0.7
+
 1. Add a new method to obtain conversation id based on user id or group id </br>
 2. Modify the type of conversation manager input parameter sessionType to int

 ## 0.0.6
+
 Fix bug

 ## 0.0.5
+
 Upgrade sdk </br>
 Fix message error bug

@ -224,11 +239,14 @@ Fix message error bug
 Replace the input parameters of the createCustomMessage method from Uint8List to Map

 ## 0.0.3
+
 Upgrade sdk </br>
 Fix bug </br>

 ## 0.0.2
-1. Move the markSingleMessageHasRead, markGroupMessageHasRead and getTotalUnreadMsgCount methods from the MessageManager class to the ConversationManager class. </br>
+
+1. Move the markSingleMessageHasRead, markGroupMessageHasRead and getTotalUnreadMsgCount methods
+   from the MessageManager class to the ConversationManager class. </br>
 2. Modify the parameters of the setFriendInfo method. </br>
 3. Modify the parameters of the createGroup and setGroupInfo methods.

--- a/android/src/main/java/io/openim/flutter_openim_sdk/manager/MessageManager.java
+++ b/android/src/main/java/io/openim/flutter_openim_sdk/manager/MessageManager.java
@ -11,6 +11,7 @@ import open_im_sdk.Open_im_sdk;

 public class MessageManager extends BaseManager {
    private final static String KEY_ID = "id";
+
    //    private final static Map<String, OnAdvancedMsgListener> listeners = new HashMap<>();
 /*   private static boolean initializedListener = false;
    private final static Map<String, AdvancedMsgListener> listeners = new ConcurrentHashMap<>();
@ -201,6 +202,7 @@ public class MessageManager extends BaseManager {
                        value(methodCall, "operationID"),
                        value(methodCall, "imagePath")));
    }
+
    public void createSoundMessage(MethodCall methodCall, MethodChannel.Result result) {
        CommonUtil.runMainThreadReturn(result,
                Open_im_sdk.createSoundMessage(
@ -413,4 +415,23 @@ public class MessageManager extends BaseManager {
                jsonValue(methodCall, "options")
        );
    }
+
+    public void createAdvancedTextMessage(MethodCall methodCall, MethodChannel.Result result) {
+        CommonUtil.runMainThreadReturn(result,
+                Open_im_sdk.createAdvancedTextMessage(
+                        value(methodCall, "operationID"),
+                        value(methodCall, "text"),
+                        jsonValue(methodCall, "richMessageInfoList")
+                ));
+    }
+
+    public void createAdvancedQuoteMessage(MethodCall methodCall, MethodChannel.Result result) {
+        CommonUtil.runMainThreadReturn(result,
+                Open_im_sdk.createAdvancedQuoteMessage(
+                        value(methodCall, "operationID"),
+                        value(methodCall, "quoteText"),
+                        jsonValue(methodCall, "quoteMessage"),
+                        jsonValue(methodCall, "richMessageInfoList")
+                ));
+    }
 }
--- a/example/pubspec.lock
+++ b/example/pubspec.lock
@ -5,56 +5,56 @@ packages:
    dependency: transitive
    description:
      name: async
-      url: "https://pub.flutter-io.cn"
+      url: "https://mirrors.sjtug.sjtu.edu.cn/dart-pub/"
    source: hosted
    version: "2.8.2"
  boolean_selector:
    dependency: transitive
    description:
      name: boolean_selector
-      url: "https://pub.flutter-io.cn"
+      url: "https://mirrors.sjtug.sjtu.edu.cn/dart-pub/"
    source: hosted
    version: "2.1.0"
  characters:
    dependency: transitive
    description:
      name: characters
-      url: "https://pub.flutter-io.cn"
+      url: "https://mirrors.sjtug.sjtu.edu.cn/dart-pub/"
    source: hosted
    version: "1.2.0"
  charcode:
    dependency: transitive
    description:
      name: charcode
-      url: "https://pub.flutter-io.cn"
+      url: "https://mirrors.sjtug.sjtu.edu.cn/dart-pub/"
    source: hosted
    version: "1.3.1"
  clock:
    dependency: transitive
    description:
      name: clock
-      url: "https://pub.flutter-io.cn"
+      url: "https://mirrors.sjtug.sjtu.edu.cn/dart-pub/"
    source: hosted
    version: "1.1.0"
  collection:
    dependency: transitive
    description:
      name: collection
-      url: "https://pub.flutter-io.cn"
+      url: "https://mirrors.sjtug.sjtu.edu.cn/dart-pub/"
    source: hosted
    version: "1.16.0"
  cupertino_icons:
    dependency: "direct main"
    description:
      name: cupertino_icons
-      url: "https://pub.flutter-io.cn"
+      url: "https://mirrors.sjtug.sjtu.edu.cn/dart-pub/"
    source: hosted
-    version: "1.0.3"
+    version: "1.0.5"
  fake_async:
    dependency: transitive
    description:
      name: fake_async
-      url: "https://pub.flutter-io.cn"
+      url: "https://mirrors.sjtug.sjtu.edu.cn/dart-pub/"
    source: hosted
    version: "1.3.0"
  flutter:
@ -68,7 +68,7 @@ packages:
      path: ".."
      relative: true
    source: path
-    version: "2.3.0"
+    version: "2.3.2"
  flutter_test:
    dependency: "direct dev"
    description: flutter
@ -78,28 +78,28 @@ packages:
    dependency: transitive
    description:
      name: matcher
-      url: "https://pub.flutter-io.cn"
+      url: "https://mirrors.sjtug.sjtu.edu.cn/dart-pub/"
    source: hosted
    version: "0.12.11"
  material_color_utilities:
    dependency: transitive
    description:
      name: material_color_utilities
-      url: "https://pub.flutter-io.cn"
+      url: "https://mirrors.sjtug.sjtu.edu.cn/dart-pub/"
    source: hosted
    version: "0.1.4"
  meta:
    dependency: transitive
    description:
      name: meta
-      url: "https://pub.flutter-io.cn"
+      url: "https://mirrors.sjtug.sjtu.edu.cn/dart-pub/"
    source: hosted
    version: "1.7.0"
  path:
    dependency: transitive
    description:
      name: path
-      url: "https://pub.flutter-io.cn"
+      url: "https://mirrors.sjtug.sjtu.edu.cn/dart-pub/"
    source: hosted
    version: "1.8.1"
  sky_engine:
@ -111,49 +111,49 @@ packages:
    dependency: transitive
    description:
      name: source_span
-      url: "https://pub.flutter-io.cn"
+      url: "https://mirrors.sjtug.sjtu.edu.cn/dart-pub/"
    source: hosted
    version: "1.8.2"
  stack_trace:
    dependency: transitive
    description:
      name: stack_trace
-      url: "https://pub.flutter-io.cn"
+      url: "https://mirrors.sjtug.sjtu.edu.cn/dart-pub/"
    source: hosted
    version: "1.10.0"
  stream_channel:
    dependency: transitive
    description:
      name: stream_channel
-      url: "https://pub.flutter-io.cn"
+      url: "https://mirrors.sjtug.sjtu.edu.cn/dart-pub/"
    source: hosted
    version: "2.1.0"
  string_scanner:
    dependency: transitive
    description:
      name: string_scanner
-      url: "https://pub.flutter-io.cn"
+      url: "https://mirrors.sjtug.sjtu.edu.cn/dart-pub/"
    source: hosted
    version: "1.1.0"
  term_glyph:
    dependency: transitive
    description:
      name: term_glyph
-      url: "https://pub.flutter-io.cn"
+      url: "https://mirrors.sjtug.sjtu.edu.cn/dart-pub/"
    source: hosted
    version: "1.2.0"
  test_api:
    dependency: transitive
    description:
      name: test_api
-      url: "https://pub.flutter-io.cn"
+      url: "https://mirrors.sjtug.sjtu.edu.cn/dart-pub/"
    source: hosted
    version: "0.4.9"
  vector_math:
    dependency: transitive
    description:
      name: vector_math
-      url: "https://pub.flutter-io.cn"
+      url: "https://mirrors.sjtug.sjtu.edu.cn/dart-pub/"
    source: hosted
    version: "2.1.2"
 sdks:
--- a/lib/src/enum/message_type.dart
+++ b/lib/src/enum/message_type.dart
@ -45,6 +45,12 @@ class MessageType {
  /// 自定义表情
  static const custom_face = 115;

+  /// 群消息已读回执
+  static const groupHasReadReceipt = 116;
+
+  /// 富文本消息
+  static const advancedText = 117;
+
  /// 高级撤回
  static const advancedRevoke = 118;

--- a/lib/src/manager/im_message_manager.dart
+++ b/lib/src/manager/im_message_manager.dart
@ -752,6 +752,46 @@ class MessageManager {
          .then((value) =>
              Utils.toObj(value, (map) => SearchResult.fromJson(value)));

+  /// 富文本消息
+  /// [text] 输入内容
+  /// [list] 富文本消息具体详细
+  Future<Message> createAdvancedTextMessage({
+    required String text,
+    List<RichMessageInfo> list = const [],
+    String? operationID,
+  }) =>
+      _channel
+          .invokeMethod(
+            'createAdvancedTextMessage',
+            _buildParam({
+              'text': text,
+              'richMessageInfoList': list.map((e) => e.toJson()).toList(),
+              "operationID": Utils.checkOperationID(operationID),
+            }),
+          )
+          .then((value) => Utils.toObj(value, (map) => Message.fromJson(map)));
+
+  /// 富文本消息
+  /// [text] 回复的内容
+  /// [quoteMsg] 被回复的消息
+  /// [list] 富文本消息具体详细
+  Future<Message> createAdvancedQuoteMessage({
+    required String text,
+    required Message quoteMsg,
+    List<RichMessageInfo> list = const [],
+    String? operationID,
+  }) =>
+      _channel
+          .invokeMethod(
+              'createAdvancedQuoteMessage',
+              _buildParam({
+                'quoteText': text,
+                'quoteMessage': quoteMsg.toJson(),
+                'richMessageInfoList': list.map((e) => e.toJson()).toList(),
+                "operationID": Utils.checkOperationID(operationID),
+              }))
+          .then((value) => Utils.toObj(value, (map) => Message.fromJson(map)));
+
  static Map _buildParam(Map param) {
    param["ManagerName"] = "messageManager";
    return param;
--- a/lib/src/models/group_info.dart
+++ b/lib/src/models/group_info.dart
@ -219,7 +219,7 @@ class GroupMembersInfo {
  @override
  bool operator ==(Object other) =>
      identical(this, other) ||
-          other is GroupMembersInfo &&
+      other is GroupMembersInfo &&
          runtimeType == other.runtimeType &&
          groupID == other.groupID &&
          userID == other.userID;
--- a/lib/src/models/message.dart
+++ b/lib/src/models/message.dart
@ -1072,3 +1072,37 @@ class AdvancedMessage {
    return data;
  }
 }
+
+class RichMessageInfo {
+  String? type;
+  int? offset;
+  int? length;
+  String? url;
+  String? info;
+
+  RichMessageInfo({
+    this.type,
+    this.offset,
+    this.length,
+    this.url,
+    this.info,
+  });
+
+  RichMessageInfo.fromJson(Map<String, dynamic> json) {
+    type = json['type'];
+    offset = json['offset'];
+    length = json['length'];
+    url = json['url'];
+    info = json['info'];
+  }
+
+  Map<String, dynamic> toJson() {
+    final data = Map<String, dynamic>();
+    data['type'] = this.type;
+    data['offset'] = this.offset;
+    data['length'] = this.length;
+    data['url'] = this.url;
+    data['info'] = this.info;
+    return data;
+  }
+}
--- a/pubspec.lock
+++ b/pubspec.lock
@ -5,49 +5,49 @@ packages:
    dependency: transitive
    description:
      name: async
-      url: "https://pub.flutter-io.cn"
+      url: "https://mirrors.sjtug.sjtu.edu.cn/dart-pub/"
    source: hosted
    version: "2.8.2"
  boolean_selector:
    dependency: transitive
    description:
      name: boolean_selector
-      url: "https://pub.flutter-io.cn"
+      url: "https://mirrors.sjtug.sjtu.edu.cn/dart-pub/"
    source: hosted
    version: "2.1.0"
  characters:
    dependency: transitive
    description:
      name: characters
-      url: "https://pub.flutter-io.cn"
+      url: "https://mirrors.sjtug.sjtu.edu.cn/dart-pub/"
    source: hosted
    version: "1.2.0"
  charcode:
    dependency: transitive
    description:
      name: charcode
-      url: "https://pub.flutter-io.cn"
+      url: "https://mirrors.sjtug.sjtu.edu.cn/dart-pub/"
    source: hosted
    version: "1.3.1"
  clock:
    dependency: transitive
    description:
      name: clock
-      url: "https://pub.flutter-io.cn"
+      url: "https://mirrors.sjtug.sjtu.edu.cn/dart-pub/"
    source: hosted
    version: "1.1.0"
  collection:
    dependency: transitive
    description:
      name: collection
-      url: "https://pub.flutter-io.cn"
+      url: "https://mirrors.sjtug.sjtu.edu.cn/dart-pub/"
    source: hosted
    version: "1.16.0"
  fake_async:
    dependency: transitive
    description:
      name: fake_async
-      url: "https://pub.flutter-io.cn"
+      url: "https://mirrors.sjtug.sjtu.edu.cn/dart-pub/"
    source: hosted
    version: "1.3.0"
  flutter:
@ -64,28 +64,28 @@ packages:
    dependency: transitive
    description:
      name: matcher
-      url: "https://pub.flutter-io.cn"
+      url: "https://mirrors.sjtug.sjtu.edu.cn/dart-pub/"
    source: hosted
    version: "0.12.11"
  material_color_utilities:
    dependency: transitive
    description:
      name: material_color_utilities
-      url: "https://pub.flutter-io.cn"
+      url: "https://mirrors.sjtug.sjtu.edu.cn/dart-pub/"
    source: hosted
    version: "0.1.4"
  meta:
    dependency: transitive
    description:
      name: meta
-      url: "https://pub.flutter-io.cn"
+      url: "https://mirrors.sjtug.sjtu.edu.cn/dart-pub/"
    source: hosted
    version: "1.7.0"
  path:
    dependency: transitive
    description:
      name: path
-      url: "https://pub.flutter-io.cn"
+      url: "https://mirrors.sjtug.sjtu.edu.cn/dart-pub/"
    source: hosted
    version: "1.8.1"
  sky_engine:
@ -97,49 +97,49 @@ packages:
    dependency: transitive
    description:
      name: source_span
-      url: "https://pub.flutter-io.cn"
+      url: "https://mirrors.sjtug.sjtu.edu.cn/dart-pub/"
    source: hosted
    version: "1.8.2"
  stack_trace:
    dependency: transitive
    description:
      name: stack_trace
-      url: "https://pub.flutter-io.cn"
+      url: "https://mirrors.sjtug.sjtu.edu.cn/dart-pub/"
    source: hosted
    version: "1.10.0"
  stream_channel:
    dependency: transitive
    description:
      name: stream_channel
-      url: "https://pub.flutter-io.cn"
+      url: "https://mirrors.sjtug.sjtu.edu.cn/dart-pub/"
    source: hosted
    version: "2.1.0"
  string_scanner:
    dependency: transitive
    description:
      name: string_scanner
-      url: "https://pub.flutter-io.cn"
+      url: "https://mirrors.sjtug.sjtu.edu.cn/dart-pub/"
    source: hosted
    version: "1.1.0"
  term_glyph:
    dependency: transitive
    description:
      name: term_glyph
-      url: "https://pub.flutter-io.cn"
+      url: "https://mirrors.sjtug.sjtu.edu.cn/dart-pub/"
    source: hosted
    version: "1.2.0"
  test_api:
    dependency: transitive
    description:
      name: test_api
-      url: "https://pub.flutter-io.cn"
+      url: "https://mirrors.sjtug.sjtu.edu.cn/dart-pub/"
    source: hosted
    version: "0.4.9"
  vector_math:
    dependency: transitive
    description:
      name: vector_math
-      url: "https://pub.flutter-io.cn"
+      url: "https://mirrors.sjtug.sjtu.edu.cn/dart-pub/"
    source: hosted
    version: "2.1.2"
 sdks:
--- a/pubspec.yaml
+++ b/pubspec.yaml
@ -1,6 +1,6 @@
 name: flutter_openim_sdk
 description: An instant messaging plug-in that supports Android and IOS. And the server is also all open source.
-version: 2.3.0
+version: 2.3.2
 homepage: https://www.rentsoft.cn
 repository: https://github.com/OpenIMSDK/Open-IM-SDK-Flutter