From c7c07eaa32ca7b137b1ac028d17beee0ebcf9a0b Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 26 三月 2024 15:22:15 +0800
Subject: [PATCH] 2024年03月26日15:22:09

---
 app/src/main/java/com/hdl/photovoltaic/ui/adapter/MessageAdapter.java |   23 +++++++++++++++--------
 1 files changed, 15 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 973be86..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
@@ -12,9 +12,11 @@
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.hdl.photovoltaic.R;
+import com.hdl.photovoltaic.enums.MessageAlarmStateType;
 import com.hdl.photovoltaic.ui.bean.MessageBean;
 import com.hdl.photovoltaic.utils.TimeUtils;
 
+import java.util.ArrayList;
 import java.util.List;
 
 public class MessageAdapter extends RecyclerView.Adapter<MessageAdapter.MyViewHolder> {
@@ -25,7 +27,6 @@
     private MessageAdapter.OnclickListener noOnclickListener;//鐐瑰嚮浜嗙殑鐩戝惉鍣�
 
     public MessageAdapter(List<MessageBean> list, Context context) {
-
         mList = list;
         this.mContext = context;
     }
@@ -42,30 +43,36 @@
         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);
-        if (messageBean.getType().equals("FAULT")) {
+        if (messageBean.getType().equals(MessageAlarmStateType.fault)) {
             type = mContext.getString(R.string.my_power_station_malfunction);
             drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_e34343);
-        } else if (messageBean.getType().equals("WARN")) {
+        } else if (messageBean.getType().equals(MessageAlarmStateType.warn)) {
             type = mContext.getString(R.string.message_alarm);
             drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_ffb300);
-        } else if (messageBean.getType().equals("EVENT")) {
-            type = "浜嬩欢";
+        } else if (messageBean.getType().equals(MessageAlarmStateType.event)) {
+            type =mContext.getString(R.string.event);
             drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_ffb300);
         }
         holder.item_estate_tv.setText(type);
+        holder.item_estate_tv.setBackground(drawable);
         holder.item_unread_message_tv.setVisibility(View.VISIBLE);
         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