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/ParameterActivityQHAlone.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ParameterActivity.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ParameterActivityQHAlone.java
similarity index 67%
rename from qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ParameterActivity.java
rename to qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ParameterActivityQHAlone.java
index 0f77e7f..4889c8f 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ParameterActivity.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/activity/ParameterActivityQHAlone.java
@@ -5,7 +5,7 @@
import android.view.LayoutInflater;
import android.view.View;
-import com.dayu.qihealonelibrary.databinding.ActivityParameterBinding;
+import com.dayu.qihealonelibrary.databinding.ActivityParameterQhaBinding;
/**
* Copyright (C), 2023,
@@ -13,13 +13,13 @@
* Date: 2023-11-06 11:47
* Description: 鍙傛暟璁剧疆鐣岄潰
*/
-public class ParameterActivity extends QHAloneBaseActivity {
- ActivityParameterBinding binding;
+public class ParameterActivityQHAlone extends BaseActivityQHAlone {
+ ActivityParameterQhaBinding binding;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- binding = ActivityParameterBinding.inflate(LayoutInflater.from(this));
+ binding = ActivityParameterQhaBinding.inflate(LayoutInflater.from(this));
setContentView(binding.getRoot());
initView();
}
@@ -29,7 +29,7 @@
binding.parameterDomain.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- Intent intent = new Intent(ParameterActivity.this, DomainActivity.class);
+ Intent intent = new Intent(ParameterActivityQHAlone.this, DomainActivityQHAlone.class);
startActivity(intent);
}
});
@@ -37,7 +37,7 @@
binding.parameterPower.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- Intent intent = new Intent(ParameterActivity.this, PowerActivity.class);
+ Intent intent = new Intent(ParameterActivityQHAlone.this, PowerActivityQHAlone.class);
startActivity(intent);
}
});
@@ -45,7 +45,7 @@
binding.parameterElectricPrice.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- Intent intent = new Intent(ParameterActivity.this, ElectricPriceActivity.class);
+ Intent intent = new Intent(ParameterActivityQHAlone.this, ElectricPriceActivityQHAlone.class);
startActivity(intent);
}
});
@@ -53,7 +53,7 @@
binding.parameterCardIdentifying.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- Intent intent = new Intent(ParameterActivity.this, IdentifyingActivity.class);
+ Intent intent = new Intent(ParameterActivityQHAlone.this, IdentifyingActivityQHAlone.class);
startActivity(intent);
}
});
@@ -61,14 +61,14 @@
binding.parameterPassWordCard.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- Intent intent = new Intent(ParameterActivity.this, PasswordCardActivity.class);
+ Intent intent = new Intent(ParameterActivityQHAlone.this, PasswordCardActivityQHAlone.class);
startActivity(intent);
}
});
binding.parameterRegion.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- Intent intent = new Intent(ParameterActivity.this, RegionActivity.class);
+ Intent intent = new Intent(ParameterActivityQHAlone.this, RegionActivityQHAlone.class);
startActivity(intent);
}
});
--
Gitblit v1.8.0