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/MyApplication.java | 176 ++++++++++++++++++++++++++--------------------------------
1 files changed, 80 insertions(+), 96 deletions(-)
diff --git a/app/src/main/java/com/dayu/recharge/MyApplication.java b/app/src/main/java/com/dayu/recharge/MyApplication.java
index d1f2172..4f9b349 100644
--- a/app/src/main/java/com/dayu/recharge/MyApplication.java
+++ b/app/src/main/java/com/dayu/recharge/MyApplication.java
@@ -7,7 +7,9 @@
import android.util.Log;
import com.dayu.recharge.dao.BaseDaoSingleton;
+import com.dayu.recharge.dbBean.DeviceNumber;
import com.dayu.recharge.dbBean.IpBean;
+import com.dayu.recharge.utils.ToastUtil;
import com.easysocket.EasySocket;
import com.easysocket.config.EasySocketOptions;
import com.easysocket.entity.SocketAddress;
@@ -24,8 +26,7 @@
import com.dayu.recharge.utils.AidlUtil;
import com.dayu.recharge.utils.CRC8;
import com.dayu.recharge.utils.SocketUtil;
-import com.dayu.recharge.utils.ToastUtil;
-import com.dayu.recharge.utils.WSHelper;
+import com.dayu.recharge.utils.TipUtil;
import java.util.Arrays;
@@ -51,8 +52,8 @@
isAidl = true;
AidlUtil.getInstance().connectPrinterService(this);
initEasySocket(false, null);
- socketConnect();
- CrashReport.initCrashReport(getApplicationContext(), "846987eae9", true);
+
+ CrashReport.initCrashReport(getApplicationContext(), "45551598b8", true);
}
private boolean isAidl;
@@ -65,13 +66,20 @@
isAidl = aidl;
}
+ IpBean ipBean;
+
/**
* 鍒濆鍖朎asySocket
*/
public void initEasySocket(boolean isCreate, SocketNet.CreateBack createBack) {
try {
this.createBack = createBack;
- IpBean ipBean = BaseDaoSingleton.getInstance(MyApplication.myApplication).ipDao().findFirst();
+ ipBean = BaseDaoSingleton.getInstance(MyApplication.myApplication).ipDao().findFirst();
+ if (ipBean == null) {
+ ipBean = new IpBean();
+ ipBean.setIp("dayuyanjiuyuan.top");
+ ipBean.setPort(8888);
+ }
if (ipBean != null) {
try {
//澶勭悊褰撹繛鎺ヤ笂IP鍚庝慨鏀筰p涓嶇敓鏁堥棶棰�
@@ -98,7 +106,7 @@
createSocket(msg.obj + "", ipBean.getPort());
break;
case 2:
- ToastUtil.show(MyApplication.this, "DNS瑙ｆ瀽澶辫触");
+ ToastUtil.show("DNS瑙ｆ瀽澶辫触");
break;
}
@@ -135,72 +143,85 @@
if (!TextUtils.isEmpty(ip)
&& !TextUtils.isEmpty(String.valueOf(port))
&& !TextUtils.isEmpty(addressCode)) {
- isDoInitMachine = true;
- InitMachineRequestBean initMachineRequestBean = new InitMachineRequestBean();
- initMachineRequestBean.setControl("01");
- //130107200008 112 闈掓硥灞呭浼�
- initMachineRequestBean.setAddress(addressCode);
- initMachineRequestBean.setXuLie(SocketUtil.getXuLie(this));
- initMachineRequestBean.setAFN("91");
+ if (EasySocket.getInstance().getDefconnection() != null) {
+ isDoInitMachine = true;
+ InitMachineRequestBean initMachineRequestBean = new InitMachineRequestBean();
+ initMachineRequestBean.setControl("01");
+ //130107200008 112 闈掓硥灞呭浼�
+ initMachineRequestBean.setAddress(addressCode);
+ initMachineRequestBean.setXuLie(SocketUtil.getXuLie(this));
+ initMachineRequestBean.setAFN("91");
//
- Log.i("Socket", "娉ㄥ唽鎶ユ枃");
- SocketNet.getInstance().sendTestMessage(initMachineRequestBean.pack(), new SocketCallBack() {
- @Override
- public void onSocketResponse(SocketData readData) {
+ Log.i("Socket", "娉ㄥ唽鎶ユ枃");
+ SocketNet.getInstance().sendTestMessage(initMachineRequestBean.pack(), new SocketCallBack() {
+ @Override
+ public void onSocketResponse(SocketData readData) {
- if (CRC8.isCRC8(readData.getOriginDataBytes())) {
- //鏍￠獙CRC鎴愬姛
- InitMachineBackBean initMachineBackBean = new InitMachineBackBean();
+ if (CRC8.isCRC8(readData.getOriginDataBytes())) {
+ //鏍￠獙CRC鎴愬姛
+ InitMachineBackBean initMachineBackBean = new InitMachineBackBean();
- String initCode = HexUtil.bytesToHex(Arrays.copyOfRange(readData.getBodyBytes(), 2, 18));
- //纭鏀跺埌娉ㄥ唽鍙锋姤鏂�
- ConfirmMachineRequestBean confirmMachineRequestBean = new ConfirmMachineRequestBean();
- confirmMachineRequestBean.setControl("01");
- //130107200008 112 闈掓硥灞呭浼�
- confirmMachineRequestBean.setAddress(addressCode);
- confirmMachineRequestBean.setXuLie(SocketUtil.getXuLie(MyApplication.this));
- confirmMachineRequestBean.setAFN("92");
- confirmMachineRequestBean.setInitCode(initCode);
- Log.i("Socket", "纭娉ㄥ唽鎶ユ枃");
- SocketNet.getInstance().sendTestMessage(confirmMachineRequestBean.pack(), new SocketCallBack() {
+ String initCode = HexUtil.bytesToHex(Arrays.copyOfRange(readData.getBodyBytes(), 2, 18));
+ //纭鏀跺埌娉ㄥ唽鍙锋姤鏂�
+ ConfirmMachineRequestBean confirmMachineRequestBean = new ConfirmMachineRequestBean();
+ confirmMachineRequestBean.setControl("01");
+ //130107200008 112 闈掓硥灞呭浼�
+ confirmMachineRequestBean.setAddress(addressCode);
+ confirmMachineRequestBean.setXuLie(SocketUtil.getXuLie(MyApplication.this));
+ confirmMachineRequestBean.setAFN("92");
+ confirmMachineRequestBean.setInitCode(initCode);
+ Log.i("Socket", "纭娉ㄥ唽鎶ユ枃");
+ SocketNet.getInstance().sendTestMessage(confirmMachineRequestBean.pack(), new SocketCallBack() {
- @Override
- public void onSocketResponse(SocketData readData) {
- isDoInitMachine = false;
- if (CRC8.isCRC8(readData.getOriginDataBytes())) {
- byte stateByte = readData.getBodyBytes()[2];
- String state = BcdUtil.bcdToStr(stateByte);
- //BCD鐮�00鎴愬姛01澶辫触(娉ㄥ唽鍙蜂笉鏄湇鍔″櫒杩斿洖淇℃伅)
- if (state.equalsIgnoreCase("00")) {
- //淇濆瓨璁惧娉ㄥ唽鍙�
- BaseDaoSingleton.getInstance(MyApplication.myApplication).ipDao().findFirst();
- WSHelper.getInstance(MyApplication.this).put("initCode", initCode);
- ToastUtil.show(MyApplication.this, "鍏呭�肩鐞嗘敞鍐屾姤鏂囪幏鍙栨垚鍔�");
+ @Override
+ public void onSocketResponse(SocketData readData) {
+ isDoInitMachine = false;
+ if (CRC8.isCRC8(readData.getOriginDataBytes())) {
+ byte stateByte = readData.getBodyBytes()[2];
+ String state = BcdUtil.bcdToStr(stateByte);
+ //BCD鐮�00鎴愬姛01澶辫触(娉ㄥ唽鍙蜂笉鏄湇鍔″櫒杩斿洖淇℃伅)
+ if (state.equalsIgnoreCase("00")) {
+ //淇濆瓨璁惧娉ㄥ唽鍙�
+ DeviceNumber deviceNumber = BaseDaoSingleton.getInstance(MyApplication.myApplication).deviceNumberDao().findFirst();
+ if (deviceNumber != null) {
+ deviceNumber.setDeviceRegistrationNumber(initCode);
+ } else {
+ deviceNumber = new DeviceNumber();
+ deviceNumber.setDeviceRegistrationNumber(initCode);
+ }
+ BaseDaoSingleton.getInstance(MyApplication.myApplication).deviceNumberDao().insert(deviceNumber);
+
+// WSHelper.getInstance(MyApplication.this).put("initCode", initCode);
+ ToastUtil.show("鍏呭�肩鐞嗘敞鍐屾姤鏂囪幏鍙栨垚鍔�");
+ } else {
+ //鏍￠獙CRC閿欒
+ ToastUtil.show("纭鏀跺埌娉ㄥ唽鎶ユ枃鐘舵�佸け璐�");
+ }
} else {
//鏍￠獙CRC閿欒
- ToastUtil.show(MyApplication.this, "纭鏀跺埌娉ㄥ唽鎶ユ枃鐘舵�佸け璐�");
+ ToastUtil.show("纭鏀跺埌娉ㄥ唽鎶ユ枃鏍￠獙CRC閿欒");
}
- } else {
- //鏍￠獙CRC閿欒
- ToastUtil.show(MyApplication.this, "纭鏀跺埌娉ㄥ唽鎶ユ枃鏍￠獙CRC閿欒");
}
- }
- @Override
- public void onSocketError(int code, String msg) {
+ @Override
+ public void onSocketError(int code, String msg) {
- }
- });
- } else {//鏍￠獙CRC閿欒
- ToastUtil.show(MyApplication.this, "鍏呭�肩鐞嗘敞鍐屾姤鏂囨牎楠孋RC閿欒");
+ }
+ });
+ } else {//鏍￠獙CRC閿欒
+ ToastUtil.show("鍏呭�肩鐞嗘敞鍐屾姤鏂囨牎楠孋RC閿欒");
+ }
}
- }
- @Override
- public void onSocketError(int code, String msg) {
+ @Override
+ public void onSocketError(int code, String msg) {
- }
- });
+ }
+ });
+
+ }
+
+
}
}
@@ -221,43 +242,6 @@
// EasySocket.getInstance().subscribeSocketAction(socketActionListener);
EasySocket.getInstance().subscribeSocketAction(SocketNet.getInstance().socketNet.socketActionListener);
}
-
-
- /**
- * 瀹氭椂閲嶈繛鏈嶅姟鍣�
- */
- private void socketConnect() {
-
- try {
- TimerTask task = new TimerTask() {
- @Override
- public void run() {
- // TODO Auto-generated method stub
- Message message = new Message();
- message.what = 1;
- handler.sendMessage(message);
- }
- };
-// timer.schedule(task, 5000, 1000 * 60 * 3);
- timer.schedule(task, 5000, 1000 * 60 * 3);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- Handler handler = new Handler() {
- @Override
- public void handleMessage(Message msg) {
- // TODO Auto-generated method stub
- // 瑕佸仛鐨勪簨鎯�
- super.handleMessage(msg);
- try {
- SocketNet.getInstance().isConnect(MyApplication.this);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- };
}
--
Gitblit v1.8.0