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

[Modify]公会数据逻辑补全

Browse Source
This commit is contained in:
wushaocheng
2023-08-08 14:14:20 +08:00
parent 96e3c65f2f
commit f8f0c2c59b
20 changed files with 432 additions and 522 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/res/drawable/bg_1abbbccf_6.xml Normal file
View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="@dimen/dp_6"/>
<solid android:color="@color/color_1abbbccf"/>
</shape>

9
app/src/main/res/drawable/bg_ffffff_10.xml Normal file
View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<corners android:radius="@dimen/dp_10"/>
<solid android:color="@color/color_FFFFFF"/>
</shape>

2
app/src/main/res/values/colors.xml
View File

@@ -674,5 +674,7 @@
<color name="color_8843E0">#8843E0</color>
<color name="color_2B2D33">#2B2D33</color>
<color name="color_696D7A">#696D7A</color>
<color name="color_F5F6FA">#F5F6FA</color>
<color name="color_1abbbccf">#1abbbccf</color>
</resources>

9
app/src/main/res/values/strings.xml
View File

@@ -640,6 +640,9 @@
<string name="format_year">%s年</string>
<string name="format_month">%s月</string>
<string name="format_year_month_day">%1$s年%2$s-%3$s</string>
<string name="format_month_day_new">%1$s-%2$s</string>
<string name="title_room_title_edit">房間公告</string>
<string name="label_hint_room_title">請設置公告標題</string>
<string name="label_hint_room_desc">請輸入公告內容</string>
@@ -5090,8 +5093,12 @@
<string name="get">獲得</string>
<string name="start_week">周星榜</string>
<string name="Diamond_balance_is_insufficient">鉆石余額不足，是否充值</string>
<string name="format_year_month_hall">%1$s-%2$s</string>
<string name="format_year_month_hall">%1$s年%2$s</string>
<string name="member_income">成員收入</string>
<string name="management_setup">高管設置</string>
<string name="Check_the_stream">查看流水</string>
<string name="Member_income">成員收入</string>
<string name="Senior_management_setup">高管設置</string>
<string name="contract_statement">簽約流水</string>
</resources>

26
app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/ClanIncomeActivity.java
View File

