From fc6048b630901058ccd90529e32e031e612b8384 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期二, 21 十一月 2023 14:32:03 +0800
Subject: [PATCH] 补卡相关
---
app/src/main/java/com/dayu/recharge/net/SocketNet.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 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 a75d37f..481b320 100644
--- a/app/src/main/java/com/dayu/recharge/net/SocketNet.java
+++ b/app/src/main/java/com/dayu/recharge/net/SocketNet.java
@@ -7,6 +7,7 @@
import com.dayu.recharge.dao.BaseDaoSingleton;
import com.dayu.recharge.dbBean.AdminDataBean;
+import com.dayu.recharge.dbBean.DeviceNumber;
import com.dayu.recharge.dbBean.IpBean;
import com.easysocket.EasySocket;
import com.easysocket.entity.OriginReadData;
@@ -51,12 +52,12 @@
isTest = false;
// 鍙戦��
// EasySocket.getInstance().upMessage(dataMessage);
- if (EasySocket.getInstance().getDefOptions().getSocketAddress() != null) {
+ if (EasySocket.getInstance().getDefconnection() != null) {
EasySocket.getInstance().disconnect(false);
EasySocket.getInstance().connect();
this.dataMessage = dataMessage;
} else {
- LogUtil.w("Socket鍦板潃涓虹┖");
+ MyApplication.myApplication.initEasySocket(false, null);
}
}
@@ -96,8 +97,8 @@
@Override
public void onSocketConnSuccess(SocketAddress socketAddress) {
Log.i("SocketActionListener", "杩炴帴鎴愬姛");
- String initCode = WSHelper.getInstance(MyApplication.myApplication).get("initCode", "");
- if (TextUtils.isEmpty(initCode) && !MyApplication.myApplication.isDoInitMachine) {
+ DeviceNumber initCode = BaseDaoSingleton.getInstance(MyApplication.myApplication).deviceNumberDao().findFirst();
+ if (initCode==null && !MyApplication.myApplication.isDoInitMachine) {
new Handler().postDelayed(new Runnable() {
@Override
public void run() {
@@ -107,7 +108,7 @@
MyApplication.myApplication.initMachineRequestBean(ipBean.getIp(), ipBean.getPort(), adminData.getAddressCode());
}
}
- }, 2000);
+ }, 500);
}
if (dataMessage != null) {
@@ -132,7 +133,7 @@
// isConnected = false;
Log.i("SocketActionListener", "socket杩炴帴澶辫触");
if (isTest) {
- ToastUtil.show(mContext, "杩炴帴澶辫触,璇锋鏌ョ綉缁�");
+// ToastUtil.show(mContext, "杩炴帴澶辫触,璇锋鏌ョ綉缁�");
} else {
if (myCallBack != null) {
myCallBack.onSocketError(-1, "socket杩炴帴澶辫触,璇锋鏌ョ綉缁�");
@@ -170,7 +171,7 @@
socketData.setBodyData(originReadData.getBodyBytes());
socketData.setHeaderData(originReadData.getHeaderData());
dataMessage = null;
- if (myCallBack!=null){
+ if (myCallBack != null) {
myCallBack.onSocketResponse(socketData);
}
--
Gitblit v1.8.0