新增贵族时间说明详情

app/src/main/java/com/yizhuan/erban/vip/VipMainActivity.kt

@@ -58,20 +58,20 @@ class VipMainActivity : BaseViewBindingActivity<ActivityVipMainBinding>(),
 
     private val authAdapter = VipAuthAdapter()
     private lateinit var rvDelegate: RVDelegate<VipAuthInfo>
-    private val roomUid by lazy { intent.getLongExtra("roomUid", 0) }
     private val vipViewModel: VipViewModel by viewModels()
 
     @SuppressLint("SetTextI18n")
     override fun init() {
         EventBus.getDefault().register(this)
         initWhiteTitleBar("贵族中心")
-        mTitleBar.addAction(object : TitleBar.ImageAction(R.drawable.ic_room_pk_help) {
+        mTitleBar.addAction(object : TitleBar.ImageAction(R.drawable.ic_vip_help) {
             override fun performAction(view: View) {
+                CommonWebViewActivity.start(this@VipMainActivity, UriProvider.getVipHelpUrl())
             }
         })
 
         binding.ivTimeHelp.setOnClickListener {
-            VipRemainTimeDialog.newInstance("desc").show(this)
+            VipRemainTimeDialog.newInstance().show(this)
         }
 
         rvDelegate = RVDelegate.Builder<VipAuthInfo>()

app/src/main/java/com/yizhuan/erban/vip/VipRemainTimeDialog.kt

@@ -2,18 +2,14 @@ package com.yizhuan.erban.vip
 
 import android.os.Bundle
 import com.yizhuan.erban.base.BaseDialog
-import com.yizhuan.erban.databinding.DialogRoomPkRuleBinding
-import com.yizhuan.erban.databinding.DialogVipAuthDetailsBinding
 import com.yizhuan.erban.databinding.DialogVipRemainTimeBinding
-import com.yizhuan.erban.ui.utils.load
 
 class VipRemainTimeDialog : BaseDialog<DialogVipRemainTimeBinding>() {
 
     companion object {
         @JvmStatic
-        fun newInstance(desc: String): VipRemainTimeDialog {
+        fun newInstance(): VipRemainTimeDialog {
             val args = Bundle()
-            args.putString("desc", desc)
             val fragment = VipRemainTimeDialog()
             fragment.arguments = args
             return fragment
@@ -22,6 +18,5 @@ class VipRemainTimeDialog : BaseDialog<DialogVipRemainTimeBinding>() {
 
     override fun init() {
         binding.ivClose.setOnClickListener { dismissAllowingStateLoss() }
-        binding.tvDesc.text = requireArguments().getString("desc", "")
     }
 }

app/src/main/res/layout/dialog_vip_remain_time.xml

@@ -33,12 +33,12 @@
             android:layout_marginTop="8dp"
             android:layout_marginEnd="12dp"
             android:ellipsize="end"
+            android:text="@string/vip_time_desc"
             android:textColor="#ffffe3af"
             android:textSize="14sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tv_title"
-            tools:text="剩余时间说明剩余时间说明剩余时间明明铭剩余时间说明剩余时间说明剩余时间说明明剩余时间说明说明说明说明说明说明说明说" />
+            app:layout_constraintTop_toBottomOf="@id/tv_title" />
 
         <ImageView
             android:id="@+id/iv_close"

app/src/main/res/values/strings.xml

@@ -910,5 +910,6 @@
     <string name="first_charge_help">1.每人仅可获得1次首充福利\n2.每个手机号，设备，实名认证等如已参与过首充，则无法获得奖励。</string>
     <string name="home_like_hint">关注的人和收藏的房间都会出现在这里\n暂无关注的人和收藏的房间哦</string>
     <string name="avatar_auditing">头像已送审，审核成功后自动应用头像</string>
+    <string name="vip_time_desc">剩余时间以30天为周期，以获得新的贵族等级次日起算30日后的中午12:00为截止时间，周期内贵族等级出现变化则剩余时间自动重置为30天。</string>
 
 </resources>

app/src/module_labour_union/res/layout/activity_vip_main.xml

@@ -295,7 +295,7 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
                     android:layout_marginStart="5dp"
-                    android:src="@drawable/ic_help_black" />
+                    android:src="@drawable/ic_vip_time_help" />
             </LinearLayout>
 
         </FrameLayout>

core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/UriProvider.java

@@ -379,4 +379,11 @@ public class UriProvider {
     public static String getPrivacyUrl() {
         return JAVA_WEB_URL.concat("/yinyou/modules/rule/privacy-wap.html");
     }
+
+    /**
+     * 贵族中心帮助页
+     */
+    public static String getVipHelpUrl() {
+        return JAVA_WEB_URL.concat("/yinyou/modules/rule/introduction-patrician.html");
+    }
 }