From 2e099623268e7d2cfc53d7b2fe4b9975ccbd5958 Mon Sep 17 00:00:00 2001 From: wushaocheng <15876365887@163.com> Date: Tue, 3 Jan 2023 15:11:10 +0800 Subject: [PATCH] =?UTF-8?q?[Modify]=E4=BF=AE=E5=A4=8D=E6=94=B6=E7=9B=8A?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E9=87=91=E5=B8=81=E8=83=8C=E6=99=AF=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E5=8F=98=E5=BD=A2=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yizhuan/erban/earn/activity/EarnRecordActivity.kt | 3 +++ .../java/com/yizhuan/erban/earn/activity/GoldDetailActivity.kt | 1 + app/src/main/res/layout/activity_earn_record.xml | 1 + 3 files changed, 5 insertions(+) diff --git a/app/src/main/java/com/yizhuan/erban/earn/activity/EarnRecordActivity.kt b/app/src/main/java/com/yizhuan/erban/earn/activity/EarnRecordActivity.kt index bf2fbb735..b13642843 100644 --- a/app/src/main/java/com/yizhuan/erban/earn/activity/EarnRecordActivity.kt +++ b/app/src/main/java/com/yizhuan/erban/earn/activity/EarnRecordActivity.kt @@ -4,6 +4,7 @@ import android.content.Context import android.content.Intent import android.view.View import androidx.activity.viewModels +import androidx.core.content.ContextCompat import com.netease.nim.uikit.StatusBarUtil import com.umeng.commonsdk.statistics.common.DeviceConfig import com.yizhuan.erban.R @@ -50,9 +51,11 @@ class EarnRecordActivity : BaseViewBindingActivity(), if (it.isClanElder) { binding.tvGoldDetail.visibility = View.VISIBLE binding.tvConvertDiamond.visibility = View.GONE + binding.csGoldBg.background = ContextCompat.getDrawable(this, R.drawable.bg_gold_detail) } else { binding.tvGoldDetail.visibility = View.GONE binding.tvConvertDiamond.visibility = View.VISIBLE + binding.csGoldBg.background = ContextCompat.getDrawable(this, R.drawable.bg_earn_gold) } } } diff --git a/app/src/main/java/com/yizhuan/erban/earn/activity/GoldDetailActivity.kt b/app/src/main/java/com/yizhuan/erban/earn/activity/GoldDetailActivity.kt index 47b81f796..784f1c15c 100644 --- a/app/src/main/java/com/yizhuan/erban/earn/activity/GoldDetailActivity.kt +++ b/app/src/main/java/com/yizhuan/erban/earn/activity/GoldDetailActivity.kt @@ -327,6 +327,7 @@ class GoldDetailActivity : BaseViewBindingActivity(), weekLastDay?.let { earnRecordModel.setWeekLastDay(it) } if (weekFirstDay != null && weekLastDay != null) { + getWeekIncomeTotal(weekFirstDay, weekLastDay) } } diff --git a/app/src/main/res/layout/activity_earn_record.xml b/app/src/main/res/layout/activity_earn_record.xml index c7e9b5472..4a55ceba5 100644 --- a/app/src/main/res/layout/activity_earn_record.xml +++ b/app/src/main/res/layout/activity_earn_record.xml @@ -91,6 +91,7 @@