[Modify]公会数据页面修改
This commit is contained in:
@@ -2,6 +2,7 @@ package com.yizhuan.xchat_android_core.module_hall.income;
|
||||
|
||||
import com.yizhuan.xchat_android_core.base.IModel;
|
||||
import com.yizhuan.xchat_android_core.module_hall.income.bean.ClanTotalIncomeInfo;
|
||||
import com.yizhuan.xchat_android_core.module_hall.income.bean.HallTotalIncomeInfo;
|
||||
import com.yizhuan.xchat_android_core.module_hall.income.bean.IncomeGiftInfo;
|
||||
import com.yizhuan.xchat_android_core.module_hall.income.bean.IncomeTotalInfo;
|
||||
import com.yizhuan.xchat_android_core.module_hall.income.bean.LiveTotalIncomeInfo;
|
||||
@@ -17,6 +18,8 @@ public interface IIncomeModel extends IModel {
|
||||
|
||||
Single<ClanTotalIncomeInfo> getClanIncomeList(long clanId, String startTimeStr, String endTimeStr);
|
||||
|
||||
Single<HallTotalIncomeInfo> getHallIncomeList(long clanId, String startTimeStr, String endTimeStr);
|
||||
|
||||
Single<LiveTotalIncomeInfo> getLiveIncomeList(long clanId, String startTimeStr, String endTimeStr);
|
||||
|
||||
Single<SingleRoomTotalIncomeInfo> getSingleRoomIncomeList(String hallId, String clanId,String startTime, String endTime);
|
||||
|
@@ -4,6 +4,7 @@ import com.yizhuan.xchat_android_core.auth.AuthModel;
|
||||
import com.yizhuan.xchat_android_core.base.BaseModel;
|
||||
import com.yizhuan.xchat_android_core.bean.response.ServiceResult;
|
||||
import com.yizhuan.xchat_android_core.module_hall.income.bean.ClanTotalIncomeInfo;
|
||||
import com.yizhuan.xchat_android_core.module_hall.income.bean.HallTotalIncomeInfo;
|
||||
import com.yizhuan.xchat_android_core.module_hall.income.bean.IncomeGiftInfo;
|
||||
import com.yizhuan.xchat_android_core.module_hall.income.bean.IncomeTotalInfo;
|
||||
import com.yizhuan.xchat_android_core.module_hall.income.bean.LiveTotalIncomeInfo;
|
||||
@@ -99,6 +100,19 @@ public class IncomeModel extends BaseModel implements IIncomeModel {
|
||||
});
|
||||
}
|
||||
|
||||
@Override
|
||||
public Single<HallTotalIncomeInfo> getHallIncomeList(long hallId, String startTime, String endTime) {
|
||||
return api.getHallIncomeList(AuthModel.get().getCurrentUid(), hallId, startTime, endTime)
|
||||
.compose(RxHelper.handleSchAndExce())
|
||||
.flatMap((Function<ServiceResult<HallTotalIncomeInfo>, SingleSource<HallTotalIncomeInfo>>) response -> {
|
||||
if (response.isSuccess()) {
|
||||
return Single.just(response.getData());
|
||||
} else {
|
||||
return Single.error(new Throwable(response.getMessage()));
|
||||
}
|
||||
|
||||
});
|
||||
}
|
||||
|
||||
private interface Api {
|
||||
|
||||
@@ -135,6 +149,15 @@ public class IncomeModel extends BaseModel implements IIncomeModel {
|
||||
@Query("startTime") String startTime,
|
||||
@Query("endTime") String endTime);
|
||||
|
||||
/**
|
||||
* 获取公会收入列表
|
||||
*/
|
||||
@GET("/income/totalList")
|
||||
Single<ServiceResult<HallTotalIncomeInfo>> getHallIncomeList(@Query("uid") long uid,
|
||||
@Query("hallId") long hallId,
|
||||
@Query("startTime") String startTime,
|
||||
@Query("endTime") String endTime);
|
||||
|
||||
/**
|
||||
* 获取个播房收入列表
|
||||
*/
|
||||
|
@@ -0,0 +1,147 @@
|
||||
package com.yizhuan.xchat_android_core.module_hall.income.bean;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
public class HallIncomeInfo implements Serializable {
|
||||
private double bagIncome;
|
||||
private String hallAvatar;
|
||||
private String hallName;
|
||||
private double roomIncome;
|
||||
private double normalGiftIncome;
|
||||
private String giftUv;
|
||||
private String newUserSendGiftNum;
|
||||
|
||||
//<editor-fold defaultstate="collapsed" desc="delombok">
|
||||
@SuppressWarnings("all")
|
||||
public HallIncomeInfo() {
|
||||
}
|
||||
|
||||
@SuppressWarnings("all")
|
||||
public double getBagIncome() {
|
||||
return this.bagIncome;
|
||||
}
|
||||
|
||||
@SuppressWarnings("all")
|
||||
public String getHallAvatar() {
|
||||
return this.hallAvatar;
|
||||
}
|
||||
|
||||
@SuppressWarnings("all")
|
||||
public String getHallName() {
|
||||
return this.hallName;
|
||||
}
|
||||
|
||||
@SuppressWarnings("all")
|
||||
public double getRoomIncome() {
|
||||
return this.roomIncome;
|
||||
}
|
||||
|
||||
@SuppressWarnings("all")
|
||||
public double getNormalGiftIncome() {
|
||||
return this.normalGiftIncome;
|
||||
}
|
||||
|
||||
@SuppressWarnings("all")
|
||||
public String getGiftUv() {
|
||||
return this.giftUv;
|
||||
}
|
||||
|
||||
@SuppressWarnings("all")
|
||||
public String getNewUserSendGiftNum() {
|
||||
return this.newUserSendGiftNum;
|
||||
}
|
||||
|
||||
@SuppressWarnings("all")
|
||||
public void setBagIncome(final double bagIncome) {
|
||||
this.bagIncome = bagIncome;
|
||||
}
|
||||
|
||||
@SuppressWarnings("all")
|
||||
public void setHallAvatar(final String hallAvatar) {
|
||||
this.hallAvatar = hallAvatar;
|
||||
}
|
||||
|
||||
@SuppressWarnings("all")
|
||||
public void setHallName(final String hallName) {
|
||||
this.hallName = hallName;
|
||||
}
|
||||
|
||||
@SuppressWarnings("all")
|
||||
public void setRoomIncome(final double roomIncome) {
|
||||
this.roomIncome = roomIncome;
|
||||
}
|
||||
|
||||
@SuppressWarnings("all")
|
||||
public void setNormalGiftIncome(final double normalGiftIncome) {
|
||||
this.normalGiftIncome = normalGiftIncome;
|
||||
}
|
||||
|
||||
@SuppressWarnings("all")
|
||||
public void setGiftUv(final String giftUv) {
|
||||
this.giftUv = giftUv;
|
||||
}
|
||||
|
||||
@SuppressWarnings("all")
|
||||
public void setNewUserSendGiftNum(final String newUserSendGiftNum) {
|
||||
this.newUserSendGiftNum = newUserSendGiftNum;
|
||||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("all")
|
||||
public boolean equals(final Object o) {
|
||||
if (o == this) return true;
|
||||
if (!(o instanceof HallIncomeInfo)) return false;
|
||||
final HallIncomeInfo other = (HallIncomeInfo) o;
|
||||
if (!other.canEqual((Object) this)) return false;
|
||||
if (Double.compare(this.getBagIncome(), other.getBagIncome()) != 0) return false;
|
||||
if (Double.compare(this.getRoomIncome(), other.getRoomIncome()) != 0) return false;
|
||||
if (Double.compare(this.getNormalGiftIncome(), other.getNormalGiftIncome()) != 0) return false;
|
||||
final Object this$hallAvatar = this.getHallAvatar();
|
||||
final Object other$hallAvatar = other.getHallAvatar();
|
||||
if (this$hallAvatar == null ? other$hallAvatar != null : !this$hallAvatar.equals(other$hallAvatar)) return false;
|
||||
final Object this$hallName = this.getHallName();
|
||||
final Object other$hallName = other.getHallName();
|
||||
if (this$hallName == null ? other$hallName != null : !this$hallName.equals(other$hallName)) return false;
|
||||
final Object this$giftUv = this.getGiftUv();
|
||||
final Object other$giftUv = other.getGiftUv();
|
||||
if (this$giftUv == null ? other$giftUv != null : !this$giftUv.equals(other$giftUv)) return false;
|
||||
final Object this$newUserSendGiftNum = this.getNewUserSendGiftNum();
|
||||
final Object other$newUserSendGiftNum = other.getNewUserSendGiftNum();
|
||||
if (this$newUserSendGiftNum == null ? other$newUserSendGiftNum != null : !this$newUserSendGiftNum.equals(other$newUserSendGiftNum)) return false;
|
||||
return true;
|
||||
}
|
||||
|
||||
@SuppressWarnings("all")
|
||||
protected boolean canEqual(final Object other) {
|
||||
return other instanceof HallIncomeInfo;
|
||||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("all")
|
||||
public int hashCode() {
|
||||
final int PRIME = 59;
|
||||
int result = 1;
|
||||
final long $bagIncome = Double.doubleToLongBits(this.getBagIncome());
|
||||
result = result * PRIME + (int) ($bagIncome >>> 32 ^ $bagIncome);
|
||||
final long $roomIncome = Double.doubleToLongBits(this.getRoomIncome());
|
||||
result = result * PRIME + (int) ($roomIncome >>> 32 ^ $roomIncome);
|
||||
final long $normalGiftIncome = Double.doubleToLongBits(this.getNormalGiftIncome());
|
||||
result = result * PRIME + (int) ($normalGiftIncome >>> 32 ^ $normalGiftIncome);
|
||||
final Object $hallAvatar = this.getHallAvatar();
|
||||
result = result * PRIME + ($hallAvatar == null ? 43 : $hallAvatar.hashCode());
|
||||
final Object $hallName = this.getHallName();
|
||||
result = result * PRIME + ($hallName == null ? 43 : $hallName.hashCode());
|
||||
final Object $giftUv = this.getGiftUv();
|
||||
result = result * PRIME + ($giftUv == null ? 43 : $giftUv.hashCode());
|
||||
final Object $newUserSendGiftNum = this.getNewUserSendGiftNum();
|
||||
result = result * PRIME + ($newUserSendGiftNum == null ? 43 : $newUserSendGiftNum.hashCode());
|
||||
return result;
|
||||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("all")
|
||||
public String toString() {
|
||||
return "ClanIncomeInfo(bagIncome=" + this.getBagIncome() + ", hallAvatar=" + this.getHallAvatar() + ", hallName=" + this.getHallName() + ", roomIncome=" + this.getRoomIncome() + ", normalGiftIncome=" + this.getNormalGiftIncome() + ", giftUv=" + this.getGiftUv() + ", newUserSendGiftNum=" + this.getNewUserSendGiftNum() + ")";
|
||||
}
|
||||
//</editor-fold>
|
||||
}
|
@@ -0,0 +1,71 @@
|
||||
package com.yizhuan.xchat_android_core.module_hall.income.bean;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class HallTotalIncomeInfo {
|
||||
private double total;
|
||||
private List<HallIncomeInfo> income;
|
||||
|
||||
//<editor-fold defaultstate="collapsed" desc="delombok">
|
||||
@SuppressWarnings("all")
|
||||
public HallTotalIncomeInfo() {
|
||||
}
|
||||
|
||||
@SuppressWarnings("all")
|
||||
public double getTotal() {
|
||||
return this.total;
|
||||
}
|
||||
|
||||
@SuppressWarnings("all")
|
||||
public List<HallIncomeInfo> getIncome() {
|
||||
return this.income;
|
||||
}
|
||||
|
||||
@SuppressWarnings("all")
|
||||
public void setTotal(final double total) {
|
||||
this.total = total;
|
||||
}
|
||||
|
||||
@SuppressWarnings("all")
|
||||
public void setIncome(final List<HallIncomeInfo> income) {
|
||||
this.income = income;
|
||||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("all")
|
||||
public boolean equals(final Object o) {
|
||||
if (o == this) return true;
|
||||
if (!(o instanceof HallTotalIncomeInfo)) return false;
|
||||
final HallTotalIncomeInfo other = (HallTotalIncomeInfo) o;
|
||||
if (!other.canEqual((Object) this)) return false;
|
||||
if (Double.compare(this.getTotal(), other.getTotal()) != 0) return false;
|
||||
final Object this$income = this.getIncome();
|
||||
final Object other$income = other.getIncome();
|
||||
if (this$income == null ? other$income != null : !this$income.equals(other$income)) return false;
|
||||
return true;
|
||||
}
|
||||
|
||||
@SuppressWarnings("all")
|
||||
protected boolean canEqual(final Object other) {
|
||||
return other instanceof HallTotalIncomeInfo;
|
||||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("all")
|
||||
public int hashCode() {
|
||||
final int PRIME = 59;
|
||||
int result = 1;
|
||||
final long $total = Double.doubleToLongBits(this.getTotal());
|
||||
result = result * PRIME + (int) ($total >>> 32 ^ $total);
|
||||
final Object $income = this.getIncome();
|
||||
result = result * PRIME + ($income == null ? 43 : $income.hashCode());
|
||||
return result;
|
||||
}
|
||||
|
||||
@Override
|
||||
@SuppressWarnings("all")
|
||||
public String toString() {
|
||||
return "ClanTotalIncomeInfo(total=" + this.getTotal() + ", income=" + this.getIncome() + ")";
|
||||
}
|
||||
//</editor-fold>
|
||||
}
|
Reference in New Issue
Block a user