From be7e678265d656eae14a8f88f772a4ec9d288435 Mon Sep 17 00:00:00 2001
From: hrxiang <xianghairui@126.com>
Date: Fri, 17 Sep 2021 18:54:50 +0800
Subject: [PATCH] upgrade

---
 .../manager/ConversationManager.java                 | 12 ++++++++++++
 .../openim/flutter_openim_sdk/manager/IMManager.java |  2 +-
 .../flutter_openim_sdk/manager/MessageManager.java   | 12 ------------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/android/src/main/java/io/openim/flutter_openim_sdk/manager/ConversationManager.java b/android/src/main/java/io/openim/flutter_openim_sdk/manager/ConversationManager.java
index 125c113..432df7b 100644
--- a/android/src/main/java/io/openim/flutter_openim_sdk/manager/ConversationManager.java
+++ b/android/src/main/java/io/openim/flutter_openim_sdk/manager/ConversationManager.java
@@ -47,4 +47,16 @@ public class ConversationManager {
                 CommonUtil.isPinnedConversation(methodCall),
                 new BaseListener(result));
     }
+
+    public void markSingleMessageHasRead(MethodCall methodCall, MethodChannel.Result result) {
+        Open_im_sdk.markSingleMessageHasRead(new BaseListener(result), CommonUtil.getSingleMessageUserid(methodCall));
+    }
+
+    public void markGroupMessageHasRead(MethodCall methodCall, MethodChannel.Result result) {
+        Open_im_sdk.markGroupMessageHasRead(new BaseListener(result), CommonUtil.getGroupMessageGroupid(methodCall));
+    }
+
+    public void getTotalUnreadMsgCount(MethodCall methodCall, MethodChannel.Result result) {
+        Open_im_sdk.getTotalUnreadMsgCount(new BaseListener(result));
+    }
 }
diff --git a/android/src/main/java/io/openim/flutter_openim_sdk/manager/IMManager.java b/android/src/main/java/io/openim/flutter_openim_sdk/manager/IMManager.java
index 2983400..4cc12fc 100644
--- a/android/src/main/java/io/openim/flutter_openim_sdk/manager/IMManager.java
+++ b/android/src/main/java/io/openim/flutter_openim_sdk/manager/IMManager.java
@@ -10,7 +10,7 @@ import open_im_sdk.Open_im_sdk;
 public class IMManager {
 
     public void initSDK(MethodCall methodCall, MethodChannel.Result result) {
-        Open_im_sdk.initSDK(CommonUtil.getSDKJsonParam(methodCall), new SDKListener());
+        CommonUtil.runMainThreadReturn(result, Open_im_sdk.initSDK(CommonUtil.getSDKJsonParam(methodCall), new SDKListener()));
 //        CommonUtil.runMainThreadReturn(result, null);
     }
 
diff --git 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
index 04864b6..ec5d904 100644
--- 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
@@ -114,14 +114,6 @@ public class MessageManager {
         Open_im_sdk.findMessages(new BaseListener(result), CommonUtil.getMessageIdList(methodCall));
     }
 
-    public void markSingleMessageHasRead(MethodCall methodCall, MethodChannel.Result result) {
-        Open_im_sdk.markSingleMessageHasRead(new BaseListener(result), CommonUtil.getSingleMessageUserid(methodCall));
-    }
-
-    public void markGroupMessageHasRead(MethodCall methodCall, MethodChannel.Result result) {
-        Open_im_sdk.markGroupMessageHasRead(new BaseListener(result), CommonUtil.getGroupMessageGroupid(methodCall));
-    }
-
     public void markC2CMessageAsRead(MethodCall methodCall, MethodChannel.Result result) {
         Open_im_sdk.markC2CMessageAsRead(new BaseListener(result),
                 CommonUtil.getSingleMessageUserid(methodCall),
@@ -241,10 +233,6 @@ public class MessageManager {
         ));
     }
 
-    public void getTotalUnreadMsgCount(MethodCall methodCall, MethodChannel.Result result) {
-        Open_im_sdk.getTotalUnreadMsgCount(new BaseListener(result));
-    }
-
     public void forceSyncMsg(MethodCall methodCall, MethodChannel.Result result) {
         Open_im_sdk.forceSyncMsg();
     }