From 4e0525287189ead2b40d86cde62d96890db1389b Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期一, 31 三月 2025 09:02:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
app/src/main/java/com/example/firstapp/ui/notifications/NotificationsFragment.kt | 48 ++++++++++++++----------------------------------
1 files changed, 14 insertions(+), 34 deletions(-)
diff --git a/app/src/main/java/com/example/firstapp/ui/notifications/NotificationsFragment.kt b/app/src/main/java/com/example/firstapp/ui/notifications/NotificationsFragment.kt
index ef69523..527fa09 100644
--- a/app/src/main/java/com/example/firstapp/ui/notifications/NotificationsFragment.kt
+++ b/app/src/main/java/com/example/firstapp/ui/notifications/NotificationsFragment.kt
@@ -31,6 +31,7 @@
import com.google.android.material.snackbar.Snackbar
import kotlinx.coroutines.launch
import com.bumptech.glide.Glide
+import com.example.firstapp.activity.VipActivity
import com.example.firstapp.database.response.UserInfo
class NotificationsFragment : Fragment() {
@@ -129,39 +130,6 @@
private fun setupClickListeners() {
- // 支付插件
- binding.payPlugin.setOnClickListener {
- // 跳转到支付插件页面
- lifecycleScope.launch {
- try {
- val response = RetrofitClient.apiService.getPayOrderInfo()
- var orderInfo=response.data
- Log.d("AliPayHelper","获取订单信息时: ${response}")
- // 这里调用支付宝
- PayAbility.aliPay(requireActivity(), orderInfo, Observer {
- when (it.resultStatus) {
- "9000" -> {
-// Snackbar.make(binding.root, "支付成功", Snackbar.LENGTH_LONG).show()
- requireActivity().runOnUiThread {
- Toast.makeText(requireContext(), "支付成功", Toast.LENGTH_LONG).show()
- }
- }
- else -> {
-// Snackbar.make(binding.root, "支付失败", Snackbar.LENGTH_LONG).show()
- requireActivity().runOnUiThread {
- Toast.makeText(requireContext(), "支付失败", Toast.LENGTH_LONG).show()
- }
-
- }
- }
- })
-
- } catch (e: Exception) {
- Log.d("AliPayHelper","获取订单信息时发生错误: ${e.message}")
- }
- }
- }
-
// 设置提醒
binding.layoutReminder.setOnClickListener {
@@ -232,8 +200,20 @@
// VIP续费
binding.btnRenew.setOnClickListener {
- Toast.makeText(context, "VIP续费功能开发中", Toast.LENGTH_SHORT).show()
+// Toast.makeText(context, "VIP续费功能开发中", Toast.LENGTH_SHORT).show()
+ // 跳转到vipActivity
+ val intent = Intent(requireContext(), VipActivity::class.java)
+ startActivity(intent)
}
+
+ binding.cardVip.setOnClickListener {
+// Toast.makeText(context, "VIP续费功能开发中", Toast.LENGTH_SHORT).show()
+ // 跳转到vipActivity
+ val intent = Intent(requireContext(), VipActivity::class.java)
+ startActivity(intent)
+ }
+
+
}
private fun showEmailDialog() {
--
Gitblit v1.9.3