From 2c62031554742600f735baf74ea6a5776a1093a9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期三, 22 五月 2024 11:47:40 +0800
Subject: [PATCH] Merge branch 'feature/hxb' into develop_new
---
app/src/main/java/com/hdl/photovoltaic/ui/adapter/DeviceInfoAdapter.java | 43 +++++++++++++++++++++++++++----------------
1 files changed, 27 insertions(+), 16 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/adapter/DeviceInfoAdapter.java b/app/src/main/java/com/hdl/photovoltaic/ui/adapter/DeviceInfoAdapter.java
index b43aba7..7118b04 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/adapter/DeviceInfoAdapter.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/adapter/DeviceInfoAdapter.java
@@ -12,6 +12,8 @@
import androidx.recyclerview.widget.RecyclerView;
import com.hdl.photovoltaic.R;
+import com.hdl.photovoltaic.enums.UnitType;
+import com.hdl.photovoltaic.other.HdlCommonLogic;
import com.hdl.photovoltaic.ui.bean.DeviceBean;
import com.hdl.photovoltaic.widget.SwipeLayout;
@@ -41,6 +43,14 @@
@Override
public void onBindViewHolder(@NonNull MyViewHolder holder, int position) {
DeviceBean deviceBean = this.mList.get(position);
+
+ holder.homeNameTv.setText(deviceBean.getHomeNameAndDeviceName());
+ holder.device_details_sn_tv.setText(deviceBean.getOsn());
+ holder.device_label_run_state_value_tv.setText(deviceBean.getSystemStatusDesc());
+ holder.device_label_power_value_tv.setText(HdlCommonLogic.getConvertDoubleUnit(deviceBean.getPowerPvNow(), UnitType.kW));
+ holder.device_label_day_value_tv.setText(HdlCommonLogic.getConvertDoubleUnit(deviceBean.getPowerPvNow(), UnitType.kWh));
+ holder.device_label_location_tv.setText(deviceBean.getHomeAddress());
+
holder.itemView.setTag(position);
holder.itemView.setOnClickListener(new View.OnClickListener() {
@Override
@@ -81,27 +91,28 @@
*/
static class MyViewHolder extends RecyclerView.ViewHolder {
- public ImageView homeIconIv;//浣忓畢鍥剧墖
+ public ImageView device_icon_iv;//璁惧鍥剧墖
public TextView homeNameTv;//浣忓畢鍚嶇О
- public TextView capacityTv;//瑁呮満瀹归噺
- public TextView powerTv;//鍙戠數鍔熺巼
- public TextView stateTv;//鐢电珯鐘舵��(杩炴帴涓�,杩愯,绂荤嚎,鏁呴殰);
- public RelativeLayout item_parent_rl;//鏉＄洰鐖跺鍣�
- public ImageView move_home_iv;//绉诲姩鐢电珯浣嶇疆
- public ImageView del_home_iv;//鍒犻櫎鐢电珯
- public SwipeLayout item_parent_swipeLayout;//鐖跺鍣�
+ public TextView device_details_sn_tv;//mac
+ public TextView device_label_run_state_value_tv;//璁惧杩愯鐘舵��
+ public TextView device_label_power_value_tv;//鏈夊姛鍔熺巼
+ public TextView device_label_day_value_tv;//褰撴棩鍙戠數閲�
+ public TextView device_label_location_tv;//鐢电珯鍦板潃
+ public TextView device_label_state_tv;//鐢电珯鐘舵��(杩炴帴涓�,杩愯,绂荤嚎,鏁呴殰);
+
public MyViewHolder(@NonNull View itemView) {
super(itemView);
- homeIconIv = itemView.findViewById(R.id.device_details_image_iv);
+ device_icon_iv = itemView.findViewById(R.id.device_details_image_iv);
homeNameTv = itemView.findViewById(R.id.device_details_name_tv);
- capacityTv = itemView.findViewById(R.id.device_details_sn_tv);
- powerTv = itemView.findViewById(R.id.power_type_tv);
- stateTv = itemView.findViewById(R.id.fragment_house_list_line_state_tv);
- item_parent_rl = itemView.findViewById(R.id.item_parent_rl);
- move_home_iv = itemView.findViewById(R.id.move_home_iv);
- del_home_iv = itemView.findViewById(R.id.del_home_iv);
- item_parent_swipeLayout = itemView.findViewById(R.id.item_parent_swipeLayout);
+ device_details_sn_tv = itemView.findViewById(R.id.device_details_sn_tv);
+ device_label_run_state_value_tv = itemView.findViewById(R.id.device_label_run_state_value_tv);
+ device_label_power_value_tv = itemView.findViewById(R.id.device_label_power_value_tv);
+ device_label_day_value_tv = itemView.findViewById(R.id.device_label_day_value_tv);
+ device_label_location_tv = itemView.findViewById(R.id.device_label_location_tv);
+
+ device_label_state_tv = itemView.findViewById(R.id.device_label_state_tv);
+
}
}
--
Gitblit v1.8.0