|
@@ -4,6 +4,7 @@ import android.content.Intent;
|
|
|
import android.os.Bundle;
|
|
|
import android.text.TextUtils;
|
|
|
import android.view.View;
|
|
|
+import android.widget.RadioGroup;
|
|
|
|
|
|
import com.alibaba.android.arouter.facade.annotation.Route;
|
|
|
import com.alibaba.android.arouter.launcher.ARouter;
|
|
@@ -89,16 +90,18 @@ public class CreateGroupActivity extends BaseMVPActivity<TcActivityCreateGroupBi
|
|
|
groupType = GROUP_TYPE_FAN;
|
|
|
}
|
|
|
|
|
|
- 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);
|
|
|
- if (!TextUtils.equals(currentUserId, rowsBean.getUserId())) {
|
|
|
- memberListResult.add(rowsBean.getUserId());
|
|
|
+ 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);
|
|
|
+ if (!TextUtils.equals(currentUserId, rowsBean.getUserId())) {
|
|
|
+ memberListResult.add(rowsBean.getUserId());
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
return true;
|
|
@@ -131,6 +134,17 @@ public class CreateGroupActivity extends BaseMVPActivity<TcActivityCreateGroupBi
|
|
|
mMemberAdapter = new CreateGroupMemberAdapter(userId);
|
|
|
viewBinding.recyclerView.setLayoutManager(new LinearLayoutManager(this, LinearLayoutManager.HORIZONTAL, false));
|
|
|
viewBinding.recyclerView.setAdapter(mMemberAdapter);
|
|
|
+
|
|
|
+ initListener();
|
|
|
+ }
|
|
|
+
|
|
|
+ private void initListener() {
|
|
|
+ viewBinding.rgGroupType.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
|
|
|
+ @Override
|
|
|
+ public void onCheckedChanged(RadioGroup group, int checkedId) {
|
|
|
+ viewBinding.csMember.setVisibility(checkedId == viewBinding.rbJgGroupType.getId() ? View.VISIBLE : View.GONE);
|
|
|
+ }
|
|
|
+ });
|
|
|
}
|
|
|
|
|
|
@NonNull
|