From 0ccb78cfb85fbba31ee16a57b13752747585b9a9 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 15 九月 2025 10:15:12 +0800
Subject: [PATCH] Merge branch 'master' into google
---
app/src/main/java/com/hdl/photovoltaic/ui/adapter/SearchMessageAdapter.java | 14 +++++---------
1 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/adapter/SearchMessageAdapter.java b/app/src/main/java/com/hdl/photovoltaic/ui/adapter/SearchMessageAdapter.java
index 031a437..5b42d46 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/adapter/SearchMessageAdapter.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/adapter/SearchMessageAdapter.java
@@ -5,8 +5,6 @@
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.RelativeLayout;
import android.widget.TextView;
import androidx.annotation.NonNull;
@@ -15,10 +13,8 @@
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.enums.MessageAlarmStateType;
-import com.hdl.photovoltaic.ui.bean.DeviceBean;
import com.hdl.photovoltaic.ui.bean.MessageBean;
import com.hdl.photovoltaic.utils.TimeUtils;
-import com.hdl.photovoltaic.widget.SwipeLayout;
import java.util.ArrayList;
import java.util.List;
@@ -54,18 +50,18 @@
String date = TimeUtils.getTimeFromTimestamp(messageBean.getCreateTime());
itemHolder.message_time_tv.setText(date);
String type = "";//FAULT:鏁呴殰,WARN:鍛婅,EVENT:鎻愮ず
- Drawable drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_ffb300);
+ Drawable drawable = AppCompatResources.getDrawable(mContext, R.drawable.device_satte_ffb300);
if (messageBean.getType().equals(MessageAlarmStateType.fault)) {
type = mContext.getString(R.string.my_power_station_malfunction);
- drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_e34343);
+ drawable = AppCompatResources.getDrawable(mContext, R.drawable.device_state_fff55252);
} else if (messageBean.getType().equals(MessageAlarmStateType.warn)) {
type = mContext.getString(R.string.message_alarm);
- drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_ffb300);
+ drawable = AppCompatResources.getDrawable(mContext, R.drawable.device_satte_ffb300);
} else if (messageBean.getType().equals(MessageAlarmStateType.event)) {
type = mContext.getString(R.string.loading_title_tip);
- drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_b9b9b9);
+ drawable = AppCompatResources.getDrawable(mContext, R.drawable.device_state_ffb9b9b9);
}
- itemHolder.message_state_tv.setText(type);
+// itemHolder.message_state_tv.setText(type);
itemHolder.message_state_tv.setBackground(drawable);
itemHolder.itemView.setTag(position);
itemHolder.itemView.setOnClickListener(new View.OnClickListener() {
--
Gitblit v1.8.0