From e69cc227309f3eb2025fa4ef043b075467d97de1 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期三, 04 十二月 2024 13:53:47 +0800
Subject: [PATCH] 更改闪屏问题
---
app/src/main/java/com/hdl/photovoltaic/ui/newC/MessageCenterList.java | 56 +++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 43 insertions(+), 13 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/newC/MessageCenterList.java b/app/src/main/java/com/hdl/photovoltaic/ui/newC/MessageCenterList.java
index ff88085..8ff325e 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/newC/MessageCenterList.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/newC/MessageCenterList.java
@@ -3,6 +3,7 @@
import android.content.DialogInterface;
import android.content.Intent;
+import android.graphics.Typeface;
import android.os.Bundle;
import android.view.View;
import android.widget.TextView;
@@ -61,7 +62,7 @@
private int mTotalCount1 = 0;//娑堟伅鏁伴噺鎬绘暟
private int mTotalCount2 = 0;//娑堟伅鏁伴噺鎬绘暟
- private String mDeviceTypeFilterKye = FilterType.deviceType;//杩囨护绫诲瀷 deviceType锛圛NV 锛氶�嗗彉鍣紱BMS 锛欱MS鎺у埗鐩掞紱BATTERY 锛氱數姹犲崟鍏冿級
+ private String mDeviceTypeFilterKye = FilterType.all;//杩囨护绫诲瀷 deviceType锛圛NV 锛氶�嗗彉鍣紱BMS 锛欱MS鎺у埗鐩掞紱BATTERY 锛氱數姹犲崟鍏冿級
private String mDeviceTypeFilterValue = FilterType.all;//杩囨护绫诲瀷鍊� deviceType锛圛NV 锛氶�嗗彉鍣紱BMS 锛欱MS鎺у埗鐩掞紱BATTERY 锛氱數姹犲崟鍏冿級
private String mTypeFilterKye = FilterType.all;//杩囨护绫诲瀷 type锛團AULT 锛氭晠闅滐紱 WARN 锛氬憡璀︼紱 EVENT 锛氫簨浠�(鎻愮ず)锛夛紱
@@ -77,6 +78,7 @@
private boolean isLoadingMore = false; // 鏍囪姝ｅ湪鍔犺浇鏇村鏁版嵁
LinearLayoutManager mLayoutManager;
+
@Override
public Object getContentView() {
viewBinding = ActivityMessageCenterListBinding.inflate(getLayoutInflater());
@@ -85,8 +87,7 @@
@Override
public void onBindView(Bundle savedInstanceState) {
- setNotificationBarBackgroundColor(CustomColor.white);
- setStatusBarTextColor();
+ setStatusBarTranslucent();
//鍒濆鍖栨暟鎹�
initData();
//鍒濆鍖�
@@ -94,7 +95,7 @@
//鍒濆鍖栫晫闈㈢洃鍚櫒
initEvent();
//杩涙潵璇诲彇涓�娆℃暟鎹�(涓轰簡鏇存柊currentPage锛宑urrentTotal杩欎釜鍊�)
- loadNextPageMessageList(1, true, FilterType.all, FilterType.all, FilterType.all, FilterType.all, FilterType.all, FilterType.all);
+ loadNextPageMessageList(1, true, mDeviceTypeFilterKye, mDeviceTypeFilterValue, mTypeFilterKye, mTypeFilterValue, mTimeTypeFilterKye, mTimeTypeFilterValue);
}
@Override
@@ -241,6 +242,15 @@
if (isAlarmDeviceClick) {
return;//闃叉澶氭鐐瑰嚮
}
+ mDeviceTypeFilterKye = FilterType.all;
+ mDeviceTypeFilterValue = FilterType.all;
+ mTypeFilterKye = FilterType.all;
+ mTypeFilterValue = FilterType.all;
+ mTimeTypeFilterKye = FilterType.all;
+ mTimeTypeFilterValue = FilterType.all;
+ viewBinding.allDeviceTitleTv.setText(getString(R.string.alarm_all_device));
+ viewBinding.allGradeTitleTv.setText(getString(R.string.alarm_all_grade));
+ viewBinding.allTimeTitleTv.setText(getString(R.string.alarm_all_time));
isAlarmDeviceClick = true;
refreshBottomStyle(true);
loadNextPageMessageList(1, true, mDeviceTypeFilterKye, mDeviceTypeFilterValue, mTypeFilterKye, mTypeFilterValue, mTimeTypeFilterKye, mTimeTypeFilterValue);
@@ -253,6 +263,15 @@
if (!isAlarmDeviceClick) {
return;//闃叉澶氭鐐瑰嚮
}
+ mDeviceTypeFilterKye = FilterType.all;
+ mDeviceTypeFilterValue = FilterType.all;
+ mTypeFilterKye = FilterType.all;
+ mTypeFilterValue = FilterType.all;
+ mTimeTypeFilterKye = FilterType.all;
+ mTimeTypeFilterValue = FilterType.all;
+ viewBinding.allDeviceTitleTv.setText(getString(R.string.alarm_all_device));
+ viewBinding.allGradeTitleTv.setText(getString(R.string.alarm_all_grade));
+ viewBinding.allTimeTitleTv.setText(getString(R.string.alarm_all_time));
isAlarmDeviceClick = false;
refreshBottomStyle(false);
loadNextPageMessageList(1, true, mDeviceTypeFilterKye, mDeviceTypeFilterValue, mTypeFilterKye, mTypeFilterValue, mTimeTypeFilterKye, mTimeTypeFilterValue);
@@ -306,9 +325,7 @@
}
private void initView() {
- viewBinding.toolbarTopMessageCenterListRl.getRoot().setBackgroundColor(getColor(R.color.text_FFFFFFFF));
viewBinding.toolbarTopMessageCenterListRl.topBackLl.setVisibility(View.VISIBLE);
- viewBinding.toolbarTopMessageCenterListRl.topLeftIv.setImageResource(R.drawable.back_c);
viewBinding.toolbarTopMessageCenterListRl.topTitleTv.setText(R.string.set_message_center);
viewBinding.toolbarTopMessageCenterListRl.topMoreBtn.setVisibility(View.VISIBLE);
viewBinding.toolbarTopMessageCenterListRl.topMoreIv.setImageResource(R.drawable.clearall);
@@ -322,10 +339,27 @@
viewBinding.messageContentRl.setLayoutManager(mLayoutManager);
viewBinding.messageContentRl.setAdapter(messageCenterListAdapter);
messageCenterListAdapter.setList(mList);
- this.nullDataUpdateUi();
+// this.nullDataUpdateUi();
}
private void initData() {
+ try {
+ Intent intent = getIntent();
+ if (intent != null) {
+ String isShowFault = intent.getStringExtra("isShowFault");
+ if (isShowFault != null && isShowFault.equals("true")) {
+ //榛樿鏁呴殰鍏ㄩ儴
+ mDeviceTypeFilterKye = FilterType.all;
+ mDeviceTypeFilterValue = FilterType.all;
+ mTypeFilterKye = FilterType.type;
+ mTypeFilterValue = "FAULT";
+ mTimeTypeFilterKye = FilterType.all;
+ mTimeTypeFilterValue = FilterType.all;
+ viewBinding.allGradeTitleTv.setText(getString(R.string.alarm_all_grade_malfunction));
+ }
+ }
+ } catch (Exception ignored) {
+ }
}
/**
@@ -461,16 +495,10 @@
@Override
public void run() {
if (typeClick) {
- viewBinding.messageBottomAlarmDeviceTitleTv.setTextColor(getColor(R.color.text_191919));
viewBinding.messageBottomAlarmDeviceLineV.setVisibility(View.VISIBLE);
- viewBinding.messageBottomAlarmRecordTitleTv.setTextColor(getColor(R.color.text_B2B2B2));
viewBinding.messageBottomAlarmRecordLineV.setVisibility(View.GONE);
-
-
} else {
- viewBinding.messageBottomAlarmDeviceTitleTv.setTextColor(getColor(R.color.text_B2B2B2));
viewBinding.messageBottomAlarmDeviceLineV.setVisibility(View.GONE);
- viewBinding.messageBottomAlarmRecordTitleTv.setTextColor(getColor(R.color.text_191919));
viewBinding.messageBottomAlarmRecordLineV.setVisibility(View.VISIBLE);
}
@@ -552,6 +580,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");
@@ -584,6 +613,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