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
---
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeActivityQHAlone.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeActivity.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeActivityQHAlone.java
similarity index 85%
rename from qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeActivity.java
rename to qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeActivityQHAlone.java
index b602030..ec99ab7 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeActivity.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/RechargeActivityQHAlone.java
@@ -9,7 +9,7 @@
import android.widget.EditText;
import com.dayu.baselibrary.utils.TipUtil;
-import com.dayu.qihealonelibrary.databinding.ActivityRechargeBinding;
+import com.dayu.qihealonelibrary.databinding.ActivityRechargeQhaBinding;
import com.dayu.qihealonelibrary.dbBean.AdminDataBean;
import com.dayu.qihealonelibrary.tools.NfcReadHelper;
import com.dayu.qihealonelibrary.utils.DeviceNumberUtils;
@@ -23,13 +23,13 @@
* Date: 2023-11-5 09:52
* Description: 鍏呭�肩晫闈�
*/
-public class RechargeActivity extends BaseNfcActivity {
+public class RechargeActivityQHAlone extends BaseNfcActivityQHAlone {
Intent intent;
boolean userFlag;
- ActivityRechargeBinding binding;
- public static RechargeActivity rechargeActivity;
+ ActivityRechargeQhaBinding binding;
+ public static RechargeActivityQHAlone rechargeActivity;
AdminDataBean adminData;
String userName;
@@ -38,7 +38,7 @@
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
try {
- binding = ActivityRechargeBinding.inflate(LayoutInflater.from(this));
+ binding = ActivityRechargeQhaBinding.inflate(LayoutInflater.from(this));
setContentView(binding.getRoot());
setPricePoint(binding.rechargeWater);
rechargeActivity = this;
@@ -58,7 +58,7 @@
ProgressDialog.show(this);
// selectBalance(userCard.getInitPeasantCode());
} else {
- TipUtil.show(RechargeActivity.this, "鍗＄墖璇诲彇澶辫触");
+ TipUtil.show(RechargeActivityQHAlone.this, "鍗＄墖璇诲彇澶辫触");
}
// readAllData(intent);
@@ -81,16 +81,16 @@
if (!TextUtils.isEmpty(morny)) {
String initCode = DeviceNumberUtils.getDeviceNumber();
if (TextUtils.isEmpty(initCode)) {
- TipUtil.show(RechargeActivity.this, "璁惧娉ㄥ唽鍙蜂负绌猴紝璇峰厛璁剧疆IP鍜岀鐞嗗憳鍦板潃");
+ TipUtil.show(RechargeActivityQHAlone.this, "璁惧娉ㄥ唽鍙蜂负绌猴紝璇峰厛璁剧疆IP鍜岀鐞嗗憳鍦板潃");
return;
}
- Intent intent = new Intent(RechargeActivity.this, NFCWreatActivity.class);
+ Intent intent = new Intent(RechargeActivityQHAlone.this, NFCWreatActivityQHAlone.class);
intent.putExtra("morny", morny);
intent.putExtra("userName", userName);
intent.putExtra("userCard", userCard);
startActivity(intent);
} else {
- TipUtil.show(RechargeActivity.this, "璇疯緭鍏ュ厖鍊奸噾棰濓紙鍏冿級");
+ TipUtil.show(RechargeActivityQHAlone.this, "璇疯緭鍏ュ厖鍊奸噾棰濓紙鍏冿級");
}
});
}
--
Gitblit v1.8.0