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 553fc29e2..6c0bf377b 100644 Binary files a/app/src/main/res/drawable-xhdpi/bg_vip_first_charge_tip.png and b/app/src/main/res/drawable-xhdpi/bg_vip_first_charge_tip.png differ diff --git a/app/src/main/res/drawable-xhdpi/bg_vip_first_open_btn.png b/app/src/main/res/drawable-xhdpi/bg_vip_first_open_btn.png new file mode 100644 index 000000000..19b06719d Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/bg_vip_first_open_btn.png differ 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 000000000..ec95657a8 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/vip_first_open_btn_bg.png differ diff --git a/app/src/main/res/drawable-xhdpi/vip_rank_ic_entrance.png b/app/src/main/res/drawable-xhdpi/vip_rank_ic_entrance.png index 0e55a079b..3a60f9c06 100644 Binary files a/app/src/main/res/drawable-xhdpi/vip_rank_ic_entrance.png and b/app/src/main/res/drawable-xhdpi/vip_rank_ic_entrance.png differ 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" />