From aadcaabdf5fc8b3b1b941fef47300d666ae6876a Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期五, 08 十二月 2023 11:02:33 +0800
Subject: [PATCH] 中安身份证识别相关代码

---
 app/src/main/java/com/dayu/recharge/MyApplication.java |   32 ++++++++++++++++----------------
 1 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/com/dayu/recharge/MyApplication.java b/app/src/main/java/com/dayu/recharge/MyApplication.java
index da04377..7414711 100644
--- a/app/src/main/java/com/dayu/recharge/MyApplication.java
+++ b/app/src/main/java/com/dayu/recharge/MyApplication.java
@@ -1,6 +1,7 @@
 package com.dayu.recharge;
 
 import android.app.Application;
+import android.nfc.Tag;
 import android.os.Handler;
 import android.os.Message;
 import android.text.TextUtils;
@@ -9,6 +10,7 @@
 import com.dayu.recharge.dao.BaseDaoSingleton;
 import com.dayu.recharge.dbBean.DeviceNumber;
 import com.dayu.recharge.dbBean.IpBean;
+import com.dayu.recharge.utils.DeviceNumberUtils;
 import com.dayu.recharge.utils.ToastUtil;
 import com.easysocket.EasySocket;
 import com.easysocket.config.EasySocketOptions;
@@ -34,7 +36,7 @@
 import java.util.TimerTask;
 
 public class MyApplication extends Application {
-
+    public static String TAG = "MyApplication";
     public static MyApplication myApplication;
     private String address;
 
@@ -52,7 +54,8 @@
         myApplication = this;
         isAidl = true;
         AidlUtil.getInstance().connectPrinterService(this);
-        initEasySocket(false, null);
+
+//        initEasySocket(false, null);
 
         CrashReport.initCrashReport(getApplicationContext(), "45551598b8", true);
     }
@@ -71,6 +74,9 @@
 
     /**
      * 鍒濆鍖朎asySocket
+     *
+     * @param isCreate   褰撳墠宸茶繛鎺ユ湇鍔″櫒鍚庢槸鍚﹂噸鏂拌繛鎺�
+     * @param createBack
      */
     public void initEasySocket(boolean isCreate, SocketNet.CreateBack createBack) {
         try {
@@ -81,6 +87,7 @@
                 ipBean.setIp("dayuyanjiuyuan.top");
                 ipBean.setPort(8888);
             }
+
             if (ipBean != null) {
                 try {
                     //澶勭悊褰撹繛鎺ヤ笂IP鍚庝慨鏀筰p涓嶇敓鏁堥棶棰�
@@ -144,6 +151,8 @@
         if (!TextUtils.isEmpty(ip)
                 && !TextUtils.isEmpty(String.valueOf(port))
                 && !TextUtils.isEmpty(addressCode)) {
+
+            Log.i("initMachineRequestBean", "寮�濮嬫敞鍐岃澶�");
             if (EasySocket.getInstance().getDefconnection() != null) {
                 isDoInitMachine = true;
                 InitMachineRequestBean initMachineRequestBean = new InitMachineRequestBean();
@@ -152,8 +161,6 @@
                 initMachineRequestBean.setAddress(addressCode);
                 initMachineRequestBean.setXuLie(SocketUtil.getXuLie(this));
                 initMachineRequestBean.setAFN("91");
-//
-                Log.i("Socket", "娉ㄥ唽鎶ユ枃");
                 SocketNet.getInstance().sendTestMessage(initMachineRequestBean.pack(), new SocketCallBack() {
                     @Override
                     public void onSocketResponse(SocketData readData) {
@@ -161,7 +168,6 @@
                         if (CRC8.isCRC8(readData.getOriginDataBytes())) {
                             //鏍¢獙CRC鎴愬姛
                             InitMachineBackBean initMachineBackBean = new InitMachineBackBean();
-
                             String initCode = HexUtil.bytesToHex(Arrays.copyOfRange(readData.getBodyBytes(), 2, 18));
                             //纭鏀跺埌娉ㄥ唽鍙锋姤鏂�
                             ConfirmMachineRequestBean confirmMachineRequestBean = new ConfirmMachineRequestBean();
@@ -183,20 +189,15 @@
                                         //BCD鐮�00鎴愬姛01澶辫触(娉ㄥ唽鍙蜂笉鏄湇鍔″櫒杩斿洖淇℃伅)
                                         if (state.equalsIgnoreCase("00")) {
                                             //淇濆瓨璁惧娉ㄥ唽鍙�
-                                            DeviceNumber deviceNumber = BaseDaoSingleton.getInstance(MyApplication.myApplication).deviceNumberDao().findFirst();
-                                            if (deviceNumber != null) {
-                                                deviceNumber.setDeviceRegistrationNumber(initCode);
-                                            } else {
-                                                deviceNumber = new DeviceNumber();
-                                                deviceNumber.setDeviceRegistrationNumber(initCode);
+                                            if (!TextUtils.isEmpty(initCode)) {
+                                                DeviceNumberUtils.setDeviceNumber(initCode);
                                             }
-                                            BaseDaoSingleton.getInstance(MyApplication.myApplication).deviceNumberDao().insert(deviceNumber);
-
+                                            Log.i(TAG, "onSuccess: 璁惧娉ㄥ唽鍙凤細" + initCode);
 //                                            WSHelper.getInstance(MyApplication.this).put("initCode", initCode);
                                             ToastUtil.show("鍏呭�肩鐞嗘敞鍐屾姤鏂囪幏鍙栨垚鍔�");
                                         } else {
                                             //鏍¢獙CRC閿欒
-                                            ToastUtil.show("纭鏀跺埌娉ㄥ唽鎶ユ枃鐘舵�佸け璐�");
+//                                                ToastUtil.show("纭鏀跺埌娉ㄥ唽鎶ユ枃鐘舵�佸け璐�");
                                         }
                                     } else {
                                         //鏍¢獙CRC閿欒
@@ -221,9 +222,8 @@
                 });
 
             }
-
-
         }
+
     }
 
     private void createSocket(String ip, int port) {

--
Gitblit v1.8.0