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

公会移除成员和获取权限增加hallId参数

Browse Source
This commit is contained in:
huangjian
2021-09-08 10:29:01 +08:00
parent b71a9f145d
commit e98d160543
6 changed files with 30 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -184,7 +184,7 @@ public class ModuleHallActivity extends BaseMvpActivity<IModuleHallView, ModuleH
private void setSettingOption(boolean visible) {
if (visible) {
binding.ivHallMemberSearch.setVisibility(View.VISIBLE);
getMvpPresenter().getHallAuths();
getMvpPresenter().getHallAuths(hallId);
binding.ivHallMemberMore.setVisibility(View.VISIBLE);
binding.ivSetting.setVisibility(View.VISIBLE);
binding.tvExit.setVisibility(View.GONE);
@@ -210,7 +210,7 @@ public class ModuleHallActivity extends BaseMvpActivity<IModuleHallView, ModuleH
@Override
public void onOk() {
getMvpPresenter().remove(targetUid);
getMvpPresenter().remove(hallId, targetUid);
}
});
}
@@ -398,7 +398,7 @@ public class ModuleHallActivity extends BaseMvpActivity<IModuleHallView, ModuleH
break;
case AuthInfo.AUTH_MEMBER_EXIT_MANAGER:
RemoveMemberListActivity.start(ModuleHallActivity.this);
RemoveMemberListActivity.start(hallId, ModuleHallActivity.this);
break;
case AuthInfo.AUTH_HALL_MANAGER_SET:

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

@@ -70,8 +70,9 @@ public class RemoveMemberListActivity extends BaseMvpActivity<IRemoveMemberView,
private long mTargetUid;
public static void start(Context context) {
public static void start(long hallId, Context context) {
Intent intent = new Intent(context, RemoveMemberListActivity.class);
intent.putExtra("hallId", hallId);
context.startActivity(intent);
}
@@ -166,7 +167,7 @@ public class RemoveMemberListActivity extends BaseMvpActivity<IRemoveMemberView,
@Override
public void onOk() {
getMvpPresenter().remove(targetUid);
getMvpPresenter().remove(getIntent().getLongExtra("hallId", 0), targetUid);
}
});

12
app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/presenter/ModuleHallPresenter.java
View File

