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/HomeActivity.java | 36 +++---------------------------------
1 files changed, 3 insertions(+), 33 deletions(-)
diff --git a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/HomeActivity.java b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/HomeActivity.java
index d079dc5..fe854ed 100644
--- a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/HomeActivity.java
+++ b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/HomeActivity.java
@@ -9,6 +9,7 @@
import android.view.View;
import android.widget.Toast;
+import com.dayu.baselibrary.utils.DeviceUtils;
import com.dayu.baselibrary.utils.TipUtil;
import com.dayu.baselibrary.view.PassWordDialog;
import com.dayu.henanlibrary.HeNanApplication;
@@ -61,7 +62,7 @@
// 鐢熸垚 1 鍒� 12 涔嬮棿鐨勯殢鏈烘暟瀛�
int randomNumber = random.nextInt(12) + 1;
AdminDataBean adminDataBean = new AdminDataBean();
- adminDataBean.setSerial(randomNumber + generateUniqueNumber(getSN()));
+ adminDataBean.setSerial(randomNumber + generateUniqueNumber(DeviceUtils.getSN()));
baseDao.adminDao().insert(adminDataBean);
}
@@ -146,36 +147,5 @@
}
}
- @SuppressLint("MissingPermission")
- public static String getSN() {
- String serial = null;
- try {
- Class<?> c = Class.forName("android.os.SystemProperties");
- Method get = c.getMethod("get", String.class);
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
- try {
- serial = (String) get.invoke(c, "ro.sunmi.serial");
- } catch (Exception e) {
- e.printStackTrace();
- }
- return serial;
- } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
- serial = Build.getSerial();
- return serial;
- } else {
- //瀹夊崜8浠ヤ笅浣跨敤Build.SERIAL鐩稿悓鏂瑰紡
- //return Build.SERIAL;
- try {
- serial = (String) get.invoke(c, "ro.serialno");
- } catch (Exception e) {
- e.printStackTrace();
- }
- return serial;
- }
- } catch (ClassNotFoundException e) {
- throw new RuntimeException(e);
- } catch (NoSuchMethodException e) {
- throw new RuntimeException(e);
- }
- }
+
}
--
Gitblit v1.8.0