From 50f6dd3b617f769e7fc6094c2dd0752747541489 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期四, 23 十一月 2023 18:04:05 +0800
Subject: [PATCH] 修复导出充值记录bug 优化充值记录加载逻辑和速度 优化导出记录逻辑
---
app/src/main/java/com/dayu/recharge/net/SocketNet.java | 19 ++++++++++++-------
1 files changed, 12 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 fe1e5cb..f1dbe8f 100644
--- a/app/src/main/java/com/dayu/recharge/net/SocketNet.java
+++ b/app/src/main/java/com/dayu/recharge/net/SocketNet.java
@@ -4,6 +4,7 @@
import android.os.Handler;
import android.util.Log;
+import com.dayu.recharge.activity.HomeActivity;
import com.dayu.recharge.dao.BaseDaoSingleton;
import com.dayu.recharge.dbBean.AdminDataBean;
import com.dayu.recharge.dbBean.DeviceNumber;
@@ -95,6 +96,7 @@
public void onSocketConnSuccess(SocketAddress socketAddress) {
Log.i("SocketActionListener", "杩炴帴鎴愬姛");
MyApplication.myApplication.isConncet = true;
+ rushState();
DeviceNumber initCode = BaseDaoSingleton.getInstance(MyApplication.myApplication).deviceNumberDao().findFirst();
if (initCode == null && !MyApplication.myApplication.isDoInitMachine) {
new Handler().postDelayed(new Runnable() {
@@ -112,12 +114,7 @@
// if (dataMessage != null) {
// EasySocket.getInstance().upMessage(dataMessage);
// }
- if (isTest) {
- MyApplication.myApplication.isConncet = true;
-// EasySocket.getInstance().disconnect(false);
- } else {
- }
}
@@ -129,12 +126,13 @@
@Override
public void onSocketConnFail(SocketAddress socketAddress, boolean isNeedReconnect) {
MyApplication.myApplication.isConncet = false;
+ rushState();
Log.i("SocketActionListener", "socket杩炴帴澶辫触");
if (isTest) {
// ToastUtil.show(mContext, "杩炴帴澶辫触,璇锋鏌ョ綉缁�");
} else {
if (myCallBack != null) {
- myCallBack.onSocketError(-1, "socket杩炴帴澶辫触,璇锋鏌ョ綉缁�");
+ myCallBack.onSocketError(-1, "杩炴帴鏁版嵁涓績澶辫触,璇锋鏌ョ綉缁�");
}
}
}
@@ -147,7 +145,8 @@
@Override
public void onSocketDisconnect(SocketAddress socketAddress, boolean isNeedReconnect) {
Log.i("SocketActionListener", "---> socket鏂紑杩炴帴锛屾槸鍚﹂渶瑕侀噸杩烇細" + isNeedReconnect);
-
+ MyApplication.myApplication.isConncet = false;
+ rushState();
}
/**
@@ -176,4 +175,10 @@
}
};
+ private void rushState() {
+ if (HomeActivity.homeActivity != null) {
+ HomeActivity.homeActivity.rushState();
+ }
+ }
+
}
--
Gitblit v1.8.0