From 32d1501e6fe6338eb6dc51c26df7fe0808caac0d Mon Sep 17 00:00:00 2001 From: zuoxiao <lf_zuo@163.com> Date: 星期四, 26 六月 2025 15:05:28 +0800 Subject: [PATCH] feat(general): 优化写卡成功界面并添加开卡功能- 重新设计写卡成功界面布局,增加滚动视图以支持长文本显示 - 添加开卡功能相关的UI和逻辑,包括工本费和充值金额的展示- 增加用户姓名和卡片信息的显示 - 优化打印凭证的内容和格式 -调整NFC连接逻辑,提高连接成功率 --- generallibrary/src/main/java/com/dayu/general/activity/CardReplaceActivity.kt | 13 +++++-------- 1 files changed, 5 insertions(+), 8 deletions(-) diff --git a/generallibrary/src/main/java/com/dayu/general/activity/CardReplaceActivity.kt b/generallibrary/src/main/java/com/dayu/general/activity/CardReplaceActivity.kt index 14a7cff..59dfd9b 100644 --- a/generallibrary/src/main/java/com/dayu/general/activity/CardReplaceActivity.kt +++ b/generallibrary/src/main/java/com/dayu/general/activity/CardReplaceActivity.kt @@ -3,23 +3,17 @@ import android.content.Context import android.content.Intent import android.os.Bundle -import android.util.TypedValue -import android.view.View -import android.widget.RadioButton -import android.widget.Toast import com.dayu.baselibrary.net.subscribers.SubscriberListener import com.dayu.baselibrary.utils.MornyUtil import com.dayu.baselibrary.utils.ToastUtil import com.dayu.baselibrary.view.TipDialog import com.dayu.baselibrary.view.TitleBar import com.dayu.general.BaseApplication -import com.dayu.general.R import com.dayu.general.bean.card.UserCard -import com.dayu.general.bean.net.CardInfoResult import com.dayu.general.bean.net.CardInfoByClientResult +import com.dayu.general.bean.net.CardInfoResult import com.dayu.general.bean.net.CardReplaceResult import com.dayu.general.bean.net.PaymentMethod -import com.dayu.general.bean.net.PaymentMethodResponse import com.dayu.general.databinding.ActivityCardReplaceBinding import com.dayu.general.net.ApiManager import com.dayu.general.net.BaseResponse @@ -181,7 +175,9 @@ } else -> { - + showConfirmDialog("褰撳墠闈炵櫧鍗�") { + resetToReadingState() + } } } @@ -380,6 +376,7 @@ putExtra("paymentMethod", paymentMethod) // 浼犻�掓敮浠樻柟寮� putExtra("paymentId", paymentId) // 浼犻�掓敮浠樻柟寮廔D putExtra("userCard", updatedUserCard as java.io.Serializable) + putExtra("cardInfo", cardInfo) } startActivity(intent) finish() -- Gitblit v1.8.0