diff --git a/app/src/main/java/com/cheng/blzb/ui/fragment/mine/auth/CompanyAuthFragment.kt b/app/src/main/java/com/cheng/blzb/ui/fragment/mine/auth/CompanyAuthFragment.kt index 89939d7..c1f1f3e 100644 --- a/app/src/main/java/com/cheng/blzb/ui/fragment/mine/auth/CompanyAuthFragment.kt +++ b/app/src/main/java/com/cheng/blzb/ui/fragment/mine/auth/CompanyAuthFragment.kt @@ -1,6 +1,7 @@ package com.cheng.blzb.ui.fragment.mine.auth import android.annotation.SuppressLint +import android.graphics.Color import android.text.TextUtils import android.view.ViewTreeObserver import androidx.activity.result.contract.ActivityResultContracts @@ -24,6 +25,7 @@ import com.cheng.blzb.ui.fragment.photo.PhotoViewFragment import com.cheng.blzb.utils.FileProviderUtils import com.cheng.blzb.utils.PermissionUtils import com.example.base.common.RxBus +import com.example.base.extensions.getColor import com.example.base.extensions.gone import com.example.base.extensions.onClick import com.example.base.extensions.toast @@ -225,16 +227,20 @@ class CompanyAuthFragment : BaseFragment { binding.tvStatus.text = "认证成功" + binding.tvStatus.setTextColor(getColor(R.color.color_3bbf0f)) binding.tvStatus.setCompoundDrawablesWithIntrinsicBounds(R.mipmap.ic_auth_success, 0, 0, 0) binding.tvReason.gone() + binding.layoutRejectReason.setLayoutBackground(getColor(R.color.color_e3fae7)) binding.layoutRejectReason.visible() binding.btnNext.text = "重新提交" } "3" -> { binding.tvStatus.text = "认证失败" + binding.tvStatus.setTextColor(getColor(R.color.color_ff592b)) binding.tvStatus.setCompoundDrawablesWithIntrinsicBounds(R.mipmap.ic_auth_fail, 0, 0, 0) binding.tvReason.text = "理由:${detail.remark}" + binding.layoutRejectReason.setLayoutBackground(getColor(R.color.color_fff5f3)) binding.layoutRejectReason.visible() binding.btnNext.text = "重新提交" 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 ab81b84..4d8479f 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 @@ -496,9 +496,9 @@ class VipFragment : BaseFragment() { payTypeCheckedRes = R.mipmap.ic_pay_checked1 binding.btnTab1.setTextColor(getColor(R.color.color_c5ffe1)) - binding.btnTab1.setCompoundDrawablesWithIntrinsicBounds(R.drawable.shape_vip_tab_checked, 0, 0, 0) + binding.btnTab1.setCompoundDrawablesWithIntrinsicBounds(R.drawable.shape_vip_tab_checked1, 0, 0, 0) binding.btnTab2.setTextColor(getColor(R.color.color_8a7570)) - binding.btnTab2.setCompoundDrawablesWithIntrinsicBounds(R.drawable.shape_vip_tab_default, 0, 0, 0) + binding.btnTab2.setCompoundDrawablesWithIntrinsicBounds(R.drawable.shape_vip_tab_default2, 0, 0, 0) binding.ivTopBg.setImageResource(R.mipmap.ic_vip_top_bg1) binding.layoutPay.setBackgroundResource(R.mipmap.ic_vip_pay_bg1) @@ -527,9 +527,9 @@ class VipFragment : BaseFragment() { payTypeCheckedRes = R.mipmap.ic_pay_checked2 binding.btnTab1.setTextColor(getColor(R.color.color_8a7570)) - binding.btnTab1.setCompoundDrawablesWithIntrinsicBounds(R.drawable.shape_vip_tab_default, 0, 0, 0) + binding.btnTab1.setCompoundDrawablesWithIntrinsicBounds(R.drawable.shape_vip_tab_default1, 0, 0, 0) binding.btnTab2.setTextColor(getColor(R.color.color_c5ffe1)) - binding.btnTab2.setCompoundDrawablesWithIntrinsicBounds(R.drawable.shape_vip_tab_checked, 0, 0, 0) + binding.btnTab2.setCompoundDrawablesWithIntrinsicBounds(R.drawable.shape_vip_tab_checked2, 0, 0, 0) binding.ivTopBg.setImageResource(R.mipmap.ic_vip_top_bg2) binding.layoutPay.setBackgroundResource(R.mipmap.ic_vip_pay_bg2) diff --git a/app/src/main/res/drawable/shape_vip_tab_checked.xml b/app/src/main/res/drawable/shape_vip_tab_checked1.xml similarity index 85% rename from app/src/main/res/drawable/shape_vip_tab_checked.xml rename to app/src/main/res/drawable/shape_vip_tab_checked1.xml index 97d02b4..c8a3360 100644 --- a/app/src/main/res/drawable/shape_vip_tab_checked.xml +++ b/app/src/main/res/drawable/shape_vip_tab_checked1.xml @@ -10,6 +10,6 @@ android:width="@dimen/dp_20" android:height="@dimen/dp_20" android:gravity="center"> - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_vip_tab_checked2.xml b/app/src/main/res/drawable/shape_vip_tab_checked2.xml new file mode 100644 index 0000000..9931523 --- /dev/null +++ b/app/src/main/res/drawable/shape_vip_tab_checked2.xml @@ -0,0 +1,15 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_vip_tab_default.xml b/app/src/main/res/drawable/shape_vip_tab_default1.xml similarity index 85% rename from app/src/main/res/drawable/shape_vip_tab_default.xml rename to app/src/main/res/drawable/shape_vip_tab_default1.xml index 4edfb4e..4ecf650 100644 --- a/app/src/main/res/drawable/shape_vip_tab_default.xml +++ b/app/src/main/res/drawable/shape_vip_tab_default1.xml @@ -10,6 +10,6 @@ android:width="@dimen/dp_20" android:height="@dimen/dp_20" android:gravity="center"> - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_vip_tab_default2.xml b/app/src/main/res/drawable/shape_vip_tab_default2.xml new file mode 100644 index 0000000..aa9f891 --- /dev/null +++ b/app/src/main/res/drawable/shape_vip_tab_default2.xml @@ -0,0 +1,15 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_vip.xml b/app/src/main/res/layout/fragment_vip.xml index 0b531b2..f7176de 100644 --- a/app/src/main/res/layout/fragment_vip.xml +++ b/app/src/main/res/layout/fragment_vip.xml @@ -48,7 +48,7 @@ android:id="@+id/btn_tab1" android:layout_width="0dp" android:layout_height="match_parent" - android:drawableStart="@drawable/shape_vip_tab_checked" + android:drawableStart="@drawable/shape_vip_tab_checked1" android:text="个人会员" android:textColor="@color/color_c5ffe1" android:textSize="@dimen/sp_16" @@ -61,7 +61,7 @@ android:id="@+id/btn_tab2" android:layout_width="0dp" android:layout_height="match_parent" - android:drawableStart="@drawable/shape_vip_tab_default" + android:drawableStart="@drawable/shape_vip_tab_default2" android:text="企业会员" android:textColor="@color/color_8a7570" android:textSize="@dimen/sp_16" diff --git a/app/src/main/res/mipmap-xxhdpi/ic_vip_tab_checked.webp b/app/src/main/res/mipmap-xxhdpi/ic_vip_tab_checked1.webp similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/ic_vip_tab_checked.webp rename to app/src/main/res/mipmap-xxhdpi/ic_vip_tab_checked1.webp diff --git a/app/src/main/res/mipmap-xxhdpi/ic_vip_tab_checked2.webp b/app/src/main/res/mipmap-xxhdpi/ic_vip_tab_checked2.webp new file mode 100644 index 0000000..b40f523 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_vip_tab_checked2.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_vip_tab_default1.webp b/app/src/main/res/mipmap-xxhdpi/ic_vip_tab_default1.webp new file mode 100644 index 0000000..52fdc2a Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_vip_tab_default1.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_vip_tab_default.webp b/app/src/main/res/mipmap-xxhdpi/ic_vip_tab_default2.webp similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/ic_vip_tab_default.webp rename to app/src/main/res/mipmap-xxhdpi/ic_vip_tab_default2.webp