From 9c9e9ea09a2d10637889c48a67c6147cf3d4136a Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期五, 15 三月 2024 10:32:15 +0800
Subject: [PATCH] 没有打开NFC时,去打开NFC

---
 app/src/main/java/com/dayu/recharge/activity/AdminSetupActivity.java |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/dayu/recharge/activity/AdminSetupActivity.java b/app/src/main/java/com/dayu/recharge/activity/AdminSetupActivity.java
index 7cc1970..1cd0373 100644
--- a/app/src/main/java/com/dayu/recharge/activity/AdminSetupActivity.java
+++ b/app/src/main/java/com/dayu/recharge/activity/AdminSetupActivity.java
@@ -109,7 +109,7 @@
 
             if (adminData != null) {
                 this.adminData = adminData;
-                adminBinding.adminSerial.setText(SocketUtil.getXuLie(this));
+                adminBinding.adminSerial.setText(adminData.getSerial());
                 adminBinding.adminAddressCode.setText(adminData.getAddressCode());
                 adminBinding.adminAddress.setText(adminData.getSheng() + adminData.getShi() + adminData.getXian() + adminData.getZhen() + adminData.getCun());
             } else {
@@ -117,8 +117,7 @@
                 Random random = new Random();
                 // 鐢熸垚 1 鍒� 12 涔嬮棿鐨勯殢鏈烘暟瀛�
                 int randomNumber = random.nextInt(12) + 1;
-                String xulie = SocketUtil.get10to16LowHigh(Integer.valueOf(randomNumber + generateUniqueNumber(getSN())), 6);
-                adminBinding.adminSerial.setText(xulie);
+                adminBinding.adminSerial.setText(randomNumber + generateUniqueNumber(getSN()));
 
             }
 

--
Gitblit v1.8.0