From e01efd770fcf79505e854965b16352bff0992910 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 04 一月 2024 14:35:28 +0800
Subject: [PATCH] 2024年01月04日14:35:21

---
 app/src/main/java/com/hdl/photovoltaic/ui/adapter/MessageAdapter.java |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 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 6ac9044..3dcd091 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
@@ -43,7 +43,7 @@
         MessageBean messageBean = this.mList.get(position);
         holder.item_content_tv.setText(messageBean.getTitle());
         holder.item_home_name_tv.setText(messageBean.getHomeName());
-        String date = TimeUtils.getDateTimestamp(messageBean.getCreateTime());
+        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);
@@ -54,7 +54,7 @@
             type = mContext.getString(R.string.message_alarm);
             drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_ffb300);
         } else if (messageBean.getType().equals(MessageAlarmStateType.event)) {
-            type = "浜嬩欢";
+            type =mContext.getString(R.string.event);
             drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_ffb300);
         }
         holder.item_estate_tv.setText(type);
@@ -63,11 +63,16 @@
         if (messageBean.isRead()) {
             holder.item_unread_message_tv.setVisibility(View.GONE);
         }
+        //鏍囪绱㈠紩
+        holder.itemView.setTag(position);
         holder.itemView.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                if (noOnclickListener != null) {
-                    noOnclickListener.onClick(holder.getAdapterPosition(), messageBean);
+                try {
+                    if (noOnclickListener != null) {
+                        noOnclickListener.onClick((int) holder.itemView.getTag(), messageBean);
+                    }
+                } catch (Exception ignored) {
                 }
             }
         });

--
Gitblit v1.8.0