From 40190198d8a625d646848a9c14918f6863311c64 Mon Sep 17 00:00:00 2001 From: hrxiang Date: Thu, 11 Nov 2021 16:31:39 +0800 Subject: [PATCH] Update SDK to 1.1.5
Fix android message error bug --- CHANGELOG.md | 5 +++++ README.md | 2 +- android/build.gradle | 2 +- .../listener/AdvancedMsgListener.java | 15 ++++++++++++--- .../listener/GroupListener.java | 18 ++++++++++-------- .../listener/MsgSendProgressListener.java | 5 +++-- .../flutter_openim_sdk/util/CommonUtil.java | 5 +++-- pubspec.yaml | 2 +- 8 files changed, 36 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 80aa00d..dc3db95 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +## 1.0.3 + +Fix android message error bug
+Update SDK to 1.1.5
+ ## 1.0.2 Upgrade sdk
diff --git a/README.md b/README.md index 71faeae..84a4a90 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ A flutter IM plugin for android and ios. #### 1，Add dependency in yaml - flutter_openim_sdk: ^1.0.2 + flutter_openim_sdk: ^1.0.3 #### 2，Import package diff --git a/android/build.gradle b/android/build.gradle index b581cf0..2feb142 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -51,5 +51,5 @@ android { } } dependencies { - implementation 'io.openim:client-sdk:1.1.4@aar' + implementation 'io.openim:client-sdk:1.1.5@aar' } \ No newline at end of file diff --git a/android/src/main/java/io/openim/flutter_openim_sdk/listener/AdvancedMsgListener.java b/android/src/main/java/io/openim/flutter_openim_sdk/listener/AdvancedMsgListener.java index d7921b7..ab16ed7 100644 --- a/android/src/main/java/io/openim/flutter_openim_sdk/listener/AdvancedMsgListener.java +++ b/android/src/main/java/io/openim/flutter_openim_sdk/listener/AdvancedMsgListener.java @@ -1,32 +1,41 @@ package io.openim.flutter_openim_sdk.listener; -import java.util.HashMap; +import android.util.ArrayMap; + import java.util.Map; import io.openim.flutter_openim_sdk.util.CommonUtil; import open_im_sdk.OnAdvancedMsgListener; public class AdvancedMsgListener implements OnAdvancedMsgListener { - final Map values = new HashMap<>(); + // final Map values = new HashMap<>(); + private final String id; public AdvancedMsgListener(String listenerId) { - this.values.put("id", listenerId); + this.id = listenerId; +// this.values.put("id", listenerId); } @Override public void onRecvC2CReadReceipt(String s) { + final Map values = new ArrayMap<>(); + values.put("id", id); values.put("haveReadMessage", s); CommonUtil.emitEvent("advancedMsgListener", "onRecvC2CReadReceipt", values); } @Override public void onRecvMessageRevoked(String s) { + final Map values = new ArrayMap<>(); + values.put("id", id); values.put("revokedMessage", s); CommonUtil.emitEvent("advancedMsgListener", "onRecvMessageRevoked", values); } @Override public void onRecvNewMessage(String s) { + final Map values = new ArrayMap<>(); + values.put("id", id); values.put("newMessage", s); CommonUtil.emitEvent("advancedMsgListener", "onRecvNewMessage", values); } diff --git a/android/src/main/java/io/openim/flutter_openim_sdk/listener/GroupListener.java b/android/src/main/java/io/openim/flutter_openim_sdk/listener/GroupListener.java index 9f21a90..7c6b418 100644 --- a/android/src/main/java/io/openim/flutter_openim_sdk/listener/GroupListener.java +++ b/android/src/main/java/io/openim/flutter_openim_sdk/listener/GroupListener.java @@ -1,5 +1,7 @@ package io.openim.flutter_openim_sdk.listener; +import android.util.ArrayMap; + import java.util.HashMap; import java.util.Map; @@ -9,7 +11,7 @@ import open_im_sdk.OnGroupListener; public class GroupListener implements OnGroupListener { @Override public void onApplicationProcessed(String s, String s1, int i, String s2) { - Map map = new HashMap<>(); + Map map = new ArrayMap<>(); map.put("groupId", s); map.put("opUser", s1); map.put("agreeOrReject", i); @@ -19,14 +21,14 @@ public class GroupListener implements OnGroupListener { @Override public void onGroupCreated(String s) { - Map map = new HashMap<>(); + Map map = new ArrayMap<>(); map.put("groupId", s); CommonUtil.emitEvent("groupListener", "onGroupCreated", map); } @Override public void onGroupInfoChanged(String s, String s1) { - Map map = new HashMap<>(); + Map map = new ArrayMap<>(); map.put("groupId", s); map.put("groupInfo", s1); CommonUtil.emitEvent("groupListener", "onGroupInfoChanged", map); @@ -34,7 +36,7 @@ public class GroupListener implements OnGroupListener { @Override public void onMemberEnter(String s, String s1) { - Map map = new HashMap<>(); + Map map = new ArrayMap<>(); map.put("groupId", s); map.put("memberList", s1); CommonUtil.emitEvent("groupListener", "onMemberEnter", map); @@ -42,7 +44,7 @@ public class GroupListener implements OnGroupListener { @Override public void onMemberInvited(String s, String s1, String s2) { - Map map = new HashMap<>(); + Map map = new ArrayMap<>(); map.put("groupId", s); map.put("opUser", s1); map.put("memberList", s2); @@ -51,7 +53,7 @@ public class GroupListener implements OnGroupListener { @Override public void onMemberKicked(String s, String s1, String s2) { - Map map = new HashMap<>(); + Map map = new ArrayMap<>(); map.put("groupId", s); map.put("opUser", s1); map.put("memberList", s2); @@ -60,7 +62,7 @@ public class GroupListener implements OnGroupListener { @Override public void onMemberLeave(String s, String s1) { - Map map = new HashMap<>(); + Map map = new ArrayMap<>(); map.put("groupId", s); map.put("member", s1); CommonUtil.emitEvent("groupListener", "onMemberLeave", map); @@ -68,7 +70,7 @@ public class GroupListener implements OnGroupListener { @Override public void onReceiveJoinApplication(String s, String s1, String s2) { - Map map = new HashMap<>(); + Map map = new ArrayMap<>(); map.put("groupId", s); map.put("member", s1); map.put("opReason", s2); diff --git a/android/src/main/java/io/openim/flutter_openim_sdk/listener/MsgSendProgressListener.java b/android/src/main/java/io/openim/flutter_openim_sdk/listener/MsgSendProgressListener.java index 6a5882a..3998880 100644 --- a/android/src/main/java/io/openim/flutter_openim_sdk/listener/MsgSendProgressListener.java +++ b/android/src/main/java/io/openim/flutter_openim_sdk/listener/MsgSendProgressListener.java @@ -1,6 +1,7 @@ package io.openim.flutter_openim_sdk.listener; -import java.util.HashMap; +import android.util.ArrayMap; + import java.util.Map; import io.flutter.plugin.common.MethodCall; @@ -11,7 +12,6 @@ import open_im_sdk.SendMsgCallBack; public class MsgSendProgressListener implements SendMsgCallBack { final private MethodChannel.Result result; final private MethodCall call; - final Map values = new HashMap<>(); public MsgSendProgressListener(MethodChannel.Result result, MethodCall call) { this.result = result; @@ -25,6 +25,7 @@ public class MsgSendProgressListener implements SendMsgCallBack { @Override public void onProgress(long l) { + final Map values = new ArrayMap<>(); values.put("clientMsgID", CommonUtil.getSendMessageClientMsgID(call)); values.put("progress", l); CommonUtil.emitEvent("msgSendProgressListener", "onProgress", values); diff --git a/android/src/main/java/io/openim/flutter_openim_sdk/util/CommonUtil.java b/android/src/main/java/io/openim/flutter_openim_sdk/util/CommonUtil.java index 3d80316..a142c98 100644 --- a/android/src/main/java/io/openim/flutter_openim_sdk/util/CommonUtil.java +++ b/android/src/main/java/io/openim/flutter_openim_sdk/util/CommonUtil.java @@ -3,7 +3,8 @@ package io.openim.flutter_openim_sdk.util; import android.os.Handler; import android.os.Looper; -import java.util.HashMap; +import androidx.collection.ArrayMap; + import java.util.Map; import io.flutter.Log; @@ -46,7 +47,7 @@ public class CommonUtil { public synchronized static void emitEvent(String method, String type, Long errCode, String errMsg, T data) { runMainThread(() -> { - HashMap res = new HashMap<>(); + Map res = new ArrayMap<>(); if (null != type) { res.put("type", type); } diff --git a/pubspec.yaml b/pubspec.yaml index b9facac..cf11a21 100644 --- 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: 1.0.2 +version: 1.0.3 homepage: https://www.rentsoft.cn repository: https://github.com/OpenIMSDK/Open-IM-SDK-Flutter