修改群组身份标记以及群主标记显示

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

@@ -75,11 +75,11 @@ public class ContactListAdapter extends BaseQuickAdapter<ContactListBean, BaseVi
         holder.setText(R.id.tv_name, contactListBean.friendNickname);
         ImageView iv_icon = holder.getView(R.id.iv_icon);
         GlideUtils.INSTANCE.loadImage(getContext(), contactListBean.friendAvatar, iv_icon);
-        View ll_klx_tag = holder.getView(R.id.ll_klx_tag);
+        View iv_role_tag = holder.getView(R.id.iv_role_tag);
         if (ChatGroupHelper.isTeacher(contactListBean.getRoleType())) {
-            ll_klx_tag.setVisibility(View.VISIBLE);
+            iv_role_tag.setVisibility(View.VISIBLE);
         } else {
-            ll_klx_tag.setVisibility(View.GONE);
+            iv_role_tag.setVisibility(View.GONE);
         }
     }
 }

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

@@ -59,7 +59,9 @@ public class ContactRoomListAdapter extends BaseQuickAdapter<ContactRoomListBean
             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 {
+        } else if(contactListBean.getType().equals("ORG")){
+            im_group_mark.setBackgroundResource(R.drawable.icon_group_mark_tenant);
+        }else {
             im_group_mark.setBackgroundResource(R.drawable.icon_group_mark_fans);
         }
     }

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

@@ -10,6 +10,7 @@ import com.chad.library.adapter.base.viewholder.BaseViewHolder;
 import com.cooleshow.base.utils.GlideImageLoaderUtils;
 import com.cooleshow.chatmodule.R;
 import com.cooleshow.chatmodule.bean.GroupMemberBean;
+import com.cooleshow.chatmodule.constants.GroupConstants;
 import com.cooleshow.usercenter.helper.UserHelper;
 
 import java.util.List;
@@ -47,6 +48,10 @@ public class GroupMemberAdapter extends BaseQuickAdapter<GroupMemberBean, BaseVi
         //群主标记
         View iv_group_admin_tag = helper.getView(R.id.iv_group_admin_tag);
         iv_group_admin_tag.setVisibility(bean.isAdmin() ? View.VISIBLE : View.GONE);
+
+        ImageView iv_teacher_tag = helper.getView(R.id.iv_teacher_tag);
+        iv_teacher_tag.setVisibility(isTeacher(bean.getRoleType()) ? View.VISIBLE : View.GONE);
+
         //学院标记
 //        View ll_klx_tag = helper.getView(R.id.ll_klx_tag);
 //        if (GroupUtils.isTeacher(bean.getRoleType())) {
