From fe04012057d024770e0180543483d393281a542f Mon Sep 17 00:00:00 2001
From: zhujie <leon.zhu@cloudroam.com.cn>
Date: 星期四, 03 四月 2025 09:18:16 +0800
Subject: [PATCH] Merge branch 'master' of http://47.96.225.205:8888/r/FirstApp2
---
app/src/main/java/com/example/firstapp/ui/notifications/NotificationsFragment.kt | 72 +++++++++++++++---------------------
1 files changed, 30 insertions(+), 42 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 9c128a1..91fcafb 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
@@ -33,6 +33,8 @@
import com.bumptech.glide.Glide
import com.example.firstapp.activity.VipActivity
import com.example.firstapp.database.response.UserInfo
+import com.example.firstapp.ui.invitation.InvitationActivity
+import com.example.firstapp.utils.PreferencesManager
class NotificationsFragment : Fragment() {
@@ -130,39 +132,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 {
@@ -177,7 +146,9 @@
// 好友邀请
binding.layoutInvite.setOnClickListener {
- shareToWechat()
+ // 跳转到邀请活动页面
+ val intent = Intent(requireActivity(), InvitationActivity::class.java)
+ startActivity(intent)
}
// AI助手
@@ -210,12 +181,12 @@
// 隐私协议
binding.layoutPrivacy.setOnClickListener {
- startContentActivity("privacy_policy", "隐私协议")
+ startContentActivity("隐私协议", "隐私协议")
}
// 使用教程
binding.layoutTutorial.setOnClickListener {
- startContentActivity("user_guide", "使用教程")
+ startContentActivity("使用教程", "使用教程")
}
// 头像点击老的处理逻辑
@@ -238,6 +209,15 @@
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() {
@@ -292,9 +272,9 @@
}
}
- private fun startContentActivity(type: String, title: String) {
+ private fun startContentActivity(id: String, title: String) {
val intent = Intent(requireContext(), ContentDetailActivity::class.java).apply {
- putExtra(ContentDetailActivity.EXTRA_CONTENT_TYPE, type)
+ putExtra(ContentDetailActivity.ID, id)
putExtra(ContentDetailActivity.EXTRA_TITLE, title)
}
startActivity(intent)
@@ -302,7 +282,14 @@
private suspend fun loadUserInfo() {
try {
- val response = RetrofitClient.apiService.getUserInfo("17586582287")
+ // 从本地获取保存的手机号
+ val savedPhone = PreferencesManager.getPhone()
+ if (savedPhone.isNullOrEmpty()) {
+ Toast.makeText(context, "用户未登录", Toast.LENGTH_SHORT).show()
+ return
+ }
+
+ val response = RetrofitClient.apiService.getUserInfo(savedPhone)
if (response.code == "0" && response.data != null) {
// 保存用户信息
currentUserInfo = response.data
@@ -319,15 +306,16 @@
binding.tvUserId.text = "个人账号：${userInfo.contactTel}"
// 设置VIP信息
- if (userInfo.showed) {
+ if (userInfo.isMember) {
binding.ivVip.visibility = View.VISIBLE
binding.cardVip.visibility = View.VISIBLE
- binding.tvVipExpire.text = "${userInfo.overTime} 到期"
+ binding.tvVipExpire.text = "${userInfo.memberOverDate} 到期"
} else {
//非会员信息
+ binding.ivVip.visibility = View.GONE
+ binding.cardVip.visibility = View.VISIBLE
binding.btnRenew.text = "立即开通"
binding.linearVipContainer.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.gray))
- binding.cardVip.visibility = View.GONE
}
}
} catch (e: Exception) {
--
Gitblit v1.9.3