From 8f218a39e45c8fffcba2247af011a779cb9ecce7 Mon Sep 17 00:00:00 2001
From: tj <1378534974@qq.com>
Date: 星期三, 02 四月 2025 11:09:38 +0800
Subject: [PATCH] 1.vip续费页面-样式修改

---
 app/src/main/java/com/example/firstapp/activity/VipActivity.kt |   49 ++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/com/example/firstapp/activity/VipActivity.kt b/app/src/main/java/com/example/firstapp/activity/VipActivity.kt
index d0daa5f..1bd49b1 100644
--- a/app/src/main/java/com/example/firstapp/activity/VipActivity.kt
+++ b/app/src/main/java/com/example/firstapp/activity/VipActivity.kt
@@ -111,11 +111,11 @@
         // 监听 RadioButton 选中状态
         protocol.setOnCheckedChangeListener(CompoundButton.OnCheckedChangeListener { buttonView, isChecked ->
             isPaymentSelected = isChecked // 更新全局变量
-            if(isChecked){
-                protocol.background = ContextCompat.getDrawable(this, R.drawable.checkbox_round_selected)
-            }else{
-                protocol.background = ContextCompat.getDrawable(this, R.drawable.checkbox_round)
-            }
+//            if(isChecked){
+//                protocol.background = ContextCompat.getDrawable(this, R.drawable.checkbox_round_selected)
+//            }else{
+//                protocol.background = ContextCompat.getDrawable(this, R.drawable.checkbox_round)
+//            }
         })
     }
 
@@ -328,14 +328,17 @@
 
             val alipayAmount:TextView = findViewById(R.id.alipay_amount);
             val wechatAmount:TextView = findViewById(R.id.wechat_amount);
+            val protocolDescLayout:TextView = findViewById(R.id.protocol_desc_layout);
+
 
             alipayAmount.text=currentPrice.toString()
             wechatAmount.text=currentPrice.toString()
+            protocolDescLayout.text="自动续费可随时取消,开通后每月按${currentPrice.toString()}元自动续费,可随时取消自动续费"
 
 
         }catch (e: Exception) {
             Toast.makeText(this@VipActivity, e.message, Toast.LENGTH_LONG).show()
-            Log.d("AliPayHelper","xuan: ${e.message}")
+            Log.d("AliPayHelper","支付失败: ${e.message}")
         }
 
         val adapter = CardAdapter(cardList) { cardViewList, cardData, cardView ->
@@ -365,7 +368,23 @@
                 layoutParams = ConstraintLayout.LayoutParams(
                     TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 30f, resources.displayMetrics).toInt(),
                     TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 30f, resources.displayMetrics).toInt()
-                )
+                ).apply {
+                    // 设置 margin
+                    setMargins(
+                        TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 20f, resources.displayMetrics).toInt(), // left
+                        TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 30f, resources.displayMetrics).toInt(), // top
+                        TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 20f, resources.displayMetrics).toInt(), // right
+                        TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 30f, resources.displayMetrics).toInt()  // bottom
+                    )
+                }
+
+
+//                setPadding(
+//                    TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 20f, resources.displayMetrics).toInt(), // left padding
+//                    TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 30f, resources.displayMetrics).toInt(), // top padding
+//                    TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 20f, resources.displayMetrics).toInt(), // right padding
+//                    TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 30f, resources.displayMetrics).toInt()  // bottom padding
+//                )
             }
 
             val textView = TextView(this).apply {
@@ -377,7 +396,8 @@
 
             val checkView = ImageView(this).apply {
                 id = View.generateViewId()
-                setImageResource(R.drawable.ic_check)
+//                setImageResource(R.drawable.ic_check)
+                setImageResource(R.mipmap.vip_right)
                 layoutParams = ConstraintLayout.LayoutParams(
                     TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 30f, resources.displayMetrics).toInt(),
                     TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 30f, resources.displayMetrics).toInt()
@@ -468,7 +488,14 @@
         alipayAmount.text=currentPrice.toString()
         wechatAmount.text=currentPrice.toString()
         // 处理点击事件,这里我们只是简单地展示一个 Toast
-        Toast.makeText(this, "点击了: ${title}", Toast.LENGTH_SHORT).show()
+//        Toast.makeText(this, "点击了: ${title}", Toast.LENGTH_SHORT).show()
+        // 只有连续包月才展示
+        val xieyiLayout:LinearLayout = findViewById(R.id.xieyi_layout);
+        if (title == "连续包月") {
+            xieyiLayout.visibility = View.VISIBLE
+        }else{
+            xieyiLayout.visibility = View.GONE
+        }
 
         orderName = title
         orderType=title
@@ -508,14 +535,14 @@
     private fun handleVipProtocolClick(){
 
         binding.protocolVip.setOnClickListener{
-            startContentActivity("privacy_policy", "VIP会员服务协议")
+            startContentActivity("VIP会员服务协议", "VIP会员服务协议")
         }
 
     }
 
     private fun startContentActivity(type: String, title: String) {
         val intent = Intent(this, ContentDetailActivity::class.java).apply {
-            putExtra(ContentDetailActivity.EXTRA_CONTENT_TYPE, type)
+            putExtra(ContentDetailActivity.ID, type)
             putExtra(ContentDetailActivity.EXTRA_TITLE, title)
         }
         startActivity(intent)

--
Gitblit v1.9.3