From 935a87b3578806ca37fee37f03da8c419a3896ce Mon Sep 17 00:00:00 2001
From: lmw <125975490@qq.com>
Date: 星期二, 16 七月 2024 15:26:54 +0800
Subject: [PATCH] 删除无效引用
---
app/src/main/java/com/dollearn/student/ui/shop/ExchangeActivity.kt | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/app/src/main/java/com/dollearn/student/ui/shop/ExchangeActivity.kt b/app/src/main/java/com/dollearn/student/ui/shop/ExchangeActivity.kt
index 3d99499..99c69e1 100644
--- a/app/src/main/java/com/dollearn/student/ui/shop/ExchangeActivity.kt
+++ b/app/src/main/java/com/dollearn/student/ui/shop/ExchangeActivity.kt
@@ -12,6 +12,7 @@
import com.dollearn.student.network.request
import com.dollearn.student.ui.TransparentStatusBarActivity
import com.dollearn.student.ui.home.PayResultActivity
+import com.dollearn.student.ui.mine.AddressManageActivity
import com.dollearn.student.ui.mine.ChangeAddressActivity
import com.dollearn.student.utils.Const
import com.dollearn.student.utils.event.EmptyEvent
@@ -48,11 +49,7 @@
}
cl_address.setOnClickListener {
- if (recipient?.id.isNullOrEmpty()){
- startActivityForResult<AddAddressActivity>(1)
- }else{
- startActivityForResult<ChangeAddressActivity>(2)
- }
+ startActivityForResult<AddressManageActivity>(2,"canChoose" to true)
}
tv_action.setOnClickListener {
@@ -96,11 +93,11 @@
tv_goods_count.text = "1"
tv_total_score.text = good.integral.toString()
tv_score.text = good.integral.toString()
- if (recipient.id.isNullOrEmpty()){
+ if (recipient?.id.isNullOrEmpty()){
tv_empty.visible()
}else{
- tv_address.text = recipient.province+recipient.city+recipient.address
- tv_user.text = "%s | %s".format(recipient.recipient,recipient.recipientPhone)
+ tv_address.text = recipient?.province+recipient?.city+recipient?.address
+ tv_user.text = "%s | %s".format(recipient?.recipient,recipient?.recipientPhone)
}
}
}
--
Gitblit v1.7.1