From 1cbb505922e010cace51020773a2dc1529713322 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期三, 06 三月 2024 16:12:58 +0800
Subject: [PATCH] 1.修改包名
---
app/src/main/java/com/dayu/rechargeqh/MyApplication.java | 40 +++++++++++++++++++++-------------------
1 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/app/src/main/java/com/dayu/recharge/MyApplication.java b/app/src/main/java/com/dayu/rechargeqh/MyApplication.java
similarity index 90%
rename from app/src/main/java/com/dayu/recharge/MyApplication.java
rename to app/src/main/java/com/dayu/rechargeqh/MyApplication.java
index 6a2370d..d3be2af 100644
--- a/app/src/main/java/com/dayu/recharge/MyApplication.java
+++ b/app/src/main/java/com/dayu/rechargeqh/MyApplication.java
@@ -1,4 +1,4 @@
-package com.dayu.recharge;
+package com.dayu.rechargeqh;
import android.app.Application;
import android.os.Handler;
@@ -6,22 +6,21 @@
import android.text.TextUtils;
import android.util.Log;
-import com.dayu.recharge.dao.BaseDaoSingleton;
-import com.dayu.recharge.dbBean.IpBean;
-import com.dayu.recharge.net.ScoketMessageProtocol;
-import com.dayu.recharge.net.SocketCallBack;
-import com.dayu.recharge.net.SocketData;
-import com.dayu.recharge.net.SocketNet;
-import com.dayu.recharge.socketBean.ConfirmMachineRequestBean;
-import com.dayu.recharge.socketBean.InitMachineBackBean;
-import com.dayu.recharge.socketBean.InitMachineRequestBean;
-import com.dayu.recharge.tools.BcdUtil;
-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.ToastUtil;
+import com.dayu.rechargeqh.dao.BaseDaoSingleton;
+import com.dayu.rechargeqh.dbBean.IpBean;
+import com.dayu.rechargeqh.net.ScoketMessageProtocol;
+import com.dayu.rechargeqh.net.SocketCallBack;
+import com.dayu.rechargeqh.net.SocketData;
+import com.dayu.rechargeqh.net.SocketNet;
+import com.dayu.rechargeqh.socketBean.ConfirmMachineRequestBean;
+import com.dayu.rechargeqh.socketBean.InitMachineRequestBean;
+import com.dayu.rechargeqh.tools.BcdUtil;
+import com.dayu.rechargeqh.tools.HexUtil;
+import com.dayu.rechargeqh.utils.AidlUtil;
+import com.dayu.rechargeqh.utils.CRC8;
+import com.dayu.rechargeqh.utils.DeviceNumberUtils;
+import com.dayu.rechargeqh.utils.SocketUtil;
+import com.dayu.rechargeqh.utils.ToastUtil;
import com.easysocket.EasySocket;
import com.easysocket.config.EasySocketOptions;
import com.easysocket.entity.SocketAddress;
@@ -74,7 +73,11 @@
public void initEasySocket(boolean isCreate, SocketNet.CreateBack createBack) {
try {
this.createBack = createBack;
- ipBean = BaseDaoSingleton.getInstance(MyApplication.myApplication).ipDao().findFirst();
+ try {
+ ipBean = BaseDaoSingleton.getInstance(MyApplication.myApplication).ipDao().findFirst();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
if (ipBean == null) {
ipBean = new IpBean();
ipBean.setIp("dayuyanjiuyuan.top");
@@ -163,7 +166,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();
--
Gitblit v1.8.0