wangyu
/
blzb-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复引导页跳转推送页，修改优惠券领取逻辑，2.8.0/280

This commit is contained in:
wangyu 2026-03-12 15:18:20 +08:00
parent fe08ad0680
commit 3fa6df53bf
4 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/com/cheng/blzb/ui/fragment/guide/item/GuideItem5Fragment.kt
View File

@ -20,7 +20,6 @@ import com.cheng.blzb.ui.fragment.guide.GuideViewModel
import com.cheng.blzb.ui.fragment.guide.adapter.GuideItem5CityAdapter import com.cheng.blzb.ui.fragment.guide.adapter.GuideItem5CityAdapter
import com.cheng.blzb.ui.fragment.guide.adapter.GuideItem5IndustryAdapter1 import com.cheng.blzb.ui.fragment.guide.adapter.GuideItem5IndustryAdapter1
import com.cheng.blzb.ui.fragment.guide.vip.GuideVipFragment import com.cheng.blzb.ui.fragment.guide.vip.GuideVipFragment
import com.efs.sdk.memleaksdk.monitor.internal.bi
import com.example.base.extensions.visible import com.example.base.extensions.visible
import com.example.base.ui.BaseFragment import com.example.base.ui.BaseFragment
import com.example.base.utils.DensityUtils import com.example.base.utils.DensityUtils
@ -90,6 +89,13 @@ class GuideItem5Fragment : BaseFragment<FragmentGuideItem5Binding, GuideViewMode
earthRotateAnim.repeatCount = -1 earthRotateAnim.repeatCount = -1
earthRotateAnim.interpolator = LinearInterpolator() earthRotateAnim.interpolator = LinearInterpolator()
val topTransAnim = ObjectAnimator.ofFloat(binding.ivTop, "translationY", -ScreenUtils.getScreenHeight().toFloat() / 2, 0f)
topTransAnim.duration = 2000
topTransAnim.startDelay = 200
topTransAnim.addListener(onStart = {
binding.ivTop.visible()
})
val titleTransAnim = ObjectAnimator.ofFloat(binding.layoutTitle, "translationY", -ScreenUtils.getScreenHeight().toFloat() / 2, 0f) val titleTransAnim = ObjectAnimator.ofFloat(binding.layoutTitle, "translationY", -ScreenUtils.getScreenHeight().toFloat() / 2, 0f)
titleTransAnim.duration = 2000 titleTransAnim.duration = 2000
titleTransAnim.startDelay = 200 titleTransAnim.startDelay = 200
@ -133,7 +139,7 @@ class GuideItem5Fragment : BaseFragment<FragmentGuideItem5Binding, GuideViewMode
}) })
val animSet = AnimatorSet() val animSet = AnimatorSet()
animSet.playTogether(bgTransAnim, star1TranAnim, star2TranAnim, earthTransAnim, earthRotateAnim, titleTransAnim, infoTransAnim, progressMaskAnim) animSet.playTogether(bgTransAnim, star1TranAnim, star2TranAnim, earthTransAnim, earthRotateAnim, topTransAnim, titleTransAnim, infoTransAnim, progressMaskAnim)
animSet.start() animSet.start()
} }

2
app/src/main/java/com/cheng/blzb/ui/fragment/guide/vip/GuideVipFragment.kt
View File

