From 5ac719d5bbd28d325f434145f2e2b0bc37a51949 Mon Sep 17 00:00:00 2001 From: wangyu Date: Thu, 15 Jan 2026 18:39:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=9A=E5=91=98tab?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=EF=BC=8C=E4=BF=AE=E6=94=B9=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/fragment/mine/auth/CompanyAuthFragment.kt | 6 ++++++ .../blzb/ui/fragment/mine/vip/VipFragment.kt | 8 ++++---- ...ab_checked.xml => shape_vip_tab_checked1.xml} | 2 +- .../main/res/drawable/shape_vip_tab_checked2.xml | 15 +++++++++++++++ ...ab_default.xml => shape_vip_tab_default1.xml} | 2 +- .../main/res/drawable/shape_vip_tab_default2.xml | 15 +++++++++++++++ app/src/main/res/layout/fragment_vip.xml | 4 ++-- ...tab_checked.webp => ic_vip_tab_checked1.webp} | Bin .../res/mipmap-xxhdpi/ic_vip_tab_checked2.webp | Bin 0 -> 1084 bytes .../res/mipmap-xxhdpi/ic_vip_tab_default1.webp | Bin 0 -> 1032 bytes ...tab_default.webp => ic_vip_tab_default2.webp} | Bin 11 files changed, 44 insertions(+), 8 deletions(-) rename app/src/main/res/drawable/{shape_vip_tab_checked.xml => shape_vip_tab_checked1.xml} (85%) create mode 100644 app/src/main/res/drawable/shape_vip_tab_checked2.xml rename app/src/main/res/drawable/{shape_vip_tab_default.xml => shape_vip_tab_default1.xml} (85%) create mode 100644 app/src/main/res/drawable/shape_vip_tab_default2.xml rename app/src/main/res/mipmap-xxhdpi/{ic_vip_tab_checked.webp => ic_vip_tab_checked1.webp} (100%) create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_vip_tab_checked2.webp create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_vip_tab_default1.webp rename app/src/main/res/mipmap-xxhdpi/{ic_vip_tab_default.webp => ic_vip_tab_default2.webp} (100%) 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 0000000000000000000000000000000000000000..b40f5236754e7d0e2cd7d932b76255d472cf291c GIT binary patch literal 1084 zcmV-C1jGAMNk&FA1ONb6MM6+kP&il$0000G0000x0027x06|PpNX7yH00EFhYugz~ zZ@JoI+qP}no>|$Rm2KNv*|u%AZ5v6xMOA%C{vItOVgm55XmR(@)@l&IbNGfMN44EH z)=Rg7XHpc>I_;{DP6ZB0r00W@x|r8xk*>MN3+b^qn{>|Er=4kd66wFxu2rj_Bw)%! zt2Sl*NXY26nv{A@f`(T!s4H|lR}^|#OWl?n5>~ocScP>e3BA*uWge9vma^89(>#;} zPoHIWRWXEwk7@0q$Sul;?+ZB_o{}GEh73zP`RO3gf=P!Q&`r zZ-D{@3Y0vr#ml+{3KS?XCyVjZ-NEf3XB!-=zEc<1(+B{QI6rI-hQ$&i>2w7E7#OD} zXAuAtJeH_1uEA;B7zWWLF94Q>GEdrJ0Z{NHu}3(w9%sorOaScrc-Kn+Fwf0oJ+e7N z!S@P-QpTA86n~^J0$Tz=yBOm7*MaN$?>Y3VIRHb4Fjr|K3;=3;C2q_R6T{dohC?5` z0hmU)kY<Bd87sG3F#a<;|&1oa~-7P-T*vyN}SBOP&+q;lexqVK;iQ;5xuJk z0Mk;5nX}zfmHVb#2Bi!FV5l2Jl-k$;phpUE?-YUh0#_6UB{wtx=#!Q{0)U}T5HXdH zMWAKrTO4{@698tca0gKIvdno~5876H!;wz<0I+%j!0udP#&j`igl=IBlINM>)H0R0 zY2%@}aYQ16GR7MmOoQV%$+MxOacm}oLfSc0`=u~)*SYBd+wyD%-7XFIJSC=l&IkGy z+QX5K*nJKXQ#n%(w0bgvf?dxg7acQHWjayu|p}5P}=3esdLH-yj-L zC(K!F7v#qd?-e2npJ2@w#wzPyzC2jhg8%H2|yT^t>G=(0neePLA*)+Fp5y2P`i>a6qA`4b47A-^lVcTfxGaOqz0S( znQysUL2e480092(0{{Ng5C6Dd|Nh$&(foHwS6HA=wb$4u37RKrr~W4vCB$N$|!iI=X$Uw*YdNC?j^K>%2swBNTU z=2D)SzC>!+?yZ0C24DVZL{g7lAMk8>2Ae^E`S?kvGE@&Iq zu!OsVG~y0965pT%Yg}aH`ILrOXGD;p&W(wT7!gSZN3GzqG!G!-$H(9*^@2F?2+FpqvYtY@=+8CdNr{KsMWj#h$!OA z`L0PtVzxZ-F;pW_cS{?DJA?{(erajfv)BGevf+ausSFB|q42({ho!kM$wn=VBZF9T zoHF!2zelojBz-ywET(saWtQ64iDmh0$?02}zz#3*(cWaWlOt1~V3V#PhW}OsN#|=kTwim;StV%G-mPBP!s+mPyIIA>da4 z0D38;zpc+<9^wu{3$ma+vTGFKp^%(}h(8|}rES?{J$>kfAT`0dKsx4h zBPEIg5|kF{gNv+C)P7WY*P0er2-|l7Jm30Pv&Y#=`ro=^MeJ~4mZVZ1V2RoqV;;ngG_i7pgS0(u^jn?Ki^Wyw`)Ma0000h CDEEW_ literal 0 HcmV?d00001 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