Commit 51995fd2 authored by shiyuelong's avatar shiyuelong

修改管理中心金额相关字体

parent 70900aae
...@@ -64,7 +64,7 @@ class MerchantCenterActivity : BaseActivity<ActivityMerchantCenterBinding>(), ...@@ -64,7 +64,7 @@ class MerchantCenterActivity : BaseActivity<ActivityMerchantCenterBinding>(),
viewBind.viewCommonHeader.ivBack.isVisible = false viewBind.viewCommonHeader.ivBack.isVisible = false
// 本期需求无资产功能 仅做UI展示 // 本期需求无资产功能 仅做UI展示
viewBind.avMerchantAsset.setMerchantAssetData(8856.88, 675.00) viewBind.avMerchantAsset.setMerchantAssetData("8856.88", "675.00")
} }
private fun initListener() { private fun initListener() {
...@@ -78,9 +78,7 @@ class MerchantCenterActivity : BaseActivity<ActivityMerchantCenterBinding>(), ...@@ -78,9 +78,7 @@ class MerchantCenterActivity : BaseActivity<ActivityMerchantCenterBinding>(),
} }
// 切换主体入口判断 // 切换主体入口判断
viewBind.tvSwitch.isVisible = params?.get(EXTRA_IS_MULTI)?.let { it as Boolean } ?: false viewBind.tvSwitch.isVisible = params?.get(EXTRA_IS_MULTI)?.let { it as Boolean } ?: false
curLifeAccount = curLifeAccount = params?.get(EXTRA_LIFE_ACCOUNT_INFO)?.let { it as LifeAccountItemBean.Response } ?: return
params?.get(EXTRA_LIFE_ACCOUNT_INFO)?.let { it as LifeAccountItemBean.Response }
?: return
// 设置当前生活号信息 // 设置当前生活号信息
viewBind.lvLifeAccountLabel.setLifeAccountData(curLifeAccount) viewBind.lvLifeAccountLabel.setLifeAccountData(curLifeAccount)
......
...@@ -35,9 +35,9 @@ class MerchantAssetView @JvmOverloads constructor( ...@@ -35,9 +35,9 @@ class MerchantAssetView @JvmOverloads constructor(
* @param income 当月收入 * @param income 当月收入
* @param balance 钱包yue * @param balance 钱包yue
*/ */
fun setMerchantAssetData(income: Double, balance: Double) { fun setMerchantAssetData(income: String, balance: String) {
viewBinding.tvMonthlyIncome.text = income.toString() viewBinding.tvMonthlyIncome.text = income
viewBinding.tvWalletBalance.text = balance.toString() viewBinding.tvWalletBalance.text = balance
} }
override fun onClick(v: View?) { override fun onClick(v: View?) {
...@@ -46,4 +46,4 @@ class MerchantAssetView @JvmOverloads constructor( ...@@ -46,4 +46,4 @@ class MerchantAssetView @JvmOverloads constructor(
} }
} }
} }
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout 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:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:foreground="@mipmap/bg_merchant_asset"
android:background="@drawable/shape_bg_merchant_center_card" android:background="@drawable/shape_bg_merchant_center_card"
android:foreground="@mipmap/bg_merchant_asset"
android:padding="19dp"> android:padding="19dp">
<TextView <TextView
...@@ -20,26 +21,36 @@ ...@@ -20,26 +21,36 @@
<TextView <TextView
android:id="@+id/tv_monthly_income" android:id="@+id/tv_monthly_income"
android:layout_width="wrap_content" android:layout_width="@dimen/dp120"
android:layout_height="wrap_content" android:layout_height="@dimen/dp37"
android:layout_marginTop="15dp" android:layout_marginTop="15dp"
android:autoSizeTextType="uniform"
android:includeFontPadding="false" android:includeFontPadding="false"
android:textColor="@color/color_FFF26E3D" android:textColor="@color/color_FFF26E3D"
android:textSize="27sp" android:textSize="27sp"
app:autoSizeMaxTextSize="27sp"
app:autoSizeMinTextSize="12sp"
app:autoSizeStepGranularity="2sp"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_title" /> app:layout_constraintTop_toBottomOf="@id/tv_title"
tools:text="9663332.22" />
<TextView <TextView
android:id="@+id/tv_wallet_balance" android:id="@+id/tv_wallet_balance"
android:layout_width="wrap_content" android:layout_width="@dimen/dp180"
android:layout_height="wrap_content" android:layout_height="@dimen/dp37"
android:layout_marginStart="146dp" android:layout_marginStart="146dp"
android:layout_marginTop="15dp" android:layout_marginTop="15dp"
android:autoSizeTextType="uniform"
android:includeFontPadding="false" android:includeFontPadding="false"
android:textColor="@color/color_FFF26E3D" android:textColor="@color/color_FFF26E3D"
android:textSize="27sp" android:textSize="27sp"
app:autoSizeMaxTextSize="27sp"
app:autoSizeMinTextSize="12sp"
app:autoSizeStepGranularity="2sp"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_title" /> app:layout_constraintTop_toBottomOf="@id/tv_title"
tools:text="675.22" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment