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/ReplacementActivityQHAlone.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ReplacementActivity.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ReplacementActivityQHAlone.java
similarity index 91%
rename from qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ReplacementActivity.java
rename to qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ReplacementActivityQHAlone.java
index 71c968e..857df52 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ReplacementActivity.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ReplacementActivityQHAlone.java
@@ -12,7 +12,7 @@
import com.dayu.baselibrary.utils.TipUtil;
import com.dayu.baselibrary.view.EdtDialog;
import com.dayu.qihealonelibrary.adapter.ReplacementAdapter;
-import com.dayu.qihealonelibrary.databinding.ActivityReplacementBinding;
+import com.dayu.qihealonelibrary.databinding.ActivityReplacementQhaBinding;
import com.dayu.qihealonelibrary.dbBean.UserCardBean;
import com.scwang.smart.refresh.footer.ClassicsFooter;
import com.scwang.smart.refresh.layout.api.RefreshLayout;
@@ -32,8 +32,8 @@
* Time: 17:32
* 澶囨敞锛� 琛ュ崱鐣岄潰
*/
-public class ReplacementActivity extends QHAloneBaseActivity {
- ActivityReplacementBinding newcardListBinding;
+public class ReplacementActivityQHAlone extends BaseActivityQHAlone {
+ ActivityReplacementQhaBinding newcardListBinding;
List<UserCardBean> userCardBeanList = new ArrayList<>();
ReplacementAdapter adapter;
long beginTime;
@@ -47,7 +47,7 @@
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- newcardListBinding = ActivityReplacementBinding.inflate(LayoutInflater.from(this));
+ newcardListBinding = ActivityReplacementQhaBinding.inflate(LayoutInflater.from(this));
setContentView(newcardListBinding.getRoot());
setRightButton();
initList();
@@ -57,7 +57,7 @@
public void itemClick(View view) {
UserCardBean userCardBean = userCardBeanList.get((int) view.getTag());
- Intent intent = new Intent(ReplacementActivity.this, NFCWreatActivity.class);
+ Intent intent = new Intent(ReplacementActivityQHAlone.this, NFCWreatActivityQHAlone.class);
intent.putExtra("dbUserCard", userCardBean);
startActivity(intent);
}
@@ -123,7 +123,7 @@
titleBar.setOnItemclickListner(ClickType_RIGHT_TEXT, new View.OnClickListener() {
@Override
public void onClick(View v) {
- edtDialog = new EdtDialog(ReplacementActivity.this, new EdtDialog.DialogBack() {
+ edtDialog = new EdtDialog(ReplacementActivityQHAlone.this, new EdtDialog.DialogBack() {
@Override
public void onOk(String data) {
List<UserCardBean> beans = baseDao.userCardDao().findByData(data);
--
Gitblit v1.8.0