From d09bdcac6830afaad6e277fb558c16d2aa6187a7 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期四, 14 十二月 2023 11:13:21 +0800
Subject: [PATCH] 卡标识码列表功能相关，可分辨设置不同类型卡标识码
---
app/src/main/java/com/dayu/recharge/MyApplication.java | 105 +++++++++++++++++++++-------------------------------
1 files changed, 43 insertions(+), 62 deletions(-)
diff --git a/app/src/main/java/com/dayu/recharge/MyApplication.java b/app/src/main/java/com/dayu/recharge/MyApplication.java
index 1b1ca34..615acbc 100644
--- a/app/src/main/java/com/dayu/recharge/MyApplication.java
+++ b/app/src/main/java/com/dayu/recharge/MyApplication.java
@@ -1,16 +1,19 @@
package com.dayu.recharge;
import android.app.Application;
+import android.nfc.Tag;
import android.os.Handler;
import android.os.Message;
import android.text.TextUtils;
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.DeviceNumberUtils;
+import com.dayu.recharge.utils.ToastUtil;
import com.easysocket.EasySocket;
import com.easysocket.config.EasySocketOptions;
-import com.easysocket.connection.action.SocketStatus;
import com.easysocket.entity.SocketAddress;
import com.tencent.bugly.crashreport.CrashReport;
import com.dayu.recharge.net.ScoketMessageProtocol;
@@ -25,16 +28,16 @@
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.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;
@@ -45,14 +48,16 @@
public boolean isConncet = false;
private final Timer timer = new Timer();
+
@Override
public void onCreate() {
super.onCreate();
myApplication = this;
isAidl = true;
AidlUtil.getInstance().connectPrinterService(this);
- initEasySocket(false, null);
- socketConnect();
+
+// initEasySocket(false, null);
+
CrashReport.initCrashReport(getApplicationContext(), "45551598b8", true);
}
@@ -66,13 +71,20 @@
isAidl = aidl;
}
+ public 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涓嶇敓鏁堥棶棰�
@@ -96,10 +108,14 @@
super.handleMessage(msg);
switch (msg.what) {
case 1:
- createSocket(msg.obj + "", ipBean.getPort());
+ createSocket(msg.obj + "", ipBean.getPort(), "0", 88);
break;
case 2:
- ToastUtil.show(MyApplication.this, "DNS瑙ｆ瀽澶辫触");
+ InetAddress[] data = (InetAddress[]) msg.obj;
+ createSocket(data[0].getHostAddress(), ipBean.getPort(), data[1].getHostAddress(), ipBean.getPort());
+ break;
+ case -1:
+ ToastUtil.show("DNS瑙ｆ瀽澶辫触");
break;
}
@@ -109,7 +125,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();
@@ -136,6 +152,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();
@@ -144,8 +162,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) {
@@ -153,7 +169,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();
@@ -175,16 +190,19 @@
//BCD鐮�00鎴愬姛01澶辫触(娉ㄥ唽鍙蜂笉鏄湇鍔″櫒杩斿洖淇℃伅)
if (state.equalsIgnoreCase("00")) {
//淇濆瓨璁惧娉ㄥ唽鍙�
- BaseDaoSingleton.getInstance(MyApplication.myApplication).ipDao().findFirst();
- WSHelper.getInstance(MyApplication.this).put("initCode", initCode);
- ToastUtil.show(MyApplication.this, "鍏呭�肩鐞嗘敞鍐屾姤鏂囪幏鍙栨垚鍔�");
+ if (!TextUtils.isEmpty(initCode)) {
+ DeviceNumberUtils.setDeviceNumber(initCode);
+ }
+ Log.i(TAG, "onSuccess: 璁惧娉ㄥ唽鍙凤細" + initCode);
+// WSHelper.getInstance(MyApplication.this).put("initCode", initCode);
+ ToastUtil.show("鍏呭�肩鐞嗘敞鍐屾姤鏂囪幏鍙栨垚鍔�");
} else {
//鏍￠獙CRC閿欒
- ToastUtil.show(MyApplication.this, "纭鏀跺埌娉ㄥ唽鎶ユ枃鐘舵�佸け璐�");
+ ToastUtil.show("纭鏀跺埌娉ㄥ唽鎶ユ枃鐘舵�佸け璐�");
}
} else {
//鏍￠獙CRC閿欒
- ToastUtil.show(MyApplication.this, "纭鏀跺埌娉ㄥ唽鎶ユ枃鏍￠獙CRC閿欒");
+ ToastUtil.show("纭鏀跺埌娉ㄥ唽鎶ユ枃鏍￠獙CRC閿欒");
}
}
@@ -194,7 +212,7 @@
}
});
} else {//鏍￠獙CRC閿欒
- ToastUtil.show(MyApplication.this, "鍏呭�肩鐞嗘敞鍐屾姤鏂囨牎楠孋RC閿欒");
+ ToastUtil.show("鍏呭�肩鐞嗘敞鍐屾姤鏂囨牎楠孋RC閿欒");
}
}
@@ -205,21 +223,21 @@
});
}
-
-
}
+
}
- 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鍦板潃
.setSocketAddress(new SocketAddress(ip, port))
// 瀹氫箟娑堟伅鍗忚锛屾柟渚胯В鍐� socket榛忓寘銆佸垎鍖呯殑闂
.setReaderProtocol(new ScoketMessageProtocol())
- .setMaxWriteBytes(1024)
- .setMaxReadBytes(1024)
- .setRequestTimeout(10 * 1000)
+ .setMaxWriteBytes(150)
+ .setMaxReadBytes(150)
+ .setRequestTimeout(5 * 1000)
+ .setBackupAddress(new SocketAddress(backUpIp, backUpPort))
.build();
// 鍒濆鍖�
@@ -227,43 +245,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