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/activity/RechargeActivity.java | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/RechargeActivity.java b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/RechargeActivity.java index 8cea9de..63290fb 100644 --- a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/RechargeActivity.java +++ b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/RechargeActivity.java @@ -11,10 +11,9 @@ import com.dayu.baselibrary.tools.BcdUtil; import com.dayu.baselibrary.utils.CRC8; -import com.dayu.henanlibrary.utils.DeviceNumberUtils; import com.dayu.baselibrary.utils.MornyUtil; import com.dayu.baselibrary.utils.TipUtil; -import com.dayu.henanlibrary.databinding.ActivityRechargeBinding; +import com.dayu.henanlibrary.databinding.ActivityRechargeHnBinding; import com.dayu.henanlibrary.dbBean.AdminDataBean; import com.dayu.henanlibrary.net.SocketCallBack; import com.dayu.henanlibrary.net.SocketData; @@ -22,6 +21,7 @@ import com.dayu.henanlibrary.socketBean.BalanceSelecteRequestBean; import com.dayu.henanlibrary.tools.NfcReadHelper; import com.dayu.henanlibrary.tools.WriteCardUtils; +import com.dayu.henanlibrary.utils.DeviceNumberUtils; import com.dayu.henanlibrary.utils.SocketUtil; import com.dayu.henanlibrary.view.ProgressDialog; import com.tencent.bugly.crashreport.CrashReport; @@ -40,7 +40,7 @@ Intent intent; boolean userFlag; - ActivityRechargeBinding binding; + ActivityRechargeHnBinding binding; public static RechargeActivity rechargeActivity; AdminDataBean adminData; @@ -50,7 +50,7 @@ protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); try { - binding = ActivityRechargeBinding.inflate(LayoutInflater.from(this)); + binding = ActivityRechargeHnBinding.inflate(LayoutInflater.from(this)); setContentView(binding.getRoot()); setPricePoint(binding.rechargeWater); rechargeActivity = this; -- Gitblit v1.8.0