修改部分问题

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

@@ -68,7 +68,7 @@ public class GroupMemberAdapter extends BaseQuickAdapter<GroupMemberBean, BaseVi
                 GlideImageLoaderUtils.getInstance().loadImage(getContext(), bean.getAvatar(), ivIcon,R.drawable.tc_icon_teacher_default_head);
             }
             tvTitle.setText(bean.getNickname());
-            if (TextUtils.equals(currentId, bean.getUserId())) {
+            if (TextUtils.equals(currentId, bean.getImUserId())) {
                 imageView2.setVisibility(View.GONE);
             } else {
                 imageView2.setVisibility(View.VISIBLE);

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

@@ -1,5 +1,7 @@
 package com.cooleshow.chatmodule.bean;
 
+import android.os.Parcel;
+import android.os.Parcelable;
 import android.text.TextUtils;
 
 import com.chad.library.adapter.base.entity.MultiItemEntity;
@@ -14,7 +16,7 @@ import java.util.List;
  * @author Ryan
  * 类说明：
  */
-public class GroupMemberBean extends BaseIndexPinyinBean implements Serializable, MultiItemEntity {
+public class GroupMemberBean extends BaseIndexPinyinBean implements Serializable, MultiItemEntity, Parcelable {
 /*
     	"avatar": "",
 			"createTime": "",
@@ -104,11 +106,11 @@ public class GroupMemberBean extends BaseIndexPinyinBean implements Serializable
     }
 
     public String getUserId() {
-        return imUserId;
+        return userId;
     }
 
     public void setUserId(String userId) {
-        this.imUserId = userId;
+        this.userId = userId;
     }
 
     @Override
@@ -132,4 +134,68 @@ public class GroupMemberBean extends BaseIndexPinyinBean implements Serializable
     public int getItemType() {
         return itemType;
     }
+
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeString(this.avatar);
+        dest.writeString(this.createTime);
+        dest.writeString(this.groupId);
+        dest.writeLong(this.id);
+        dest.writeByte(this.isAdmin ? (byte) 1 : (byte) 0);
+        dest.writeString(this.nickname);
+        dest.writeString(this.roleType);
+        dest.writeString(this.updateTime);
+        dest.writeString(this.userId);
+        dest.writeString(this.imUserId);
+        dest.writeInt(this.itemType);
+    }
+
+    public void readFromParcel(Parcel source) {
+        this.avatar = source.readString();
+        this.createTime = source.readString();
+        this.groupId = source.readString();
+        this.id = source.readLong();
+        this.isAdmin = source.readByte() != 0;
+        this.nickname = source.readString();
+        this.roleType = source.readString();
+        this.updateTime = source.readString();
+        this.userId = source.readString();
+        this.imUserId = source.readString();
+        this.itemType = source.readInt();
+    }
+
+    public GroupMemberBean() {
+    }
+
+    protected GroupMemberBean(Parcel in) {
+        this.avatar = in.readString();
+        this.createTime = in.readString();
+        this.groupId = in.readString();
+        this.id = in.readLong();
+        this.isAdmin = in.readByte() != 0;
+        this.nickname = in.readString();
+        this.roleType = in.readString();
+        this.updateTime = in.readString();
+        this.userId = in.readString();
+        this.imUserId = in.readString();
+        this.itemType = in.readInt();
+    }
+
+    public static final Parcelable.Creator<GroupMemberBean> CREATOR = new Parcelable.Creator<GroupMemberBean>() {
+        @Override
+        public GroupMemberBean createFromParcel(Parcel source) {
+            return new GroupMemberBean(source);
+        }
+
+        @Override
+        public GroupMemberBean[] newArray(int size) {
+            return new GroupMemberBean[size];
+        }
+    };
 }

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

@@ -283,6 +283,7 @@ public class ChatGroupSettingActivity extends BaseMVPActivity<TcActivityChatGrou
 
     private void goSelectContact() {
         ARouter.getInstance().build(RouterPath.MineCenter.SELECT_TENANT_MEMBER)
+                .withSerializable("filterList", allMemberList)
                 .navigation(this, REQUEST_CODE_SELECT);
     }
 

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

@@ -96,10 +96,10 @@ public class GroupMemberActivity extends BaseMVPActivity<TcActivityGroupMemberBi
             public void onItemClick(@NonNull BaseQuickAdapter<?, ?> adapter, @NonNull View view, int position) {
                 GroupMemberBean item = (GroupMemberBean) adapter.getItem(position);
                 String imUserId = UserHelper.getImUserId();
-                if (TextUtils.equals(item.getUserId(), imUserId)) {
+                if (TextUtils.equals(item.getImUserId(), imUserId)) {
                     return;
                 }
-                ChatHelper.getInstance().goChat(item.getUserId(),item.getNickname());
+                ChatHelper.getInstance().goChat(item.getImUserId(),item.getNickname());
             }
         });
 

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

@@ -7,11 +7,12 @@
     android:gravity="center"
     android:orientation="vertical">
 
-    <de.hdodenhof.circleimageview.CircleImageView
+    <com.cooleshow.base.widgets.QMUIRadiusImageView
         android:id="@+id/iv_icon"
         android:layout_width="@dimen/dp_45"
         android:layout_height="@dimen/dp_45"
         android:layout_marginTop="6dp"
+        app:qmui_corner_radius="8dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />

institution/src/main/java/com/cooleshow/institution/stu/ui/main/HomeCardFragment.java

@@ -117,6 +117,13 @@ public class HomeCardFragment extends BaseMVPFragment<FgHomeCardLayoutBinding, H
     }
 
     public void refreshUserInfo(StudentUserInfo data) {
+        if (isDetached()) {
+            return;
+        }
+        if (data == null) {
+            return;
+        }
+        mViewBinding.tvName.setText(data.getTenantName());
     }
 
     private int currentStatus = -1;
@@ -175,7 +182,6 @@ public class HomeCardFragment extends BaseMVPFragment<FgHomeCardLayoutBinding, H
     public void refreshAlbumData(HomeAlbumListBean data) {
         if (data != null) {
             int cPos = mViewBinding.viewPager.getCurrentItem();
-            mViewBinding.tvName.setText(data.getTenantName());
             if (data.getTenantAlbumStatus() == Constants.HOME_PAGE_STATUS_EMPTY) {
                 loadEmpty(data.getTenantAlbumStatus());
             } else {
@@ -185,7 +191,7 @@ public class HomeCardFragment extends BaseMVPFragment<FgHomeCardLayoutBinding, H
                 cPos = 0;
             }
             mViewBinding.viewPager.setCurrentItem(cPos, false);
-        }else{
+        } else {
             loadEmpty(Constants.HOME_PAGE_STATUS_EMPTY);
         }
     }

institution/src/main/res/layout/fg_home_card_layout.xml

@@ -40,8 +40,12 @@
         app:layout_constraintTop_toBottomOf="@+id/view_status_bar" />
 
     <TextView
+        app:layout_constraintRight_toLeftOf="@+id/iv_more_track"
         android:id="@+id/tv_name"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
+        android:maxLines="1"
+        android:layout_marginEnd="5dp"
+        android:ellipsize="end"
         android:layout_height="wrap_content"
         android:layout_marginStart="6dp"
         android:includeFontPadding="false"
@@ -50,7 +54,7 @@
         app:layout_constraintBottom_toBottomOf="@+id/iv_tag"
         app:layout_constraintLeft_toRightOf="@+id/iv_tag"
         app:layout_constraintTop_toTopOf="@+id/iv_tag"
-        tools:text="满天都是小星星机构" />
+        tools:text="满天都是小星星机构满天都是小星星机构满天都是小星星机构" />
 
 
     <View

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

@@ -4,6 +4,7 @@ import android.content.Intent;
 import android.graphics.Color;
 import android.os.Bundle;
 import android.os.Parcelable;
+import android.text.TextUtils;
 import android.view.View;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
@@ -17,6 +18,7 @@ import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
 import com.cooleshow.base.widgets.CommonBottomItemDecoration;
 import com.cooleshow.base.widgets.CustomSuspensionDecoration;
 import com.cooleshow.base.widgets.EmptyViewLayout;
+import com.cooleshow.chatmodule.bean.GroupMemberBean;
 import com.cooleshow.chatmodule.widget.CustomIndexBarDataHelperImpl;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.adapter.SelectTenantMemberAdapter;
@@ -28,6 +30,7 @@ import com.scwang.smart.refresh.layout.api.RefreshLayout;
 import com.scwang.smart.refresh.layout.listener.OnRefreshListener;
 
 import java.util.ArrayList;
+import java.util.List;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -43,6 +46,7 @@ public class SelectTenantMemberActivity extends BaseMVPActivity<AcSelectTenantMe
 
     private SelectTenantMemberAdapter mMemberAdapter;
     private CustomSuspensionDecoration mDecoration;
+    private ArrayList<GroupMemberBean> mFilterList;
 
 
     @Override
@@ -60,6 +64,7 @@ public class SelectTenantMemberActivity extends BaseMVPActivity<AcSelectTenantMe
     public void initData() {
         super.initData();
         ArrayList<StudentPageListBean.RowsBean> list = getIntent().getParcelableArrayListExtra("list");
+        mFilterList = getIntent().getParcelableArrayListExtra("filterList");
         mMemberAdapter = new SelectTenantMemberAdapter(list);
         EmptyViewLayout emptyViewLayout = new EmptyViewLayout(this);
         emptyViewLayout.setContent(R.drawable.icon_empty_content, "暂无学员");
@@ -131,16 +136,41 @@ public class SelectTenantMemberActivity extends BaseMVPActivity<AcSelectTenantMe
         }
         viewBinding.refreshLayout.finishRefresh();
         if (data != null && data.getRows() != null && data.getRows().size() > 0) {
-            mDecoration.setmDatas(data.getRows());
-            viewBinding.livLetters.setmSourceDatas(data.getRows())//设置数据
+            ArrayList<StudentPageListBean.RowsBean> list = filterExist(data.getRows());
+            mDecoration.setmDatas(list);
+            viewBinding.livLetters.setmSourceDatas(list)//设置数据
                     .invalidate();
-            mMemberAdapter.setList(data.getRows());
+            mMemberAdapter.setList(list);
         } else {
             mMemberAdapter.getData().clear();
             mMemberAdapter.notifyDataSetChanged();
         }
     }
 
+    private ArrayList<StudentPageListBean.RowsBean> filterExist(List<StudentPageListBean.RowsBean> list) {
+        ArrayList<StudentPageListBean.RowsBean> listResult = new ArrayList<>();
+        for (int i = 0; i < list.size(); i++) {
+            StudentPageListBean.RowsBean rowsBean = list.get(i);
+            boolean containInFilterList = isContainInFilterList(rowsBean.getUserId());
+            if (!containInFilterList) {
+                listResult.add(rowsBean);
+            }
+        }
+        return listResult;
+    }
+
+    private boolean isContainInFilterList(String targetId) {
+        if (mFilterList != null && mFilterList.size() > 0) {
+            for (int j = 0; j < mFilterList.size(); j++) {
+                GroupMemberBean groupMemberBean = mFilterList.get(j);
+                if (TextUtils.equals(targetId, groupMemberBean.getUserId())) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
     @Override
     public void onClick(View v) {
         int id = v.getId();