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
2022-08-02 18:46:21 +08:00
parent bf94e46855
commit 9c4b55a55e
3 changed files with 172 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/adapter/ClanIncomeAdapter.java
View File

@@ -13,7 +13,7 @@ import java.math.RoundingMode;
public class ClanIncomeAdapter extends BaseQuickAdapter<ClanIncomeInfo, BaseViewHolder> {
private boolean isClan;
private final boolean isClan;
public ClanIncomeAdapter(boolean isClan) {
super(R.layout.item_clan_income);
@@ -22,6 +22,7 @@ public class ClanIncomeAdapter extends BaseQuickAdapter<ClanIncomeInfo, BaseView
@Override
protected void convert(@NotNull BaseViewHolder helper, ClanIncomeInfo item) {
helper.setText(R.id.tv_bag_income, formatGoldNun(item.getBagIncome()))
.setText(R.id.tv_normal_gift_income, formatGoldNun(item.getNormalGiftIncome()))
.setText(R.id.tv_room_income, formatGoldNun(item.getRoomIncome()))
@@ -29,6 +30,13 @@ public class ClanIncomeAdapter extends BaseQuickAdapter<ClanIncomeInfo, BaseView
.setText(R.id.tv_hall_name, item.getHallName())
.setText(R.id.tv_room_income_desc, isClan ? "房间流水" : "主播流水");
if (isClan) {
helper.setGone(R.id.ll_room_stat, true)
.setText(R.id.tv_send_gift_number, item.getGiftUv())
.setText(R.id.tv_new_user_send_gift_number, item.getNewUserSendGiftNum());
} else {
helper.setGone(R.id.ll_room_stat, false);
}
ImageLoadUtils.loadImage(mContext, item.getHallAvatar(), helper.getView(R.id.iv_hall_avatar));
}

222
app/src/module_labour_union/res/layout/item_clan_income.xml
View File

@@ -12,7 +12,6 @@
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_hall_number"
android:layout_width="45dp"
@@ -25,8 +24,8 @@
<LinearLayout
android:layout_width="60dp"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:layout_marginBottom="10dp"
android:layout_marginTop="20dp"
android:layout_marginBottom="20dp"
android:orientation="vertical">
<com.yizhuan.erban.common.widget.RectRoundImageView
@@ -61,71 +60,171 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
<TextView
android:id="@+id/tv_room_income"
android:layout_width="wrap_content"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="15sp"
tools:text="+8" />
android:orientation="horizontal">
<TextView
android:id="@+id/tv_room_income_desc"
android:layout_width="wrap_content"
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
<TextView
android:id="@+id/tv_room_income"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="15sp"
tools:text="+8" />
<TextView
android:id="@+id/tv_room_income_desc"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="房间流水"
android:textColor="@color/text_secondary_4f516a"
android:textSize="10sp" />
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
<TextView
android:id="@+id/tv_normal_gift_income"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="15sp"
tools:text="+8" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="普通礼物流水"
android:textColor="@color/text_secondary_4f516a"
android:textSize="10sp" />
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
<TextView
android:id="@+id/tv_bag_income"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="15sp"
tools:text="+8" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="背包礼物流水"
android:textColor="@color/text_secondary_4f516a"
android:textSize="10sp" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/ll_room_stat"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="房间流水"
android:textColor="@color/text_secondary_4f516a"
android:textSize="10sp" />
android:layout_marginTop="12dp"
android:orientation="horizontal"
android:visibility="gone"
android:weightSum="3">
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical"
android:visibility="gone">
<TextView
android:id="@+id/tv_room_open_time_value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="15sp"
tools:text="+8" />
<TextView
android:id="@+id/tv_room_open_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="开厅时长"
android:textColor="@color/text_secondary_4f516a"
android:textSize="10sp" />
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
<TextView
android:id="@+id/tv_send_gift_number"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="15sp"
tools:text="+8" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="送礼人数"
android:textColor="@color/text_secondary_4f516a"
android:textSize="10sp" />
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
<TextView
android:id="@+id/tv_new_user_send_gift_number"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="15sp"
tools:text="+8" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="新用户送礼人数"
android:textColor="@color/text_secondary_4f516a"
android:textSize="10sp" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
<TextView
android:id="@+id/tv_normal_gift_income"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="15sp"
tools:text="+8" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="普通礼物流水"
android:textColor="@color/text_secondary_4f516a"
android:textSize="10sp" />
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
<TextView
android:id="@+id/tv_bag_income"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="15sp"
tools:text="+8" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="背包礼物流水"
android:textColor="@color/text_secondary_4f516a"
android:textSize="10sp" />
</LinearLayout>
</LinearLayout>
@@ -133,4 +232,5 @@
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/line_353548" />
</FrameLayout>

2
core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/bean/ClanIncomeInfo.java
View File

@@ -11,4 +11,6 @@ public class ClanIncomeInfo implements Serializable {
private String hallName;
private double roomIncome;
private double normalGiftIncome;
private String giftUv;
private String newUserSendGiftNum;
}