From 372d9618f5482e180de022f9b96c8eb0034ef2aa Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期三, 02 四月 2025 09:13:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
app/src/main/java/com/example/firstapp/activity/VipActivity.kt | 2 +-
app/src/main/res/layout/activity_vip.xml | 1 +
2 files changed, 2 insertions(+), 1 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 3559df3..a25ef54 100644
--- a/app/src/main/java/com/example/firstapp/activity/VipActivity.kt
+++ b/app/src/main/java/com/example/firstapp/activity/VipActivity.kt
@@ -468,7 +468,7 @@
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()
orderName = title
orderType=title
diff --git a/app/src/main/res/layout/activity_vip.xml b/app/src/main/res/layout/activity_vip.xml
index 3e5fee4..50a341f 100644
--- a/app/src/main/res/layout/activity_vip.xml
+++ b/app/src/main/res/layout/activity_vip.xml
@@ -433,6 +433,7 @@
>
<TextView
+ android:id="@+id/protocol_desc_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="自动续费可随时取消，开通后每月按12元自动续费，可随时取消自动续费"
--
Gitblit v1.9.3