diff --git a/app/src/main/java/com/chwl/app/vip/VipMainActivity.kt b/app/src/main/java/com/chwl/app/vip/VipMainActivity.kt index 3fc6c4de3..45d3f50b2 100644 --- a/app/src/main/java/com/chwl/app/vip/VipMainActivity.kt +++ b/app/src/main/java/com/chwl/app/vip/VipMainActivity.kt @@ -33,12 +33,15 @@ import com.chwl.app.databinding.ActivityVipMainBinding import com.chwl.app.ui.pay.ChargeActivity import com.chwl.app.ui.setting.ModifyPwdActivity import com.chwl.app.ui.utils.RVDelegate +import com.chwl.app.ui.webview.CommonWebViewActivity import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator import com.chwl.app.vip.adapter.VipAuthAdapter import com.chwl.app.vip.adapter.VipMagicIndicatorAdapter import com.chwl.app.vip.adapter.VipRebateAdapter import com.chwl.app.vip.dialog.SelectPayTypeDialog +import com.chwl.app.vip.dialog.VipAuthDetailsDialog import com.chwl.app.vip.dialog.VipRemainTimeDialog +import com.chwl.core.UriProvider import com.chwl.core.pay.PayModel import com.chwl.core.pay.bean.ChargeBean import com.chwl.core.pay.bean.PayRecordId @@ -83,8 +86,16 @@ class VipMainActivity : BaseViewBindingActivity(), override fun init() { EventBus.getDefault().register(this) initWhiteTitleBar(getString(R.string.vip_center)) + mTitleBar.addAction(object : TitleBar.ImageAction(R.drawable.ic_vip_help) { + override fun performAction(view: View) { + CommonWebViewActivity.start(this@VipMainActivity, UriProvider.getVipHelpUrl()) + } + }) initView() initObserve() + binding.ivRankList.setOnClickListener { + CommonWebViewActivity.start(this@VipMainActivity, UriProvider.getRankListUrl()) + } binding.ivTimeHelp.setOnClickListener { VipRemainTimeDialog.newInstance().show(this) } @@ -101,7 +112,11 @@ class VipMainActivity : BaseViewBindingActivity(), .setAdapter(authAdapter) .build() binding.recyclerView.isNestedScrollingEnabled = false - + authAdapter.setOnItemClickListener { _, _, position -> + authAdapter.getItem(position)?.let { + VipAuthDetailsDialog.newInstance(it.descPic, it.authName, it.authIntro).show(this) + } + } vipViewModel.getVipPageInfo() vipViewModel.loadingLiveData.observe(this) { diff --git a/app/src/main/java/com/chwl/app/vip/dialog/VipAuthDetailsDialog.kt b/app/src/main/java/com/chwl/app/vip/dialog/VipAuthDetailsDialog.kt new file mode 100644 index 000000000..17b411858 --- /dev/null +++ b/app/src/main/java/com/chwl/app/vip/dialog/VipAuthDetailsDialog.kt @@ -0,0 +1,29 @@ +package com.chwl.app.vip.dialog + +import android.os.Bundle +import com.chwl.app.base.BaseDialog +import com.chwl.app.databinding.DialogVipAuthDetailsBinding +import com.chwl.app.ui.utils.load + +class VipAuthDetailsDialog : BaseDialog() { + + companion object { + @JvmStatic + fun newInstance(icon: String, name: String, desc: String): VipAuthDetailsDialog { + val args = Bundle() + args.putString("icon", icon) + args.putString("name", name) + args.putString("desc", desc) + val fragment = VipAuthDetailsDialog() + fragment.arguments = args + return fragment + } + } + + override fun init() { + binding?.ivClose?.setOnClickListener { dismissAllowingStateLoss() } + binding?.ivAuthIcon?.load(requireArguments().getString("icon", "")) + binding?.tvAuthDesc?.text = requireArguments().getString("desc", "") + binding?.tvAuthName?.text = requireArguments().getString("name", "") + } +} \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_vip_auth_details.xml b/app/src/main/res/layout/dialog_vip_auth_details.xml new file mode 100644 index 000000000..98c84fd63 --- /dev/null +++ b/app/src/main/res/layout/dialog_vip_auth_details.xml @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/module_labour_union/res/drawable-xhdpi/ic_rank_list.webp b/app/src/module_labour_union/res/drawable-xhdpi/ic_rank_list.webp deleted file mode 100644 index 1e8c4bd3e..000000000 Binary files a/app/src/module_labour_union/res/drawable-xhdpi/ic_rank_list.webp and /dev/null differ diff --git a/app/src/module_labour_union/res/drawable-xxhdpi/ic_rank_list.png b/app/src/module_labour_union/res/drawable-xxhdpi/ic_rank_list.png new file mode 100644 index 000000000..274712b75 Binary files /dev/null and b/app/src/module_labour_union/res/drawable-xxhdpi/ic_rank_list.png differ 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 91da6f81a..8171f94ae 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 @@ -68,6 +68,16 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> + +