@@ -27,14 +27,14 @@ import io.reactivex.disposables.Disposable;
* Created by lvzebiao on 2018/12/27.
*/
public class ModuleHallPresenter extends BaseMvpPresenter<IModuleHallView>{
public class ModuleHallPresenter extends BaseMvpPresenter<IModuleHallView> {
/**
* 成员列表
*/
public void getHallAuths() {
public void getHallAuths(long hallId) {
HallModel.get().getHallAuths(AuthModel.get().getCurrentUid(),
HallModel.get().getHallAuths(AuthModel.get().getCurrentUid(), hallId,
HallDataManager.get().getRoleType())
.compose(bindToLifecycle())
.subscribe(new SingleObserver<List<AuthInfo>>() {
@@ -48,7 +48,7 @@ public class ModuleHallPresenter extends BaseMvpPresenter<IModuleHallView>{
//对权限处理下
List<AuthInfo> showList = new ArrayList<>();
List<String> canHandle = AuthInfo.canHandleAuth();
for(AuthInfo info : authInfos) {
for (AuthInfo info : authInfos) {
if (info == null) {
continue;
}
@@ -92,8 +92,8 @@ public class ModuleHallPresenter extends BaseMvpPresenter<IModuleHallView>{
});
}
public void remove(long targetUid) {
HallModel.get().removeFromHall(targetUid)
public void remove(long hallId, long targetUid) {
HallModel.get().removeFromHall(hallId, targetUid)
.compose(bindToLifecycle())
.subscribe(new SingleObserver<String>() {
@Override

4
app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/presenter/RemoveMemberPresenter.java
View File

@@ -19,8 +19,8 @@ import io.reactivex.disposables.Disposable;
public class RemoveMemberPresenter extends BaseMvpPresenter<IRemoveMemberView> {
public void remove(long targetUid) {
HallModel.get().removeFromHall(targetUid)
public void remove(long hallId,long targetUid) {
HallModel.get().removeFromHall(hallId,targetUid)
.compose(bindToLifecycle())
.subscribe(new SingleObserver<String>() {
@Override

24
core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/HallModel.java
View File

@@ -127,8 +127,8 @@ public class HallModel extends BaseModel implements IHallModel {
}
@Override
public Single<String> removeFromHall(long targetUid) {
return api.remove(AuthModel.get().getCurrentUid(), targetUid)
public Single<String> removeFromHall(long hallId, long targetUid) {
return api.remove(hallId, AuthModel.get().getCurrentUid(), targetUid)
.compose(RxHelper.handleSchAndExce())
.flatMap(result -> {
if (result.isSuccess()) {
@@ -148,8 +148,8 @@ public class HallModel extends BaseModel implements IHallModel {
* @param roleType 1:厅主 2:高管 3:普通成员
*/
@Override
public Single<List<AuthInfo>> getHallAuths(long uid, int roleType) {
return api.getHallAuths(uid, roleType)
public Single<List<AuthInfo>> getHallAuths(long uid, long hallId, int roleType) {
return api.getHallAuths(uid, hallId, roleType)
.compose(RxHelper.handleCommon(ArrayList::new));
}
@@ -302,8 +302,8 @@ public class HallModel extends BaseModel implements IHallModel {
}
@Override
public Single<String> setSuperAdmin(String roomUids ,long uid) {
return api.setSuperAdmin(roomUids,uid)
public Single<String> setSuperAdmin(String roomUids, long uid) {
return api.setSuperAdmin(roomUids, uid)
.compose(RxHelper.handleStringData());
}
@@ -361,7 +361,8 @@ public class HallModel extends BaseModel implements IHallModel {
*/
@FormUrlEncoded
@POST("/hall/remove")
Single<ServiceResult<ListMemberInfo>> remove(@Field("uid") long uid,
Single<ServiceResult<ListMemberInfo>> remove(@Field("hallId") long hallId,
@Field("uid") long uid,
@Field("targetUid") long targetUid);
@@ -379,7 +380,9 @@ public class HallModel extends BaseModel implements IHallModel {
* @param uid 厅主id
*/
@POST("/hallAuth/getHallAuths")
Single<AuthListResult> getHallAuths(@Query("uid") long uid, @Query("roleType") int roleType);
Single<AuthListResult> getHallAuths(@Query("uid") long uid,
@Query("hallId") long hallId,
@Query("roleType") int roleType);
/**
* 申请退出模厅
@@ -502,12 +505,13 @@ public class HallModel extends BaseModel implements IHallModel {
/**
* 设置超管信息
*
* @param roomUids 设置的房间uid,都会隔开
* @param uid 需要设置的用户uid
* @param uid 需要设置的用户uid
*/
@FormUrlEncoded
@POST("/hall/superManager/setSuperManage")
Single<ServiceResult<String>> setSuperAdmin(@Field("roomUids") String roomUids,@Field("uid") long uid);
Single<ServiceResult<String>> setSuperAdmin(@Field("roomUids") String roomUids, @Field("uid") long uid);
/**
* 获取房间超管信息

4
core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/IHallModel.java
View File

@@ -43,11 +43,11 @@ public interface IHallModel {
int page,
int pageSize);
/**移除模厅*/
Single<String> removeFromHall(long targetUid);
Single<String> removeFromHall(long hallId,long targetUid);
Single<List<OptionInfo>> getHallMenusByUid(long uid);
Single<List<AuthInfo>> getHallAuths(long uid, int roleType);
Single<List<AuthInfo>> getHallAuths(long uid, long hallId, int roleType);
Single<String> quit(long uid);
/**获取模厅信息*/