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/adapter/MessageAdapter.java | 7 ++++---
1 files changed, 4 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 771ab03..7ca2b67 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;
@@ -41,9 +42,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:鎻愮ず
@@ -58,7 +59,7 @@
type = mContext.getString(R.string.loading_title_tip);
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