From c42258b3bdc3527b74e05bbd917ceaa458cc205a Mon Sep 17 00:00:00 2001
From: lmw <125975490@qq.com>
Date: 星期五, 08 八月 2025 11:25:48 +0800
Subject: [PATCH] save
---
app/src/main/java/com/dollearn/student/ui/shop/ExchangeActivity.kt | 16 +++++++---------
1 files changed, 7 insertions(+), 9 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..c6e0155 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
@@ -2,6 +2,7 @@
import android.content.Intent
import androidx.core.os.bundleOf
+import cn.sinata.xldutils.gone
import cn.sinata.xldutils.utils.myToast
import cn.sinata.xldutils.visible
import com.dollearn.student.R
@@ -12,7 +13,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.ChangeAddressActivity
+import com.dollearn.student.ui.mine.AddressManageActivity
import com.dollearn.student.utils.Const
import com.dollearn.student.utils.event.EmptyEvent
import kotlinx.android.synthetic.main.activity_exchange.*
@@ -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)
}
}
}
@@ -113,6 +110,7 @@
if (!recipient?.id.isNullOrEmpty()) {
tv_address.text = recipient?.province+recipient?.city+recipient?.address
tv_user.text = "%s | %s".format(recipient?.recipient,recipient?.recipientPhone)
+ tv_empty.gone()
}
}else{
HttpManager.getOrderAddress().request(this){_,data->
--
Gitblit v1.7.1