瀏覽代碼

修改部分问题

Pq 1 年之前
父節點
當前提交
467f9efa13

+ 2 - 4
chatModule/src/main/java/com/cooleshow/chatmodule/ui/CreateGroupActivity.java

@@ -68,7 +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());
             ARouter.getInstance().build(RouterPath.MineCenter.SELECT_TENANT_MEMBER)
+                    .withParcelableArrayList("list",cList)
                     .navigation(this, REQUEST_CODE_SELECT);
             return;
         }
@@ -92,10 +94,6 @@ public class CreateGroupActivity extends BaseMVPActivity<TcActivityCreateGroupBi
 
         if (groupType == GROUP_TYPE_ORG) {
             List<StudentPageListBean.RowsBean> data = mMemberAdapter.getData();
-            if (data.size() == 0) {
-                ToastUtil.getInstance().showShort("请选择群成员");
-                return false;
-            }
             memberListResult = new ArrayList<>();
             for (int i = data.size() - 1; i >= 0; i--) {
                 StudentPageListBean.RowsBean rowsBean = data.get(i);

+ 2 - 0
chatModule/src/main/res/layout/tc_activity_chat_group_setting.xml

@@ -49,6 +49,8 @@
                     android:layout_marginEnd="@dimen/dp_15"
                     android:textColor="@color/color_1a1a1a"
                     android:textSize="@dimen/dp_18"
+                    android:maxLines="1"
+                    android:ellipsize="end"
                     android:layout_marginTop="@dimen/dp_8"
                     app:layout_constraintBottom_toTopOf="@id/tv_class_num"
                     app:layout_constraintEnd_toEndOf="parent"

+ 6 - 2
teacher/src/main/java/com/cooleshow/teacher/adapter/SelectTenantMemberAdapter.java

@@ -20,9 +20,13 @@ public class SelectTenantMemberAdapter extends BaseQuickAdapter<StudentPageListB
     public ArrayList<StudentPageListBean.RowsBean> selectMembers;
 
 
-    public SelectTenantMemberAdapter() {
+    public SelectTenantMemberAdapter(ArrayList<StudentPageListBean.RowsBean> defaultList) {
         super(R.layout.item_select_tenant_member_layout);
-        selectMembers = new ArrayList<>();
+        if(defaultList!=null){
+            selectMembers = new ArrayList<>(defaultList);
+        }else{
+            selectMembers =new ArrayList<>();
+        }
     }
 
     public void addSelect(int pos, StudentPageListBean.RowsBean bean) {

+ 3 - 1
teacher/src/main/java/com/cooleshow/teacher/ui/mine/SelectTenantMemberActivity.java

@@ -2,6 +2,7 @@ package com.cooleshow.teacher.ui.mine;
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.os.Parcelable;
 import android.view.View;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
@@ -54,7 +55,8 @@ public class SelectTenantMemberActivity extends BaseMVPActivity<AcSelectTenantMe
     @Override
     public void initData() {
         super.initData();
-        mMemberAdapter = new SelectTenantMemberAdapter();
+        ArrayList<StudentPageListBean.RowsBean> list = getIntent().getParcelableArrayListExtra("list");
+        mMemberAdapter = new SelectTenantMemberAdapter(list);
         EmptyViewLayout emptyViewLayout = new EmptyViewLayout(this);
         emptyViewLayout.setContent(R.drawable.icon_empty_content, "暂无学员");
         mMemberAdapter.setEmptyView(emptyViewLayout);