@@ -5,9 +5,10 @@ import android.content.Intent;
import android.os.Bundle;
import android.view.View;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.appcompat.widget.AppCompatTextView;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentStatePagerAdapter;
import androidx.viewpager.widget.ViewPager;
@@ -54,10 +55,10 @@ public class ClanIncomeActivity extends BaseMvpActivity<IIncomeStatisticsView, C
private MagicIndicator indicator;
private TextView tvMonthDayStart;
private TextView tvMonthDayEnd;
private TextView tvYear;
private TextView tvTotal;
private ImageView ivDateArrow;
private ConstraintLayout llDayGroup;
private LinearLayout llDayGroup;
private AppCompatTextView tvTip;
FragmentStatePagerAdapter adapter = new FragmentStatePagerAdapter(getSupportFragmentManager()) {
@Override
@@ -108,10 +109,10 @@ public class ClanIncomeActivity extends BaseMvpActivity<IIncomeStatisticsView, C
indicator = findViewById(R.id.indicator);
tvMonthDayStart = findViewById(R.id.tv_month_day_start);
tvMonthDayEnd = findViewById(R.id.tv_month_day_end);
tvYear = findViewById(R.id.tv_year);
tvTotal = findViewById(R.id.tv_total);
ivDateArrow = findViewById(R.id.iv_date_arrow);
llDayGroup = findViewById(R.id.ll_day_group);
tvTip = findViewById(R.id.tv_tip);
}
private void initListener() {
@@ -242,12 +243,12 @@ public class ClanIncomeActivity extends BaseMvpActivity<IIncomeStatisticsView, C
}
private void getDayIncomeTotal(String startTimeStr, String endTimeStr) {
tvTip.setVisibility(View.VISIBLE);
String[] dayArray = startTimeStr.split("-");
String[] endDayArray = endTimeStr.split("-");
tvYear.setText(String.format(getString(R.string.format_year), dayArray[0]));
tvMonthDayStart.setText(String.format(getString(R.string.format_month_day), dayArray[1], dayArray[2]));
tvMonthDayStart.setText(String.format(getString(R.string.format_year_month_day), dayArray[0], dayArray[1], dayArray[2]));
tvMonthDayEnd.setVisibility(View.VISIBLE);
tvMonthDayEnd.setText(String.format(getString(R.string.format_month_day), endDayArray[1], endDayArray[2]));
tvMonthDayEnd.setText(String.format(getString(R.string.format_month_day_new), endDayArray[1], endDayArray[2]));
if (mSelectPosition == 0) {
ClanIncomeFragment clanIncomeFragment = (ClanIncomeFragment) list.get(0);
clanIncomeFragment.getIncomeTotal(startTimeStr, endTimeStr);
@@ -258,13 +259,12 @@ public class ClanIncomeActivity extends BaseMvpActivity<IIncomeStatisticsView, C
}
private void getWeekIncomeTotal(String startTimeStr, String endTimeStr) {
tvTip.setVisibility(View.VISIBLE);
String[] weekFirstArray = startTimeStr.split("-");
String[] weekLastArray = endTimeStr.split("-");
tvYear.setText(String.format(getString(R.string.format_year), weekFirstArray[0]));
tvMonthDayEnd.setVisibility(View.VISIBLE);
tvMonthDayStart.setText(String.format(getString(R.string.format_month_day), weekFirstArray[1], weekFirstArray[2]));
tvMonthDayEnd.setText(String.format(getString(R.string.format_month_day), weekLastArray[1], weekLastArray[2]));
tvMonthDayStart.setText(String.format(getString(R.string.format_year_month_day), weekFirstArray[0], weekFirstArray[1], weekFirstArray[2]));
tvMonthDayEnd.setText(String.format(getString(R.string.format_month_day_new), weekLastArray[1], weekLastArray[2]));
if (mSelectPosition == 0) {
ClanIncomeFragment clanIncomeFragment = (ClanIncomeFragment) list.get(0);
clanIncomeFragment.getIncomeTotal(startTimeStr, endTimeStr);
@@ -275,10 +275,10 @@ public class ClanIncomeActivity extends BaseMvpActivity<IIncomeStatisticsView, C
}
private void getMonthIncomeTotal(String startTimeStr, String endTimeStr) {
tvTip.setVisibility(View.GONE);
String[] startArray = startTimeStr.split("-");
tvYear.setText(String.format(getString(R.string.format_year), startArray[0]));
tvMonthDayEnd.setVisibility(View.GONE);
tvMonthDayStart.setText(String.format(getString(R.string.format_month), startArray[1]));
tvMonthDayStart.setText(String.format(getString(R.string.format_year_month_hall), startArray[0], startArray[1]));
if (mSelectPosition == 0) {
ClanIncomeFragment clanIncomeFragment = (ClanIncomeFragment) list.get(0);
clanIncomeFragment.getIncomeTotal(startTimeStr, endTimeStr);

10
app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/RoomIncomeActivity.java
View File

@@ -52,8 +52,6 @@ public class RoomIncomeActivity extends BaseMvpActivity<IIncomeStatisticsView, R
private TextView tvMonthDayEnd;
private TextView tvTotal;
private AppCompatTextView tvTip;
private CircleImageView civAvatar;
private AppCompatTextView tvName;
FragmentStatePagerAdapter adapter = new FragmentStatePagerAdapter(getSupportFragmentManager()) {
@Override
@@ -108,8 +106,6 @@ public class RoomIncomeActivity extends BaseMvpActivity<IIncomeStatisticsView, R
tvMonthDayEnd = findViewById(R.id.tv_month_day_end);
tvTotal = findViewById(R.id.tv_total);
tvTip = findViewById(R.id.tv_tip);
civAvatar = findViewById(R.id.civ_avatar);
tvName = findViewById(R.id.tv_name);
}
@Override
@@ -265,12 +261,6 @@ public class RoomIncomeActivity extends BaseMvpActivity<IIncomeStatisticsView, R
tvTotal.setText(getMvpPresenter().setTotal(total));
}
@Override
public void setUserMessage(String url, String name) {
ImageLoadUtilsV2.loadImage(civAvatar, url);
tvName.setText(name);
}
private String getDayFormat(long time) {
return TimeUtils.getDateTimeString(time, TimeUtils.DATE_FORMAT);
}

8
app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/HallIncomeFragment.java
View File

@@ -69,11 +69,6 @@ public class HallIncomeFragment extends BaseMvpFragment<IHallIncomeView, HallInc
mDayIncomeFragmentListener.setTotal(total);
}
private void setUserMessage(String url, String name) {
if (mDayIncomeFragmentListener != null)
mDayIncomeFragmentListener.setUserMessage(url, name);
}
public void setmDayIncomeFragmentListener(DayIncomeFragmentListener mDayIncomeFragmentListener) {
this.mDayIncomeFragmentListener = mDayIncomeFragmentListener;
}
@@ -82,8 +77,6 @@ public class HallIncomeFragment extends BaseMvpFragment<IHallIncomeView, HallInc
public void incomeTotalSuccess(HallTotalIncomeInfo hallTotalIncomeInfo) {
setTotal(hallTotalIncomeInfo.getTotal());
if (!ListUtils.isListEmpty(hallTotalIncomeInfo.getIncome())) {
HallIncomeInfo hallIncomeInfo = hallTotalIncomeInfo.getIncome().get(0);
setUserMessage(hallIncomeInfo.getHallAvatar(), hallIncomeInfo.getHallName());
hideStatus();
mIncomeAdapter.setNewData(hallTotalIncomeInfo.getIncome());
} else {
@@ -102,6 +95,5 @@ public class HallIncomeFragment extends BaseMvpFragment<IHallIncomeView, HallInc
public interface DayIncomeFragmentListener {
void setTotal(double total);
void setUserMessage(String url, String name);
}
}

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

@@ -9,8 +9,7 @@ import com.yizhuan.xchat_android_library.utils.ResUtil;
import org.jetbrains.annotations.NotNull;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.text.DecimalFormat;
public class ClanIncomeAdapter extends BaseQuickAdapter<ClanIncomeInfo, BaseViewHolder> {
@@ -24,31 +23,23 @@ 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()))
.setText(R.id.tv_hall_number, String.valueOf(helper.getLayoutPosition() + 1))
DecimalFormat decimalFormat = new DecimalFormat("###################.###########");
helper.setText(R.id.tv_bag_income, "+" + decimalFormat.format(item.getBagIncome()))
.setText(R.id.tv_normal_gift_income, "+" + decimalFormat.format(item.getNormalGiftIncome()))
.setText(R.id.tv_room_income, "+" + decimalFormat.format(item.getRoomIncome()))
.setText(R.id.tv_hall_number, helper.getLayoutPosition() + 1 + ".")
.setText(R.id.tv_hall_name, item.getHallName())
.setText(R.id.tv_room_income_desc, isClan ? ResUtil.getString(R.string.income_adapter_clanincomeadapter_01) : ResUtil.getString(R.string.income_adapter_clanincomeadapter_02));
if (isClan) {
helper.setGone(R.id.ll_room_stat, true)
helper.setGone(R.id.group, 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);
helper.setGone(R.id.group, false);
}
ImageLoadUtils.loadImage(mContext, item.getHallAvatar(), helper.getView(R.id.iv_hall_avatar));
}
private String formatGoldNun(double goldNum) {
if (goldNum > 10000) {
double d = goldNum;
d = d / 10000;
BigDecimal df = new BigDecimal(d);
return "+" + df.setScale(2, RoundingMode.DOWN).toString() + ResUtil.getString(R.string.income_adapter_clanincomeadapter_03);
}
return "+" + goldNum;
}
}