@@ -57,10 +62,10 @@ public class GroupMemberAdapter extends BaseQuickAdapter<GroupMemberBean, BaseVi
 
 
         if (null != bean) {
-            if (TextUtils.equals(bean.getRoleType(),"STUDENT")) {
-                GlideImageLoaderUtils.getInstance().loadCircleImage(getContext(), bean.getAvatar(),R.drawable.tc_icon_teacher_default_head, ivIcon);
+            if (TextUtils.equals(bean.getRoleType(), "STUDENT")) {
+                GlideImageLoaderUtils.getInstance().loadCircleImage(getContext(), bean.getAvatar(), R.drawable.tc_icon_teacher_default_head, ivIcon);
             } else {
-                GlideImageLoaderUtils.getInstance().loadCircleImage(getContext(), bean.getAvatar(), R.drawable.tc_icon_teacher_default_head,ivIcon);
+                GlideImageLoaderUtils.getInstance().loadCircleImage(getContext(), bean.getAvatar(), R.drawable.tc_icon_teacher_default_head, ivIcon);
             }
             tvTitle.setText(bean.getNickname());
             if (TextUtils.equals(currentId, bean.getUserId())) {
@@ -73,4 +78,8 @@ public class GroupMemberAdapter extends BaseQuickAdapter<GroupMemberBean, BaseVi
 
     }
 
+    private boolean isTeacher(String roleType) {
+        return TextUtils.equals(roleType, GroupConstants.ROLE_TYPE_TEACHER);
+    }
+
 }

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

@@ -1,6 +1,7 @@
 package com.cooleshow.chatmodule.adapter;
 
 import android.text.TextUtils;
+import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
@@ -16,7 +17,7 @@ import com.cooleshow.chatmodule.bean.GroupMemberBean;
  * @author Ryan
  * 类说明：
  */
-public class GroupSettingMemberAdapter extends BaseQuickAdapter<GroupMemberBean , BaseViewHolder> {
+public class GroupSettingMemberAdapter extends BaseQuickAdapter<GroupMemberBean, BaseViewHolder> {
 
     public GroupSettingMemberAdapter() {
         super(R.layout.tc_item_group_setting_member_list_layout);
@@ -24,15 +25,21 @@ public class GroupSettingMemberAdapter extends BaseQuickAdapter<GroupMemberBean
 
 
     @Override
-    protected void convert(BaseViewHolder helper, GroupMemberBean  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")) {
-            GlideImageLoaderUtils.getInstance().loadCircleImage(getContext(), item.getAvatar(),R.drawable.tc_icon_teacher_default_head, ivIcon);
+        if (TextUtils.equals(item.getRoleType(), "STUDENT")) {
+            GlideImageLoaderUtils.getInstance().loadCircleImage(getContext(), item.getAvatar(), R.drawable.tc_icon_teacher_default_head, ivIcon);
         } else {
-            GlideImageLoaderUtils.getInstance().loadCircleImage(getContext(), item.getAvatar(), R.drawable.tc_icon_teacher_default_head,ivIcon);
+            GlideImageLoaderUtils.getInstance().loadCircleImage(getContext(), item.getAvatar(), R.drawable.tc_icon_teacher_default_head, ivIcon);
         }
         tvTitle.setText(item.getNickname());
-    }
 
+        View tv_group_owner_tag = helper.getView(R.id.tv_group_owner_tag);
+        if (item.isAdmin()) {
+            tv_group_owner_tag.setVisibility(View.VISIBLE);
+        } else {
+            tv_group_owner_tag.setVisibility(View.GONE);
+        }
+    }
 }

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

@@ -20,7 +20,7 @@ import java.util.ArrayList;
  * 类说明：
  */
 public class CreateGroupPresenter extends BasePresenter<CreateGroupContract.CreateGroupView> implements CreateGroupContract.Presenter {
-    public void createGroup(String name, String introduce, String type, ArrayList<StudentPageListBean.RowsBean> list) {
+    public void createGroup(String name, String introduce, String type, ArrayList<String> list) {
         JSONObject jsonObject = new JSONObject();
         try {
             jsonObject.put("name", name);

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

@@ -40,6 +40,7 @@ import com.tencent.qcloud.tuicore.TUICore;
 import com.tencent.qcloud.tuikit.tuigroup.bean.GroupInfo;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.List;
 
 import androidx.annotation.NonNull;
@@ -283,9 +284,18 @@ public class ChatGroupSettingActivity extends BaseMVPActivity<TcActivityChatGrou
             return;
         }
         if (adapter != null && data != null) {
+            List<GroupMemberBean> result = new ArrayList<>();
+            for (int i = 0; i < data.size(); i++) {
+                GroupMemberBean groupMemberBean = data.get(i);
+                if (groupMemberBean.isAdmin()) {
+                    result.add(0, groupMemberBean);
+                } else {
+                    result.add(groupMemberBean);
+                }
+            }
             adapter.getData().clear();
-            adapter.setNewInstance(data);
-            tv_group_member_list.setText("查看" + data.size() + "名群成员");
+            adapter.setNewInstance(result);
+            tv_group_member_list.setText("查看" + result.size() + "名群成员");
             for (int i = 0; i < data.size(); i++) {
                 try {
 //                    GroupMemberBean usersBean = data.get(i);
@@ -301,9 +311,9 @@ public class ChatGroupSettingActivity extends BaseMVPActivity<TcActivityChatGrou
     @Override
     public void onQueryGroupDetail(IMGroupInfo data) {
         if (null != data) {
-            if(!TextUtils.isEmpty(data.getImg())){
-                GlideUtils.INSTANCE.loadImage(this,data.getImg(),iv_portrait);
-            }else{
+            if (!TextUtils.isEmpty(data.getImg())) {
+                GlideUtils.INSTANCE.loadImage(this, data.getImg(), iv_portrait);
+            } else {
                 iv_portrait.setImageResource(ChatGroupHelper.getChatGroupAvatarFromId(data.getId()));
             }
             if (!TextUtils.isEmpty(data.getMemberNum())) {
@@ -353,7 +363,7 @@ public class ChatGroupSettingActivity extends BaseMVPActivity<TcActivityChatGrou
         }
         mGroupInfo = data;
         boolean messageReceiveOption = mGroupInfo.getMessageReceiveOption();
-        LogUtils.i("消息免打扰模式:"+messageReceiveOption);
+        LogUtils.i("消息免打扰模式:" + messageReceiveOption);
         viewBinding.cbMessage.setChecked(messageReceiveOption);
     }
 

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

@@ -45,7 +45,7 @@ public class CreateGroupActivity extends BaseMVPActivity<TcActivityCreateGroupBi
 
     private String groupType = GROUP_TYPE_FAN;
 
-    private ArrayList<StudentPageListBean.RowsBean> memberListResult = null;
+    private ArrayList<String> memberListResult = null;
     private String currentUserId;
 
     @Override
@@ -64,7 +64,7 @@ public class CreateGroupActivity extends BaseMVPActivity<TcActivityCreateGroupBi
                 return;
             }
             String introduction = viewBinding.etIntroduction.getText().toString().trim();
-            presenter.createGroup(groupName, introduction, GROUP_TYPE_FAN, memberListResult);
+            presenter.createGroup(groupName, introduction, groupType, memberListResult);
         }
         if (id == R.id.tv_add_members) {
             ARouter.getInstance().build(RouterPath.MineCenter.SELECT_TENANT_MEMBER)
@@ -94,15 +94,13 @@ public class CreateGroupActivity extends BaseMVPActivity<TcActivityCreateGroupBi
             ToastUtil.getInstance().showShort("请选择群成员");
             return false;
         }
+        memberListResult =new ArrayList<>();
         for (int i = data.size() - 1; i >= 0; i--) {
             StudentPageListBean.RowsBean rowsBean = data.get(i);
-            if (TextUtils.equals(currentUserId, rowsBean.getUserId())) {
-                data.remove(i);
-                break;
+            if (!TextUtils.equals(currentUserId, rowsBean.getUserId())) {
+                memberListResult.add(rowsBean.getUserId());
             }
         }
-        memberListResult = new ArrayList<>();
-        memberListResult.addAll(data);
         return true;
     }
 

chatModule/src/main/res/layout/item_create_group_member_layout.xml

@@ -39,8 +39,9 @@
         android:layout_height="15dp"/>
 
     <TextView
+        android:gravity="center"
         android:id="@+id/tv_name"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="6dp"
         android:ellipsize="end"
@@ -51,5 +52,5 @@
         app:layout_constraintLeft_toLeftOf="@+id/iv_avatar"
         app:layout_constraintRight_toRightOf="@+id/iv_avatar"
         app:layout_constraintTop_toBottomOf="@+id/iv_avatar"
-        tools:text="陈同学" />
+        tools:text="陈同学陈同学陈同学" />
 </androidx.constraintlayout.widget.ConstraintLayout>

chatModule/src/main/res/layout/tc_activity_create_group.xml

@@ -137,9 +137,7 @@
                     android:inputType="text"
                     android:lines="1"
                     android:maxLength="50"
-                    android:paddingLeft="@dimen/dp_21"
                     android:paddingTop="@dimen/dp_8"
-                    android:paddingRight="@dimen/dp_21"
                     android:paddingBottom="@dimen/dp_16"
                     android:textColor="@color/color_333333"
                     android:textColorHint="@color/color_ffc1c1c1"
@@ -184,9 +182,7 @@
                     android:inputType="text"
                     android:lines="1"
                     android:maxLength="50"
-                    android:paddingLeft="@dimen/dp_21"
                     android:paddingTop="@dimen/dp_8"
-                    android:paddingRight="@dimen/dp_21"
                     android:paddingBottom="@dimen/dp_16"
                     android:textColor="@color/color_333333"
                     android:textColorHint="@color/color_ffc1c1c1"

chatModule/src/main/res/layout/tc_group_member_list_item.xml

@@ -44,22 +44,36 @@
     </LinearLayout>
 
 
-    <ImageView
+    <View
+        android:id="@+id/view_help_point"
+        android:layout_width="1px"
+        android:layout_height="1px"
+        android:layout_marginTop="3dp"
+        app:layout_constraintLeft_toLeftOf="@+id/iv_icon"
+        app:layout_constraintTop_toBottomOf="@+id/iv_icon" />
+
+    <TextView
         android:id="@+id/iv_group_admin_tag"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="10dp"
+        android:layout_height="15dp"
+        android:background="@drawable/shape_ff4d72_8dp"
+        android:gravity="center"
+        android:paddingStart="9dp"
+        android:paddingEnd="9dp"
+        android:text="群主"
+        android:textColor="@color/white"
+        android:textSize="@dimen/sp_11"
         android:visibility="gone"
-        android:src="@drawable/tc_icon_group_admin_tag2"
-        app:layout_constraintBottom_toBottomOf="@+id/iv_icon"
-        app:layout_constraintLeft_toRightOf="@+id/iv_icon"
-        app:layout_constraintTop_toTopOf="@+id/iv_icon" />
+        app:layout_constraintBottom_toTopOf="@+id/view_help_point"
+        app:layout_constraintLeft_toLeftOf="@+id/iv_icon"
+        app:layout_constraintRight_toRightOf="@+id/iv_icon" />
 
     <TextView
         android:id="@+id/tv_title"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="4dp"
+        app:layout_constraintWidth_default="wrap"
+        android:layout_marginStart="10dp"
         android:layout_marginEnd="10dp"
         android:ellipsize="end"
         android:includeFontPadding="false"
@@ -67,12 +81,14 @@
         android:text=""
         android:textColor="@color/black_444"
         android:textSize="@dimen/dp_16"
+        app:layout_constraintHorizontal_chainStyle="packed"
+        app:layout_constraintHorizontal_bias="0"
         app:layout_constraintBottom_toBottomOf="@id/iv_icon"
-        app:layout_constraintEnd_toStartOf="@+id/imageView2"
-        app:layout_constraintStart_toEndOf="@+id/iv_group_admin_tag"
+        app:layout_constraintEnd_toStartOf="@+id/iv_teacher_tag"
+        app:layout_constraintStart_toEndOf="@+id/iv_icon"
         app:layout_constraintTop_toTopOf="@+id/iv_icon"
         app:layout_goneMarginStart="10dp"
-        tools:text="哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈" />
+        tools:text="哈哈哈哈哈哈哈" />
 
     <TextView
         android:id="@+id/tv_type"
@@ -91,6 +107,18 @@
 
 
     <ImageView
+        android:visibility="gone"
+        app:layout_constraintLeft_toRightOf="@+id/tv_title"
+        android:layout_marginEnd="10dp"
+        android:id="@+id/iv_teacher_tag"
+        app:layout_constraintRight_toLeftOf="@+id/imageView2"
+        app:layout_constraintBottom_toBottomOf="@+id/tv_title"
+        app:layout_constraintTop_toTopOf="@+id/tv_title"
+        android:src="@drawable/icon_teacher_tag"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+    <ImageView
         android:id="@+id/imageView2"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"

chatModule/src/main/res/layout/tc_item_contact_person_list_layout.xml

@@ -47,26 +47,36 @@
 
     <TextView
         android:id="@+id/tv_name"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:includeFontPadding="false"
         android:layout_marginStart="11dp"
         android:textColor="@color/color_1a1a1a"
         android:textSize="@dimen/sp_16"
+        android:maxLines="1"
+        android:ellipsize="end"
+        android:layout_marginEnd="10dp"
+        app:layout_goneMarginEnd="27dp"
+        app:layout_constraintHorizontal_bias="0"
+        app:layout_constraintHorizontal_chainStyle="packed"
+        app:layout_constraintWidth_default="wrap"
+        app:layout_constraintRight_toLeftOf="@+id/iv_role_tag"
         app:layout_constraintBottom_toBottomOf="@+id/iv_icon"
         app:layout_constraintLeft_toRightOf="@+id/iv_icon"
         app:layout_constraintTop_toTopOf="@+id/iv_icon"
-        tools:text="哈喽王" />
+        tools:text="哈喽王哈喽王哈喽王哈喽王哈喽王哈喽王哈喽王哈喽王哈喽王哈喽王" />
 
     <ImageView
-        android:id="@+id/im_group_mark"
-        android:layout_width="@dimen/dp_45"
-        android:layout_height="@dimen/dp_17"
+        android:visibility="gone"
         app:layout_constraintLeft_toRightOf="@+id/tv_name"
+        android:layout_marginEnd="27dp"
+        android:id="@+id/iv_role_tag"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintBottom_toBottomOf="@+id/tv_name"
         app:layout_constraintTop_toTopOf="@+id/tv_name"
-        android:layout_marginLeft="@dimen/dp_4"
-        android:visibility="visible"
-        app:layout_constraintBottom_toBottomOf="@+id/tv_name"/>
+        android:src="@drawable/icon_teacher_tag"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
 
     <View
         android:background="@color/divide_color_f0f0f0"

chatModule/src/main/res/layout/tc_item_group_setting_member_list_layout.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
@@ -8,34 +7,58 @@
     android:layout_marginStart="@dimen/dp_16"
     android:layout_marginEnd="@dimen/dp_16"
     android:gravity="center"
-    android:orientation="vertical"
-    >
+    android:orientation="vertical">
 
     <de.hdodenhof.circleimageview.CircleImageView
         android:id="@+id/iv_icon"
         android:layout_width="@dimen/dp_40"
         android:layout_height="@dimen/dp_40"
         android:layout_marginTop="6dp"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        />
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <View
+        android:id="@+id/view_help_point"
+        android:layout_width="1px"
+        android:layout_height="1px"
+        android:layout_marginTop="3dp"
+        app:layout_constraintLeft_toLeftOf="@+id/iv_icon"
+        app:layout_constraintTop_toBottomOf="@+id/iv_icon" />
 
     <TextView
-        android:maxLines="1"
-        android:maxWidth="70dp"
-        android:ellipsize="end"
+        android:id="@+id/tv_group_owner_tag"
+        android:layout_width="wrap_content"
+        android:layout_height="15dp"
+        android:background="@drawable/shape_ff4d72_8dp"
+        android:gravity="center"
+        android:paddingStart="9dp"
+        android:paddingEnd="9dp"
+        android:text="群主"
+        android:textColor="@color/white"
+        android:textSize="@dimen/sp_11"
+        android:visibility="gone"
+        app:layout_constraintBottom_toTopOf="@+id/view_help_point"
+        app:layout_constraintLeft_toLeftOf="@+id/iv_icon"
+        app:layout_constraintRight_toRightOf="@+id/iv_icon" />
+
+    <TextView
+        android:gravity="center"
         android:id="@+id/tv_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/dp_5"
         android:layout_marginBottom="@dimen/dp_19"
+        android:ellipsize="end"
+        android:maxWidth="70dp"
+        android:maxLines="1"
         android:text=""
-        tools:text="哈哈哈哈哈哈哈哈"
         android:textColor="@color/color_666666"
         android:textSize="@dimen/dp_14"
-        app:layout_constraintBottom_toBottomOf="@id/iv_icon"
-        app:layout_constraintStart_toEndOf="@+id/iv_icon"
-        app:layout_constraintTop_toTopOf="@+id/iv_icon"/>
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/iv_icon"
+        tools:text="哈哈哈哈哈哈哈哈" />
 
 
-</LinearLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

teacher/src/main/java/com/cooleshow/teacher/ui/mine/SelectTenantMemberActivity.java

@@ -112,6 +112,7 @@ public class SelectTenantMemberActivity extends BaseMVPActivity<AcSelectTenantMe
         if (mMemberAdapter == null) {
             return;
         }
+        viewBinding.refreshLayout.finishRefresh();
         if (data != null && data.getRows() != null && data.getRows().size() > 0) {
             mMemberAdapter.setList(data.getRows());
         } else {

teacher/src/main/res/layout/ac_select_tenant_member_layout.xml

@@ -12,6 +12,7 @@
         android:id="@+id/refresh_layout"
         android:layout_width="match_parent"
         android:layout_height="0dp"
+        android:layout_marginTop="10dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/toolbar_include"
         app:srlEnableLoadMore="false"