diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/SingleRoomIncomeActivity.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/SingleRoomIncomeActivity.java index d83936fe1..0bd051c91 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/SingleRoomIncomeActivity.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/SingleRoomIncomeActivity.java @@ -17,6 +17,7 @@ import com.yizhuan.erban.base.BaseMvpActivity; import com.yizhuan.erban.module_hall.hall.view.dialog.TimePickerDialog; import com.yizhuan.erban.module_hall.hall.view.indicator.StatisticsIndicatorAdapter; import com.yizhuan.erban.module_hall.income.ClanIncomeFragment; +import com.yizhuan.erban.module_hall.income.SingleRoomIncomeFragment; import com.yizhuan.erban.module_hall.income.presenter.ClanIncomePresenter; import com.yizhuan.erban.module_hall.income.presenter.SingleRoomIncomePresenter; import com.yizhuan.erban.module_hall.income.view.IIncomeStatisticsView; @@ -45,7 +46,7 @@ import butterknife.OnClick; @CreatePresenter(SingleRoomIncomePresenter.class) public class SingleRoomIncomeActivity extends BaseMvpActivity - implements IIncomeStatisticsView, TimePickerDialog.TimePickerListener, ClanIncomeFragment.DayIncomeFragmentListener { + implements IIncomeStatisticsView, TimePickerDialog.TimePickerListener, SingleRoomIncomeFragment.DayIncomeFragmentListener { private static final int TYPE_DAY = 0; private static final int TYPE_WEEK = 1; @@ -54,7 +55,7 @@ public class SingleRoomIncomeActivity extends BaseMvpActivity list = new ArrayList<>(); + List list = new ArrayList<>(); @BindView(R.id.indicator) MagicIndicator indicator; @@ -77,24 +78,22 @@ public class SingleRoomIncomeActivity extends BaseMvpActivity implements ISingRoomIncomeView { +public class SingleRoomIncomeFragment extends BaseMvpFragment implements ISingRoomIncomeView { public static final int TYPE_DAY = 0; public static final int TYPE_WEEK = 1; - public static final int TYPE_MONTH = 2; public static final String FLAG_DAY_TYPE = "dayType"; public static final String FLAG_CLAN_ID = "clanId"; - - private int mDayType; - private ClanIncomeAdapter mIncomeAdapter; - - private DayIncomeFragmentListener mDayIncomeFragmentListener; - Unbinder unbinder; - @BindView(R.id.recycler_view) RecyclerView recyclerView; - - private long clanId; + private SingleRoomIncomeAdapter mIncomeAdapter; + private DayIncomeFragmentListener mDayIncomeFragmentListener; public static SingleRoomIncomeFragment getInstance(int dayType, long clanId) { SingleRoomIncomeFragment fragment = new SingleRoomIncomeFragment(); @@ -62,7 +52,7 @@ public class SingleRoomIncomeFragment extends BaseMvpFragment { + + public SingleRoomIncomeAdapter() { + super(R.layout.item_single_room_income); + } + + @Override + protected void convert(@NotNull BaseViewHolder helper, SingleRoomIncomeInfo item) { + helper.setText(R.id.tv_author_income, item.getAnchorDiamondNum()) + .setText(R.id.tv_room_income, item.getRoomDiamondNum()) + .setText(R.id.tv_user_id, "ID:" + item.getErbanNo()) + .setText(R.id.tv_hall_number, String.valueOf(helper.getLayoutPosition() + 1)) + .setText(R.id.tv_user_name, item.getNick()); + ImageLoadUtils.loadImage(mContext, item.getAvatar(), helper.getView(R.id.iv_hall_avatar)); + } +} diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/presenter/SingRoomIncomeFragmentPresenter.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/presenter/SingRoomIncomeFragmentPresenter.java index 48d59260e..1e13bbbc4 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/presenter/SingRoomIncomeFragmentPresenter.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/presenter/SingRoomIncomeFragmentPresenter.java @@ -1,10 +1,9 @@ package com.yizhuan.erban.module_hall.income.presenter; import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.module_hall.income.view.IClanIncomeView; import com.yizhuan.erban.module_hall.income.view.ISingRoomIncomeView; import com.yizhuan.xchat_android_core.module_hall.income.IncomeModel; -import com.yizhuan.xchat_android_core.module_hall.income.bean.ClanTotalIncomeInfo; +import com.yizhuan.xchat_android_core.module_hall.income.bean.SingleRoomTotalIncomeInfo; import org.jetbrains.annotations.NotNull; @@ -13,20 +12,20 @@ import io.reactivex.disposables.Disposable; public class SingRoomIncomeFragmentPresenter extends BaseMvpPresenter { - public void incomeTotal(long clanId,String startTimeStr, String endTimeStr) { - IncomeModel.get().getClanIncomeList(clanId, startTimeStr, endTimeStr) + public void incomeTotal(String startTimeStr, String endTimeStr) { + IncomeModel.get().getSingleRoomIncomeList(startTimeStr, endTimeStr) .compose(bindToLifecycle()) - .subscribe(new SingleObserver() { + .subscribe(new SingleObserver() { @Override public void onSubscribe(Disposable d) { } @Override - public void onSuccess(@NotNull ClanTotalIncomeInfo clanTotalIncomeInfo) { + public void onSuccess(@NotNull SingleRoomTotalIncomeInfo incomeInfo) { if (getMvpView() == null) return; - getMvpView().incomeTotalSuccess(clanTotalIncomeInfo); + getMvpView().incomeTotalSuccess(incomeInfo); } @Override diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/view/ISingRoomIncomeView.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/view/ISingRoomIncomeView.java index d8e4876ad..0d9938380 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/view/ISingRoomIncomeView.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/view/ISingRoomIncomeView.java @@ -1,10 +1,10 @@ package com.yizhuan.erban.module_hall.income.view; -import com.yizhuan.xchat_android_core.module_hall.income.bean.ClanTotalIncomeInfo; +import com.yizhuan.xchat_android_core.module_hall.income.bean.SingleRoomTotalIncomeInfo; import com.yizhuan.xchat_android_library.base.IMvpBaseView; public interface ISingRoomIncomeView extends IMvpBaseView { - void incomeTotalSuccess(ClanTotalIncomeInfo clanTotalIncomeInfo); + void incomeTotalSuccess(SingleRoomTotalIncomeInfo incomeInfo); void incomeTotalFail(String message); } diff --git a/app/src/module_labour_union/res/layout/activity_single_room_income.xml b/app/src/module_labour_union/res/layout/activity_single_room_income.xml new file mode 100644 index 000000000..bd6636e17 --- /dev/null +++ b/app/src/module_labour_union/res/layout/activity_single_room_income.xml @@ -0,0 +1,188 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/module_labour_union/res/layout/item_single_room_income.xml b/app/src/module_labour_union/res/layout/item_single_room_income.xml new file mode 100644 index 000000000..885e8b8f0 --- /dev/null +++ b/app/src/module_labour_union/res/layout/item_single_room_income.xml @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/IIncomeModel.java b/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/IIncomeModel.java index 2d50de4a6..93479c995 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/IIncomeModel.java +++ b/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/IIncomeModel.java @@ -4,6 +4,7 @@ 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.IncomeGiftInfo; import com.yizhuan.xchat_android_core.module_hall.income.bean.IncomeTotalInfo; +import com.yizhuan.xchat_android_core.module_hall.income.bean.SingleRoomTotalIncomeInfo; import java.util.List; @@ -15,7 +16,7 @@ public interface IIncomeModel extends IModel { Single getClanIncomeList(long clanId, String startTimeStr, String endTimeStr); - Single getSingleRoomIncomeList(long hallId, String startTime, String endTime); + Single getSingleRoomIncomeList(String startTime, String endTime); Single> incomeDetail(long memberId, long hallId, String startTimeStr, String endTimeStr); } diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/IncomeModel.java b/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/IncomeModel.java index 60b58027d..5d12746b0 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/IncomeModel.java +++ b/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/IncomeModel.java @@ -6,6 +6,7 @@ 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.IncomeGiftInfo; import com.yizhuan.xchat_android_core.module_hall.income.bean.IncomeTotalInfo; +import com.yizhuan.xchat_android_core.module_hall.income.bean.SingleRoomTotalIncomeInfo; import com.yizhuan.xchat_android_core.utils.net.RxHelper; import com.yizhuan.xchat_android_library.net.rxnet.RxNet; @@ -56,12 +57,8 @@ public class IncomeModel extends BaseModel implements IIncomeModel { } @Override - public Single getSingleRoomIncomeList(long hallId, String startTime, String endTime) { - return api.getSingleRoomIncomeList( - AuthModel.get().getCurrentUid(), - hallId == 0 ? null : String.valueOf(hallId), - startTime, - endTime) + public Single getSingleRoomIncomeList(String startTime, String endTime) { + return api.getSingleRoomIncomeList(startTime, endTime) .compose(RxHelper.handleSchAndExce()) .compose(RxHelper.handleBeanData()); } @@ -87,12 +84,15 @@ public class IncomeModel extends BaseModel implements IIncomeModel { * 收入统计 */ @POST("/income/incomeTotal") - Single> incomeTotal(@Query("uid") long uid, @Query("hallId") long hallId, + Single> incomeTotal(@Query("uid") long uid, + @Query("hallId") long hallId, @Query("startTimeStr") String startTimeStr, @Query("endTimeStr") String endTimeStr); @POST("/income/incomeDetail") - Single>> incomeDetail(@Query("uid") long uid, @Query("memberId") long memberId, @Query("hallId") long hallId, + Single>> incomeDetail(@Query("uid") long uid, + @Query("memberId") long memberId, + @Query("hallId") long hallId, @Query("startTimeStr") String startTimeStr, @Query("endTimeStr") String endTimeStr); @@ -100,19 +100,18 @@ public class IncomeModel extends BaseModel implements IIncomeModel { * 获取家族收入列表 */ @GET("/clan/income/totalList") - Single> getClanIncomeList(@Query("uid") long uid, @Query("clanId") long clanId, + Single> getClanIncomeList(@Query("uid") long uid, + @Query("clanId") long clanId, @Query("startTime") String startTime, @Query("endTime") String endTime); /** - * 获取家族收入列表 + * 获取个播房收入列表 */ @FormUrlEncoded - @POST("income/singleroom/incomeTotal") - Single> getSingleRoomIncomeList(@Field("uid") long uid, - @Field("hallId") String hallId, - @Field("startTime") String startTime, - @Field("endTime") String endTime); + @POST("/income/singleroom/incomeTotal") + Single> getSingleRoomIncomeList(@Field("startTime") String startTime, + @Field("endTime") String endTime); } private static final class Helper { diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/bean/SingleRoomIncomeInfo.java b/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/bean/SingleRoomIncomeInfo.java new file mode 100644 index 000000000..4194ceb7d --- /dev/null +++ b/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/bean/SingleRoomIncomeInfo.java @@ -0,0 +1,15 @@ +package com.yizhuan.xchat_android_core.module_hall.income.bean; + +import java.io.Serializable; + +import lombok.Data; + +@Data +public class SingleRoomIncomeInfo implements Serializable { + private String erbanNo; + private String uid; + private String nick; + private String avatar; + private String roomDiamondNum; + private String anchorDiamondNum; +} diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/bean/SingleRoomTotalIncomeInfo.java b/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/bean/SingleRoomTotalIncomeInfo.java new file mode 100644 index 000000000..3edf88586 --- /dev/null +++ b/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/bean/SingleRoomTotalIncomeInfo.java @@ -0,0 +1,13 @@ +package com.yizhuan.xchat_android_core.module_hall.income.bean; + +import java.util.List; + +import lombok.Data; + +@Data +public class SingleRoomTotalIncomeInfo { + + private double totalDiamond; + private List incomes; + +}