From 08f74861b6445c33054a66eb0e4e4d154884be51 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 27 三月 2024 17:30:54 +0800
Subject: [PATCH] 2024年03月27日17:30:49

---
 app/src/main/java/com/hdl/photovoltaic/ui/newC/adapter/MessageCenterListAdapter.java |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 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 0340717..96c12cb 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
@@ -43,8 +43,9 @@
     @Override
     public void onBindViewHolder(@NonNull MessageCenterListAdapter.MyViewHolder holder, int position) {
         MessageBean messageBean = this.mList.get(position);
-        holder.item_content_tv.setText(messageBean.getTitle());
-        holder.item_home_name_tv.setText(messageBean.getHomeName());
+        holder.item_home_name_tv.setText(messageBean.getTitle());
+        String strName = messageBean.getType() + "(" + messageBean.getDeviceDesc() + ")";
+        holder.item_content_tv.setText(strName);
         String date = TimeUtils.getTimeFromTimestamp(messageBean.getCreateTime());
         holder.item_time_tv.setText(date);
         String type = "";//FAULT:鏁呴殰,WARN:鍛婅,EVENT:浜嬩欢
@@ -53,11 +54,11 @@
             type = mContext.getString(R.string.my_power_station_malfunction);
             drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_e34343);
         } else if (messageBean.getType().equals(MessageAlarmStateType.warn)) {
-            type = mContext.getString(R.string.message_alarm);
+            type = mContext.getString(R.string.alarm_all_grade_warning);
             drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_ffb300);
         } else if (messageBean.getType().equals(MessageAlarmStateType.event)) {
-            type = mContext.getString(R.string.event);
-            drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_ffb300);
+            type = mContext.getString(R.string.loading_title_tip);
+            drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_b9b9b9);
         }
         holder.item_estate_tv.setText(type);
         holder.item_estate_tv.setBackground(drawable);

--
Gitblit v1.8.0