@ -160,7 +160,7 @@ class GuideVipFragment: BaseFragment<FragmentGuideVipBinding, GuideVipViewModel>
} }
binding.ivClose.onClick { binding.ivClose.onClick {
requireActivity().startActivity<MainActivity>() requireActivity().startActivity<MainActivity>(Pair("origin", "bootpage"))
} }
binding.tvTab1.onClick { binding.tvTab1.onClick {

20
app/src/main/java/com/cheng/blzb/ui/fragment/mine/vip/VipFragment.kt
View File

@ -105,6 +105,8 @@ class VipFragment : BaseFragment<FragmentVipBinding, VipViewModel>() {
private val couponList by lazy { mutableListOf<CouponEntity>() } private val couponList by lazy { mutableListOf<CouponEntity>() }
private val couponEnterActivityList by lazy { mutableListOf<CouponActivityEntity>() } private val couponEnterActivityList by lazy { mutableListOf<CouponActivityEntity>() }
private val couponReturnActivityList by lazy { mutableListOf<CouponActivityEntity>() } private val couponReturnActivityList by lazy { mutableListOf<CouponActivityEntity>() }
private var hasCheckedVipEnterCouponActivity = false
private var hasCheckedVipReturnCouponActivity = false
override fun initView() { override fun initView() {
super.initView() super.initView()
@ -133,11 +135,11 @@ class VipFragment : BaseFragment<FragmentVipBinding, VipViewModel>() {
mViewModel.getCorpInfo() mViewModel.getCorpInfo()
mViewModel.couponList() mViewModel.couponList()
if (!UserConfigManager.isShowGoodsCouponAnim()) { if (!UserConfigManager.isShowGoodsCouponAnim()) {
if (!MainActivity.hasCheckedVipEnterCouponActivity) { if (!hasCheckedVipEnterCouponActivity) {
mViewModel.couponEnterActivityList() mViewModel.couponEnterActivityList()
} }
} }
if (!MainActivity.hasCheckedVipReturnCouponActivity) { if (!hasCheckedVipReturnCouponActivity) {
mViewModel.couponReturnActivityList() mViewModel.couponReturnActivityList()
} }
} }
@ -149,7 +151,7 @@ class VipFragment : BaseFragment<FragmentVipBinding, VipViewModel>() {
setBackPressed() setBackPressed()
mTitleBar?.setNavigationOnClickListener { mTitleBar?.setNavigationOnClickListener {
if (MainActivity.hasCheckedVipReturnCouponActivity || MainActivity.hasCheckedVipGuideReturnCouponActivity || couponReturnActivityList.isEmpty()) { if (hasCheckedVipReturnCouponActivity || couponReturnActivityList.isEmpty()) {
requireActivity().finish() requireActivity().finish()
} else { } else {
if (couponReturnActivityList.size == 1 && couponReturnActivityList[0].activity_type == CouponEntity.TYPE_CASH) { if (couponReturnActivityList.size == 1 && couponReturnActivityList[0].activity_type == CouponEntity.TYPE_CASH) {
@ -765,10 +767,10 @@ class VipFragment : BaseFragment<FragmentVipBinding, VipViewModel>() {
private fun showRedPacketActivityDialog(isEnter: Boolean) { private fun showRedPacketActivityDialog(isEnter: Boolean) {
val coupon = if (isEnter) { val coupon = if (isEnter) {
MainActivity.hasCheckedVipEnterCouponActivity = true hasCheckedVipEnterCouponActivity = true
couponEnterActivityList[0] couponEnterActivityList[0]
} else { } else {
MainActivity.hasCheckedVipReturnCouponActivity = true hasCheckedVipReturnCouponActivity = true
couponReturnActivityList[0] couponReturnActivityList[0]
} }
val f = RedPacketActivityDialog.newInstance(coupon) val f = RedPacketActivityDialog.newInstance(coupon)
@ -785,10 +787,10 @@ class VipFragment : BaseFragment<FragmentVipBinding, VipViewModel>() {
private fun showCouponActivityDialog(isEnter: Boolean) { private fun showCouponActivityDialog(isEnter: Boolean) {
val couponList = if (isEnter) { val couponList = if (isEnter) {
MainActivity.hasCheckedVipEnterCouponActivity = true hasCheckedVipEnterCouponActivity = true
couponEnterActivityList couponEnterActivityList
} else { } else {
MainActivity.hasCheckedVipReturnCouponActivity = true hasCheckedVipReturnCouponActivity = true
couponReturnActivityList couponReturnActivityList
} }
if (couponList.isNotEmpty()) { if (couponList.isNotEmpty()) {
@ -875,7 +877,7 @@ class VipFragment : BaseFragment<FragmentVipBinding, VipViewModel>() {
private fun setBackPressed() { private fun setBackPressed() {
if (BuildCompat.isAtLeastT()) { if (BuildCompat.isAtLeastT()) {
requireActivity().onBackInvokedDispatcher.registerOnBackInvokedCallback(OnBackInvokedDispatcher.PRIORITY_DEFAULT) { requireActivity().onBackInvokedDispatcher.registerOnBackInvokedCallback(OnBackInvokedDispatcher.PRIORITY_DEFAULT) {
if (MainActivity.hasCheckedVipReturnCouponActivity || MainActivity.hasCheckedVipGuideReturnCouponActivity || couponReturnActivityList.isEmpty()) { if (hasCheckedVipReturnCouponActivity || couponReturnActivityList.isEmpty()) {
requireActivity().finish() requireActivity().finish()
} else { } else {
if (couponReturnActivityList.size == 1 && couponReturnActivityList[0].activity_type == CouponEntity.TYPE_CASH) { if (couponReturnActivityList.size == 1 && couponReturnActivityList[0].activity_type == CouponEntity.TYPE_CASH) {
@ -889,7 +891,7 @@ class VipFragment : BaseFragment<FragmentVipBinding, VipViewModel>() {
} }
} else { } else {
requireActivity().onBackPressedDispatcher.addCallback(this) { requireActivity().onBackPressedDispatcher.addCallback(this) {
if (MainActivity.hasCheckedVipReturnCouponActivity || MainActivity.hasCheckedVipGuideReturnCouponActivity || couponReturnActivityList.isEmpty()) { if (hasCheckedVipReturnCouponActivity || couponReturnActivityList.isEmpty()) {
requireActivity().finish() requireActivity().finish()
} else { } else {
if (couponReturnActivityList.size == 1 && couponReturnActivityList[0].activity_type == CouponEntity.TYPE_CASH) { if (couponReturnActivityList.size == 1 && couponReturnActivityList[0].activity_type == CouponEntity.TYPE_CASH) {

3
app/src/main/res/layout/fragment_guide_item5.xml
View File

@ -15,8 +15,11 @@
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<androidx.appcompat.widget.AppCompatImageView <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_top"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:visibility="invisible"
tools:visibility="visible"
android:src="@mipmap/ic_guide_item5_top" android:src="@mipmap/ic_guide_item5_top"
app:layout_constraintDimensionRatio="h,1425:234" app:layout_constraintDimensionRatio="h,1425:234"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />