From 520c4343a7121d610391c41cd090c480d65d13f2 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期五, 22 三月 2024 09:37:40 +0800
Subject: [PATCH] 读取卡片界面添加地址码字段 参数设置添加密码校验

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

diff --git a/app/src/main/java/com/dayu/recharge/MyApplication.java b/app/src/main/java/com/dayu/recharge/MyApplication.java
index 6a2370d..453b711 100644
--- a/app/src/main/java/com/dayu/recharge/MyApplication.java
+++ b/app/src/main/java/com/dayu/recharge/MyApplication.java
@@ -43,6 +43,9 @@
     public boolean isConncet = false;
     private final Timer timer = new Timer();
 
+    //姣忔鍚姩绋嬪簭鍙幓娉ㄥ唽涓�閬嶏紝涓嶅啀閲嶆柊娉ㄥ唽銆�
+    public static boolean isCreate = false;
+
 
     @Override
     public void onCreate() {
@@ -74,11 +77,17 @@
     public void initEasySocket(boolean isCreate, SocketNet.CreateBack createBack) {
         try {
             this.createBack = createBack;
-            ipBean = BaseDaoSingleton.getInstance(MyApplication.myApplication).ipDao().findFirst();
+            try {
+                ipBean = BaseDaoSingleton.getInstance(MyApplication.myApplication).ipDao().findFirst();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
             if (ipBean == null) {
                 ipBean = new IpBean();
-                ipBean.setIp("dayuyanjiuyuan.top");
-                ipBean.setPort(8888);
+                ipBean.setIp("newreceive.hnsjgg.com");
+                ipBean.setPort(9999);
+//                ipBean.setIp("dayuyanjiuyuan.top");
+//                ipBean.setPort(8888);
             }
             if (ipBean != null) {
                 try {
@@ -179,6 +188,7 @@
                                 @Override
                                 public void onSocketResponse(SocketData readData) {
                                     isDoInitMachine = false;
+                                    MyApplication.myApplication.isCreate = true;
                                     if (CRC8.isCRC8(readData.getOriginDataBytes())) {
                                         byte stateByte = readData.getBodyBytes()[2];
                                         String state = BcdUtil.bcdToStr(stateByte);
@@ -192,8 +202,9 @@
 //                                            WSHelper.getInstance(MyApplication.this).put("initCode", initCode);
                                             ToastUtil.show("鍏呭�肩鐞嗘敞鍐屾姤鏂囪幏鍙栨垚鍔�");
                                         } else {
+                                            Log.i(TAG, "娉ㄥ唽澶辫触--- 鐘舵�佺爜锛�" + state);
                                             //鏍¢獙CRC閿欒
-                                            ToastUtil.show("纭鏀跺埌娉ㄥ唽鎶ユ枃鐘舵�佸け璐�");
+//                                            ToastUtil.show("纭鏀跺埌娉ㄥ唽鎶ユ枃鐘舵�佸け璐�");
                                         }
                                     } else {
                                         //鏍¢獙CRC閿欒

--
Gitblit v1.8.0