From a8751388c9a86ae95714a15279994d8aa426a26d Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期五, 13 六月 2025 14:59:02 +0800
Subject: [PATCH] feat(generallibrary): 优化充值功能并添加水价获取- 在 activity_recharge_detail.xml 中移除了不必要的 bold 样式- 在 EditText 中添加了金额输入限制(数字和小数点)- 在 BaseApplication 中添加了水价信息存储 - 在 MainActivity 中实现了延时获取水价的功能- 优化了 RechargeDetailActivity 中的水价检查和使用逻辑 - 在 README.md 中添加了金额格式化和水价获取的最佳实践指南

---
 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