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 | 2 +- 1 files changed, 1 insertions(+), 1 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 511d8cb..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,7 +45,7 @@ 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); -- Gitblit v1.8.0