3
app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/adapter/HallIncomeAdapter.java
View File

@@ -3,6 +3,7 @@ package com.yizhuan.erban.module_hall.income.adapter;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.yizhuan.erban.R;
import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2;
import com.yizhuan.xchat_android_core.module_hall.income.bean.HallIncomeInfo;
import org.jetbrains.annotations.NotNull;
@@ -25,6 +26,8 @@ public class HallIncomeAdapter extends BaseQuickAdapter<HallIncomeInfo, BaseView
.setText(R.id.tv_new_user_send_gift_number, item.getNewUserSendGiftNum())
.setText(R.id.tv_room_income_desc, "房间流水");
ImageLoadUtilsV2.loadImage(helper.getView(R.id.civ_avatar), item.getHallAvatar());
helper.setText(R.id.tv_name, item.getHallName());
}
}

24
app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/presenter/ClanIncomePresenter.java
View File

@@ -11,6 +11,7 @@ import com.yizhuan.xchat_android_library.utils.TimeUtils;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.util.Calendar;
@@ -52,28 +53,11 @@ public class ClanIncomePresenter extends BaseMvpPresenter<IIncomeStatisticsView>
mEndTimeStr = TimeUtils.getLastDayOfMonth(ym);
}
public SpannableString setTotal(double total) {
public String setTotal(double total) {
SpannableString spannableString;
RelativeSizeSpan sizeSpan = new RelativeSizeSpan(0.5f);
DecimalFormat decimalFormat = new DecimalFormat("###################.###########");
if (total > 10000) {
double d = (double) total;
d = d / 10000;
BigDecimal df = new BigDecimal(d);
String str = df.setScale(2, RoundingMode.DOWN).toString() + ResUtil.getString(R.string.income_presenter_clanincomepresenter_01);
spannableString = new SpannableString(str);
spannableString.setSpan(sizeSpan, str.length() - 3, str.length(), SpannableString.SPAN_EXCLUSIVE_EXCLUSIVE);
} else {
String str = String.valueOf(total) + ResUtil.getString(R.string.income_presenter_clanincomepresenter_02);
spannableString = new SpannableString(str);
spannableString.setSpan(sizeSpan, str.length() - 2, str.length(), SpannableString.SPAN_EXCLUSIVE_EXCLUSIVE);
}
return spannableString;
return decimalFormat.format(total);
}
public String getmStartTimeStr() {

BIN
app/src/module_labour_union/res/drawable-xhdpi/bg_hall_income_diamond.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 369 B

BIN
app/src/module_labour_union/res/drawable-xhdpi/bg_hall_income_statistics.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 118 KiB

After

Width:  |  Height:  |  Size: 96 KiB

BIN
app/src/module_labour_union/res/drawable-xhdpi/icon_hall_date_gray_arrow.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 192 B

143
app/src/module_labour_union/res/layout/activity_clan_income.xml
View File

@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:background="@color/color_white"
android:background="@color/color_F5F6FA"
android:orientation="vertical">
<com.yizhuan.erban.base.TitleBar
android:id="@+id/title_bar"
android:layout_marginTop="@dimen/dp_30"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_30" />
<com.yizhuan.erban.ui.widget.magicindicator.MagicIndicator
android:id="@+id/indicator"
@@ -20,108 +20,91 @@
android:layout_marginStart="@dimen/dp_30"
android:layout_marginEnd="@dimen/dp_30" />
<RelativeLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="75dp"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginTop="12dp"
android:layout_marginEnd="@dimen/dp_15"
android:background="@drawable/bg_gradient_363e45_2b4658_r10">
android:layout_height="148dp"
android:background="@drawable/bg_hall_income_statistics">
<TextView
android:id="@+id/tv_year"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_14"
android:layout_marginTop="@dimen/dp_10"
android:textColor="@color/white_transparent_80"
android:textSize="@dimen/sp_10"
tools:text="@string/layout_activity_clan_income_01" />
<androidx.constraintlayout.widget.ConstraintLayout
<LinearLayout
android:id="@+id/ll_day_group"
android:layout_width="wrap_content"
android:layout_height="31dp"
android:layout_below="@id/tv_year"
android:layout_alignParentBottom="true"
android:layout_marginStart="15dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_35"
android:layout_marginBottom="@dimen/dp_24"
android:gravity="center_vertical"
android:orientation="vertical">
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent">
<TextView
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_month_day_start"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/white"
android:textSize="@dimen/sp_14"
tools:text="@string/layout_activity_clan_income_02"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@+id/tv_month_day_end"/>
android:textColor="@color/color_6D6B89"
android:textSize="@dimen/sp_12"
tools:text="2023年01-01" />
<TextView
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_tip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_4"
android:layout_marginEnd="@dimen/dp_4"
android:text="至"
android:textColor="@color/color_6D6B89"
android:textSize="@dimen/sp_12" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_month_day_end"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/white"
android:textSize="@dimen/sp_14"
android:textColor="@color/color_6D6B89"
android:textSize="@dimen/sp_12"
android:visibility="gone"
tools:text="@string/layout_activity_clan_income_03"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_month_day_start"
app:layout_constraintBottom_toBottomOf="parent"/>
tools:text="01-01"
tools:visibility="visible" />
<ImageView
android:id="@+id/iv_date_arrow"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/icon_date_arrow"
app:layout_constraintStart_toEndOf="@+id/tv_month_day_start"
app:layout_constraintTop_toTopOf="@+id/tv_month_day_start"
app:layout_constraintBottom_toBottomOf="@+id/tv_month_day_start"/>
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
<View
android:id="@+id/view_line"
android:layout_width="0.5dp"
android:layout_height="match_parent"
android:layout_alignParentBottom="true"
android:layout_marginStart="@dimen/dp_10"
android:layout_marginTop="@dimen/dp_13"
android:layout_marginBottom="13dp"
android:layout_toEndOf="@id/ll_day_group"
android:background="@color/white_transparent_10" />
<TextView
android:id="@+id/tvAllIncome"
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_date_arrow"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_28"
android:layout_toEndOf="@id/view_line"
android:text="@string/all_income"
android:textColor="@color/white"
android:textSize="@dimen/sp_12" />
android:layout_marginStart="@dimen/dp_4"
android:src="@drawable/icon_hall_date_gray_arrow"
app:layout_constraintBottom_toBottomOf="@+id/ll_day_group"
app:layout_constraintStart_toEndOf="@+id/ll_day_group"
app:layout_constraintTop_toTopOf="@+id/ll_day_group" />
<TextView
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_all_total"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_35"
android:layout_marginTop="@dimen/dp_30"
android:text="@string/all_income_diamond"
android:textColor="@color/color_1F1B4F"
android:textSize="@dimen/sp_14"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_total"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_2"
android:layout_toEndOf="@id/view_line"
android:layout_below="@+id/tvAllIncome"
tools:text="1,000,000,000"
android:textColor="@color/white"
android:textSize="@dimen/sp_16" />
android:layout_marginStart="@dimen/dp_35"
android:layout_marginTop="@dimen/dp_8"
android:textColor="@color/color_9168FA"
android:textSize="@dimen/text_size_24"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_all_total"
tools:text="0.0" />
</RelativeLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.viewpager.widget.ViewPager
android:id="@+id/view_pager"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent" />
</androidx.viewpager.widget.ViewPager>
</LinearLayout>

6
app/src/module_labour_union/res/layout/activity_module_hall.xml
View File

@@ -127,7 +127,7 @@
android:paddingStart="10dp"
android:paddingEnd="0dp"
android:paddingTop="10dp"
android:text="查看流水"
android:text="@string/Check_the_stream"
android:textColor="@color/color_308BE0"
android:textSize="14sp" />
@@ -141,7 +141,7 @@
android:paddingStart="10dp"
android:paddingEnd="0dp"
android:paddingTop="10dp"
android:text="成员收入"
android:text="@string/Member_income"
android:textColor="@color/color_E1489B"
android:textSize="14sp" />
@@ -155,7 +155,7 @@
android:paddingStart="10dp"
android:paddingEnd="0dp"
android:paddingTop="10dp"
android:text="高管设置"
android:text="@string/Senior_management_setup"
android:textColor="@color/color_8843E0"
android:textSize="14sp" />
</LinearLayout>

74
app/src/module_labour_union/res/layout/activity_room_income.xml
View File

@@ -11,9 +11,7 @@
android:id="@+id/title_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_30">
</com.yizhuan.erban.base.TitleBar>
android:layout_marginTop="@dimen/dp_30" />
<com.yizhuan.erban.ui.widget.magicindicator.MagicIndicator
android:id="@+id/indicator"
@@ -24,18 +22,15 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="108dp"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="10dp"
android:layout_marginEnd="@dimen/dp_16"
android:layout_height="148dp"
android:background="@drawable/bg_hall_income_statistics">
<LinearLayout
android:id="@+id/ll_day_group"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginBottom="@dimen/dp_10"
android:layout_marginStart="@dimen/dp_35"
android:layout_marginBottom="@dimen/dp_24"
android:gravity="center_vertical"
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="parent"
@@ -45,9 +40,9 @@
android:id="@+id/tv_month_day_start"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/white"
android:textSize="@dimen/sp_15"
tools:text="2023-01-01" />
android:textColor="@color/color_6D6B89"
android:textSize="@dimen/sp_12"
tools:text="2023年01-01" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_tip"
@@ -56,17 +51,17 @@
android:layout_marginStart="@dimen/dp_4"
android:layout_marginEnd="@dimen/dp_4"
android:text="至"
android:textColor="@color/color_white"
android:textColor="@color/color_6D6B89"
android:textSize="@dimen/sp_12" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_month_day_end"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/white"
android:textSize="@dimen/sp_15"
android:textColor="@color/color_6D6B89"
android:textSize="@dimen/sp_12"
android:visibility="gone"
tools:text="2023-01-01"
tools:text="01-01"
tools:visibility="visible" />
</LinearLayout>
@@ -76,7 +71,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_4"
android:src="@drawable/icon_hall_date_arrow"
android:src="@drawable/icon_hall_date_gray_arrow"
app:layout_constraintBottom_toBottomOf="@+id/ll_day_group"
app:layout_constraintStart_toEndOf="@+id/ll_day_group"
app:layout_constraintTop_toTopOf="@+id/ll_day_group" />
@@ -85,10 +80,10 @@
android:id="@+id/tv_all_total"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_12"
android:text="@string/all_income"
android:textColor="@color/color_white"
android:layout_marginStart="@dimen/dp_35"
android:layout_marginTop="@dimen/dp_30"
android:text="@string/all_income_diamond"
android:textColor="@color/color_1F1B4F"
android:textSize="@dimen/sp_14"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -97,46 +92,19 @@
android:id="@+id/tv_total"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_16"
android:textColor="@color/white"
android:textSize="28sp"
app:layout_constraintBottom_toTopOf="@+id/ll_day_group"
android:layout_marginStart="@dimen/dp_35"
android:layout_marginTop="@dimen/dp_8"
android:textColor="@color/color_9168FA"
android:textSize="@dimen/text_size_24"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_all_total"
tools:text="0.0" />
<com.yizhuan.erban.common.widget.CircleImageView
android:id="@+id/civ_avatar"
android:layout_width="64dp"
android:layout_height="64dp"
android:layout_marginTop="@dimen/dp_12"
android:layout_marginEnd="@dimen/dp_24"
android:src="@drawable/default_avatar"
app:civ_border_color="@color/color_white"
app:civ_border_width="1dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_14"
android:textColor="@color/color_white"
android:textSize="@dimen/sp_14"
android:lines="1"
android:ellipsize="end"
android:maxEms="6"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/civ_avatar"
tools:text="小半半的房间广泛风格士大夫" />
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.viewpager.widget.ViewPager
android:id="@+id/view_pager"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent" />
</androidx.viewpager.widget.ViewPager>
</LinearLayout>

35
app/src/module_labour_union/res/layout/fragment_day_income.xml
View File

@@ -4,40 +4,6 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="48dp"
android:background="@color/color_F0F5F6"
android:layout_marginTop="@dimen/dp_16"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:layout_width="45dp"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/layout_activity_clan_income_04"
android:textColor="@color/text_title_color"
android:textSize="@dimen/sp_12" />
<TextView
android:layout_width="60dp"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/layout_activity_clan_income_05"
android:textColor="@color/text_title_color"
android:textSize="@dimen/sp_12" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/diamond_income"
android:textColor="@color/text_title_color"
android:textSize="@dimen/sp_12" />
</LinearLayout>
<com.yizhuan.erban.common.widget.StatusLayout
android:id="@+id/status_layout"
android:layout_width="match_parent"
@@ -45,6 +11,7 @@
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler_view"
android:background="@drawable/bg_ffffff_top_18"
android:layout_width="match_parent"
android:layout_height="match_parent" />

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

@@ -1,233 +1,243 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
tools:background="@color/color_white">
android:layout_marginStart="@dimen/dp_16"
android:layout_marginEnd="@dimen/dp_16"
android:layout_marginBottom="@dimen/dp_10"
android:background="@drawable/bg_ffffff_10"
android:paddingBottom="@dimen/dp_20">
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_hall_number"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_20"
android:gravity="center"
android:text="1."
android:textColor="@color/color_1F1B4F"
android:textSize="@dimen/sp_20"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<com.yizhuan.erban.common.widget.CircleImageView
android:id="@+id/iv_hall_avatar"
android:layout_width="@dimen/dp_40"
android:layout_height="@dimen/dp_40"
android:layout_marginStart="@dimen/dp_8"
android:layout_marginTop="@dimen/dp_14"
android:src="@drawable/default_avatar"
app:layout_constraintStart_toEndOf="@+id/tv_hall_number"
app:layout_constraintTop_toTopOf="parent" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_hall_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_8"
android:ellipsize="end"
android:gravity="center"
android:lines="1"
android:textColor="@color/color_2B2D33"
android:textSize="@dimen/sp_16"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@+id/iv_hall_avatar"
app:layout_constraintStart_toEndOf="@+id/iv_hall_avatar"
app:layout_constraintTop_toTopOf="@+id/iv_hall_avatar"
tools:text="@string/layout_item_clan_income_01" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_contract_statement"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_10"
android:text="@string/contract_statement"
android:textColor="@color/color_2B2D33"
android:textSize="@dimen/sp_14"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="@+id/tv_hall_number"
app:layout_constraintTop_toBottomOf="@+id/iv_hall_avatar" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">
android:id="@+id/ll_1"
android:layout_width="0dp"
android:layout_height="52dp"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_6"
android:background="@drawable/bg_1abbbccf_6"
android:gravity="center"
android:orientation="vertical"
app:layout_constraintEnd_toStartOf="@+id/ll_2"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_contract_statement">
<TextView
android:id="@+id/tv_hall_number"
android:layout_width="45dp"
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_room_income"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:text="1"
android:textColor="@color/color_1F1A4E"
android:textSize="15sp" />
android:textColor="@color/color_2B2D33"
android:textSize="@dimen/sp_12"
android:textStyle="bold"
tools:text="+8" />
<LinearLayout
android:layout_width="60dp"
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_room_income_desc"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:layout_marginBottom="20dp"
android:orientation="vertical">
<com.yizhuan.erban.common.widget.RectRoundImageView
android:id="@+id/iv_hall_avatar"
android:layout_width="@dimen/dp_38"
android:layout_height="@dimen/dp_38"
android:layout_gravity="center_horizontal"
android:src="@drawable/default_cover"
app:borderRadius="8dp"
app:type="round" />
<TextView
android:id="@+id/tv_hall_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="3dp"
android:ellipsize="end"
android:gravity="center"
android:lines="1"
android:textColor="@color/text_title_color"
android:textSize="@dimen/sp_12"
tools:text="@string/layout_item_clan_income_01" />
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<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_title_color"
android:textSize="@dimen/sp_12"
tools:text="+8" />
<TextView
android:id="@+id/tv_room_income_desc"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/layout_item_clan_income_02"
android:textColor="@color/color_B3B3C3"
android:textSize="@dimen/sp_12" />
</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_title_color"
android:textSize="@dimen/sp_12"
tools:text="+8" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/layout_item_clan_income_03"
android:textColor="@color/color_B3B3C3"
android:textSize="@dimen/sp_12" />
</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_title_color"
android:textSize="@dimen/sp_12"
tools:text="+8" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/layout_item_clan_income_04"
android:textColor="@color/color_B3B3C3"
android:textSize="@dimen/sp_12" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/ll_room_stat"
android:layout_width="match_parent"
android:layout_height="wrap_content"
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_title_color"
android:textSize="@dimen/sp_12"
tools:text="+8" />
<TextView
android:id="@+id/tv_room_open_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/layout_item_clan_income_05"
android:textColor="@color/color_B3B3C3"
android:textSize="@dimen/sp_12" />
</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_title_color"
android:textSize="@dimen/sp_12"
tools:text="+8" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/layout_item_clan_income_06"
android:textColor="@color/color_B3B3C3"
android:textSize="@dimen/sp_12" />
</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_title_color"
android:textSize="@dimen/sp_12"
tools:text="+8" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/layout_item_clan_income_07"
android:textColor="@color/color_B3B3C3"
android:textSize="@dimen/sp_12" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
android:text="@string/layout_item_clan_income_02"
android:textColor="@color/color_8A8CAB"
android:textSize="@dimen/sp_11" />
</LinearLayout>
<View
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:background="@color/color_EFEFEF" />
<LinearLayout
android:id="@+id/ll_2"
android:layout_width="0dp"
android:layout_height="52dp"
android:layout_marginStart="@dimen/dp_8"
android:layout_marginTop="@dimen/dp_6"
android:background="@drawable/bg_1abbbccf_6"
android:gravity="center"
android:orientation="vertical"
app:layout_constraintEnd_toStartOf="@+id/ll_3"
app:layout_constraintStart_toEndOf="@+id/ll_1"
app:layout_constraintTop_toBottomOf="@+id/tv_contract_statement">
</LinearLayout>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_normal_gift_income"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/color_2B2D33"
android:textSize="@dimen/sp_12"
android:textStyle="bold"
tools:text="+8" />
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/layout_item_clan_income_03"
android:textColor="@color/color_8A8CAB"
android:textSize="@dimen/sp_11" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_3"
android:layout_width="0dp"
android:layout_height="52dp"
android:layout_marginStart="@dimen/dp_8"
android:layout_marginTop="@dimen/dp_6"
android:layout_marginEnd="@dimen/dp_16"
android:background="@drawable/bg_1abbbccf_6"
android:gravity="center"
android:orientation="vertical"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/ll_2"
app:layout_constraintTop_toBottomOf="@+id/tv_contract_statement">
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_bag_income"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/color_2B2D33"
android:textSize="@dimen/sp_12"
android:textStyle="bold"
tools:text="+8" />
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/layout_item_clan_income_04"
android:textColor="@color/color_8A8CAB"
android:textSize="@dimen/sp_11" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_4"
android:layout_width="0dp"
android:layout_height="52dp"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_8"
android:background="@drawable/bg_1abbbccf_6"
android:gravity="center"
android:orientation="vertical"
app:layout_constraintEnd_toStartOf="@+id/ll_5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ll_1">
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_send_gift_number"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/color_2B2D33"
android:textSize="@dimen/sp_12"
android:textStyle="bold"
tools:text="+8" />
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/layout_item_clan_income_06"
android:textColor="@color/color_8A8CAB"
android:textSize="@dimen/sp_11" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_5"
android:layout_width="0dp"
android:layout_height="52dp"
android:layout_marginStart="@dimen/dp_8"
android:layout_marginTop="@dimen/dp_8"
android:background="@drawable/bg_1abbbccf_6"
android:gravity="center"
android:orientation="vertical"
app:layout_constraintEnd_toStartOf="@+id/ll_6"
app:layout_constraintStart_toEndOf="@+id/ll_4"
app:layout_constraintTop_toBottomOf="@+id/ll_1">
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_new_user_send_gift_number"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/color_2B2D33"
android:textSize="@dimen/sp_12"
android:textStyle="bold"
tools:text="+8" />
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/layout_item_clan_income_07"
android:textColor="@color/color_8A8CAB"
android:textSize="@dimen/sp_11" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_6"
android:layout_width="0dp"
android:layout_height="52dp"
android:layout_marginStart="@dimen/dp_8"
android:layout_marginTop="@dimen/dp_8"
android:layout_marginEnd="@dimen/dp_16"
android:gravity="center"
android:orientation="vertical"
android:visibility="invisible"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/ll_5"
app:layout_constraintTop_toBottomOf="@+id/ll_1">
</LinearLayout>
<androidx.constraintlayout.widget.Group
android:id="@+id/group"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:constraint_referenced_ids="ll_4,ll_5,ll_6" />
</androidx.constraintlayout.widget.ConstraintLayout>

122
app/src/module_labour_union/res/layout/item_hall_income.xml
View File

@@ -6,57 +6,69 @@
android:layout_height="wrap_content"
tools:background="@color/bg_normal_1c1b22">
<View
android:id="@+id/view"
android:layout_width="@dimen/dp_4"
android:layout_height="@dimen/dp_14"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_28"
android:background="@drawable/bg_hall_income_diamond"
<com.yizhuan.erban.common.widget.CircleImageView
android:id="@+id/civ_avatar"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_marginStart="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_16"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_name"
tools:text="房间名"
android:textSize="@dimen/sp_16"
android:textColor="@color/color_2B2D33"
android:textStyle="bold"
android:layout_marginStart="@dimen/dp_10"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="@+id/civ_avatar"
app:layout_constraintBottom_toBottomOf="@+id/civ_avatar"
app:layout_constraintStart_toEndOf="@+id/civ_avatar"/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_income"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_8"
android:layout_marginStart="@dimen/dp_20"
android:text="收入"
android:textColor="@color/color_2B2D33"
android:textSize="@dimen/sp_16"
android:textSize="@dimen/sp_14"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@+id/view"
app:layout_constraintStart_toEndOf="@+id/view"
app:layout_constraintTop_toTopOf="@+id/view" />
android:layout_marginTop="@dimen/dp_10"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/civ_avatar" />
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="（钻石）"
app:layout_constraintBottom_toBottomOf="@+id/view"
android:textSize="@dimen/sp_14"
android:textColor="@color/color_1F1B4F"
app:layout_constraintStart_toEndOf="@+id/tv_income"
app:layout_constraintTop_toTopOf="@+id/view" />
app:layout_constraintBottom_toBottomOf="@+id/tv_income" />
<LinearLayout
android:id="@+id/ll_room_water"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_height="58dp"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_12"
android:background="@drawable/bg_white_cornor_6"
android:background="@drawable/bg_1abbbccf_6"
android:gravity="center"
android:orientation="vertical"
app:layout_constraintEnd_toStartOf="@+id/ll_gift_water"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/view">
app:layout_constraintTop_toBottomOf="@+id/tv_income">
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_room_income"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_15"
android:textColor="@color/color_2B2D33"
android:textSize="@dimen/sp_14"
android:textSize="@dimen/sp_12"
android:textStyle="bold"
tools:text="+8" />
@@ -64,20 +76,18 @@
android:id="@+id/tv_room_income_desc"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_4"
android:layout_marginBottom="@dimen/dp_12"
android:text="房间流水"
android:textColor="@color/color_696D7A"
android:textSize="@dimen/sp_12" />
android:textColor="@color/color_8A8CAB"
android:textSize="@dimen/sp_11" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_gift_water"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_height="58dp"
android:layout_marginStart="@dimen/dp_10"
android:background="@drawable/bg_white_cornor_6"
android:background="@drawable/bg_1abbbccf_6"
android:gravity="center"
android:orientation="vertical"
app:layout_constraintEnd_toStartOf="@+id/ll_bag_water"
@@ -88,29 +98,26 @@
android:id="@+id/tv_normal_gift_income"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_15"
android:textColor="@color/color_2B2D33"
android:textSize="@dimen/sp_14"
android:textSize="@dimen/sp_12"
android:textStyle="bold"
tools:text="+8" />
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_4"
android:layout_marginBottom="@dimen/dp_12"
android:text="普通礼物流水"
android:textColor="@color/color_696D7A"
android:textSize="@dimen/sp_12" />
android:textColor="@color/color_8A8CAB"
android:textSize="@dimen/sp_11" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_bag_water"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_height="58dp"
android:layout_marginStart="@dimen/dp_10"
android:background="@drawable/bg_white_cornor_6"
android:background="@drawable/bg_1abbbccf_6"
android:gravity="center"
android:orientation="vertical"
app:layout_constraintEnd_toEndOf="parent"
@@ -121,32 +128,29 @@
android:id="@+id/tv_bag_income"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_15"
android:textColor="@color/color_2B2D33"
android:textSize="@dimen/sp_14"
android:textSize="@dimen/sp_12"
android:textStyle="bold"
tools:text="+8" />
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_4"
android:layout_marginBottom="@dimen/dp_12"
android:text="背包礼物流水"
android:textColor="@color/color_696D7A"
android:textSize="@dimen/sp_12" />
android:textColor="@color/color_8A8CAB"
android:textSize="@dimen/sp_11" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_gift_num"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_height="58dp"
android:gravity="center"
android:orientation="vertical"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_16"
android:background="@drawable/bg_white_cornor_6"
android:background="@drawable/bg_1abbbccf_6"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@+id/ll_new_gift_num"
app:layout_constraintTop_toBottomOf="@+id/ll_gift_water">
@@ -155,31 +159,28 @@
android:id="@+id/tv_send_gift_number"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_15"
android:textColor="@color/color_2B2D33"
android:textSize="@dimen/sp_14"
android:textSize="@dimen/sp_12"
android:textStyle="bold"
tools:text="+8" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_4"
android:layout_marginBottom="@dimen/dp_12"
android:text="送礼人数"
android:textColor="@color/color_696D7A"
android:textSize="@dimen/sp_12" />
android:textColor="@color/color_8A8CAB"
android:textSize="@dimen/sp_11" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_new_gift_num"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_height="58dp"
android:gravity="center"
android:orientation="vertical"
android:layout_marginStart="@dimen/dp_10"
android:background="@drawable/bg_white_cornor_6"
android:background="@drawable/bg_1abbbccf_6"
app:layout_constraintEnd_toStartOf="@+id/ll_new_gift_num_copy"
app:layout_constraintStart_toEndOf="@+id/ll_gift_num"
app:layout_constraintTop_toTopOf="@+id/ll_gift_num">
@@ -188,31 +189,27 @@
android:id="@+id/tv_new_user_send_gift_number"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_15"
android:textColor="@color/color_2B2D33"
android:textSize="@dimen/sp_14"
android:textSize="@dimen/sp_12"
android:textStyle="bold"
tools:text="+8" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_4"
android:layout_marginBottom="@dimen/dp_12"
android:text="新用户送礼人数"
android:textColor="@color/color_696D7A"
android:textSize="@dimen/sp_12" />
android:textColor="@color/color_8A8CAB"
android:textSize="@dimen/sp_11" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_new_gift_num_copy"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_height="58dp"
android:gravity="center"
android:orientation="vertical"
android:layout_marginStart="@dimen/dp_10"
android:background="@drawable/bg_white_cornor_6"
android:visibility="invisible"
app:layout_constraintStart_toEndOf="@+id/ll_new_gift_num"
app:layout_constraintTop_toTopOf="@+id/ll_gift_num"
@@ -222,20 +219,17 @@
android:id="@+id/tv_new_user_send_gift_number_copy"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_15"
android:textColor="@color/color_2B2D33"
android:textSize="@dimen/sp_14"
android:textSize="@dimen/sp_12"
android:textStyle="bold"
tools:text="+8" />
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_4"
android:layout_marginBottom="@dimen/dp_12"
android:text="新用户送礼人数"
android:textColor="@color/color_696D7A"
android:textSize="@dimen/sp_12" />
android:textColor="@color/color_8A8CAB"
android:textSize="@dimen/sp_11" />
</LinearLayout>

1
app/src/module_labour_union/res/values/strings.xml
View File

@@ -3,6 +3,7 @@
<string name="lu_label_group_chat">廳群聊</string>
<string name="lu_label_group_create">創建群聊</string>
<string name="all_income">總收入</string>
<string name="all_income_diamond">總收入(鉆石)</string>
<string name="lu_upload_group_avatar">上傳群頭像</string>
<string name="lu_edit_group_name">輸入群名稱</string>