new_version1

Author: hrxiang

android/build.gradle

@@ -41,5 +41,5 @@ android {
     }
 }
 dependencies {
-    implementation 'io.openim:client-sdk:1.4.5@aar'
+    implementation 'io.openim:client-sdk:1.5.4@aar'
 }

android/src/main/java/io/openim/flutter_openim_sdk/FlutterOpenimSdkPlugin.java

@@ -18,6 +18,7 @@
 import io.openim.flutter_openim_sdk.manager.GroupManager;
 import io.openim.flutter_openim_sdk.manager.IMManager;
 import io.openim.flutter_openim_sdk.manager.MessageManager;
+import io.openim.flutter_openim_sdk.manager.UserManager;
 
 
 /**
@@ -31,6 +32,7 @@ public class FlutterOpenimSdkPlugin implements FlutterPlugin, MethodCallHandler
 
     public static MethodChannel channel;
     private static IMManager imManager;
+    private static UserManager userManager;
     private static FriendshipManager friendshipManager;
     private static MessageManager messageManager;
     private static ConversationManager conversationManager;
@@ -41,6 +43,7 @@ public FlutterOpenimSdkPlugin() {
 
     private FlutterOpenimSdkPlugin(Context context) {
         FlutterOpenimSdkPlugin.imManager = new IMManager();
+        FlutterOpenimSdkPlugin.userManager = new UserManager();
         FlutterOpenimSdkPlugin.friendshipManager = new FriendshipManager();
         FlutterOpenimSdkPlugin.messageManager = new MessageManager();
         FlutterOpenimSdkPlugin.conversationManager = new ConversationManager();

android/src/main/java/io/openim/flutter_openim_sdk/listener/FriendshipListener.java

@@ -5,13 +5,12 @@
 import java.util.Map;
 
 import io.openim.flutter_openim_sdk.util.CommonUtil;
-import open_im_sdk.OnAdvancedMsgListener;
 
-public class AdvancedMsgListener implements OnAdvancedMsgListener {
+public class OnAdvancedMsgListener implements open_im_sdk_callback.OnAdvancedMsgListener {
     //    final Map<String, String> values = new HashMap<>();
     private final String id;
 
-    public AdvancedMsgListener(String listenerId) {
+    public OnAdvancedMsgListener(String listenerId) {
         this.id = listenerId;
 //        this.values.put("id", listenerId);
     }

android/src/main/java/io/openim/flutter_openim_sdk/listener/GroupListener.java

@@ -1,28 +1,25 @@
 package io.openim.flutter_openim_sdk.listener;
 
 
-import io.flutter.Log;
 import io.flutter.plugin.common.MethodChannel;
 import io.openim.flutter_openim_sdk.util.CommonUtil;
-import open_im_sdk.Base;
+import open_im_sdk_callback.Base;
 
-public class BaseListener implements Base {
+public class OnBaseListener implements Base {
 
     MethodChannel.Result result;
 
-    public BaseListener(MethodChannel.Result result) {
+    public OnBaseListener(MethodChannel.Result result) {
         this.result = result;
     }
 
     @Override
-    public void onError(long l, String s) {
-//        Log.e("F-OpenIMSD(callback)", s);
+    public void onError(int l, String s) {
         CommonUtil.runMainThreadReturnError(result, l, s, null);
     }
 
     @Override
     public void onSuccess(String s) {
-//        Log.i("F-OpenIMSDK(callback)", s);
         CommonUtil.runMainThreadReturn(result, s);
     }
 }

android/src/main/java/io/openim/flutter_openim_sdk/listener/AdvancedMsgListener.java renamed to android/src/main/java/io/openim/flutter_openim_sdk/listener/OnAdvancedMsgListener.java

@@ -0,0 +1,34 @@
+package io.openim.flutter_openim_sdk.listener;
+
+
+import io.openim.flutter_openim_sdk.util.CommonUtil;
+
+
+public class OnConnListener implements open_im_sdk_callback.OnConnListener {
+
+    @Override
+    public void onConnectFailed(int i, String s) {
+        CommonUtil.emitEvent("connectListener", "onConnectFailed", i, s, null);
+    }
+
+    @Override
+    public void onConnectSuccess() {
+        CommonUtil.emitEvent("connectListener", "onConnectSuccess", null);
+    }
+
+    @Override
+    public void onConnecting() {
+        CommonUtil.emitEvent("connectListener", "onConnecting", null);
+    }
+
+    @Override
+    public void onKickedOffline() {
+        CommonUtil.emitEvent("connectListener", "onKickedOffline", null);
+    }
+
+
+    @Override
+    public void onUserTokenExpired() {
+        CommonUtil.emitEvent("connectListener", "onUserTokenExpired", null);
+    }
+}

android/src/main/java/io/openim/flutter_openim_sdk/listener/BaseListener.java renamed to android/src/main/java/io/openim/flutter_openim_sdk/listener/OnBaseListener.java

@@ -1,10 +1,9 @@
 package io.openim.flutter_openim_sdk.listener;
 
 import io.openim.flutter_openim_sdk.util.CommonUtil;
-import open_im_sdk.OnConversationListener;
 
-public class ConversationListener implements OnConversationListener {
 
+public class OnConversationListener implements open_im_sdk_callback.OnConversationListener {
 
     @Override
     public void onConversationChanged(String s) {

android/src/main/java/io/openim/flutter_openim_sdk/listener/OnConnListener.java

@@ -0,0 +1,76 @@
+package io.openim.flutter_openim_sdk.listener;
+
+import io.openim.flutter_openim_sdk.util.CommonUtil;
+
+/**
+ * 申请添加好友：
+ * 主动申请者收到OnFriendApplicationAdded
+ * 被添加者收到OnFriendApplicationAdded    ok  111加222
+ * <p>
+ * 同意好友申请：
+ * 操作者收到 OnFriendApplicationAccepted OnFriendAdded；
+ * 申请者收到：OnFriendApplicationAccepted OnFriendAdded  ok
+ * <p>
+ * 好友拒绝申请：
+ * 操作者收到OnFriendApplicationRejected；
+ * 申请者收到：OnFriendApplicationRejected ok
+ * <p>
+ * 删除好友：
+ * 操作者收到OnFriendDeleted  ok
+ * <p>
+ * 修改备注：
+ * 操作者收到OnFriendInfoChanged  ok
+ * <p>
+ * 添加黑名单：
+ * 操作者收到OnBlackAdded；  ok
+ * <p>
+ * 移除黑名单：
+ * 操作者收到OnBlackDeleted  ok
+ */
+public class OnFriendshipListener implements open_im_sdk_callback.OnFriendshipListener {
+
+    @Override
+    public void onBlackAdded(String s) {
+        CommonUtil.emitEvent("friendListener", "onBlacklistAdded", s);
+    }
+
+    @Override
+    public void onBlackDeleted(String s) {
+        CommonUtil.emitEvent("friendListener", "onBlacklistDeleted", s);
+    }
+
+    @Override
+    public void onFriendAdded(String s) {
+        CommonUtil.emitEvent("friendListener", "onFriendAdded", s);
+    }
+
+    @Override
+    public void onFriendApplicationAccepted(String s) {
+        CommonUtil.emitEvent("friendListener", "onFriendApplicationAccepted", s);
+    }
+
+    @Override
+    public void onFriendApplicationAdded(String s) {
+        CommonUtil.emitEvent("friendListener", "onFriendApplicationAdded", s);
+    }
+
+    @Override
+    public void onFriendApplicationDeleted(String s) {
+        CommonUtil.emitEvent("friendListener", "onFriendApplicationDeleted", s);
+    }
+
+    @Override
+    public void onFriendApplicationRejected(String s) {
+        CommonUtil.emitEvent("friendListener", "onFriendApplicationRejected", s);
+    }
+
+    @Override
+    public void onFriendDeleted(String s) {
+        CommonUtil.emitEvent("friendListener", "onFriendDeleted", s);
+    }
+
+    @Override
+    public void onFriendInfoChanged(String s) {
+        CommonUtil.emitEvent("friendListener", "onFriendInfoChanged", s);
+    }
+}