From 1ffa3cb19f95855d44fbc9485f4eb3286b12e359 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期三, 22 十一月 2023 12:43:17 +0800
Subject: [PATCH] 修改提示方式 修改充值流程
---
app/src/main/java/com/dayu/recharge/net/SocketNet.java | 45 ++++++++++++++++++++++-----------------------
1 files changed, 22 insertions(+), 23 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..fe1e5cb 100644
--- a/app/src/main/java/com/dayu/recharge/net/SocketNet.java
+++ b/app/src/main/java/com/dayu/recharge/net/SocketNet.java
@@ -2,11 +2,11 @@
import android.content.Context;
import android.os.Handler;
-import android.text.TextUtils;
import android.util.Log;
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;
@@ -14,9 +14,6 @@
import com.easysocket.interfaces.conn.ISocketActionListener;
import com.easysocket.interfaces.conn.SocketActionListener;
import com.dayu.recharge.MyApplication;
-import com.dayu.recharge.utils.ToastUtil;
-import com.dayu.recharge.utils.WSHelper;
-import com.easysocket.utils.LogUtil;
/**
@@ -28,7 +25,7 @@
public class SocketNet {
public static SocketNet socketNet;
SocketCallBack myCallBack;
- byte[] dataMessage;
+ // byte[] dataMessage;
boolean isTest = false;
Context mContext;
@@ -51,12 +48,13 @@
isTest = false;
// 鍙戦��
// EasySocket.getInstance().upMessage(dataMessage);
- if (EasySocket.getInstance().getDefOptions().getSocketAddress() != null) {
- EasySocket.getInstance().disconnect(false);
- EasySocket.getInstance().connect();
- this.dataMessage = dataMessage;
+ if (EasySocket.getInstance().getDefconnection() != null) {
+// EasySocket.getInstance().disconnect(false);
+// EasySocket.getInstance().connect();
+ EasySocket.getInstance().upMessage(dataMessage);
+// this.dataMessage = dataMessage;
} else {
- LogUtil.w("Socket鍦板潃涓虹┖");
+ MyApplication.myApplication.initEasySocket(false, null);
}
}
@@ -71,8 +69,8 @@
isTest = true;
mContext = context;
if (EasySocket.getInstance().getDefOptions().getSocketAddress() != null && !MyApplication.myApplication.isDoInitMachine) {
- EasySocket.getInstance().disconnect(false);
- EasySocket.getInstance().connect();
+// EasySocket.getInstance().disconnect(false);
+// EasySocket.getInstance().connect();
} else {
// ToastUtil.show(mContext, "Socket鍦板潃涓虹┖");
}
@@ -96,8 +94,9 @@
@Override
public void onSocketConnSuccess(SocketAddress socketAddress) {
Log.i("SocketActionListener", "杩炴帴鎴愬姛");
- String initCode = WSHelper.getInstance(MyApplication.myApplication).get("initCode", "");
- if (TextUtils.isEmpty(initCode) && !MyApplication.myApplication.isDoInitMachine) {
+ MyApplication.myApplication.isConncet = true;
+ DeviceNumber initCode = BaseDaoSingleton.getInstance(MyApplication.myApplication).deviceNumberDao().findFirst();
+ if (initCode == null && !MyApplication.myApplication.isDoInitMachine) {
new Handler().postDelayed(new Runnable() {
@Override
public void run() {
@@ -107,15 +106,15 @@
MyApplication.myApplication.initMachineRequestBean(ipBean.getIp(), ipBean.getPort(), adminData.getAddressCode());
}
}
- }, 2000);
+ }, 500);
}
- if (dataMessage != null) {
- EasySocket.getInstance().upMessage(dataMessage);
- }
+// if (dataMessage != null) {
+// EasySocket.getInstance().upMessage(dataMessage);
+// }
if (isTest) {
MyApplication.myApplication.isConncet = true;
- EasySocket.getInstance().disconnect(false);
+// EasySocket.getInstance().disconnect(false);
} else {
}
@@ -129,10 +128,10 @@
*/
@Override
public void onSocketConnFail(SocketAddress socketAddress, boolean isNeedReconnect) {
-// isConnected = false;
+ MyApplication.myApplication.isConncet = false;
Log.i("SocketActionListener", "socket杩炴帴澶辫触");
if (isTest) {
- ToastUtil.show(mContext, "杩炴帴澶辫触,璇锋鏌ョ綉缁�");
+// ToastUtil.show(mContext, "杩炴帴澶辫触,璇锋鏌ョ綉缁�");
} else {
if (myCallBack != null) {
myCallBack.onSocketError(-1, "socket杩炴帴澶辫触,璇锋鏌ョ綉缁�");
@@ -169,8 +168,8 @@
SocketData socketData = new SocketData();
socketData.setBodyData(originReadData.getBodyBytes());
socketData.setHeaderData(originReadData.getHeaderData());
- dataMessage = null;
- if (myCallBack!=null){
+// dataMessage = null;
+ if (myCallBack != null) {
myCallBack.onSocketResponse(socketData);
}
--
Gitblit v1.8.0