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/NFCWreatActivity.java | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/NFCWreatActivity.java b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/NFCWreatActivity.java
index 61f6f6c..b409ef6 100644
--- a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/NFCWreatActivity.java
+++ b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/NFCWreatActivity.java
@@ -14,11 +14,10 @@
import com.dayu.baselibrary.utils.AidlUtil;
import com.dayu.baselibrary.utils.CRC8;
import com.dayu.baselibrary.utils.DateUtil;
-import com.dayu.baselibrary.view.TitleBar;
-import com.dayu.henanlibrary.utils.DeviceNumberUtils;
import com.dayu.baselibrary.utils.MornyUtil;
import com.dayu.baselibrary.utils.TipUtil;
-import com.dayu.henanlibrary.HeNanApplication;
+import com.dayu.baselibrary.view.ConfirmDialog;
+import com.dayu.baselibrary.view.TitleBar;
import com.dayu.henanlibrary.card.CleanCard;
import com.dayu.henanlibrary.card.CleanUserCard;
import com.dayu.henanlibrary.card.ConfigurationPowerCard;
@@ -28,7 +27,7 @@
import com.dayu.henanlibrary.card.RegisteredCard;
import com.dayu.henanlibrary.card.TestCard;
import com.dayu.henanlibrary.card.UserCard;
-import com.dayu.henanlibrary.databinding.ActivityWriteTextBinding;
+import com.dayu.henanlibrary.databinding.ActivityWriteTextHnBinding;
import com.dayu.henanlibrary.dbBean.AdminDataBean;
import com.dayu.henanlibrary.dbBean.ElectricPriceBean;
import com.dayu.henanlibrary.dbBean.RechargeBean;
@@ -41,9 +40,9 @@
import com.dayu.henanlibrary.tools.NFCWriteHelper;
import com.dayu.henanlibrary.tools.NfcReadHelper;
import com.dayu.henanlibrary.tools.WriteCardUtils;
-import com.dayu.henanlibrary.utils.MyCommon;
+import com.dayu.henanlibrary.utils.CardCommon;
+import com.dayu.henanlibrary.utils.DeviceNumberUtils;
import com.dayu.henanlibrary.utils.SocketUtil;
-import com.dayu.henanlibrary.view.ConfirmDialog;
import com.dayu.henanlibrary.view.ProgressDialog;
import com.tencent.bugly.crashreport.CrashReport;
@@ -110,14 +109,14 @@
boolean isRecharge = false;
//鍏呭�奸�氫俊鏄惁瀹屾垚
boolean rechargeIsOk = false;
- ActivityWriteTextBinding binding;
+ ActivityWriteTextHnBinding binding;
ConfirmDialog confirmDialog;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
try {
- binding = ActivityWriteTextBinding.inflate(LayoutInflater.from(this));
+ binding = ActivityWriteTextHnBinding.inflate(LayoutInflater.from(this));
setContentView(binding.getRoot());
nfcWreatActivity = this;
setData();
@@ -248,9 +247,9 @@
String cardType = NfcReadHelper.getInstence(intent, this).getCradType();
Log.i("NFCWreatActivity", "cardType=" + cardType);
- if (cardType.equals(MyCommon.USER_CARD_TYPE_1) ||
- cardType.equals(MyCommon.USER_CARD_TYPE_2) ||
- cardType.equals(MyCommon.USER_CARD_TYPE_3)
+ if (cardType.equals(CardCommon.USER_CARD_TYPE_1) ||
+ cardType.equals(CardCommon.USER_CARD_TYPE_2) ||
+ cardType.equals(CardCommon.USER_CARD_TYPE_3)
) {
binding.textView.setText("璇ュ崱宸茬粡鍐欏叆鐢ㄦ埛淇℃伅锛岃鏇存崲鍗＄墖");
binding.textView.setTextColor(getResources().getColor(com.dayu.baselibrary.R.color.red));
--
Gitblit v1.8.0