Merge remote-tracking branch 'origin/master'

cloudroam

2025-04-02 372d9618f5482e180de022f9b96c8eb0034ef2aa

Merge remote-tracking branch 'origin/master'

 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

 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元自动续费，可随时取消自动续费"