From 90d5f028ccdaaaf64286f9d632cb335a4d0544b9 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 07 一月 2025 09:40:52 +0800
Subject: [PATCH] Merge branch '1.5.1'
---
app/src/main/java/com/hdl/photovoltaic/ui/message/MessageFragment.java | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
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 f7ccd18..d7f4968 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
@@ -59,8 +59,8 @@
private int mTotalCount = 0; //鎬绘潯鏁�
private int mCurrentPage = 0; // 褰撳墠椤电爜
private int mCurrentTotal = 0; // 鎬婚〉鐮�
- private String mDeviceTypeFilterKye = FilterType.deviceType;//杩囨护绫诲瀷 deviceType锛圛NV 锛氶�嗗彉鍣紱BMS 锛欱MS鎺у埗鐩掞紱BATTERY 锛氱數姹犲崟鍏冿級
- private String mDeviceTypeFilterValue = FilterType.all;//杩囨护绫诲瀷鍊� deviceType锛圛NV 锛氶�嗗彉鍣紱BMS 锛欱MS鎺у埗鐩掞紱BATTERY 锛氱數姹犲崟鍏冿級
+ private String mDeviceTypeFilterKye = FilterType.deviceType;//杩囨护绫诲瀷 deviceType锛圛NV 锛氶�嗗彉鍣紱BMS 锛欱MS鎺у埗鐩掞紱BATTERY 锛氱數姹犲崟鍏冿紱"LOAD_CENTRE"锛氳礋杞芥帶鍒朵腑蹇冿級
+ private String mDeviceTypeFilterValue = FilterType.all;//杩囨护绫诲瀷鍊� deviceType锛圛NV 锛氶�嗗彉鍣紱BMS 锛欱MS鎺у埗鐩掞紱BATTERY 锛氱數姹犲崟鍏冿紱"LOAD_CENTRE"锛氳礋杞芥帶鍒朵腑蹇�
private String mTypeFilterKye = FilterType.all;//杩囨护绫诲瀷 type锛團AULT 锛氭晠闅滐紱 WARN 锛氬憡璀︼紱 EVENT 锛氫簨浠�(鎻愮ず)锛夛紱
private String mTypeFilterValue = FilterType.all;//杩囨护绫诲瀷鍊� type锛團AULT 锛氭晠闅滐紱 WARN 锛氬憡璀︼紱 EVENT 锛氫簨浠�(鎻愮ず)锛夛紱
@@ -109,8 +109,8 @@
viewBinding.allTimeTitleTv.setText(getString(R.string.alarm_all_time));
isAlarmDeviceClick = true;
isRefreshTotalCount = true;
- viewBinding.messageTabNascentTitleTv.setTextAppearance(R.style.Text20Style);
- viewBinding.messageTabRecoverTitleTv.setTextAppearance(R.style.Text16Style);
+ viewBinding.messageTabNascentTitleTv.setTextAppearance(R.style.Text18Style);
+ viewBinding.messageTabRecoverTitleTv.setTextAppearance(R.style.Text14Style);
viewBinding.allClearIv.setVisibility(View.VISIBLE);
loadNextPageMessageList(true, 1, mDeviceTypeFilterKye, mDeviceTypeFilterValue, mTypeFilterKye, mTypeFilterValue, mTimeTypeFilterKye, mTimeTypeFilterValue, true);
}
@@ -133,8 +133,8 @@
viewBinding.allTimeTitleTv.setText(getString(R.string.alarm_all_time));
isAlarmDeviceClick = false;
isRefreshTotalCount = true;
- viewBinding.messageTabNascentTitleTv.setTextAppearance(R.style.Text16Style);
- viewBinding.messageTabRecoverTitleTv.setTextAppearance(R.style.Text20Style);
+ viewBinding.messageTabNascentTitleTv.setTextAppearance(R.style.Text14Style);
+ viewBinding.messageTabRecoverTitleTv.setTextAppearance(R.style.Text18Style);
viewBinding.allClearIv.setVisibility(View.GONE);
loadNextPageMessageList(true, 1, mDeviceTypeFilterKye, mDeviceTypeFilterValue, mTypeFilterKye, mTypeFilterValue, mTimeTypeFilterKye, mTimeTypeFilterValue, true);
}
@@ -302,11 +302,11 @@
private void initView() {
if (isAlarmDeviceClick) {
- viewBinding.messageTabNascentTitleTv.setTextAppearance(R.style.Text20Style);
- viewBinding.messageTabRecoverTitleTv.setTextAppearance(R.style.Text16Style);
+ viewBinding.messageTabNascentTitleTv.setTextAppearance(R.style.Text18Style);
+ viewBinding.messageTabRecoverTitleTv.setTextAppearance(R.style.Text14Style);
} else {
- viewBinding.messageTabNascentTitleTv.setTextAppearance(R.style.Text16Style);
- viewBinding.messageTabRecoverTitleTv.setTextAppearance(R.style.Text20Style);
+ viewBinding.messageTabNascentTitleTv.setTextAppearance(R.style.Text18Style);
+ viewBinding.messageTabRecoverTitleTv.setTextAppearance(R.style.Text14Style);
}
// viewBinding..topMoreBtn.setVisibility(View.VISIBLE);
// viewBinding.toolbarTopMessageCenterListRl.topMoreIv.setImageResource(R.drawable.clearall);
@@ -609,6 +609,7 @@
map.put(getString(R.string.alarm_all_device_inverter), "INV");
map.put(getString(R.string.alarm_all_device_bms), "BMS");
map.put(getString(R.string.alarm_all_device_battery_cell), "BATTERY");
+ map.put(getString(R.string.alarm_all_device_load_centre), "LOAD_CENTRE");
map.put(getString(R.string.alarm_all_grade), "");//璁剧瓑绾у叏閮�
map.put(getString(R.string.alarm_all_grade_malfunction), "FAULT");
map.put(getString(R.string.alarm_all_grade_warning), "WARN");
@@ -641,6 +642,7 @@
stringList.add(getString(R.string.alarm_all_device_inverter));
stringList.add(getString(R.string.alarm_all_device_bms));
stringList.add(getString(R.string.alarm_all_device_battery_cell));
+ stringList.add(getString(R.string.alarm_all_device_load_centre));
}
break;
case FilterType.type: {
--
Gitblit v1.8.0