From e1ff640c5d99396c2aafb24d4324272eeb60e98d Mon Sep 17 00:00:00 2001 From: huangjian Date: Fri, 28 Oct 2022 16:04:24 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=B5=E6=97=8FUI=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mango/moshen/home/fragment/MeFragment.kt | 7 +- .../com/mango/moshen/vip/VipMainActivity.kt | 6 +- .../com/mango/moshen/vip/VipRankActivity.kt | 5 +- .../bg_vip_first_charge_tip.png | Bin 4433 -> 4651 bytes .../drawable-xhdpi/bg_vip_first_open_btn.png | Bin 0 -> 6138 bytes .../drawable-xhdpi/vip_first_open_btn_bg.png | Bin 0 -> 13324 bytes .../drawable-xhdpi/vip_rank_ic_entrance.png | Bin 1475 -> 8233 bytes app/src/main/res/layout/item_vip_rank.xml | 2 +- .../res/layout/activity_vip_main.xml | 124 ++++++++++-------- .../res/layout/activity_vip_rank.xml | 26 ++-- 10 files changed, 92 insertions(+), 78 deletions(-) create mode 100644 app/src/main/res/drawable-xhdpi/bg_vip_first_open_btn.png create mode 100644 app/src/main/res/drawable-xhdpi/vip_first_open_btn_bg.png diff --git a/app/src/main/java/com/mango/moshen/home/fragment/MeFragment.kt b/app/src/main/java/com/mango/moshen/home/fragment/MeFragment.kt index 21e8b78c7..39ec8175c 100644 --- a/app/src/main/java/com/mango/moshen/home/fragment/MeFragment.kt +++ b/app/src/main/java/com/mango/moshen/home/fragment/MeFragment.kt @@ -108,8 +108,6 @@ class MeFragment : BaseFragment(), View.OnClickListener { @SuppressLint("CheckResult", "SetTextI18n") override fun initiate() { EventBus.getDefault().register(this) - vipViewModel.getVipPageInfo() - mCompositeDisposable.add( IMNetEaseManager.get() .relationShipEventObservable @@ -315,9 +313,8 @@ class MeFragment : BaseFragment(), View.OnClickListener { override fun onResume() { super.onResume() setUserData() - if (mUserInfo?.isReview == true) { - requestUpdateUserInfo() - } + requestUpdateUserInfo() + vipViewModel.getVipPageInfo() } @SuppressLint("SetTextI18n") diff --git a/app/src/main/java/com/mango/moshen/vip/VipMainActivity.kt b/app/src/main/java/com/mango/moshen/vip/VipMainActivity.kt index 27bfa9f65..241e8c267 100644 --- a/app/src/main/java/com/mango/moshen/vip/VipMainActivity.kt +++ b/app/src/main/java/com/mango/moshen/vip/VipMainActivity.kt @@ -83,7 +83,7 @@ class VipMainActivity : BaseViewBindingActivity(), VipRemainTimeDialog.newInstance().show(this) } - binding.stvRank.setOnClickListener { + binding.ivRank.setOnClickListener { VipRankActivity.start(this) } @@ -207,8 +207,8 @@ class VipMainActivity : BaseViewBindingActivity(), binding.clOpenVipFirst.isGone = !isDiscountPrice if (isDiscountPrice) { binding.tvFirstOpenPriceOriginal.paint.flags = Paint.STRIKE_THRU_TEXT_FLAG - binding.tvFirstOpenPriceOriginal.text = chargeBean.oriPrice - binding.tvFirstOpenPrice.text = "仅需${chargeBean.money}¥" + binding.tvFirstOpenPriceOriginal.text = "原价${chargeBean.oriPrice}/月" + binding.tvFirstOpenPrice.text = "${chargeBean.money}" } else { binding.tvOpenVip.text = "${chargeBean.getMoney()}立刻成为魔力贵族" } diff --git a/app/src/main/java/com/mango/moshen/vip/VipRankActivity.kt b/app/src/main/java/com/mango/moshen/vip/VipRankActivity.kt index 23f951352..8040995b6 100644 --- a/app/src/main/java/com/mango/moshen/vip/VipRankActivity.kt +++ b/app/src/main/java/com/mango/moshen/vip/VipRankActivity.kt @@ -17,6 +17,7 @@ import com.mango.moshen.databinding.ActivityVipRankBinding import com.mango.moshen.ui.utils.RVDelegate import com.mango.moshen.ui.utils.load import com.mango.moshen.ui.utils.loadAvatar +import com.mango.moshen.ui.utils.loadFromUrl import com.netease.nim.uikit.StatusBarUtil import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers @@ -43,7 +44,7 @@ class VipRankActivity : BaseViewBindingActivity() { @SuppressLint("SetTextI18n") override fun init() { - initWhiteTitleBar("贵族设置") + initWhiteTitleBar("") bannerRvDelegate = RVDelegate.Builder() .setLayoutManager(LinearLayoutManager(this, LinearLayoutManager.HORIZONTAL, false)) .setRecyclerView(binding.rvBanner) @@ -86,7 +87,7 @@ class VipRankActivity : BaseViewBindingActivity() { binding.tvVipInfo.isVisible = false binding.llMyValue.isVisible = true binding.tvMyValue.text = it.score?.toString().ifNullOrEmpty { "0" } - binding.ivMyVipLogo.load(it.vipLogo) + binding.ivMyVipLogo.loadFromUrl(it.vipLogo) if (it.rankNo == 0 || it.rankNo == null) { binding.tvNoRank.isVisible = true diff --git a/app/src/main/res/drawable-xhdpi/bg_vip_first_charge_tip.png b/app/src/main/res/drawable-xhdpi/bg_vip_first_charge_tip.png index 553fc29e29b4ac3449c719ba41778c890e3182e5..6c0bf377bbab4b18b7bb605d7949b334c4706a72 100644 GIT binary patch delta 4645 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/vip_first_open_btn_bg.png b/app/src/main/res/drawable-xhdpi/vip_first_open_btn_bg.png new file mode 100644 index 0000000000000000000000000000000000000000..ec95657a81a2df8d7e25dedba10e131895d3f514 GIT binary patch literal 13324 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 b1LOY&(Om$!0~}1o00000NkvXXu0mjf^;f2` literal 1475 zcmV;!1w8tRP)X1^@s6D=Y3@00001b5ch_0Itp) z=>Px)eMv+?R7gv$m1}GiRTzff@62_lyHdJR1WTa=5GCI48cd2xG^o*_2KAT5RudBu zqKO)Xs_~L&qDF&SH1flEiTcM|qGBZy?<9Z-qLf0xmQq^S?#|B6<(%`GnXLvRiYD%# z*_k=#ea?4zzabp%{a`PgR5 zai*zq61%i!901YRSA*94<@9Y`C{{#Q`tAEBxvb%0|- zG&nHw?rL+|bDfn>+E-Y|wLN4OFaDU+p4ENP&_`{;P_x}L-|Llw%er+n9tVU#ZW5eX zOF@(tSOJL-Bqgv8A%ope2i9jbN+U1|P6h}!-Z-0;`o(T;?<3X!{IAizwa4cQQ>W0p zRYP?^)S*gca1;T;gxPv6%>1e2fD(|5fjL6FzXu!+fGi6l?~MbV@2qaWWh#~Z0jqf7 z0Lk4i_Q(6zwu(Z2j(gIY9dcl4x2}dAYOD$l>nVcc!f9I$Vhe~50%{Dhyan>mMnFlx zwqfLRF!Ii7bNZ^za8t(|mf_D<@!WoryI$;({+9N{A6-&7|IN3Oz4tuBVR@-41>-&t zAa5d^wz~ltf|J3lb98kV;^B3GPTRB&5Z;7mt+uD{s%-99;@Hh^kUP1DWdAE2oQ!ts zaIilXjaTFfwexj2)~&`WNX?cuayllg$(KUQUO*0k#7yYgA*fPsW{cGMBHsX!JEk+z z&0pIx{7{(rRu*mtF?WgN7jLaFxScuHTKDylux2UWhb{+z)<9asbk^7+6XaMzhY>hd zAdyDsWL-oi_X^{LnFL2@rF*P7(WRNuc5ZlL!n6XvL|j{};z1K;1yCmbsDq%on=JyE z#)qA%yVy=o?*fnjTnKxLgmB*RE$6o4?5^^khTWkr@0f1V;5qOQ70s5Ghf%FgQhu17 zI7^jLH$Q6zIK8L3$@2N(Xy?wAMlL^U=8NCv=D)q?h{Nvi$r^0C^*qFt_c-t;=@gQr zV?hHDb(m#=Yy;#q93XeXRoZ<*;3CeC+)O7j(4tQv# z@(*^^wr_+&%c7<$|0h7Wb=mD4lpmC(T7kn diff --git a/app/src/main/res/layout/item_vip_rank.xml b/app/src/main/res/layout/item_vip_rank.xml index d6b302dfa..f16f3ff56 100644 --- a/app/src/main/res/layout/item_vip_rank.xml +++ b/app/src/main/res/layout/item_vip_rank.xml @@ -80,7 +80,7 @@ android:layout_gravity="center_vertical|end" android:drawablePadding="5dp" android:textColor="#F7DA94" - android:textSize="@dimen/dp_14" + android:textSize="14sp" android:textStyle="bold" tools:text="0" /> diff --git a/app/src/module_labour_union/res/layout/activity_vip_main.xml b/app/src/module_labour_union/res/layout/activity_vip_main.xml index a60b0f018..ccba80c80 100644 --- a/app/src/module_labour_union/res/layout/activity_vip_main.xml +++ b/app/src/module_labour_union/res/layout/activity_vip_main.xml @@ -148,7 +148,7 @@ - - - - - + app:layout_constraintTop_toTopOf="@id/view_open_vip_first_bg"> + + + + + + + + + + + + + + @@ -256,26 +283,15 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/title_bar" /> - + app:layout_constraintTop_toBottomOf="@id/magic_indicator" /> - - + + @@ -113,15 +114,13 @@ + android:layout_width="52dp" + android:layout_height="30dp" />