From a9c1231be4e3c1c5bd5e9fc61489d55363090407 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期一, 04 三月 2024 15:26:22 +0800
Subject: [PATCH] 齐河项目相关修改
---
app/src/main/java/com/dayu/recharge/MyApplication.java | 52 +++++++++++++++++++++++++---------------------------
1 files changed, 25 insertions(+), 27 deletions(-)
diff --git a/app/src/main/java/com/dayu/recharge/MyApplication.java b/app/src/main/java/com/dayu/recharge/MyApplication.java
index da04377..6a2370d 100644
--- a/app/src/main/java/com/dayu/recharge/MyApplication.java
+++ b/app/src/main/java/com/dayu/recharge/MyApplication.java
@@ -7,13 +7,7 @@
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;
-import com.tencent.bugly.crashreport.CrashReport;
import com.dayu.recharge.net.ScoketMessageProtocol;
import com.dayu.recharge.net.SocketCallBack;
import com.dayu.recharge.net.SocketData;
@@ -25,16 +19,20 @@
import com.dayu.recharge.tools.HexUtil;
import com.dayu.recharge.utils.AidlUtil;
import com.dayu.recharge.utils.CRC8;
+import com.dayu.recharge.utils.DeviceNumberUtils;
import com.dayu.recharge.utils.SocketUtil;
-import com.dayu.recharge.utils.TipUtil;
+import com.dayu.recharge.utils.ToastUtil;
+import com.easysocket.EasySocket;
+import com.easysocket.config.EasySocketOptions;
+import com.easysocket.entity.SocketAddress;
+import com.tencent.bugly.crashreport.CrashReport;
-
+import java.net.InetAddress;
import java.util.Arrays;
import java.util.Timer;
-import java.util.TimerTask;
public class MyApplication extends Application {
-
+ public static String TAG = "MyApplication";
public static MyApplication myApplication;
private String address;
@@ -52,7 +50,8 @@
myApplication = this;
isAidl = true;
AidlUtil.getInstance().connectPrinterService(this);
- initEasySocket(false, null);
+
+// initEasySocket(false, null);
CrashReport.initCrashReport(getApplicationContext(), "45551598b8", true);
}
@@ -104,9 +103,13 @@
super.handleMessage(msg);
switch (msg.what) {
case 1:
- createSocket(msg.obj + "", ipBean.getPort());
+ createSocket(msg.obj + "", ipBean.getPort(), "0", 88);
break;
case 2:
+ InetAddress[] data = (InetAddress[]) msg.obj;
+ createSocket(data[0].getHostAddress(), ipBean.getPort(), data[1].getHostAddress(), ipBean.getPort());
+ break;
+ case -1:
ToastUtil.show("DNS瑙ｆ瀽澶辫触");
break;
}
@@ -117,7 +120,7 @@
} else {
//ip鏂瑰紡
if (EasySocket.getInstance().getContext() == null || isCreate) {
- createSocket(ipBean.getIp(), ipBean.getPort());
+ createSocket(ipBean.getIp(), ipBean.getPort(), "0", 88);
} else {
if (EasySocket.getInstance().getDefconnection() != null) {
SocketAddress address = EasySocket.getInstance().getDefconnection().getOptions().getSocketAddress();
@@ -144,6 +147,8 @@
if (!TextUtils.isEmpty(ip)
&& !TextUtils.isEmpty(String.valueOf(port))
&& !TextUtils.isEmpty(addressCode)) {
+
+ Log.i("initMachineRequestBean", "寮�濮嬫敞鍐岃澶�");
if (EasySocket.getInstance().getDefconnection() != null) {
isDoInitMachine = true;
InitMachineRequestBean initMachineRequestBean = new InitMachineRequestBean();
@@ -152,8 +157,6 @@
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) {
@@ -161,7 +164,6 @@
if (CRC8.isCRC8(readData.getOriginDataBytes())) {
//鏍￠獙CRC鎴愬姛
InitMachineBackBean initMachineBackBean = new InitMachineBackBean();
-
String initCode = HexUtil.bytesToHex(Arrays.copyOfRange(readData.getBodyBytes(), 2, 18));
//纭鏀跺埌娉ㄥ唽鍙锋姤鏂�
ConfirmMachineRequestBean confirmMachineRequestBean = new ConfirmMachineRequestBean();
@@ -183,15 +185,10 @@
//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);
+ if (!TextUtils.isEmpty(initCode)) {
+ DeviceNumberUtils.setDeviceNumber(initCode);
}
- BaseDaoSingleton.getInstance(MyApplication.myApplication).deviceNumberDao().insert(deviceNumber);
-
+ Log.i(TAG, "onSuccess: 璁惧娉ㄥ唽鍙凤細" + initCode);
// WSHelper.getInstance(MyApplication.this).put("initCode", initCode);
ToastUtil.show("鍏呭�肩鐞嗘敞鍐屾姤鏂囪幏鍙栨垚鍔�");
} else {
@@ -221,12 +218,11 @@
});
}
-
-
}
+
}
- private void createSocket(String ip, int port) {
+ private void createSocket(String ip, int port, String backUpIp, int backUpPort) {
// socket閰嶇疆
EasySocketOptions options = new EasySocketOptions.Builder()
// 涓绘満鍦板潃锛岃濉啓鑷繁鐨処P鍦板潃锛屼互getString鐨勬柟寮忔槸涓轰簡闅愯棌浣滆�呰嚜宸辩殑IP鍦板潃
@@ -236,6 +232,8 @@
.setMaxWriteBytes(150)
.setMaxReadBytes(150)
.setRequestTimeout(5 * 1000)
+
+ .setBackupAddress(new SocketAddress(backUpIp, backUpPort))
.build();
// 鍒濆鍖�
--
Gitblit v1.8.0