修改创建群组流程字段

BaseLibrary/src/main/java/com/cooleshow/base/bean/StudentPageListBean.java

@@ -449,6 +449,14 @@ public class StudentPageListBean implements Parcelable {
 
 
         @Override
+        public String getTarget() {
+            LOG.i("username:"+username);
+            String result = TextUtils.isEmpty(username) ? "#" : username;
+            LOG.i("result:"+result);
+            return result;
+        }
+
+        @Override
         public int describeContents() {
             return 0;
         }
@@ -488,6 +496,7 @@ public class StudentPageListBean implements Parcelable {
             dest.writeString(this.userStatus);
             dest.writeString(this.userType);
             dest.writeString(this.username);
+            dest.writeString(this.imUserId);
         }
 
         public void readFromParcel(Parcel source) {
@@ -524,19 +533,12 @@ public class StudentPageListBean implements Parcelable {
             this.userStatus = source.readString();
             this.userType = source.readString();
             this.username = source.readString();
+            this.imUserId = source.readString();
         }
 
         public RowsBean() {
         }
 
-        @Override
-        public String getTarget() {
-            LOG.i("username:"+username);
-            String result = TextUtils.isEmpty(username) ? "#" : username;
-            LOG.i("result:"+result);
-            return result;
-        }
-
         protected RowsBean(Parcel in) {
             this.age = in.readInt();
             this.avatar = in.readString();
@@ -571,9 +573,10 @@ public class StudentPageListBean implements Parcelable {
             this.userStatus = in.readString();
             this.userType = in.readString();
             this.username = in.readString();
+            this.imUserId = in.readString();
         }
 
-        public static final Parcelable.Creator<RowsBean> CREATOR = new Parcelable.Creator<RowsBean>() {
+        public static final Creator<RowsBean> CREATOR = new Creator<RowsBean>() {
             @Override
             public RowsBean createFromParcel(Parcel source) {
                 return new RowsBean(source);
@@ -584,7 +587,6 @@ public class StudentPageListBean implements Parcelable {
                 return new RowsBean[size];
             }
         };
-
     }
 
     @Override

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

@@ -32,7 +32,7 @@ public class CreateGroupMemberAdapter extends BaseQuickAdapter<StudentPageListBe
         holder.setText(R.id.tv_name, bean.getUsername());
 
         TextView tv_group_owner_tag = holder.getView(R.id.tv_group_owner_tag);
-        if(TextUtils.equals(bean.getUserId(),groupOwnerId)){
+        if(TextUtils.equals(bean.getImUserId(),groupOwnerId)){
             tv_group_owner_tag.setVisibility(View.VISIBLE);
         }else{
             tv_group_owner_tag.setVisibility(View.GONE);

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

@@ -68,9 +68,9 @@ public class CreateGroupActivity extends BaseMVPActivity<TcActivityCreateGroupBi
             presenter.createGroup(groupName, introduction, groupType, memberListResult);
         }
         if (id == R.id.tv_add_members) {
-            ArrayList<StudentPageListBean.RowsBean> cList  =new ArrayList<>(mMemberAdapter.getData());
+            ArrayList<StudentPageListBean.RowsBean> cList = new ArrayList<>(mMemberAdapter.getData());
             ARouter.getInstance().build(RouterPath.MineCenter.SELECT_TENANT_MEMBER)
-                    .withParcelableArrayList("list",cList)
+                    .withParcelableArrayList("list", cList)
                     .navigation(this, REQUEST_CODE_SELECT);
             return;
         }
@@ -97,9 +97,7 @@ public class CreateGroupActivity extends BaseMVPActivity<TcActivityCreateGroupBi
             memberListResult = new ArrayList<>();
             for (int i = data.size() - 1; i >= 0; i--) {
                 StudentPageListBean.RowsBean rowsBean = data.get(i);
-                if (!TextUtils.equals(currentUserId, rowsBean.getUserId())) {
-                    memberListResult.add(rowsBean.getUserId());
-                }
+                memberListResult.add(rowsBean.getUserId());
             }
         }
         return true;
@@ -122,7 +120,7 @@ public class CreateGroupActivity extends BaseMVPActivity<TcActivityCreateGroupBi
     @Override
     public void initData() {
         super.initData();
-        currentUserId = UserHelper.getUserId();
+        currentUserId = UserHelper.getImUserId();
         String tenantId = UserHelper.getTenantId();
         if (UserHelper.isTenantAccount(tenantId)) {
             viewBinding.csGroupType.setVisibility(View.VISIBLE);
@@ -147,7 +145,7 @@ public class CreateGroupActivity extends BaseMVPActivity<TcActivityCreateGroupBi
     @NonNull
     private ArrayList<StudentPageListBean.RowsBean> getOwnerData() {
         StudentPageListBean.RowsBean rowsBean = new StudentPageListBean.RowsBean();
-        rowsBean.setUserId(UserHelper.getUserId());
+        rowsBean.setUserId(UserHelper.getImUserId());
         rowsBean.setAvatar(UserHelper.getUserAvatar());
         rowsBean.setUsername(UserHelper.getUserName());
         ArrayList<StudentPageListBean.RowsBean> list = new ArrayList();
@@ -181,7 +179,7 @@ public class CreateGroupActivity extends BaseMVPActivity<TcActivityCreateGroupBi
                 if (selectMembers != null) {
                     if (selectMembers.size() > 0) {
                         viewBinding.recyclerView.setVisibility(View.VISIBLE);
-                    }else{
+                    } else {
                         viewBinding.recyclerView.setVisibility(View.GONE);
                     }
                     if (mMemberAdapter != null) {

teacher/src/main/java/com/cooleshow/teacher/adapter/SelectTenantMemberAdapter.java

@@ -33,7 +33,7 @@ public class SelectTenantMemberAdapter extends BaseQuickAdapter<StudentPageListB
     }
 
     public void addSelect(int pos, StudentPageListBean.RowsBean bean) {
-        int contain = isContain(bean.getUserId());
+        int contain = isContain(bean.getImUserId());
         if (contain != -1) {
             selectMembers.remove(contain);
         } else {
@@ -45,7 +45,7 @@ public class SelectTenantMemberAdapter extends BaseQuickAdapter<StudentPageListB
     private int isContain(String targetId) {
         for (int i = 0; i < selectMembers.size(); i++) {
             StudentPageListBean.RowsBean rowsBean = selectMembers.get(i);
-            if (TextUtils.equals(rowsBean.getUserId(), targetId)) {
+            if (TextUtils.equals(rowsBean.getImUserId(), targetId)) {
                 return i;
             }
         }
@@ -65,7 +65,7 @@ public class SelectTenantMemberAdapter extends BaseQuickAdapter<StudentPageListB
 
         ImageView iv_check = holder.getView(R.id.iv_check);
 
-        if (isContain(bean.getUserId()) != -1) {
+        if (isContain(bean.getImUserId()) != -1) {
             iv_check.setImageResource(R.drawable.icon_check_select);
         } else {
             iv_check.setImageResource(com.cooleshow.base.R.drawable.icon_check_select_default);