From 788c70114287306db20e9a4539018d6e32fb5cb7 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 19 四月 2024 10:10:10 +0800
Subject: [PATCH] Merge branch 'wjc_new' into develop_new
---
app/src/main/java/com/hdl/photovoltaic/ui/newC/adapter/MessageCenterListAdapter.java | 31 +++++++++++++++++++++++++++----
1 files changed, 27 insertions(+), 4 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 0340717..551b1b9 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
@@ -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;
@@ -44,7 +45,8 @@
public void onBindViewHolder(@NonNull MessageCenterListAdapter.MyViewHolder holder, int position) {
MessageBean messageBean = this.mList.get(position);
holder.item_content_tv.setText(messageBean.getTitle());
- holder.item_home_name_tv.setText(messageBean.getHomeName());
+ String strName = getDeviceTypeStr(messageBean.getDeviceType()) + "(" + messageBean.getDeviceDesc() + ")";
+ holder.item_home_name_tv.setText(strName);
String date = TimeUtils.getTimeFromTimestamp(messageBean.getCreateTime());
holder.item_time_tv.setText(date);
String type = "";//FAULT:鏁呴殰,WARN:鍛婅,EVENT:浜嬩欢
@@ -53,11 +55,11 @@
type = mContext.getString(R.string.my_power_station_malfunction);
drawable = AppCompatResources.getDrawable(mContext, R.drawable.state_e34343);
} else if (messageBean.getType().equals(MessageAlarmStateType.warn)) {
- type = mContext.getString(R.string.message_alarm);
+ type = mContext.getString(R.string.alarm_all_grade_warning);
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);
@@ -98,6 +100,25 @@
notifyDataSetChanged();
}
+ /**
+ * 閫氳繃鏋氫妇杞崲璁惧绫诲瀷鐨勫瓧绗�
+ *
+ * @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 "";
+ }
+ }
+
public void setNoOnclickListener(OnclickListener onClickListener) {
this.mOnClickListener = onClickListener;
@@ -123,4 +144,6 @@
public interface OnclickListener {
void onClick(int position, MessageBean messageBean);
}
+
+
}
--
Gitblit v1.8.0