From 08bfe3072377b53c60e0952f00c26bce2e5b4bc0 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期三, 18 六月 2025 17:05:55 +0800
Subject: [PATCH] feat(card): 添加卡片返还功能- 新增 CardReturnActivity 用于执行卡片返还操作 - 在 BSCardFragment 中添加返还按钮，跳转到 CardReturnActivity - 在 CardOperationType 中添加 ReturnCard 类型 - 修改 CardReadActivity，优化卡片信息显示逻辑 - 更新 CardWriteSuccessActivity，支持返还成功提示 - 新增 ic_morny_back 图标用于返还操作
---
henanlibrary/src/main/java/com/dayu/henanlibrary/activity/MyActivity.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/MyActivity.java b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/MyActivity.java
index 958c081..06ad0b6 100644
--- a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/MyActivity.java
+++ b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/MyActivity.java
@@ -169,11 +169,13 @@
adminData = baseDao.adminDao().findFirst();
if (adminData.isHasAddressCode()) {
myBinding.myAdminName.setText(adminData.getSheng() + adminData.getShi() + adminData.getXian() + adminData.getZhen() + adminData.getCun());
- myBinding.myVillageNum.setText(adminData.getSerial());
} else {
myBinding.myAdminName.setText("璇风偣鍑诲湴鍧�淇℃伅璁剧疆");
- myBinding.myVillageNum.setText("璇风偣鍑诲湴鍧�淇℃伅璁剧疆");
}
+ if (!TextUtils.isEmpty(adminData.getSerial())) {
+ myBinding.myVillageNum.setText(adminData.getSerial());
+ }
+
StringBuilder msgData = new StringBuilder();
String initCode = DeviceNumberUtils.getDeviceNumber();
--
Gitblit v1.8.0