From b1f617d201ada34081aefc38414813cbf521fed5 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期一, 20 五月 2024 20:38:17 +0800
Subject: [PATCH] 2024年05月20日20:26:17
---
app/src/main/java/com/hdl/photovoltaic/ui/message/SearchMessageActivity.java | 10 +++-
app/src/main/java/com/hdl/photovoltaic/ui/message/MessageFragment.java | 26 ++++++++++++-
app/src/main/java/com/hdl/photovoltaic/ui/home/HomePageFragment.java | 28 ++++++++++++++
app/src/main/res/layout/activity_search_messge.xml | 2
app/src/main/res/layout/item_search_message.xml | 4 -
app/src/main/res/layout/activity_device_search.xml | 2
app/src/main/res/layout/activity_house_search.xml | 2
7 files changed, 63 insertions(+), 11 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/home/HomePageFragment.java b/app/src/main/java/com/hdl/photovoltaic/ui/home/HomePageFragment.java
index 8d64c1b..bc40105 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/home/HomePageFragment.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/home/HomePageFragment.java
@@ -24,6 +24,7 @@
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.databinding.FragmentHomePageBinding;
import com.hdl.photovoltaic.enums.HomepageTitleTabSwitch;
+import com.hdl.photovoltaic.enums.PowerStationStatus;
import com.hdl.photovoltaic.enums.TimeType;
import com.hdl.photovoltaic.enums.UnitType;
import com.hdl.photovoltaic.listener.CloudCallBeak;
@@ -114,6 +115,33 @@
HdlUniLogic.getInstance().openUniMP(HDLUniMP.UNI_EVENT_OPEN_HOME_CREATION, null);
}
});
+
+ //鍏ㄩ儴
+ viewBinding.homeAllIl.parentLl.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+
+
+ }
+ });
+ //鏁呴殰
+ viewBinding.homeFaultsIl.parentLl.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ }
+ });
+ //绂荤嚎
+ viewBinding.homeOfflineIl.parentLl.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ }
+ });
+ //寰呮帴鍏�
+ viewBinding.homeConnectedIl.parentLl.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ }
+ });
//鏃堕棿閫夋嫨鍣�
viewBinding.yearMonthDayTv.setOnClickListener(new View.OnClickListener() {
@Override
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/message/MessageFragment.java b/app/src/main/java/com/hdl/photovoltaic/ui/message/MessageFragment.java
index 5384da5..fc0caa2 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/message/MessageFragment.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/message/MessageFragment.java
@@ -117,7 +117,14 @@
viewBinding.messageSearchCl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
+ String messageStateType;
+ if (isAlarmDeviceClick) {
+ messageStateType = MessageStateType.untreated;
+ } else {
+ messageStateType = MessageStateType.processed;
+ }
Intent intent = new Intent();
+ intent.putExtra("MessageStateType", messageStateType);
intent.setClass(_mActivity, SearchMessageActivity.class);
startActivity(intent);
}
@@ -236,8 +243,23 @@
@Override
public void onClick(int position, String title) {
textView.setText(title);
- mTimeTypeFilterKye = filterType;
- mTimeTypeFilterValue = findFilterValueString(title);
+ switch (filterType) {
+ case FilterType.deviceType: {
+ mDeviceTypeFilterKye = filterType;
+ mDeviceTypeFilterValue = findFilterValueString(title);
+ }
+ break;
+ case FilterType.type: {
+ mTypeFilterKye = filterType;
+ mTypeFilterValue = findFilterValueString(title);
+ }
+ break;
+ case FilterType.timeType: {
+ mTimeTypeFilterKye = filterType;
+ mTimeTypeFilterValue = findFilterValueString(title);
+ }
+ break;
+ }
loadNextPageMessageList(true, 1, mDeviceTypeFilterKye, mDeviceTypeFilterValue, mTypeFilterKye, mTypeFilterValue, mTimeTypeFilterKye, mTimeTypeFilterValue, true);
}
});
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/message/SearchMessageActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/message/SearchMessageActivity.java
index 62986e6..8894db5 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/message/SearchMessageActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/message/SearchMessageActivity.java
@@ -56,6 +56,8 @@
List<String> searchHistoryTitleList = new ArrayList<>();
+ String mMessageStateType = "";
+
@Override
public Object getContentView() {
viewBinding = ActivitySearchMessgeBinding.inflate(getLayoutInflater());
@@ -65,6 +67,7 @@
@Override
public void onBindView(Bundle savedInstanceState) {
setStatusBarTranslucent();
+ mMessageStateType = getIntent().getStringExtra("MessageStateType");
//鍘嗗彶璁板綍鏂囦欢澶瑰垱寤�
HdlFileLogic.getInstance().createFileDir(HdlFileLogic.getInstance().getCurrentUserRootPath());
//鍒濆鍖栨暟鎹�
@@ -288,7 +291,7 @@
HdlMessageLogic.getInstance().getPageNoMessageList(
"",
pageNo,
- "",
+ mMessageStateType,
"",
"",
"",
@@ -380,6 +383,7 @@
* 娣诲姞鍘嗗彶璁板綍
*/
private void addSearchTextToList() {
+ int maxValue = 10;
for (int i = 0; i < searchHistoryTitleList.size(); i++) {
if (searchHistoryTitleList.get(i).equals(currSearchText)) {
searchHistoryTitleList.remove(searchHistoryTitleList.get(i));
@@ -388,9 +392,9 @@
searchHistoryTitleList.add(currSearchText);
// 鍊掑簭鎺掑垪鏁版嵁(鎼滅储鏈�鍚庢帓鍦ㄥ墠闈�)
Collections.reverse(searchHistoryTitleList);
- if (searchHistoryTitleList.size() > 10) {
+ if (searchHistoryTitleList.size() > maxValue) {
//鍘嗗彶璁板綍涓嶈兘瓒呭嚭10
- searchHistoryTitleList.remove(searchHistoryTitleList.get(11));
+ searchHistoryTitleList.remove(searchHistoryTitleList.get(maxValue + 1));
}
}
diff --git a/app/src/main/res/layout/activity_device_search.xml b/app/src/main/res/layout/activity_device_search.xml
index 059a110..d240c1f 100644
--- a/app/src/main/res/layout/activity_device_search.xml
+++ b/app/src/main/res/layout/activity_device_search.xml
@@ -62,7 +62,7 @@
android:layout_toEndOf="@+id/power_station_search_iv"
android:background="@null"
android:gravity="start|center_vertical"
- android:hint="Search the power station"
+ android:hint="@string/enter_the_device_sn_and_device_name"
android:textColor="@color/text_E6000000"
android:textColorHint="@color/text_66000000"
android:textSize="@dimen/text_14" />
diff --git a/app/src/main/res/layout/activity_house_search.xml b/app/src/main/res/layout/activity_house_search.xml
index a5c9f43..c17c4a5 100644
--- a/app/src/main/res/layout/activity_house_search.xml
+++ b/app/src/main/res/layout/activity_house_search.xml
@@ -61,7 +61,7 @@
android:layout_toEndOf="@+id/power_station_search_iv"
android:background="@null"
android:gravity="start|center_vertical"
- android:hint="Search the power station"
+ android:hint="@string/search_station"
android:textColor="@color/text_E6000000"
android:textColorHint="@color/text_66000000"
android:textSize="@dimen/text_14" />
diff --git a/app/src/main/res/layout/activity_search_messge.xml b/app/src/main/res/layout/activity_search_messge.xml
index 8cf4087..2a464ab 100644
--- a/app/src/main/res/layout/activity_search_messge.xml
+++ b/app/src/main/res/layout/activity_search_messge.xml
@@ -61,7 +61,7 @@
android:layout_toEndOf="@+id/message_search_iv"
android:background="@null"
android:gravity="start|center_vertical"
- android:hint="Search the power station"
+ android:hint="@string/enter_alarm_name"
android:textColor="@color/text_E6000000"
android:textColorHint="@color/text_66000000"
android:textSize="@dimen/text_14" />
diff --git a/app/src/main/res/layout/item_search_message.xml b/app/src/main/res/layout/item_search_message.xml
index feea816..fb73f2b 100644
--- a/app/src/main/res/layout/item_search_message.xml
+++ b/app/src/main/res/layout/item_search_message.xml
@@ -9,16 +9,14 @@
android:layout_width="@dimen/dp_18"
android:layout_height="@dimen/dp_18"
android:layout_marginStart="@dimen/dp_16"
- android:layout_marginTop="@dimen/dp_28"
android:src="@drawable/search_path"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
- android:layout_height="match_parent"
+ android:layout_height="@dimen/dp_99"
android:layout_marginStart="@dimen/dp_57"
- android:layout_marginTop="@dimen/dp_28"
android:layout_marginEnd="@dimen/dp_21"
android:background="@drawable/bj_13fffffff"
app:layout_constraintEnd_toEndOf="parent"
--
Gitblit v1.8.0