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

公会逻辑修改

Browse Source
This commit is contained in:
wushaocheng
2022-11-08 11:52:44 +08:00
parent 42e3a8e32e
commit 792b63e0d5
16 changed files with 360 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/src/main/java/com/yizhuan/xchat_android_core/association/AssociationModel.kt
View File

@@ -3,13 +3,9 @@ package com.yizhuan.xchat_android_core.association
import com.yizhuan.xchat_android_core.base.BaseModel
import com.yizhuan.xchat_android_core.bean.response.ListResult
import com.yizhuan.xchat_android_core.bean.response.ServiceResult
import com.yizhuan.xchat_android_core.home.model.HomeModel
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager
import com.yizhuan.xchat_android_core.module_hall.hall.bean.ClanListInfo
import com.yizhuan.xchat_android_core.utils.net.launchRequest
import com.yizhuan.xchat_android_library.net.rxnet.RxNet
import retrofit2.http.GET
import retrofit2.http.Query
object AssociationModel : BaseModel() {
@@ -20,6 +16,11 @@ object AssociationModel : BaseModel() {
api.getClanList()
}
suspend fun getHallList(): ListResult<HallListInfo>? =
launchRequest {
api.getHallList()
}
private interface Api {
/**
@@ -28,6 +29,12 @@ object AssociationModel : BaseModel() {
@GET("/clan/list")
suspend fun getClanList(): ServiceResult<ListResult<ClanListInfo>>
/**
* 获取牌照房
*/
@GET("/hall/list")
suspend fun getHallList(): ServiceResult<ListResult<HallListInfo>>
}
}

19
core/src/main/java/com/yizhuan/xchat_android_core/association/HallListInfo.java Normal file
View File

@@ -0,0 +1,19 @@
package com.yizhuan.xchat_android_core.association;
import lombok.Data;
@Data
public class HallListInfo {
private Long hallId;
private String hallName;
private Long clanId;
private int roleType;
private Long ownerUid;
private String ownerNick;
private String ownerAvatar;
private Integer memberCount;
private Long ownerErbanNo;
private Double roomIncome;
private int applyBtnStatus;//0=不显示 1=可申请 2=已申请
}

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

@@ -10,7 +10,6 @@ import com.yizhuan.xchat_android_core.module_hall.hall.bean.AuthInfo;
import com.yizhuan.xchat_android_core.module_hall.hall.bean.AuthListResult;
import com.yizhuan.xchat_android_core.module_hall.hall.bean.ClanAndHallInfo;
import com.yizhuan.xchat_android_core.module_hall.hall.bean.ClanInfo;
import com.yizhuan.xchat_android_core.module_hall.hall.bean.ClanListInfo;
import com.yizhuan.xchat_android_core.module_hall.hall.bean.HallInfo;
import com.yizhuan.xchat_android_core.module_hall.hall.bean.HallMenuByUidResult;
import com.yizhuan.xchat_android_core.module_hall.hall.bean.ListMemberInfo;

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

@@ -4,8 +4,6 @@ package com.yizhuan.xchat_android_core.module_hall.hall;
import com.yizhuan.xchat_android_core.module_hall.hall.bean.ApplyResult;
import com.yizhuan.xchat_android_core.module_hall.hall.bean.AuthInfo;
import com.yizhuan.xchat_android_core.module_hall.hall.bean.ClanAndHallInfo;
import com.yizhuan.xchat_android_core.module_hall.hall.bean.ClanInfo;
import com.yizhuan.xchat_android_core.module_hall.hall.bean.ClanListInfo;
import com.yizhuan.xchat_android_core.module_hall.hall.bean.HallInfo;
import com.yizhuan.xchat_android_core.module_hall.hall.bean.ListMemberInfo;
import com.yizhuan.xchat_android_core.module_hall.hall.bean.OptionInfo;

15
core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/ClanListInfo.java
View File

@@ -1,15 +0,0 @@
package com.yizhuan.xchat_android_core.module_hall.hall.bean;
import lombok.Data;
@Data
public class ClanListInfo {
private int clanId;
private long clanElderUid;
private String avatar;
private String name;
private String levelIcon;
private double income;
private int level;
private int applyBtnStatus;//0=不显示 1=可申请 2=已申请
}