From 87cd5df70918e6ba1af849c5f026d3719bfdb1ac Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 09 四月 2025 09:06:29 +0800
Subject: [PATCH] Merge branch '1.5.2' into dev
---
app/src/main/java/com/hdl/photovoltaic/ui/newC/adapter/MessageCenterListAdapter.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/newC/adapter/MessageCenterListAdapter.java b/app/src/main/java/com/hdl/photovoltaic/ui/newC/adapter/MessageCenterListAdapter.java
index 551b1b9..43b52fd 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/newC/adapter/MessageCenterListAdapter.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/newC/adapter/MessageCenterListAdapter.java
@@ -45,23 +45,23 @@
public void onBindViewHolder(@NonNull MessageCenterListAdapter.MyViewHolder holder, int position) {
MessageBean messageBean = this.mList.get(position);
holder.item_content_tv.setText(messageBean.getTitle());
- String strName = getDeviceTypeStr(messageBean.getDeviceType()) + "(" + messageBean.getDeviceDesc() + ")";
+ String strName = getDeviceTypeStr(messageBean.getDeviceType()) + "(" + messageBean.getHomeName() + "_" + messageBean.getDeviceDesc() + ")";
holder.item_home_name_tv.setText(strName);
String date = TimeUtils.getTimeFromTimestamp(messageBean.getCreateTime());
holder.item_time_tv.setText(date);
String type = "";//FAULT:鏁呴殰,WARN:鍛婅,EVENT:浜嬩欢
- Drawable drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_ffb300);
+ Drawable drawable = AppCompatResources.getDrawable(mContext, R.drawable.device_satte_ffb300);
if (messageBean.getType().equals(MessageAlarmStateType.fault)) {
type = mContext.getString(R.string.my_power_station_malfunction);
- drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_e34343);
+ drawable = AppCompatResources.getDrawable(mContext, R.drawable.device_state_fff55252);
} else if (messageBean.getType().equals(MessageAlarmStateType.warn)) {
type = mContext.getString(R.string.alarm_all_grade_warning);
- drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_ffb300);
+ drawable = AppCompatResources.getDrawable(mContext, R.drawable.device_satte_ffb300);
} else if (messageBean.getType().equals(MessageAlarmStateType.event)) {
type = mContext.getString(R.string.loading_title_tip);
- drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_b9b9b9);
+ drawable = AppCompatResources.getDrawable(mContext, R.drawable.device_state_ffb9b9b9);
}
- holder.item_estate_tv.setText(type);
+// holder.item_estate_tv.setText(type);
holder.item_estate_tv.setBackground(drawable);
holder.item_unread_message_tv.setVisibility(View.VISIBLE);
if (messageBean.isRead()) {
--
Gitblit v1.8.0