moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

功能恢复：恢复贵族中心的帮助入口、排行榜入口、特权详情查看功能

Browse Source
This commit is contained in:
max
2024-04-17 12:04:28 +08:00
parent fcecc29add
commit 68e6d2aa15
7 changed files with 137 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/java/com/chwl/app/vip/VipMainActivity.kt
View File

@@ -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<ActivityVipMainBinding>(),
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<ActivityVipMainBinding>(),
.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) {

29
app/src/main/java/com/chwl/app/vip/dialog/VipAuthDetailsDialog.kt Normal file
View File

@@ -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<DialogVipAuthDetailsBinding>() {
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", "")
}
}

68
app/src/main/res/layout/dialog_vip_auth_details.xml Normal file
View File

@@ -0,0 +1,68 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="300dp"
android:layout_height="286dp"
android:layout_gravity="center"
android:background="@drawable/bg_vip_dialog"
android:orientation="vertical">
<ImageView
android:id="@+id/iv_auth_icon"
android:layout_width="252dp"
android:layout_height="115dp"
android:layout_marginTop="40dp"
android:scaleType="centerCrop"
android:src="@drawable/bg_vip_auth_img"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_auth_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:textColor="#ffffe3af"
android:textSize="18sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/iv_auth_icon"
tools:text="@string/layout_dialog_vip_auth_details_01" />
<TextView
android:id="@+id/tv_auth_desc"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="12dp"
android:ellipsize="end"
android:gravity="center_horizontal"
android:maxLines="3"
android:textColor="#ffffe3af"
android:textSize="14sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_auth_name"
tools:text="@string/layout_dialog_vip_auth_details_02" />
<ImageView
android:id="@+id/iv_close"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="9dp"
android:layout_marginEnd="14dp"
android:src="@drawable/ic_vip_dialog_close"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</FrameLayout>

BIN
app/src/module_labour_union/res/drawable-xhdpi/ic_rank_list.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 8.7 KiB

BIN
app/src/module_labour_union/res/drawable-xxhdpi/ic_rank_list.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 18 KiB

10
app/src/module_labour_union/res/layout/activity_vip_main.xml
View File

@@ -68,6 +68,16 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/ivRankList"
android:src="@drawable/ic_rank_list"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_24"
android:layout_marginTop="@dimen/dp_10"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/iv_my_level"
android:layout_width="wrap_content"

14
core/src/main/java/com/chwl/core/UriProvider.java
View File

@@ -180,4 +180,18 @@ public class UriProvider {
public static String getLiveAgreement() {
return JAVA_WEB_URL.concat("/molistar/activity/activemodel/index.html?code=ZBGG");
}
/**
* 贵族中心帮助页
*/
public static String getVipHelpUrl() {
return JAVA_WEB_URL.concat("/molistar/modules/rule/introduction-patrician.html");
}
/**
* 贵族榜
*/
public static String getRankListUrl() {
return JAVA_WEB_URL.concat("/molistar/modules/noble/index.html");
}
}