diff --git a/app/src/main/java/com/cheng/blzb/ui/fragment/mine/MineFragment.kt b/app/src/main/java/com/cheng/blzb/ui/fragment/mine/MineFragment.kt index e1d83ee..8114db8 100644 --- a/app/src/main/java/com/cheng/blzb/ui/fragment/mine/MineFragment.kt +++ b/app/src/main/java/com/cheng/blzb/ui/fragment/mine/MineFragment.kt @@ -35,6 +35,7 @@ import com.example.base.extensions.getColor import com.example.base.extensions.gone import com.example.base.extensions.onClick import com.example.base.extensions.toast +import com.example.base.extensions.visible import com.example.base.ui.BaseFragment import com.example.base.utils.ClipboardUtils @@ -60,6 +61,7 @@ class MineFragment : BaseFragment() { override fun onResume() { super.onResume() mViewModel.userInfo(isInit) + mViewModel.getCompanyInfo() mViewModel.getSubscriptionList() mViewModel.getFavoriteList() mViewModel.getHistoryList() @@ -69,7 +71,6 @@ class MineFragment : BaseFragment() { override fun initData() { super.initData() - mViewModel.getCompanyInfo() } override fun initListener() { @@ -169,11 +170,13 @@ class MineFragment : BaseFragment() { binding.tvAuthStatus.text = "认证成功" binding.tvAuthStatus.setTextColor(getColor(R.color.color_3bbf0f)) binding.tvAuthStatus.setCompoundDrawablesWithIntrinsicBounds(R.drawable.shape_auth_success_dot, 0, 0, 0) + binding.tvAuthStatus.visible() } "3" -> { binding.tvAuthStatus.text = "认证失败" binding.tvAuthStatus.setTextColor(getColor(R.color.color_ff592b)) binding.tvAuthStatus.setCompoundDrawablesWithIntrinsicBounds(R.drawable.shape_auth_fail_dot, 0, 0, 0) + binding.tvAuthStatus.visible() } else -> binding.tvAuthStatus.gone() } diff --git a/app/src/main/java/com/cheng/blzb/ui/fragment/mine/vip/VipFragment.kt b/app/src/main/java/com/cheng/blzb/ui/fragment/mine/vip/VipFragment.kt index 4d8479f..c6d3b64 100644 --- a/app/src/main/java/com/cheng/blzb/ui/fragment/mine/vip/VipFragment.kt +++ b/app/src/main/java/com/cheng/blzb/ui/fragment/mine/vip/VipFragment.kt @@ -495,9 +495,9 @@ class VipFragment : BaseFragment() { if (vipType == 0) { payTypeCheckedRes = R.mipmap.ic_pay_checked1 - binding.btnTab1.setTextColor(getColor(R.color.color_c5ffe1)) + binding.btnTab1.setTextColor(getColor(R.color.color_fff5e6)) binding.btnTab1.setCompoundDrawablesWithIntrinsicBounds(R.drawable.shape_vip_tab_checked1, 0, 0, 0) - binding.btnTab2.setTextColor(getColor(R.color.color_8a7570)) + binding.btnTab2.setTextColor(getColor(R.color.color_1b6648)) binding.btnTab2.setCompoundDrawablesWithIntrinsicBounds(R.drawable.shape_vip_tab_default2, 0, 0, 0) binding.ivTopBg.setImageResource(R.mipmap.ic_vip_top_bg1) diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml index e702d01..a0a990b 100644 --- a/app/src/main/res/layout/fragment_mine.xml +++ b/app/src/main/res/layout/fragment_mine.xml @@ -43,8 +43,8 @@ android:layout_height="@dimen/dp_68" android:layout_marginStart="@dimen/dp_16" android:layout_marginTop="@dimen/dp_3" - android:padding="@dimen/dp_2" android:background="@drawable/shape_avatar_bg" + android:padding="@dimen/dp_2" android:src="@mipmap/ic_default_avatar" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/iv_setting" /> @@ -232,25 +232,25 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="@dimen/dp_20" + android:layout_marginTop="@dimen/dp_28" android:text="开通会员" android:textColor="@color/color_fbcd8c" android:textSize="@dimen/sp_16" - app:layout_constraintTop_toTopOf="@id/iv_vip_bg" - android:layout_marginTop="@dimen/dp_28" - app:layout_constraintStart_toStartOf="@id/iv_vip_bg" /> + app:layout_constraintStart_toStartOf="@id/iv_vip_bg" + app:layout_constraintTop_toTopOf="@id/iv_vip_bg" /> + app:layout_constraintStart_toStartOf="@id/tv_vip_name" + app:layout_constraintTop_toBottomOf="@id/tv_vip_name" /> diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 6db843d..7e5419e 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -94,6 +94,7 @@ #FF592B #FBCD8C #BCAC8E + #FFF5E6 #C5FFE1 #A6C8BA #7E4024 @@ -101,6 +102,7 @@ #F11E1E #797069 #8A7570 + #1B6648 #FFFAEF #FFFAEE #FDF7F0