Upgrade

CHANGELOG.md

@@ -3,6 +3,7 @@
 1.Fix bug </br>
 2.New organization fuction</br>
 3.New uploadImage method </br>
+4.Fix login slow bug</br>
 
 ## 2.0.8
 

android/build.gradle

@@ -41,5 +41,5 @@ android {
     }
 }
 dependencies {
-    implementation 'io.openim:core-sdk:2.0.9.3@aar'
+    implementation 'io.openim:core-sdk:2.0.9.6@aar'
 }

android/src/main/java/io/openim/flutter_openim_sdk/manager/OrganizationManager.java

@@ -44,11 +44,7 @@ public class OrganizationManager extends BaseManager {
         Open_im_sdk.getDepartmentMemberAndSubDepartment(
                 new OnBaseListener(result, methodCall),
                 value(methodCall, "operationID"),
-                value(methodCall, "departmentID"),
+                value(methodCall, "departmentID")
-                int2long(methodCall, "departmentOffset"),
-                int2long(methodCall, "departmentCount"),
-                int2long(methodCall, "memberOffset"),
-                int2long(methodCall, "memberCount")
         );
     }
 }

lib/src/manager/im_organization_manager.dart

@@ -70,12 +70,12 @@ class OrganizationManager {
 
   /// Get the sub-departments and employees under the department
   /// 获取部门下的子部门跟员工
-  Future<List<UserInDept>> getDeptMemberAndSubDept({
+  Future<DeptMemberAndSubDept> getDeptMemberAndSubDept({
     required String departmentID,
-    int departmentOffset = 0,
+    // int departmentOffset = 0,
-    int departmentCount = 40,
+    // int departmentCount = 40,
-    int memberOffset = 0,
+    // int memberOffset = 0,
-    int memberCount = 40,
+    // int memberCount = 40,
     String? operationID,
   }) =>
       _channel
@@ -83,13 +83,14 @@ class OrganizationManager {
               'getDepartmentMemberAndSubDepartment',
               _buildParam({
                 'departmentID': departmentID,
-                'departmentOffset': departmentOffset,
+                // 'departmentOffset': departmentOffset,
-                'departmentCount': departmentCount,
+                // 'departmentCount': departmentCount,
-                'memberOffset': memberOffset,
+                // 'memberOffset': memberOffset,
-                'memberCount': memberCount,
+                // 'memberCount': memberCount,
                 'operationID': Utils.checkOperationID(operationID),
               }))
-          .then((value) => Utils.toList(value, (v) => UserInDept.fromJson(v)));
+          .then((value) =>
+              Utils.toObj(value, (v) => DeptMemberAndSubDept.fromJson(v)));
 
   static Map _buildParam(Map param) {
     param["ManagerName"] = "organizationManager";

lib/src/models/organization_info.dart

@@ -53,6 +53,16 @@ class DeptInfo {
     data['attachedInfo'] = this.attachedInfo;
     return data;
   }
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      other is DeptInfo &&
+          runtimeType == other.runtimeType &&
+          departmentID == other.departmentID;
+
+  @override
+  int get hashCode => departmentID.hashCode;
 }
 
 class DeptMemberInfo {
@@ -134,8 +144,19 @@ class DeptMemberInfo {
     data['attachedInfo'] = this.attachedInfo;
     return data;
   }
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      other is DeptMemberInfo &&
+          runtimeType == other.runtimeType &&
+          userID == other.userID;
+
+  @override
+  int get hashCode => userID.hashCode;
 }
 
+/// 用户所在的部门
 class UserInDept {
   DeptInfo? department;
   DeptMemberInfo? member;
@@ -162,6 +183,7 @@ class UserInDept {
   }
 }
 
+/// 部门下的子部门跟员工
 class DeptMemberAndSubDept {
   List<DeptInfo>? departmentList;
   List<DeptMemberInfo>? departmentMemberList;