diff --git a/app/src/main/java/com/chwl/app/vip/VipCenterActivity.kt b/app/src/main/java/com/chwl/app/vip/VipCenterActivity.kt index 48feb674b..97ecc0bea 100644 --- a/app/src/main/java/com/chwl/app/vip/VipCenterActivity.kt +++ b/app/src/main/java/com/chwl/app/vip/VipCenterActivity.kt @@ -25,6 +25,7 @@ import com.chwl.app.databinding.ActivityVipCenterBinding import com.chwl.app.ui.pay.ChargeActivity import com.chwl.app.ui.utils.RVDelegate import com.chwl.app.ui.webview.CommonWebViewActivity +import com.chwl.app.vip.adapter.OnItemClickListener import com.chwl.app.vip.adapter.VipAuthAdapter import com.chwl.app.vip.adapter.VipCenterBannerAdapter import com.chwl.app.vip.adapter.VipCenterIdentificationsAdapter @@ -41,6 +42,7 @@ import com.chwl.core.vip.bean.VipInfo import com.example.module_base.support.billing.IBillingService import com.example.module_base.support.billing.IProductDetails import com.example.module_base.support.billing.IPurchase +import com.netease.nim.uikit.StatusBarUtil import com.youth.banner.Banner import com.youth.banner.adapter.BannerImageAdapter import com.youth.banner.holder.BannerImageHolder @@ -50,10 +52,11 @@ import com.youth.banner.transformer.DepthPageTransformer import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import org.greenrobot.eventbus.EventBus +import com.youth.banner.listener.OnPageChangeListener class VipCenterActivity : BaseViewBindingActivity(), - VipMagicIndicatorAdapter.OnItemSelectListener, IBillingService.Listener { + VipMagicIndicatorAdapter.OnItemSelectListener, OnItemClickListener, IBillingService.Listener { private val authAdapter = VipAuthAdapter() // 用户权限 private val vipViewModel: VipViewModel by viewModels() @@ -66,7 +69,7 @@ class VipCenterActivity : BaseViewBindingActivity(), private lateinit var recyclerView: RecyclerView private lateinit var vipIdentificationsAdapter: VipCenterIdentificationsAdapter -// protected var banner: Banner? = null + private var currentIndex = 0 companion object { @@ -88,10 +91,6 @@ class VipCenterActivity : BaseViewBindingActivity(), initView() initObserve() - handleAuthAdapter() - handleViewModel() - handleBinding() - rvDelegate = RVDelegate.Builder() .setLayoutManager(GridLayoutManager(this, 3)) .setRecyclerView(binding.recyclerViewBottom) @@ -110,6 +109,10 @@ class VipCenterActivity : BaseViewBindingActivity(), } } + handleAuthAdapter() + handleViewModel() + handleBinding() + requestChargeList{ loadChargeList(it) } @@ -117,17 +120,30 @@ class VipCenterActivity : BaseViewBindingActivity(), private fun initView() { banner = findViewById(R.id.banner_view) - banner.isAutoLoop(false) banner.setBannerGalleryEffect(25, 25,25) + banner.addOnPageChangeListener(object : OnPageChangeListener { + override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) { + // 页面滑动中 + } + + override fun onPageSelected(position: Int) { + // 页面被选中，position 已更新 + currentIndex = position + vipViewModel.onItemSelect(position) + } + + override fun onPageScrollStateChanged(state: Int) { + // 页面滚动状态改变 + } + }) recyclerView = findViewById(R.id.recycler_view) recyclerView.layoutManager = GridLayoutManager(this, 2) -// val identificationTitle = findViewById(R.id.center_title) -// identificationTitle.text = R.string.vip_center_2.toString() -// -// val exclusivePrivilegesTitle = findViewById(R.id.center_title_2) -// exclusivePrivilegesTitle.text = R.string.vip_center_4.toString() + val identificationTitle = findViewById(R.id.center_title) + identificationTitle.text = R.string.vip_center_2.toString() + val exclusivePrivilegesTitle = findViewById(R.id.center_title_2) + exclusivePrivilegesTitle.text = R.string.vip_center_4.toString() } override fun initWhiteTitleBar(title: String?) { @@ -182,48 +198,31 @@ class VipCenterActivity : BaseViewBindingActivity(), // ArrayList[VipAuthInfo] // 全部特权列表 authAdapter.setNewData(it) it?.let { - vipIdentificationsAdapter = VipCenterIdentificationsAdapter(this, it) + vipIdentificationsAdapter = VipCenterIdentificationsAdapter(this, it, this) recyclerView.adapter = vipIdentificationsAdapter } } vipViewModel.pageLiveData.observe(this) { it?.let { // 当前显示的 index -// binding.magicIndicator.onPageSelected(it) // TODO 处理轮播组件 index 更新 + currentIndex = it + handleIdentificationAreaContent(it) } } vipViewModel.vipInfosLiveData.observe(this) { it?.let { // ArrayList[VipInfo] 每个等级的 VIP 内容 -// initTitleTab(it) // TODO 初始化轮播组件 val adapter = VipCenterBannerAdapter(this, it) - banner.setAdapter(adapter) - -// banner.setAdapter(object : BannerImageAdapter(it) { -// override fun onBindView(holder: BannerImageHolder, data: VipInfo, position: Int, size: Int) { -// //图片加载自己实现 -// Glide.with(holder.itemView) -// .load(data.vipIcon) -// .apply(RequestOptions.bitmapTransform(RoundedCorners(30))) -// .into(holder.imageView) -// } -// override fun onCreateHolder( -// parent: ViewGroup?, -// viewType: Int -// ): BannerImageHolder { -// return super.onCreateHolder(parent, viewType) -// } -// }).addBannerLifecycleObserver(this) -// .setIndicator(CircleIndicator(this), false) + banner.setAdapter(adapter, false) + handleIdentificationAreaContent(0) } } - vipViewModel.myVipInfoLiveData.observe(this) { it?.let { - //TODO 处理有 VIP 的情况 + //TODO 处理有 VIP 的情况，banner 要跳转到对应 index // bannerView.visibility = View.VISIBLE // bannerView.post { // binding.bannerView.setPageMargin(UIUtil.dip2px(mContext, 8.0)) @@ -242,13 +241,37 @@ class VipCenterActivity : BaseViewBindingActivity(), vipViewModel.currVipInfoLiveData.observe(this) { it?.let { // VipInfo - // TODO 根据当前显示的 VIP 信息更新 UI + if (it.comingSoon == 2) { + /// 处理敬请期待情况, 补充显示 SVGA + binding.slAuth.isVisible = false + binding.bannerView.isVisible = false + binding.layoutBottomPanel.isVisible = false +// loadSVGA(binding.ivNotOpenIcon, it.vipLogo) + } else { + val myVipInfo = vipViewModel.myVipInfoLiveData.value + // TODO 根据当前显示的 VIP 信息更新 UI + authAdapter.setVipInfo(it) + authAdapter.notifyDataSetChanged() +// handleIdentificationAreaContent(it.vipLevel) + vipIdentificationsAdapter.setVipInfo(it) + } + } ?: run { getString(R.string.me_failed_to_get_aristocrat_data).toast() } } } + override fun onItemClick(position: Int) { + authAdapter.getItem(position)?.let { + VipAuthDetailsDialog.newInstance(it.descPic, it.authName, it.authIntro).show(this) + } + } + + private fun handleIdentificationAreaContent(position: Int) { + // 条件： + } + @SuppressLint("CheckResult") private fun requestChargeList(call: (List) -> Unit) { PayModel.get().vipList @@ -400,4 +423,10 @@ class VipCenterActivity : BaseViewBindingActivity(), TODO("Not yet implemented") } + override fun needSteepStateBar() = true + + override fun setStatusBar() { + super.setStatusBar() + StatusBarUtil.transparencyBar(this) + } } \ No newline at end of file diff --git a/app/src/main/java/com/chwl/app/vip/adapter/VipCenterBannerAdapter.kt b/app/src/main/java/com/chwl/app/vip/adapter/VipCenterBannerAdapter.kt index f766453d9..5d68a673e 100644 --- a/app/src/main/java/com/chwl/app/vip/adapter/VipCenterBannerAdapter.kt +++ b/app/src/main/java/com/chwl/app/vip/adapter/VipCenterBannerAdapter.kt @@ -7,8 +7,15 @@ import android.widget.ImageView import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide import com.chwl.app.R +import com.chwl.app.ui.utils.loadFromUrl import com.chwl.core.vip.bean.VipInfo +import com.opensource.svgaplayer.SVGADrawable +import com.opensource.svgaplayer.SVGAImageView +import com.opensource.svgaplayer.SVGAParser +import com.opensource.svgaplayer.SVGAVideoEntity import com.youth.banner.adapter.BannerAdapter +import java.net.MalformedURLException +import java.net.URL class VipCenterBannerAdapter( private val context: Context, @@ -25,25 +32,39 @@ class VipCenterBannerAdapter( override fun onBindView(holder: BannerViewHolder, data: VipInfo, position: Int, size: Int) { // 加载本地背景图片 when(position) { - 1->holder.imgBackground.setImageResource(R.drawable.vip_center_level_1) - 2->holder.imgBackground.setImageResource(R.drawable.vip_center_level_2) - 3->holder.imgBackground.setImageResource(R.drawable.vip_center_level_3) - 4->holder.imgBackground.setImageResource(R.drawable.vip_center_level_4) - 5->holder.imgBackground.setImageResource(R.drawable.vip_center_level_5) - 6->holder.imgBackground.setImageResource(R.drawable.vip_center_level_6) - 7->holder.imgBackground.setImageResource(R.drawable.vip_center_level_7) - 8->holder.imgBackground.setImageResource(R.drawable.vip_center_level_8) - 9->holder.imgBackground.setImageResource(R.drawable.vip_center_level_9) + 0->holder.imgBackground.setImageResource(R.drawable.vip_center_level_1) + 1->holder.imgBackground.setImageResource(R.drawable.vip_center_level_2) + 2->holder.imgBackground.setImageResource(R.drawable.vip_center_level_3) + 3->holder.imgBackground.setImageResource(R.drawable.vip_center_level_4) + 4->holder.imgBackground.setImageResource(R.drawable.vip_center_level_5) + 5->holder.imgBackground.setImageResource(R.drawable.vip_center_level_6) + 6->holder.imgBackground.setImageResource(R.drawable.vip_center_level_7) + 7->holder.imgBackground.setImageResource(R.drawable.vip_center_level_8) + 8->holder.imgBackground.setImageResource(R.drawable.vip_center_level_9) } - // 加载网络图片 - Glide.with(context) - .load(data.vipIcon) // data 是图片的 URL - .into(holder.imgForeground) + holder.svgaImage.loadFromUrl(data.vipLogo) } inner class BannerViewHolder(view: View) : RecyclerView.ViewHolder(view) { val imgBackground: ImageView = view.findViewById(R.id.img_background) - val imgForeground: ImageView = view.findViewById(R.id.img_foreground) + val svgaImage: SVGAImageView = view.findViewById(R.id.iv_vip_icon) + } + + private fun loadSVGA(svgaImageView: SVGAImageView, svgaUrl: String) { + try { + SVGAParser.shareParser() + .decodeFromURL(URL(svgaUrl), object : SVGAParser.ParseCompletion { + override fun onComplete(videoItem: SVGAVideoEntity) { + val drawable = SVGADrawable(videoItem) + svgaImageView.setImageDrawable(drawable) + svgaImageView.startAnimation() + } + override fun onError() { + } + }) + } catch (e: MalformedURLException) { + + } } } \ No newline at end of file diff --git a/app/src/main/java/com/chwl/app/vip/adapter/VipCenterIdentificationsAdapter.kt b/app/src/main/java/com/chwl/app/vip/adapter/VipCenterIdentificationsAdapter.kt index b7b6e145f..d5959322a 100644 --- a/app/src/main/java/com/chwl/app/vip/adapter/VipCenterIdentificationsAdapter.kt +++ b/app/src/main/java/com/chwl/app/vip/adapter/VipCenterIdentificationsAdapter.kt @@ -1,4 +1,5 @@ package com.chwl.app.vip.adapter +import android.annotation.SuppressLint import android.content.Context import android.view.LayoutInflater import android.view.View @@ -9,11 +10,20 @@ import androidx.recyclerview.widget.RecyclerView import com.bumptech.glide.Glide import com.chwl.app.R import com.chwl.core.vip.bean.VipAuthInfo +import com.chwl.core.vip.bean.VipInfo + +interface OnItemClickListener { + fun onItemClick(position: Int) +} class VipCenterIdentificationsAdapter( private val context: Context, - private val items: List + private val items: List, + private val listener: OnItemClickListener ) : RecyclerView.Adapter() { + + private var vipInfo: VipInfo? = null + override fun onCreateViewHolder( parent: ViewGroup, viewType: Int @@ -35,10 +45,27 @@ class VipCenterIdentificationsAdapter( // 设置标题 holder.titleTextView.text = item.authName + + holder.itemView.setOnClickListener { + listener.onItemClick(position) + } } override fun getItemCount(): Int { - return items.size + return vipInfo?.let { + when (it.vipLevel) { + 1, 2 -> 3 + 3 -> 4 + else -> 6 + } + } ?: 0 // items.size + } + + @SuppressLint("NotifyDataSetChanged") + fun setVipInfo(vipInfo: VipInfo?) { + this.vipInfo = vipInfo + // TODO：过滤 items 的内容，显示指定的 vip 权益 + this.notifyDataSetChanged() } inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { diff --git a/app/src/main/res/layout/activity_vip_center.xml b/app/src/main/res/layout/activity_vip_center.xml index 743700efb..9ac6709b3 100644 --- a/app/src/main/res/layout/activity_vip_center.xml +++ b/app/src/main/res/layout/activity_vip_center.xml @@ -6,7 +6,8 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="#150c00" - android:orientation="vertical"> + android:orientation="vertical" + android:fitsSystemWindows="true"> diff --git a/app/src/main/res/layout/banner_vip_center_custom.xml b/app/src/main/res/layout/banner_vip_center_custom.xml index 8dffaca2a..5a9337644 100644 --- a/app/src/main/res/layout/banner_vip_center_custom.xml +++ b/app/src/main/res/layout/banner_vip_center_custom.xml @@ -1,12 +1,13 @@ - - - + android:layout_marginEnd="0dp" + android:layout_marginBottom="25dp" /> - + + \ No newline at end of file