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/net/SocketNet.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/app/src/main/java/com/dayu/recharge/net/SocketNet.java b/app/src/main/java/com/dayu/recharge/net/SocketNet.java
index 2031a00..0573432 100644
--- a/app/src/main/java/com/dayu/recharge/net/SocketNet.java
+++ b/app/src/main/java/com/dayu/recharge/net/SocketNet.java
@@ -111,7 +111,7 @@
if (!MyApplication.myApplication.isDoInitMachine) {
Log.i("SocketActionListener1111", "isDoInitMachine");
if (MyApplication.myApplication.ipBean != null && adminData != null) {
- if (!TextUtils.isEmpty(adminData.getAddressCode())) {
+ if (!TextUtils.isEmpty(adminData.getAddressCode()) && !MyApplication.myApplication.isCreate) {
Log.i("SocketActionListener1111", "initMachineRequestBean");
MyApplication.myApplication.initMachineRequestBean(MyApplication.myApplication.ipBean.getIp(), MyApplication.myApplication.ipBean.getPort(), adminData.getAddressCode());
@@ -135,13 +135,10 @@
MyApplication.myApplication.isConncet = false;
rushState();
Log.i("SocketActionListener", "socket杩炴帴澶辫触");
- if (isTest) {
-// ToastUtil.show(mContext, "杩炴帴澶辫触,璇锋鏌ョ綉缁�");
- } else {
- if (myCallBack != null) {
- myCallBack.onSocketError(-1, "杩炴帴鏁版嵁涓績澶辫触,璇锋鏌ョ綉缁�");
- }
+ if (myCallBack != null) {
+ myCallBack.onSocketError(-1, "杩炴帴鏁版嵁涓績澶辫触,璇锋鏌ョ綉缁�");
}
+ myCallBack = null;
}
/**
@@ -154,8 +151,11 @@
Log.i("SocketActionListener", "---> socket鏂紑杩炴帴锛屾槸鍚﹂渶瑕侀噸杩烇細" + isNeedReconnect);
MyApplication.myApplication.isConncet = false;
rushState();
+ if (myCallBack != null) {
+ myCallBack.onSocketError(-2, "涓庢湇鍔″櫒杩炴帴鏂紑锛岃閲嶈瘯");
+ }
+ myCallBack = null;
}
-
/**
@@ -174,7 +174,7 @@
if (myCallBack != null) {
myCallBack.onSocketResponse(socketData);
}
-
+ myCallBack = null;
}
};
--
Gitblit v1.8.0