修改聊天模块部分问题

BaseLibrary/src/main/java/com/cooleshow/base/common/BaseConstant.java

@@ -1,6 +1,9 @@
 package com.cooleshow.base.common;
 
+import android.text.TextUtils;
+
 import com.cooleshow.base.BuildConfig;
+import com.cooleshow.base.constanst.Constants;
 import com.tencent.open.im.IM;
 
 /**
@@ -9,7 +12,9 @@ import com.tencent.open.im.IM;
 public class BaseConstant {
     public final static String SERVER_ADDRESS = BuildConfig.BASE_SERVER_URL;
     public final static String TEACHER_GROUP = "api-teacher/";
+    public final static String TEACHER_GROUP2 = "api-teacher";
     public final static String STUDENT_GROUP = "api-student/";
+    public final static String STUDENT_GROUP2 = "api-student";
     public final static String AUTH_GROUP = "api-auth/";
     public final static String ADMIN_GROUP = "api-admin/";
     public final static String MALL_ADMIN_SERVER = "api-mall-admin/";
@@ -22,16 +27,24 @@ public class BaseConstant {
     public final static String KEY_SP_TOKEN = "token";
     public final static String STUDENT_ID = "student_id";
     public final static String CHECK_ADDRESS = "check_address";
-    public static final String CLIENT_API_GROUP_NAME = "";
+    public static final String CLIENT_API_GROUP_NAME = getClientApiGroup();
 
     /**
      * 获取图片验证码地址
+     *
      * @return
      */
     public static String getImgCodeApiUrl() {
         if (BaseApplication.Companion.isTeacherClient()) {
-            return SERVER_ADDRESS+TEACHER_GROUP + IMAGE_VERIFY_CODE_API_URL;
+            return SERVER_ADDRESS + TEACHER_GROUP + IMAGE_VERIFY_CODE_API_URL;
+        }
+        return SERVER_ADDRESS + STUDENT_GROUP + IMAGE_VERIFY_CODE_API_URL;
+    }
+
+    public static String getClientApiGroup() {
+        if (BaseApplication.Companion.isTeacherClient()) {
+            return TEACHER_GROUP2;
         }
-        return SERVER_ADDRESS+STUDENT_GROUP + IMAGE_VERIFY_CODE_API_URL;
+        return STUDENT_GROUP2;
     }
 }

chatModule/src/main/java/com/cooleshow/chatmodule/adapter/ContactListAdapter.java

@@ -21,16 +21,16 @@ import androidx.recyclerview.widget.RecyclerView;
 /**
  * Author by pq, Date on 2022/5/7.
  */
