From 8f4a21c13de88f6c34705f0660ec54ec5e032aa4 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 01 十二月 2025 08:24:33 +0800
Subject: [PATCH] Merge branch 'master' into 2.0
---
app/src/main/java/com/hdl/photovoltaic/ui/adapter/MessageAdapter.java | 8 +++++---
1 files changed, 5 insertions(+), 3 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 b4dfd84..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
@@ -20,7 +20,9 @@
import java.util.ArrayList;
import java.util.List;
-
+/**
+ * 娑堟伅閫傞厤鍣�
+ */
public class MessageAdapter extends RecyclerView.Adapter<MessageAdapter.MyViewHolder> {
@@ -42,9 +44,9 @@
@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:鎻愮ず
--
Gitblit v1.8.0