From 389d1e5aedc99a3909c61db855b18a2936919942 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期四, 07 三月 2024 14:37:59 +0800
Subject: [PATCH] 修复设置电量单价时没有保留三位小数的bug
---
app/src/main/java/com/dayu/recharge/net/SocketNet.java | 65 ++++++++++++++++++--------------
1 files changed, 36 insertions(+), 29 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 d8866a2..2031a00 100644
--- a/app/src/main/java/com/dayu/recharge/net/SocketNet.java
+++ b/app/src/main/java/com/dayu/recharge/net/SocketNet.java
@@ -2,6 +2,7 @@
import android.content.Context;
import android.os.Handler;
+import android.text.TextUtils;
import android.util.Log;
import com.dayu.recharge.activity.HomeActivity;
@@ -10,11 +11,14 @@
import com.dayu.recharge.dbBean.DeviceNumber;
import com.dayu.recharge.dbBean.IpBean;
import com.easysocket.EasySocket;
+import com.easysocket.connection.action.SocketStatus;
import com.easysocket.entity.OriginReadData;
import com.easysocket.entity.SocketAddress;
import com.easysocket.interfaces.conn.ISocketActionListener;
import com.easysocket.interfaces.conn.SocketActionListener;
import com.dayu.recharge.MyApplication;
+import com.easysocket.utils.HexUtil;
+import com.tencent.bugly.crashreport.CrashReport;
/**
@@ -52,7 +56,12 @@
if (EasySocket.getInstance().getDefconnection() != null) {
// EasySocket.getInstance().disconnect(false);
// EasySocket.getInstance().connect();
+// if (EasySocket.getInstance().getDefconnection().getConnectionStatus()== SocketStatus.SOCKET_CONNECTED){
EasySocket.getInstance().upMessage(dataMessage);
+// }else {
+//
+// }
+
// this.dataMessage = dataMessage;
} else {
MyApplication.myApplication.initEasySocket(false, null);
@@ -94,28 +103,26 @@
*/
@Override
public void onSocketConnSuccess(SocketAddress socketAddress) {
- Log.i("SocketActionListener", "杩炴帴鎴愬姛");
+ Log.i("SocketActionListener1111", "杩炴帴鎴愬姛");
MyApplication.myApplication.isConncet = true;
- rushState();
- DeviceNumber initCode = BaseDaoSingleton.getInstance(MyApplication.myApplication).deviceNumberDao().findFirst();
- if (initCode == null && !MyApplication.myApplication.isDoInitMachine) {
- new Handler().postDelayed(new Runnable() {
- @Override
- public void run() {
- IpBean ipBean = BaseDaoSingleton.getInstance(MyApplication.myApplication).ipDao().findFirst();
- AdminDataBean adminData = BaseDaoSingleton.getInstance(MyApplication.myApplication).adminDao().findFirst();
- if (ipBean != null && adminData != null) {
- MyApplication.myApplication.initMachineRequestBean(ipBean.getIp(), ipBean.getPort(), adminData.getAddressCode());
+ try {
+ AdminDataBean adminData = BaseDaoSingleton.getInstance(MyApplication.myApplication).adminDao().findFirst();
+ Log.i("SocketActionListener1111", "isDoInitMachine==" + MyApplication.myApplication.isDoInitMachine + "");
+ if (!MyApplication.myApplication.isDoInitMachine) {
+ Log.i("SocketActionListener1111", "isDoInitMachine");
+ if (MyApplication.myApplication.ipBean != null && adminData != null) {
+ if (!TextUtils.isEmpty(adminData.getAddressCode())) {
+ Log.i("SocketActionListener1111", "initMachineRequestBean");
+ MyApplication.myApplication.initMachineRequestBean(MyApplication.myApplication.ipBean.getIp(), MyApplication.myApplication.ipBean.getPort(), adminData.getAddressCode());
+
}
}
- }, 500);
+ }
+ } catch (Exception e) {
+ CrashReport.postCatchedException(e);
}
-// if (dataMessage != null) {
-// EasySocket.getInstance().upMessage(dataMessage);
-// }
-
-
+ rushState();
}
/**
@@ -132,7 +139,7 @@
// ToastUtil.show(mContext, "杩炴帴澶辫触,璇锋鏌ョ綉缁�");
} else {
if (myCallBack != null) {
- myCallBack.onSocketError(-1, "socket杩炴帴澶辫触,璇锋鏌ョ綉缁�");
+ myCallBack.onSocketError(-1, "杩炴帴鏁版嵁涓績澶辫触,璇锋鏌ョ綉缁�");
}
}
}
@@ -149,21 +156,17 @@
rushState();
}
+
+
/**
* socket鎺ユ敹鐨勬暟鎹�
* @param socketAddress
- * @param readData
+ * @param originReadData
*/
- @Override
- public void onSocketResponse(SocketAddress socketAddress, String readData) {
- Log.i("SocketActionListener", "SocketActionListener鏀跺埌鏁版嵁-->" + readData);
-
- }
-
@Override
public void onSocketResponse(SocketAddress socketAddress, OriginReadData originReadData) {
super.onSocketResponse(socketAddress, originReadData);
- Log.i("SocketActionListener", "SocketActionListener鏀跺埌鏁版嵁-->" + originReadData.getBodyString());
+ Log.i("SocketActionListener", "SocketActionListener鏀跺埌鏁版嵁-->" + HexUtil.bytesToHex(originReadData.getBodyBytes()));
SocketData socketData = new SocketData();
socketData.setBodyData(originReadData.getBodyBytes());
socketData.setHeaderData(originReadData.getHeaderData());
@@ -175,9 +178,13 @@
}
};
- private void rushState(){
- if ( HomeActivity.homeActivity!=null){
- HomeActivity.homeActivity.rushState();
+ private void rushState() {
+ try {
+ if (HomeActivity.homeActivity != null) {
+ HomeActivity.homeActivity.rushState();
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
}
}
--
Gitblit v1.8.0