-public class ContactListAdapter extends BaseQuickAdapter<ContactListBean.RowsBean, BaseViewHolder> {
+public class ContactListAdapter extends BaseQuickAdapter<ContactListBean, BaseViewHolder> {
     public ContactListAdapter() {
         super(R.layout.tc_item_contact_person_list_layout);
     }
 
     @Override
-    protected void convert(@NonNull BaseViewHolder holder, ContactListBean.RowsBean contactListBean) {
+    protected void convert(@NonNull BaseViewHolder holder, ContactListBean contactListBean) {
 //        TextView tv_name = holder.getView(R.id.tv_name);
 //        tv_name.setTypeface(Typeface.DEFAULT);
-//        holder.setText(R.id.tv_name, contactListBean.getFriendNickname());
+//        holder.setText(R.id.tv_name, contactListBean.getName());
 //        ImageView iv_icon = holder.getView(R.id.iv_icon);
 //
 //        if (TextUtils.equals(contactListBean.getRoleType(), GroupConstants.ROLE_TYPE_TEACHER)) {
@@ -72,11 +72,11 @@ public class ContactListAdapter extends BaseQuickAdapter<ContactListBean.RowsBea
 //            layoutParams.setMargins(0,0,0, 0);
 //        }
 //        view.setLayoutParams(layoutParams);
-        holder.setText(R.id.tv_name, contactListBean.getFriendNickname());
+        holder.setText(R.id.tv_name, contactListBean.friendNickname);
         ImageView iv_icon = holder.getView(R.id.iv_icon);
-        GlideUtils.INSTANCE.loadImage(getContext(), contactListBean.getFriendAvatar(), iv_icon);
+        GlideUtils.INSTANCE.loadImage(getContext(), contactListBean.friendAvatar, iv_icon);
         View ll_klx_tag = holder.getView(R.id.ll_klx_tag);
-        if (ChatGroupHelper.isTeacher(contactListBean.roleType)) {
+        if (ChatGroupHelper.isTeacher(contactListBean.getRoleType())) {
             ll_klx_tag.setVisibility(View.VISIBLE);
         } else {
             ll_klx_tag.setVisibility(View.GONE);

chatModule/src/main/java/com/cooleshow/chatmodule/adapter/ContactRoomListAdapter.java

@@ -21,13 +21,13 @@ import androidx.annotation.NonNull;
  * @author Ryan
  * 类说明：
  */
-public class ContactRoomListAdapter extends BaseQuickAdapter<ContactRoomListBean.RowsBean, BaseViewHolder> {
+public class ContactRoomListAdapter extends BaseQuickAdapter<ContactRoomListBean, BaseViewHolder> {
     public ContactRoomListAdapter() {
         super(R.layout.tc_item_contact_list_layout);
     }
 
     @Override
-    protected void convert(@NonNull BaseViewHolder holder, ContactRoomListBean.RowsBean contactListBean) {
+    protected void convert(@NonNull BaseViewHolder holder, ContactRoomListBean contactListBean) {
         holder.setText(R.id.tv_name, contactListBean.getName());
 //        ImageView iv_icon = holder.getView(R.id.iv_icon);
 //        TextView tv_group_tag = holder.getView(R.id.tv_group_tag);
@@ -48,5 +48,19 @@ public class ContactRoomListAdapter extends BaseQuickAdapter<ContactRoomListBean
 //            tv_group_tag.setBackgroundResource(com.cooleshow.base.R.drawable.shape_ff8057_4dp);
 //            GlideUtils.INSTANCE.loadImage(getContext(), contactListBean.getImg(), iv_icon, R.drawable.tc_icon_group_fans);
 //        }
+
+        holder.setText(R.id.tv_name, contactListBean.getName());
+        ImageView iv_icon = holder.getView(R.id.iv_icon);
+        ImageView im_group_mark = holder.getView(R.id.im_group_mark);
+
+
+        GlideUtils.INSTANCE.loadImage(getContext(), contactListBean.getImg(), iv_icon, R.drawable.icon_group_fans);
+        if (contactListBean.getType().equals("FAN")) {
+            im_group_mark.setBackgroundResource(R.drawable.icon_group_mark_fans);
+        } else if (contactListBean.getType().equals("COURSE")) {
+            im_group_mark.setBackgroundResource(R.drawable.icon_group_mark_course);
+        } else {
+            im_group_mark.setBackgroundResource(R.drawable.icon_group_mark_fans);
+        }
     }
 }

chatModule/src/main/java/com/cooleshow/chatmodule/adapter/GroupMemberAdapter.java

@@ -21,17 +21,17 @@ import java.util.List;
  * @author Ryan
  * 类说明：
  */
-public class GroupMemberAdapter extends BaseQuickAdapter<GroupMemberBean.RowsBean, BaseViewHolder> {
+public class GroupMemberAdapter extends BaseQuickAdapter<GroupMemberBean, BaseViewHolder> {
     private String currentId;
 
-    public GroupMemberAdapter(List<GroupMemberBean.RowsBean> data) {
+    public GroupMemberAdapter(List<GroupMemberBean> data) {
         super(R.layout.tc_group_member_list_item, data);
         currentId = UserHelper.getImUserId();
     }
 
 
     @Override
-    protected void convert(BaseViewHolder helper, GroupMemberBean.RowsBean bean) {
+    protected void convert(BaseViewHolder helper, GroupMemberBean bean) {
 
         ImageView ivIcon = helper.getView(R.id.iv_icon);
         TextView tvTitle = helper.getView(R.id.tv_title);

chatModule/src/main/java/com/cooleshow/chatmodule/adapter/GroupSettingMemberAdapter.java

@@ -16,7 +16,7 @@ import com.cooleshow.chatmodule.bean.GroupMemberBean;
  * @author Ryan
  * 类说明：
  */
-public class GroupSettingMemberAdapter extends BaseQuickAdapter<GroupMemberBean.RowsBean , BaseViewHolder> {
+public class GroupSettingMemberAdapter extends BaseQuickAdapter<GroupMemberBean , BaseViewHolder> {
 
     public GroupSettingMemberAdapter() {
         super(R.layout.tc_item_group_setting_member_list_layout);
@@ -24,7 +24,7 @@ public class GroupSettingMemberAdapter extends BaseQuickAdapter<GroupMemberBean.
 
 
     @Override
-    protected void convert(BaseViewHolder helper, GroupMemberBean.RowsBean  item) {
+    protected void convert(BaseViewHolder helper, GroupMemberBean  item) {
         ImageView ivIcon = helper.getView(R.id.iv_icon);
         TextView tvTitle = helper.getView(R.id.tv_title);
         if (TextUtils.equals(item.getRoleType(),"STUDENT")) {

chatModule/src/main/java/com/cooleshow/chatmodule/api/IMApi.java

@@ -8,6 +8,8 @@ import com.cooleshow.chatmodule.bean.GroupMemberBean;
 import com.cooleshow.chatmodule.bean.GroupNoticeBean;
 import com.cooleshow.chatmodule.bean.IMGroupInfo;
 
+import java.util.List;
+
 import io.reactivex.rxjava3.core.Observable;
 import okhttp3.RequestBody;
 import retrofit2.http.Body;
@@ -46,9 +48,8 @@ public interface IMApi {
      *
      * @returnClassListAdapter
      */
-    @GET("{group_name}" + "/imGroup/detail/{id}")
-    Observable<BaseResponse<IMGroupInfo>> queryGroupDetail(@Path("id") String groupId,@Path("group_name")String group_name);
-
+    @GET("{group_name}" + "/imGroup/getDetail/{groupId}")
+    Observable<BaseResponse<IMGroupInfo>> queryGroupDetail(@Path("groupId") String groupId,@Path("group_name")String group_name);
 
     /**
      * 获取群成员列表-学员
@@ -56,8 +57,8 @@ public interface IMApi {
      * @param body
      * @return
      */
-    @POST("{group_name}" + "/imGroupMember/page")
-    Observable<BaseResponse<GroupMemberBean>> queryGroupAllMembers(@Body RequestBody body,@Path("group_name")String group_name);
+    @POST("{group_name}" + "/imGroupMember/queryAll")
+    Observable<BaseResponse<List<GroupMemberBean>>> queryGroupAllMembers(@Body RequestBody body,@Path("group_name")String group_name);
 
     /**
      * 群公告-学生
@@ -65,7 +66,7 @@ public interface IMApi {
      * @param body
      * @return
      */
-    @POST("{group_name}" + "/imGroupNotice/page")
+    @POST("{group_name}" + "/imGroupNotice/queryPage")
     Observable<BaseResponse<GroupNoticeBean>> queryTeaGroupNotice(@Body RequestBody body,@Path("group_name")String group_name);
 
     /**
@@ -99,7 +100,7 @@ public interface IMApi {
      * @param body
      * @return
      */
-    @POST("{group_name}" + "/imComplaint/save")
+    @POST("{group_name}" + "/sysImComplaint/add")
     Observable<BaseResponse<Object>> sysImComplaint(@Body RequestBody body,@Path("group_name")String group_name);
 
     /**
@@ -107,14 +108,14 @@ public interface IMApi {
      *
      * @return
      */
-    @POST("{group_name}" + "/imGroup/page")
-    Observable<BaseResponse<ContactRoomListBean>> queryGroupList(@Body RequestBody requestBody,@Path("group_name") String group_name);
+    @POST("{group_name}" + "/imGroup/queryAll")
+    Observable<BaseResponse<List<ContactRoomListBean>>> queryGroupList(@Body RequestBody requestBody, @Path("group_name") String group_name);
 
     /**
      * 获取好友列表-学员
      *
      * @return
      */
-    @POST("{group_name}" + "/imUserFriend/page")
-    Observable<BaseResponse<ContactListBean>> queryFriendList(@Body RequestBody requestBody,@Path("group_name") String group_name);
+    @POST("{group_name}" + "/imUserFriend/queryAll")
+    Observable<BaseResponse<List<ContactListBean>>> queryFriendList(@Body RequestBody requestBody,@Path("group_name") String group_name);
 }

chatModule/src/main/java/com/cooleshow/chatmodule/bean/ContactListBean.java

@@ -13,222 +13,44 @@ import java.util.List;
  * Author     : r
  * Date       : 2019/10/3 10:42
  */
-public class ContactListBean {
+public class ContactListBean extends BaseIndexPinyinBean{
+    public String createTime;
+    public String friendAvatar;
+    public String friendId;
+    public String imFriendId;
+    public String friendNickname;
+    public int id;
+    public String memo;
+    public String updateTime;
+    public String roleType;
+    public int userId;
 
-
-    /**
-     * next : true
-     * current : 0
-     * total : 0
-     * pages : 0
-     * prev : true
-     * limit : 0
-     * rows : [{"friendAvatar":"","clientType":"","friendType":"","friendId":0,"createTime":"","friendNickname":"","memo":"","updateTime":"","id":0,"userId":0}]
-     */
-
-    private boolean next;
-    private int current;
-    private int total;
-    private int pages;
-    private boolean prev;
-    private int limit;
-    private List<RowsBean> rows;
-
-    public boolean isNext() {
-        return next;
-    }
-
-    public void setNext(boolean next) {
-        this.next = next;
-    }
-
-    public int getCurrent() {
-        return current;
-    }
-
-    public void setCurrent(int current) {
-        this.current = current;
-    }
-
-    public int getTotal() {
-        return total;
-    }
-
-    public void setTotal(int total) {
-        this.total = total;
-    }
-
-    public int getPages() {
-        return pages;
-    }
-
-    public void setPages(int pages) {
-        this.pages = pages;
-    }
-
-    public boolean isPrev() {
-        return prev;
+    public String getImFriendId() {
+        return imFriendId;
     }
 
-    public void setPrev(boolean prev) {
-        this.prev = prev;
+    public void setImFriendId(String imFriendId) {
+        this.imFriendId = imFriendId;
     }
 
-    public int getLimit() {
-        return limit;
+    public String getRoleType() {
+        return roleType;
     }
 
-    public void setLimit(int limit) {
-        this.limit = limit;
+    public void setRoleType(String roleType) {
+        this.roleType = roleType;
     }
 
-    public List<RowsBean> getRows() {
-        return rows;
+    public String getCreateTime() {
+        return createTime;
     }
 
-    public void setRows(List<RowsBean> rows) {
-        this.rows = rows;
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
     }
 
-    public static class RowsBean  extends BaseIndexPinyinBean {
-        /**
-         * friendAvatar :
-         * clientType :
-         * friendType :
-         * friendId : 0
-         * createTime :
-         * friendNickname :
-         * memo :
-         * updateTime :
-         * id : 0
-         * userId : 0
-         */
-
-        private String friendAvatar;
-        private String clientType;
-        private String friendType;
-        private String friendId;
-        private String imUserId;
-        private String createTime;
-        private String friendNickname;
-        private String memo;
-        private String updateTime;
-        public String roleType;
-        private String id;
-        private String userId;
-        private String subjectName;
-
-        public String getSubjectName() {
-            return subjectName;
-        }
-
-        public void setSubjectName(String subjectName) {
-            this.subjectName = subjectName;
-        }
-
-        public String getImUserId() {
-            return imUserId;
-        }
-
-        public void setImUserId(String imUserId) {
-            this.imUserId = imUserId;
-        }
-
-        public String getFriendAvatar() {
-            return friendAvatar;
-        }
-
-        public void setFriendAvatar(String friendAvatar) {
-            this.friendAvatar = friendAvatar;
-        }
-
-        public String getClientType() {
-            return roleType;
-        }
-
-        public String getRoleType() {
-            return roleType;
-        }
-
-        public void setRoleType(String roleType) {
-            this.roleType = roleType;
-        }
-
-        public void setClientType(String clientType) {
-            this.clientType = clientType;
-        }
-
-        public String getFriendType() {
-            return friendType;
-        }
-
-        public void setFriendType(String friendType) {
-            this.friendType = friendType;
-        }
-
-        public String getFriendId() {
-            return friendId;
-        }
-
-        public void setFriendId(String friendId) {
-            this.friendId = friendId;
-        }
-
-        public String getCreateTime() {
-            return createTime;
-        }
-
-        public void setCreateTime(String createTime) {
-            this.createTime = createTime;
-        }
-
-        public String getFriendNickname() {
-            return friendNickname;
-        }
-
-        public void setFriendNickname(String friendNickname) {
-            this.friendNickname = friendNickname;
-        }
-
-        public String getMemo() {
-            return memo;
-        }
-
-        public void setMemo(String memo) {
-            this.memo = memo;
-        }
-
-        public String getUpdateTime() {
-            return updateTime;
-        }
-
-        public void setUpdateTime(String updateTime) {
-            this.updateTime = updateTime;
-        }
-
-        public String getId() {
-            return id;
-        }
-
-        public void setId(String id) {
-            this.id = id;
-        }
-
-        public String getUserId() {
-            return userId;
-        }
-
-        public void setUserId(String userId) {
-            this.userId = userId;
-        }
-
-        @Override
-        public String getTarget() {
-            return TextUtils.isEmpty(friendNickname) ? "#" : friendNickname;
-        }
-
-        public String getImFriendId() {
-            return imUserId;
-        }
+    @Override
+    public String getTarget() {
+        return TextUtils.isEmpty(friendNickname) ? "#" : friendNickname;
     }
 }

chatModule/src/main/java/com/cooleshow/chatmodule/bean/ContactRoomListBean.java

@@ -3,6 +3,7 @@ package com.cooleshow.chatmodule.bean;
 import android.text.TextUtils;
 
 import com.mcxtzhang.indexlib.IndexBar.bean.BaseIndexPinyinBean;
+import com.mcxtzhang.indexlib.suspension.ISuspensionInterface;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -13,230 +14,127 @@ import java.util.List;
  * @author Ryan
  * 类说明：
  */
-public class ContactRoomListBean {
-
-
-    /**
-     * next : true
-     * current : 0
-     * total : 0
-     * pages : 0
-     * prev : true
-     * limit : 0
-     * rows : [{"img":"","introduce":"","groupId":"","courseGroupId":0,"memo":"","updateTime":"","memberNum":0,"type":"","createBy":0,"createTime":"","name":"","autoPassFlag":true,"id":0}]
-     */
-
-    private boolean next;
-    private int current;
-    private int total;
-    private int pages;
-    private boolean prev;
-    private int limit;
-    private ArrayList<RowsBean> rows;
-
-    public boolean isNext() {
-        return next;
+public class ContactRoomListBean extends BaseIndexPinyinBean {
+    private boolean autoPassFlag;
+    private long createBy;
+    private String createTime;
+    private boolean existFlag;
+    private boolean hasWaitAuditFlag;
+    private String id;
+    private String img;
+    private String introduce;
+    private int memberNum;
+    private String memo;
+    private String name;
+    private String type;
+    private String updateTime;
+
+    public boolean isAutoPassFlag() {
+        return autoPassFlag;
     }
 
-    public void setNext(boolean next) {
-        this.next = next;
+    public void setAutoPassFlag(boolean autoPassFlag) {
+        this.autoPassFlag = autoPassFlag;
     }
 
-    public int getCurrent() {
-        return current;
+    public long getCreateBy() {
+        return createBy;
     }
 
-    public void setCurrent(int current) {
-        this.current = current;
+    public void setCreateBy(long createBy) {
+        this.createBy = createBy;
     }
 
-    public int getTotal() {
-        return total;
+    public String getCreateTime() {
+        return createTime;
     }
 
-    public void setTotal(int total) {
-        this.total = total;
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
     }
 
-    public int getPages() {
-        return pages;
+    public boolean isExistFlag() {
+        return existFlag;
     }
 
-    public void setPages(int pages) {
-        this.pages = pages;
+    public void setExistFlag(boolean existFlag) {
+        this.existFlag = existFlag;
     }
 
-    public boolean isPrev() {
-        return prev;
+    public boolean isHasWaitAuditFlag() {
+        return hasWaitAuditFlag;
     }
 
-    public void setPrev(boolean prev) {
-        this.prev = prev;
+    public void setHasWaitAuditFlag(boolean hasWaitAuditFlag) {
+        this.hasWaitAuditFlag = hasWaitAuditFlag;
     }
 
-    public int getLimit() {
-        return limit;
+    public String getId() {
+        return id;
     }
 
-    public void setLimit(int limit) {
-        this.limit = limit;
+    public void setId(String id) {
+        this.id = id;
     }
 
-    public List<RowsBean> getRows() {
-        return rows;
+    public String getImg() {
+        return img;
     }
 
-    public void setRows(ArrayList<RowsBean> rows) {
-        this.rows = rows;
+    public void setImg(String img) {
+        this.img = img;
     }
 
-    public static class RowsBean extends BaseIndexPinyinBean {
-        /**
-         * img :
-         * introduce :
-         * groupId :
-         * courseGroupId : 0
-         * memo :
-         * updateTime :
-         * memberNum : 0
-         * type :
-         * createBy : 0
-         * createTime :
-         * name :
-         * autoPassFlag : true
-         * id : 0
-         */
-
-        private String img;
-        private String introduce;
-        private String groupId;
-        private String courseGroupId;
-        private String memo;
-        private String updateTime;
-        private String memberNum;
-        private String type;
-        private String createBy;
-        private String createTime;
-        private String name;
-        private boolean autoPassFlag;
-        private String id;
-        private String orchestraName;
-
-        public String getOrchestraName() {
-            return orchestraName;
-        }
-
-        public void setOrchestraName(String orchestraName) {
-            this.orchestraName = orchestraName;
-        }
-
-        public String getImg() {
-            return img;
-        }
-
-        public void setImg(String img) {
-            this.img = img;
-        }
+    public String getIntroduce() {
+        return introduce;
+    }
 
-        public String getIntroduce() {
-            return introduce;
-        }
+    public void setIntroduce(String introduce) {
+        this.introduce = introduce;
+    }
 
-        public void setIntroduce(String introduce) {
-            this.introduce = introduce;
-        }
+    public int getMemberNum() {
+        return memberNum;
+    }
 
-        public String getGroupId() {
-            return groupId;
-        }
+    public void setMemberNum(int memberNum) {
+        this.memberNum = memberNum;
+    }
 
-        public void setGroupId(String groupId) {
-            this.groupId = groupId;
-        }
+    public String getMemo() {
+        return memo;
+    }
 
-        public String getCourseGroupId() {
-            return courseGroupId;
-        }
+    public void setMemo(String memo) {
+        this.memo = memo;
+    }
 
-        public void setCourseGroupId(String courseGroupId) {
-            this.courseGroupId = courseGroupId;
-        }
+    public String getName() {
+        return name;
+    }
 
-        public String getMemo() {
-            return memo;
-        }
+    public void setName(String name) {
+        this.name = name;
+    }
 
-        public void setMemo(String memo) {
-            this.memo = memo;
-        }
-
-        public String getUpdateTime() {
-            return updateTime;
-        }
-
-        public void setUpdateTime(String updateTime) {
-            this.updateTime = updateTime;
-        }
-
-        public String getMemberNum() {
-            return memberNum;
-        }
-
-        public void setMemberNum(String memberNum) {
-            this.memberNum = memberNum;
-        }
-
-        public String getType() {
-            return type;
-        }
-
-        public void setType(String type) {
-            this.type = type;
-        }
-
-        public String getCreateBy() {
-            return createBy;
-        }
-
-        public void setCreateBy(String createBy) {
-            this.createBy = createBy;
-        }
-
-        public String getCreateTime() {
-            return createTime;
-        }
-
-        public void setCreateTime(String createTime) {
-            this.createTime = createTime;
-        }
-
-        public String getName() {
-            return name;
-        }
-
-        public void setName(String name) {
-            this.name = name;
-        }
-
-        public boolean isAutoPassFlag() {
-            return autoPassFlag;
-        }
+    public String getType() {
+        return type;
+    }
 
-        public void setAutoPassFlag(boolean autoPassFlag) {
-            this.autoPassFlag = autoPassFlag;
-        }
+    public void setType(String type) {
+        this.type = type;
+    }
 
-        public String getId() {
-            return groupId;
-        }
+    public String getUpdateTime() {
+        return updateTime;
+    }
 
-        public void setId(String id) {
-            this.id = id;
-        }
+    public void setUpdateTime(String updateTime) {
+        this.updateTime = updateTime;
+    }
 
-        @Override
-        public String getTarget() {
-            return TextUtils.isEmpty(name) ? "#" : name;
-        }
+    @Override
+    public String getTarget() {
+        return TextUtils.isEmpty(name) ? "#" : name;
     }
 }

chatModule/src/main/java/com/cooleshow/chatmodule/bean/GroupMemberBean.java

@@ -13,199 +13,104 @@ import java.util.List;
  * @author Ryan
  * 类说明：
  */
-public class GroupMemberBean implements Serializable {
-
-    /**
-     * next : true
-     * current : 0
-     * total : 0
-     * pages : 0
-     * prev : true
-     * limit : 0
-     * rows : [{"clientType":"","createTime":"","groupId":"","nickname":"","updateTime":"","avatar":"","id":0,"isAdmin":true,"roleType":"","userId":0}]
+public class GroupMemberBean extends BaseIndexPinyinBean implements Serializable {
+/*
+    	"avatar": "",
+			"createTime": "",
+			"groupId": "",
+			"id": 0,
+			"isAdmin": true,
+			"nickname": "",
+			"roleType": "",
+			"updateTime": "",
+			"userId": 0
      */
 
-    private boolean next;
-    private int current;
-    private int total;
-    private int pages;
-    private boolean prev;
-    private int limit;
-    private List<RowsBean> rows;
-
-    public boolean isNext() {
-        return next;
+    private String avatar;
+    private String createTime;
+    private String groupId;
+    private long id;
+    private boolean isAdmin;
+    private String nickname;
+    private String roleType;
+    private String updateTime;
+    private String userId;
+    private String imUserId;
+
+    public String getAvatar() {
+        return avatar;
     }
 
-    public void setNext(boolean next) {
-        this.next = next;
+    public void setAvatar(String avatar) {
+        this.avatar = avatar;
     }
 
-    public int getCurrent() {
-        return current;
+    public String getCreateTime() {
+        return createTime;
     }
 
-    public void setCurrent(int current) {
-        this.current = current;
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
     }
 
-    public int getTotal() {
-        return total;
+    public String getGroupId() {
+        return groupId;
     }
 
-    public void setTotal(int total) {
-        this.total = total;
+    public void setGroupId(String groupId) {
+        this.groupId = groupId;
     }
 
-    public int getPages() {
-        return pages;
+    public long getId() {
+        return id;
     }
 
-    public void setPages(int pages) {
-        this.pages = pages;
+    public void setId(long id) {
+        this.id = id;
     }
 
-    public boolean isPrev() {
-        return prev;
+    public boolean isAdmin() {
+        return isAdmin;
     }
 
-    public void setPrev(boolean prev) {
-        this.prev = prev;
+    public void setAdmin(boolean admin) {
+        isAdmin = admin;
     }
 
-    public int getLimit() {
-        return limit;
+    public String getNickname() {
+        return nickname;
     }
 
-    public void setLimit(int limit) {
-        this.limit = limit;
+    public void setNickname(String nickname) {
+        this.nickname = nickname;
     }
 
-    public List<RowsBean> getRows() {
-        return rows;
+    public String getRoleType() {
+        return roleType;
     }
 
-    public void setRows(List<RowsBean> rows) {
-        this.rows = rows;
+    public void setRoleType(String roleType) {
+        this.roleType = roleType;
     }
 
-    public static class RowsBean extends BaseIndexPinyinBean implements Serializable{
-        /**
-         * clientType :
-         * createTime :
-         * groupId :
-         * nickname :
-         * updateTime :
-         * avatar :
-         * id : 0
-         * isAdmin : true
-         * roleType :
-         * userId : 0
-         */
-
-        private String clientType;
-        private String createTime;
-        private String groupId;
-        private String nickname;
-        private String updateTime;
-        private String avatar;
-        private String id;
-        private String imUserId;
-        private boolean isAdmin;
-        private String roleType;
-        private String userId;
-
-        public String getImUserId() {
-            return imUserId;
-        }
-
-        public void setImUserId(String imUserId) {
-            this.imUserId = imUserId;
-        }
-
-        public String getClientType() {
-            return clientType;
-        }
-
-        public void setClientType(String clientType) {
-            this.clientType = clientType;
-        }
-
-        public String getCreateTime() {
-            return createTime;
-        }
-
-        public void setCreateTime(String createTime) {
-            this.createTime = createTime;
-        }
-
-        public String getGroupId() {
-            return groupId;
-        }
-
-        public void setGroupId(String groupId) {
-            this.groupId = groupId;
-        }
-
-        public String getNickname() {
-            return nickname;
-        }
-
-        public void setNickname(String nickname) {
-            this.nickname = nickname;
-        }
-
-        public String getUpdateTime() {
-            return updateTime;
-        }
+    public String getUpdateTime() {
+        return updateTime;
+    }
 
-        public void setUpdateTime(String updateTime) {
-            this.updateTime = updateTime;
-        }
+    public void setUpdateTime(String updateTime) {
+        this.updateTime = updateTime;
+    }
 
-        public String getAvatar() {
-            return avatar;
-        }
+    public String getUserId() {
+        return imUserId;
+    }
 
-        public void setAvatar(String avatar) {
-            this.avatar = avatar;
-        }
+    public void setUserId(String userId) {
+        this.imUserId = userId;
+    }
 
-        public String getId() {
-            return id;
-        }
-
-        public void setId(String id) {
-            this.id = id;
-        }
-
-        public boolean isAdmin() {
-            return isAdmin;
-        }
-
-        public void setIsAdmin(boolean isAdmin) {
-            this.isAdmin = isAdmin;
-        }
-
-        public String getRoleType() {
-            return clientType;
-        }
-
-        public void setRoleType(String roleType) {
-            this.roleType = roleType;
-        }
-
-        public String getUserId() {
-            return imUserId;
-        }
-
-        public void setUserId(String userId) {
-            this.userId = userId;
-        }
-
-        @Override
-        public String getTarget() {
-            return TextUtils.isEmpty(nickname) ? "#" : nickname;
-        }
+    @Override
+    public String getTarget() {
+        return TextUtils.isEmpty(nickname) ? "#" : nickname;
     }
 }

chatModule/src/main/java/com/cooleshow/chatmodule/contract/ChatGroupSettingContract.java

@@ -5,6 +5,8 @@ import com.cooleshow.chatmodule.bean.GroupMemberBean;
 import com.cooleshow.chatmodule.bean.IMGroupInfo;
 import com.tencent.qcloud.tuikit.tuigroup.bean.GroupInfo;
 
+import java.util.List;
+
 /**
  * 创建日期：2022/6/11 14:43
  *
@@ -15,7 +17,7 @@ public interface ChatGroupSettingContract {
     interface ChatGroupSettingView extends BaseView {
         void onConversation(boolean b);
 
-        void onGroupUsers(GroupMemberBean data, String groupId);
+        void onGroupUsers(List<GroupMemberBean> data, String groupId);
 
         void onQueryGroupDetail(IMGroupInfo data);
 

chatModule/src/main/java/com/cooleshow/chatmodule/contract/ContactListFragmentContract.java

@@ -3,13 +3,15 @@ package com.cooleshow.chatmodule.contract;
 import com.cooleshow.base.presenter.view.BaseView;
 import com.cooleshow.chatmodule.bean.ContactListBean;
 
+import java.util.List;
+
 /**
  * Author by pq, Date on 2022/4/20.
  */
 public interface ContactListFragmentContract {
 
     interface ContactListFragmentView extends BaseView {
-        void getFriendListSuccess(ContactListBean contactListBeans);
+        void getFriendListSuccess(List<ContactListBean> contactListBeans);
 
         void getFriendListError();
 

chatModule/src/main/java/com/cooleshow/chatmodule/contract/ContactRoomListFragmentContract.java

@@ -5,6 +5,8 @@ import android.content.Context;
 import com.cooleshow.base.presenter.view.BaseView;
 import com.cooleshow.chatmodule.bean.ContactRoomListBean;
 
+import java.util.List;
+
 /**
  * 创建日期：2022/6/10 11:32
  *
@@ -13,7 +15,7 @@ import com.cooleshow.chatmodule.bean.ContactRoomListBean;
  */
 public interface ContactRoomListFragmentContract {
     interface ContactRoomListFragmentView extends BaseView {
-        void getGroupListSuccess(ContactRoomListBean contactListBeans);
+        void getGroupListSuccess(List<ContactRoomListBean> contactListBeans);
 
         void getGroupListError();
     }

chatModule/src/main/java/com/cooleshow/chatmodule/presenter/ChatGroupSettingPresenter.java

@@ -25,6 +25,8 @@ import com.tencent.qcloud.tuikit.tuigroup.util.TUIGroupUtils;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.util.List;
+
 
 /**
  * 创建日期：2022/6/11 14:42
@@ -65,9 +67,9 @@ public class ChatGroupSettingPresenter extends BasePresenter<ChatGroupSettingCon
         } catch (JSONException e) {
             e.printStackTrace();
         }
-        addSubscribe(create(IMApi.class).queryGroupAllMembers(RequestBodyUtil.convertToRequestBodyJson(jsonObject.toString()),BaseConstant.CLIENT_API_GROUP_NAME), new BaseObserver<GroupMemberBean>(getView()) {
+        addSubscribe(create(IMApi.class).queryGroupAllMembers(RequestBodyUtil.convertToRequestBodyJson(jsonObject.toString()),BaseConstant.CLIENT_API_GROUP_NAME), new BaseObserver<List<GroupMemberBean>>(getView()) {
             @Override
-            protected void onSuccess(GroupMemberBean data) {
+            protected void onSuccess(List<GroupMemberBean> data) {
                 if (getView() != null) {
                     getView().onGroupUsers(data, groupId);
                 }
@@ -89,13 +91,6 @@ public class ChatGroupSettingPresenter extends BasePresenter<ChatGroupSettingCon
                 if (isViewAttached()) {
                     getView().onQueryGroupDetail(data);
                 }
-                if (data != null) {
-                    String id = data.getId() + "";
-                    String name = data.getName();
-//                    if (!TextUtils.isEmpty(id)) {
-//                        RongIM.getInstance().refreshGroupInfoCache(new Group(id, name, Uri.parse(TextUtils.isEmpty(data.getImg()) ? "" : data.getImg())));
-//                    }
-                }
             }
 
         });

chatModule/src/main/java/com/cooleshow/chatmodule/presenter/ContactListPresenter.java

@@ -13,6 +13,8 @@ import com.cooleshow.chatmodule.contract.ContactListFragmentContract;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.util.List;
+
 /**
  * Author by pq, Date on 2022/5/6.
  */
@@ -20,42 +22,42 @@ public class ContactListPresenter extends BasePresenter<ContactListFragmentContr
 
     @Override
     public void queryFriendList(String searchCondition, String schoolId, String orchestraId, String subjectId, String roleId) {
-//        JSONObject jsonObject = new JSONObject();
-//        try {
-//            jsonObject.putOpt("keyword", searchCondition);
-//            if (!TextUtils.isEmpty(schoolId)) {
-//                jsonObject.putOpt("schoolId", schoolId);
-//            }
-//            if (!TextUtils.isEmpty(orchestraId)) {
-//                jsonObject.putOpt("orchestraId", orchestraId);
-//            }
-//            if (!TextUtils.isEmpty(subjectId)) {
-//                jsonObject.putOpt("subjectId", subjectId);
-//            }
-//            if (!TextUtils.isEmpty(roleId)) {
-//                jsonObject.putOpt("friendType", roleId);
-//            }
-//            jsonObject.putOpt("rows", Integer.MAX_VALUE);
-//            jsonObject.putOpt("page", 1);
-//        } catch (JSONException e) {
-//            e.printStackTrace();
-//        }
-//        addSubscribe(create(IMApi.class).queryFriendList(RequestBodyUtil.convertToRequestBodyJson(jsonObject.toString()),BaseConstant.CLIENT_API_GROUP_NAME), new BaseObserver<ContactListBean>(getView()) {
-//            @Override
-//            protected void onSuccess(ContactListBean data) {
-//                if (getView() != null) {
-//                    getView().getFriendListSuccess(data);
-//                }
-//            }
-//
-//            @Override
-//            public void onError(Throwable e) {
-//                super.onError(e);
-//                if (getView() != null) {
-//                    getView().getFriendListError();
-//                }
-//            }
-//        });
+        JSONObject jsonObject = new JSONObject();
+        try {
+            jsonObject.putOpt("keyword", searchCondition);
+            if (!TextUtils.isEmpty(schoolId)) {
+                jsonObject.putOpt("schoolId", schoolId);
+            }
+            if (!TextUtils.isEmpty(orchestraId)) {
+                jsonObject.putOpt("orchestraId", orchestraId);
+            }
+            if (!TextUtils.isEmpty(subjectId)) {
+                jsonObject.putOpt("subjectId", subjectId);
+            }
+            if (!TextUtils.isEmpty(roleId)) {
+                jsonObject.putOpt("friendType", roleId);
+            }
+            jsonObject.putOpt("rows", Integer.MAX_VALUE);
+            jsonObject.putOpt("page", 1);
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+        addSubscribe(create(IMApi.class).queryFriendList(RequestBodyUtil.convertToRequestBodyJson(jsonObject.toString()),BaseConstant.CLIENT_API_GROUP_NAME), new BaseObserver<List<ContactListBean>>(getView()) {
+            @Override
+            protected void onSuccess(List<ContactListBean> data) {
+                if (getView() != null) {
+                    getView().getFriendListSuccess(data);
+                }
+            }
+
+            @Override
+            public void onError(Throwable e) {
+                super.onError(e);
+                if (getView() != null) {
+                    getView().getFriendListError();
+                }
+            }
+        });
     }
 
     public void getOrchestraList() {

chatModule/src/main/java/com/cooleshow/chatmodule/presenter/ContactRoomListPresenter.java

@@ -13,6 +13,8 @@ import com.cooleshow.chatmodule.contract.ContactRoomListFragmentContract;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.util.List;
+
 /**
  * 创建日期：2022/6/10 11:32
  *
@@ -31,9 +33,9 @@ public class ContactRoomListPresenter extends BasePresenter<ContactRoomListFragm
         } catch (JSONException e) {
             e.printStackTrace();
         }
-        addSubscribe(create(IMApi.class).queryGroupList(RequestBodyUtil.convertToRequestBodyJson(jsonObject.toString()), BaseConstant.CLIENT_API_GROUP_NAME), new BaseObserver<ContactRoomListBean>(getView()) {
+        addSubscribe(create(IMApi.class).queryGroupList(RequestBodyUtil.convertToRequestBodyJson(jsonObject.toString()), BaseConstant.CLIENT_API_GROUP_NAME), new BaseObserver<List<ContactRoomListBean>>(getView()) {
             @Override
-            protected void onSuccess(ContactRoomListBean data) {
+            protected void onSuccess(List<ContactRoomListBean> data) {
                 if (getView() != null) {
                     getView().getGroupListSuccess(data);
                 }

chatModule/src/main/java/com/cooleshow/chatmodule/ui/ChatGroupSettingActivity.java

@@ -37,6 +37,7 @@ import com.tencent.qcloud.tuicore.TUICore;
 import com.tencent.qcloud.tuikit.tuigroup.bean.GroupInfo;
 
 import java.io.Serializable;
+import java.util.List;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -265,25 +266,20 @@ public class ChatGroupSettingActivity extends BaseMVPActivity<TcActivityChatGrou
     }
 
     @Override
-    public void onGroupUsers(GroupMemberBean data, String groupId) {
+    public void onGroupUsers(List<GroupMemberBean> data, String groupId) {
         if (!checkActivityExist()) {
             return;
         }
-        if (adapter != null && data != null && data.getRows() != null) {
+        if (adapter != null && data != null) {
             adapter.getData().clear();
-            adapter.setNewInstance(data.getRows());
-            tv_group_member_list.setText("查看" + data.getRows().size() + "名群成员");
-            for (int i = 0; i < data.getRows().size(); i++) {
+            adapter.setNewInstance(data);
+            tv_group_member_list.setText("查看" + data.size() + "名群成员");
+            for (int i = 0; i < data.size(); i++) {
                 try {
-                    GroupMemberBean.RowsBean usersBean = data.getRows().get(i);
-                    String id = usersBean.getUserId() + "";
-                    String avatar = usersBean.getAvatar();
-                    String name = usersBean.getNickname();
-//                    String extra = GroupUtils.getGroupUserInfoExtra(usersBean.isAdmin(), usersBean.getRoleType());
-//                    if (!TextUtils.isEmpty(id)) {
-//                        //todo 这里需要改一下,刷新会有操作数据库逻辑,for循环不太合适,可以改成集合形式更改数据库->insertGroupMembers
-//                        RongIM.getInstance().refreshGroupUserInfoCache(new GroupUserInfo(groupId, id, name, avatar, extra));
-//                    }
+//                    GroupMemberBean usersBean = data.get(i);
+//                    String id = usersBean.getUserId() + "";
+//                    String avatar = usersBean.getAvatar();
+//                    String name = usersBean.getNickname();
                 } catch (Exception e) {
                 }
             }

chatModule/src/main/java/com/cooleshow/chatmodule/ui/ContactPersonListFragment.java

@@ -45,7 +45,7 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 public class ContactPersonListFragment extends BaseMVPFragment<TcFragmentContactListLayoutBinding, ContactListPresenter> implements ContactListFragmentContract.ContactListFragmentView, View.OnClickListener {
 
     private SuspensionDecoration mDecoration;
-    private List<ContactListBean.RowsBean> mDatas = new ArrayList<>();
+    private List<ContactListBean> mDatas = new ArrayList<>();
     private ContactListAdapter mListAdapter;
     private String searchCondition;
     private String schoolId;
@@ -93,7 +93,7 @@ public class ContactPersonListFragment extends BaseMVPFragment<TcFragmentContact
             @Override
             public void onItemClick(@NonNull BaseQuickAdapter<?, ?> adapter, @NonNull View view, int position) {
                 if (isSelectContact) {
-                    ContactListBean.RowsBean item = (ContactListBean.RowsBean) mListAdapter.getItem(position);
+                    ContactListBean item = (ContactListBean) mListAdapter.getItem(position);
                     //选择联系人模式
 //                    if (getActivity() != null) {
 //                        Intent intent = new Intent();
@@ -104,8 +104,8 @@ public class ContactPersonListFragment extends BaseMVPFragment<TcFragmentContact
 //                    }
                     return;
                 }
-                ContactListBean.RowsBean item = (ContactListBean.RowsBean) adapter.getItem(position);
-                goChat(view, item.getImFriendId() + "", item.getFriendNickname());
+                ContactListBean item = (ContactListBean) adapter.getItem(position);
+                goChat(view, item.getImFriendId() + "", item.friendNickname);
             }
         });
 
@@ -134,18 +134,18 @@ public class ContactPersonListFragment extends BaseMVPFragment<TcFragmentContact
     }
 
     @Override
-    public void getFriendListSuccess(ContactListBean contactListBeans) {
+    public void getFriendListSuccess(List<ContactListBean> contactListBeans) {
         if (isDetached()) {
             return;
         }
         mViewBinding.refreshLayout.finishRefresh();
         if (mListAdapter != null) {
-            if (contactListBeans != null && contactListBeans.getRows() != null && contactListBeans.getRows().size() > 0) {
-                mDatas = contactListBeans.getRows();
+            if (contactListBeans != null && contactListBeans.size() > 0) {
+                mDatas = contactListBeans;
                 mDecoration.setmDatas(mDatas);
                 mViewBinding.livLetters.setmSourceDatas(mDatas)//设置数据
                         .invalidate();
-                mListAdapter.setNewInstance(contactListBeans.getRows());
+                mListAdapter.setNewInstance(contactListBeans);
             } else {
                 mListAdapter.getData().clear();
                 mListAdapter.notifyDataSetChanged();

chatModule/src/main/java/com/cooleshow/chatmodule/ui/ContactRoomListFragment.java

@@ -24,6 +24,8 @@ import com.mcxtzhang.indexlib.suspension.SuspensionDecoration;
 import com.scwang.smart.refresh.layout.api.RefreshLayout;
 import com.scwang.smart.refresh.layout.listener.OnRefreshListener;
 
+import java.util.List;
+
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
@@ -77,7 +79,7 @@ public class ContactRoomListFragment extends BaseMVPFragment<TcFragmentContactRo
             @Override
             public void onItemClick(@NonNull BaseQuickAdapter<?, ?> adapter, @NonNull View view, int position) {
                 if (isSelectContact) {
-                    ContactRoomListBean.RowsBean item = (ContactRoomListBean.RowsBean) adapter.getItem(position);
+                    ContactRoomListBean item = (ContactRoomListBean) adapter.getItem(position);
                     //选择联系人模式
                     if (getActivity() != null) {
 //                        Intent intent = new Intent();
@@ -88,8 +90,8 @@ public class ContactRoomListFragment extends BaseMVPFragment<TcFragmentContactRo
                     }
                     return;
                 }
-                ContactRoomListBean.RowsBean item = (ContactRoomListBean.RowsBean) adapter.getItem(position);
-                goChat(item.getGroupId(), item.getName());
+                ContactRoomListBean item = (ContactRoomListBean) adapter.getItem(position);
+                goChat(item.getId(), item.getName());
             }
         });
         mViewBinding.refreshLayout.setOnRefreshListener(new OnRefreshListener() {
@@ -118,16 +120,16 @@ public class ContactRoomListFragment extends BaseMVPFragment<TcFragmentContactRo
     }
 
     @Override
-    public void getGroupListSuccess(ContactRoomListBean contactListBeans) {
+    public void getGroupListSuccess(List<ContactRoomListBean> contactListBeans) {
         if (isDetached()) {
             return;
         }
         mViewBinding.refreshLayout.finishRefresh();
         if (mListAdapter != null) {
-            if (contactListBeans != null && contactListBeans.getRows() != null && contactListBeans.getRows().size() > 0) {
-                mListAdapter.setNewInstance(contactListBeans.getRows());
-                mDecoration.setmDatas(contactListBeans.getRows());
-                mViewBinding.livLetters.setmSourceDatas(contactListBeans.getRows())//设置数据
+            if (contactListBeans != null && contactListBeans.size() > 0) {
+                mListAdapter.setNewInstance(contactListBeans);
+                mDecoration.setmDatas(contactListBeans);
+                mViewBinding.livLetters.setmSourceDatas(contactListBeans)//设置数据
                         .invalidate();
             } else {
                 mListAdapter.getData().clear();

chatModule/src/main/java/com/cooleshow/chatmodule/ui/GroupMemberActivity.java

@@ -56,7 +56,7 @@ public class GroupMemberActivity extends BaseMVPActivity<TcActivityGroupMemberBi
     private LinearLayoutManager mManager;
     private GroupMemberAdapter adapter;
     private SuspensionDecoration mDecoration;
-    private List<GroupMemberBean.RowsBean> mDatas = new ArrayList<>();
+    private List<GroupMemberBean> mDatas = new ArrayList<>();
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -94,7 +94,7 @@ public class GroupMemberActivity extends BaseMVPActivity<TcActivityGroupMemberBi
         adapter.setOnItemClickListener(new OnItemClickListener() {
             @Override
             public void onItemClick(@NonNull BaseQuickAdapter<?, ?> adapter, @NonNull View view, int position) {
-                GroupMemberBean.RowsBean item = (GroupMemberBean.RowsBean) adapter.getItem(position);
+                GroupMemberBean item = (GroupMemberBean) adapter.getItem(position);
                 String imUserId = UserHelper.getImUserId();
                 if (TextUtils.equals(item.getUserId(), imUserId)) {
                     return;
@@ -118,7 +118,7 @@ public class GroupMemberActivity extends BaseMVPActivity<TcActivityGroupMemberBi
     @Override
     public void initData() {
         super.initData();
-        List<GroupMemberBean.RowsBean> list = (List<GroupMemberBean.RowsBean>) getIntent().getSerializableExtra("list");
+        List<GroupMemberBean> list = (List<GroupMemberBean>) getIntent().getSerializableExtra("list");
         if (list == null) {
             list = new ArrayList<>();
         }