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 | 37 ++++++++++++++++++++++---------------
1 files changed, 22 insertions(+), 15 deletions(-)
diff --git a/app/src/main/java/com/dayu/recharge/MyApplication.java b/app/src/main/java/com/dayu/recharge/MyApplication.java
index 615acbc..453b711 100644
--- a/app/src/main/java/com/dayu/recharge/MyApplication.java
+++ b/app/src/main/java/com/dayu/recharge/MyApplication.java
@@ -1,21 +1,13 @@
package com.dayu.recharge;
import android.app.Application;
-import android.nfc.Tag;
import android.os.Handler;
import android.os.Message;
import android.text.TextUtils;
import android.util.Log;
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;
-import com.easysocket.entity.SocketAddress;
-import com.tencent.bugly.crashreport.CrashReport;
import com.dayu.recharge.net.ScoketMessageProtocol;
import com.dayu.recharge.net.SocketCallBack;
import com.dayu.recharge.net.SocketData;
@@ -27,14 +19,17 @@
import com.dayu.recharge.tools.HexUtil;
import com.dayu.recharge.utils.AidlUtil;
import com.dayu.recharge.utils.CRC8;
+import com.dayu.recharge.utils.DeviceNumberUtils;
import com.dayu.recharge.utils.SocketUtil;
-import com.dayu.recharge.utils.TipUtil;
-
+import com.dayu.recharge.utils.ToastUtil;
+import com.easysocket.EasySocket;
+import com.easysocket.config.EasySocketOptions;
+import com.easysocket.entity.SocketAddress;
+import com.tencent.bugly.crashreport.CrashReport;
import java.net.InetAddress;
import java.util.Arrays;
import java.util.Timer;
-import java.util.TimerTask;
public class MyApplication extends Application {
public static String TAG = "MyApplication";
@@ -47,6 +42,9 @@
//鏄惁杩炴帴鏈嶅姟鍣ㄦ垚鍔�
public boolean isConncet = false;
private final Timer timer = new Timer();
+
+ //姣忔鍚姩绋嬪簭鍙幓娉ㄥ唽涓�閬嶏紝涓嶅啀閲嶆柊娉ㄥ唽銆�
+ public static boolean isCreate = false;
@Override
@@ -79,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 {
@@ -184,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);
@@ -197,8 +202,9 @@
// WSHelper.getInstance(MyApplication.this).put("initCode", initCode);
ToastUtil.show("鍏呭�肩鐞嗘敞鍐屾姤鏂囪幏鍙栨垚鍔�");
} else {
+ Log.i(TAG, "娉ㄥ唽澶辫触--- 鐘舵�佺爜锛�" + state);
//鏍￠獙CRC閿欒
- ToastUtil.show("纭鏀跺埌娉ㄥ唽鎶ユ枃鐘舵�佸け璐�");
+// ToastUtil.show("纭鏀跺埌娉ㄥ唽鎶ユ枃鐘舵�佸け璐�");
}
} else {
//鏍￠獙CRC閿欒
@@ -237,6 +243,7 @@
.setMaxWriteBytes(150)
.setMaxReadBytes(150)
.setRequestTimeout(5 * 1000)
+
.setBackupAddress(new SocketAddress(backUpIp, backUpPort))
.build();
--
Gitblit v1.8.0