From e79ced190337222c7475409363c8071c976c7de9 Mon Sep 17 00:00:00 2001 From: zuoxiao <470321431@qq.com> Date: 星期一, 06 五月 2024 10:03:04 +0800 Subject: [PATCH] 1.修复两个工程因layout名字一样导致的bug --- henanlibrary/src/main/java/com/dayu/henanlibrary/utils/SocketUtil.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/henanlibrary/src/main/java/com/dayu/henanlibrary/utils/SocketUtil.java b/henanlibrary/src/main/java/com/dayu/henanlibrary/utils/SocketUtil.java index 7ecc31a..2698428 100644 --- a/henanlibrary/src/main/java/com/dayu/henanlibrary/utils/SocketUtil.java +++ b/henanlibrary/src/main/java/com/dayu/henanlibrary/utils/SocketUtil.java @@ -5,7 +5,7 @@ import android.os.Message; import com.dayu.baselibrary.tools.HexUtil; -import com.dayu.henanlibrary.dao.BaseDaoSingleton; +import com.dayu.henanlibrary.dao.HNBaseDaoSingleton; import com.dayu.henanlibrary.dbBean.AdminDataBean; import java.io.UnsupportedEncodingException; @@ -223,7 +223,7 @@ String xuLie = ""; try { - AdminDataBean villageNo = BaseDaoSingleton.getInstance(context).adminDao().findFirst(); + AdminDataBean villageNo = HNBaseDaoSingleton.getInstance(context).adminDao().findFirst(); if (villageNo != null) { xuLie = SocketUtil.get10to16LowHigh(Integer.valueOf(villageNo.getSerial()), 6); } @@ -454,7 +454,7 @@ public static String getOrderId(Context context) { String orderId = "000000000001"; try { - AdminDataBean villageNo = BaseDaoSingleton.getInstance(context).adminDao().findFirst(); + AdminDataBean villageNo = HNBaseDaoSingleton.getInstance(context).adminDao().findFirst(); // String orderNo = WSHelper.getInstance(context).get(OrderNo, 1) + ""; String orderNo = generateNumber8(); if (villageNo != null) { -- Gitblit v1.8.0