From 923e59c7e538300d822eb7bf6d43a5465fb1743c Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 19 十一月 2025 14:31:55 +0800
Subject: [PATCH] 2025-11-19 14:31:50

---
 app/src/main/java/com/hdl/photovoltaic/ui/adapter/MessageAdapter.java |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/adapter/MessageAdapter.java b/app/src/main/java/com/hdl/photovoltaic/ui/adapter/MessageAdapter.java
index 00515da..5ee22c5 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/adapter/MessageAdapter.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/adapter/MessageAdapter.java
@@ -5,6 +5,7 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ImageView;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
@@ -19,7 +20,9 @@
 
 import java.util.ArrayList;
 import java.util.List;
-
+/**
+ * 娑堟伅閫傞厤鍣�
+ */
 public class MessageAdapter extends RecyclerView.Adapter<MessageAdapter.MyViewHolder> {
 
 
@@ -41,24 +44,24 @@
     @Override
     public void onBindViewHolder(@NonNull MyViewHolder holder, int position) {
         MessageBean messageBean = this.mList.get(position);
-//        String strName = getDeviceTypeStr(messageBean.getDeviceType()) + "(" + messageBean.getTitle() + ")";
+        String strName = getDeviceTypeStr(messageBean.getDeviceType()) + "(" + messageBean.getHomeName()+"_"+messageBean.getDeviceDesc() + ")";
         holder.item_content_tv.setText(messageBean.getTitle());
-        holder.item_home_name_tv.setText(messageBean.getHomeName());
+        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.message_alarm);
-            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