From 12d6db5780d8a2121a3bef2d58bf897b24ff552a Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 12 六月 2024 15:54:29 +0800
Subject: [PATCH] Merge branch 'dev'
---
app/src/main/java/com/hdl/photovoltaic/ui/adapter/MessageAdapter.java | 53 ++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 40 insertions(+), 13 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 3dcd091..00515da 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,6 +12,7 @@
import androidx.recyclerview.widget.RecyclerView;
import com.hdl.photovoltaic.R;
+import com.hdl.photovoltaic.enums.DeviceType;
import com.hdl.photovoltaic.enums.MessageAlarmStateType;
import com.hdl.photovoltaic.ui.bean.MessageBean;
import com.hdl.photovoltaic.utils.TimeUtils;
@@ -24,10 +25,9 @@
private List<MessageBean> mList;
private final Context mContext;
- private MessageAdapter.OnclickListener noOnclickListener;//鐐瑰嚮浜嗙殑鐩戝惉鍣�
+ private OnClickListener mOnclickListener;//鐐瑰嚮浜嗙殑鐩戝惉鍣�
- public MessageAdapter(List<MessageBean> list, Context context) {
- mList = list;
+ public MessageAdapter(Context context) {
this.mContext = context;
}
@@ -41,11 +41,12 @@
@Override
public void onBindViewHolder(@NonNull MyViewHolder holder, int position) {
MessageBean messageBean = this.mList.get(position);
+// String strName = getDeviceTypeStr(messageBean.getDeviceType()) + "(" + messageBean.getTitle() + ")";
holder.item_content_tv.setText(messageBean.getTitle());
holder.item_home_name_tv.setText(messageBean.getHomeName());
String date = TimeUtils.getTimeFromTimestamp(messageBean.getCreateTime());
holder.item_time_tv.setText(date);
- String type = "";//FAULT:鏁呴殰,WARN:鍛婅,EVENT:浜嬩欢
+ String type = "";//FAULT:鏁呴殰,WARN:鍛婅,EVENT:鎻愮ず
Drawable drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_ffb300);
if (messageBean.getType().equals(MessageAlarmStateType.fault)) {
type = mContext.getString(R.string.my_power_station_malfunction);
@@ -54,8 +55,8 @@
type = mContext.getString(R.string.message_alarm);
drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_ffb300);
} else if (messageBean.getType().equals(MessageAlarmStateType.event)) {
- type =mContext.getString(R.string.event);
- drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_ffb300);
+ type = mContext.getString(R.string.loading_title_tip);
+ drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_b9b9b9);
}
holder.item_estate_tv.setText(type);
holder.item_estate_tv.setBackground(drawable);
@@ -69,8 +70,8 @@
@Override
public void onClick(View v) {
try {
- if (noOnclickListener != null) {
- noOnclickListener.onClick((int) holder.itemView.getTag(), messageBean);
+ if (mOnclickListener != null) {
+ mOnclickListener.onClick((int) holder.itemView.getTag(), messageBean);
}
} catch (Exception ignored) {
}
@@ -85,12 +86,19 @@
}
- public void setList(List<MessageBean> list) {
- this.mList = list;
+ public void setList(List<MessageBean> newData) {
+ if (this.mList == null) {
+ this.mList = new ArrayList<>();
+ } else {
+ this.mList.clear();
+ }
+
+ this.mList.addAll(newData);
+ notifyDataSetChanged();
}
- public void setNoOnclickListener(MessageAdapter.OnclickListener onclickListener) {
- this.noOnclickListener = onclickListener;
+ public void setOnclickListener(OnClickListener onClickListener) {
+ this.mOnclickListener = onClickListener;
}
/**
@@ -113,8 +121,27 @@
}
}
- public interface OnclickListener {
+ public interface OnClickListener {
void onClick(int position, MessageBean messageBean);
}
+ /**
+ * 閫氳繃鏋氫妇杞崲璁惧绫诲瀷鐨勫瓧绗�
+ *
+ * @param deviceType //璁惧绫诲瀷(INV 锛� 閫嗗彉鍣�, BMS 锛� BMS鎺у埗鐩�, BATTERY 锛� 鐢垫睜鍗曞厓)
+ * @return 璁惧绫诲瀷
+ */
+ private String getDeviceTypeStr(String deviceType) {
+ switch (deviceType) {
+ case DeviceType.inv:
+ return mContext.getString(R.string.alarm_all_device_inverter);
+ case DeviceType.bms:
+ return mContext.getString(R.string.alarm_all_device_bms);
+ case DeviceType.battery:
+ return mContext.getString(R.string.alarm_all_device_battery_cell);
+ default:
+ return "";
+ }
+ }
+
}
--
Gitblit v1.8.0