From dd0f9e5f533d868d68c5fc343a44356b537b3988 Mon Sep 17 00:00:00 2001
From: zuojincheng <lf_zuo@163.com>
Date: 星期五, 06 六月 2025 15:36:45 +0800
Subject: [PATCH] feat(nfc): 新增用户卡写入功能并优化开卡流程
---
baselibrary/src/main/java/com/dayu/baselibrary/activity/BaseNfcActivity.java | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/baselibrary/src/main/java/com/dayu/baselibrary/activity/BaseNfcActivity.java b/baselibrary/src/main/java/com/dayu/baselibrary/activity/BaseNfcActivity.java
index 2bbdda6..65e2eed 100644
--- a/baselibrary/src/main/java/com/dayu/baselibrary/activity/BaseNfcActivity.java
+++ b/baselibrary/src/main/java/com/dayu/baselibrary/activity/BaseNfcActivity.java
@@ -6,7 +6,7 @@
import android.nfc.NfcAdapter;
import android.os.Bundle;
-import com.dayu.baselibrary.tools.nfc.NfcCommonData;
+import com.dayu.baselibrary.utils.ModelUtils;
import com.dayu.baselibrary.utils.TipUtil;
/**
@@ -22,14 +22,14 @@
public abstract class BaseNfcActivity extends BaseActivity {
protected NfcAdapter mNfcAdapter;
private PendingIntent mPendingIntent;
- public static int adapterType = NfcCommonData.defaultType;
+ public static int adapterType = ModelUtils.defaultType;
@Override
protected void onNewIntent(Intent intent) {
super.onNewIntent(intent);
switch (adapterType) {
- case NfcCommonData.defaultType:
+ case ModelUtils.defaultType:
onNfcBack(intent);
break;
}
@@ -44,13 +44,13 @@
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- //鍒ゆ柇鏄摢涓満鍨�
- try {
- Class.forName("com.pos.device.config.DevConfig");
- adapterType = NfcCommonData.HuaZhiRongHai;
- } catch (ClassNotFoundException e) {
- adapterType = NfcCommonData.defaultType;
+ switch (ModelUtils.getModelType()) {
+ case ModelUtils.defaultType:
+ case ModelUtils.ShangMiType:
+ adapterType = ModelUtils.defaultType;
+ break;
}
+
}
@Override
@@ -90,6 +90,12 @@
}
+ @Override
+ protected void onDestroy() {
+ super.onDestroy();
+
+ }
+
/**
* 妫�娴嬪伐浣�,鍒ゆ柇璁惧鐨凬FC鏀寔鎯呭喌
*
--
Gitblit v1.8.0