moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

公会超管移除成员优化

Browse Source
This commit is contained in:
huangjian
2021-09-03 17:34:25 +08:00
parent b98ff32fe0
commit 6bcd955df1
3 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/ModuleHallActivity.java
View File

@@ -92,6 +92,7 @@ public class ModuleHallActivity extends BaseMvpActivity<IModuleHallView, ModuleH
binding.ivHallMemberMore.setOnClickListener(this);
binding.ivBack.setOnClickListener(this);
binding.ivSetting.setOnClickListener(this);
binding.tvExit.setOnClickListener(this);
hallId = getIntent().getLongExtra(KEY_HALL_ID, HallModel.get().getHallId());
ownerUid = getIntent().getLongExtra(KEY_OWNER_UID, AuthModel.get().getCurrentUid());
otherUid = getIntent().getLongExtra(KEY_OTHER_UID, AuthModel.get().getCurrentUid());

11
app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/RemoveMemberListActivity.java
View File

@@ -27,6 +27,7 @@ import com.yizhuan.erban.ui.utils.RVDelegate;
import com.yizhuan.erban.ui.widget.TextWatcherSimple;
import com.yizhuan.xchat_android_core.module_hall.hall.HallModel;
import com.yizhuan.xchat_android_core.module_hall.hall.bean.MemberInfo;
import com.yizhuan.xchat_android_core.module_hall.hall.bean.RoleType;
import com.yizhuan.xchat_android_core.module_hall.income.event.UpdateMemberListEvent;
import com.yizhuan.xchat_android_core.utils.net.RxHelper;
import com.yizhuan.xchat_android_library.base.factory.CreatePresenter;
@@ -37,6 +38,7 @@ import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import butterknife.BindView;
@@ -133,6 +135,15 @@ public class RemoveMemberListActivity extends BaseMvpActivity<IRemoveMemberView,
Logger.i("模厅成员加载失败...");
rvDelegate.loadErr(refresh);
} else {
List<MemberInfo> memberInfoList = listMemberInfo.getMembers();
if (!ListUtils.isListEmpty(memberInfoList)) {
Iterator<MemberInfo> iterator = memberInfoList.iterator();
while (iterator.hasNext()) {
if (iterator.next().getRoleType() == RoleType.CLAN_SUPER_ADMIN) {
iterator.remove();
}
}
}
rvDelegate.loadData(listMemberInfo.getMembers(), refresh);
orignalList.clear();
orignalList.addAll(mGroupMemberListAdapter.getData());

4
app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/GroupMemberListAdapter.java
View File

@@ -113,7 +113,9 @@ public class GroupMemberListAdapter extends BaseQuickAdapter<MemberInfo, BaseVie
holder.addOnClickListener(R.id.iv_remove);
if (mType == TYPE_REMOVE) {
setRemove(holder, item.getRoleType() > HallDataManager.get().getRoleType());
setRemove(holder, item.getRoleType() == 0 ||
item.getRoleType() == 3 ||
item.getRoleType() == RoleType.ADMIN);
holder.addOnClickListener(R.id.container);
} else if (mType == TYPE_NEXT) {
setNext(holder, true);