From b93ca15aa55af7cf2dee653beb100076c897f152 Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期二, 25 六月 2024 16:56:38 +0800 Subject: [PATCH] 2024年06月25日16:56:31 --- app/src/main/java/com/hdl/photovoltaic/ui/adapter/DeviceInfoAdapter.java | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 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 8772c42..65fd1b7 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 @@ -6,7 +6,6 @@ import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; -import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.NonNull; @@ -16,15 +15,14 @@ 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; +import com.hdl.photovoltaic.ui.bean.CloudInverterDeviceBean; import java.util.ArrayList; import java.util.List; public class DeviceInfoAdapter extends RecyclerView.Adapter<DeviceInfoAdapter.MyViewHolder> { - List<DeviceBean> mList; + List<CloudInverterDeviceBean> mList; Context mContext; @@ -44,13 +42,13 @@ @Override public void onBindViewHolder(@NonNull MyViewHolder holder, int position) { - DeviceBean deviceBean = this.mList.get(position); + CloudInverterDeviceBean deviceBean = this.mList.get(position); holder.homeNameTv.setText(deviceBean.getHomeNameAndDeviceName()); - holder.device_details_sn_tv.setText("SN:"+deviceBean.getOsn()); + holder.device_details_sn_tv.setText("SN:" + 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_power_value_tv.setText(HdlCommonLogic.getConvertDoubleUnit(deviceBean.getOutputActivePower(), UnitType.kW)); + holder.device_label_day_value_tv.setText(HdlCommonLogic.getConvertDoubleUnit(deviceBean.getTotalElectricityPvToday(), UnitType.kWh)); holder.device_label_location_tv.setText(deviceBean.getHomeAddress()); setTextViewStyle(holder.device_label_state_tv, deviceBean.getDeviceStatus()); holder.itemView.setTag(position); @@ -77,7 +75,7 @@ this.mOnclickListener = onClickListener; } - public void setList(List<DeviceBean> newData) { + public void setList(List<CloudInverterDeviceBean> newData) { if (this.mList == null) { this.mList = new ArrayList<>(); } else { @@ -157,7 +155,7 @@ } public interface OnClickListener { - void onClick(int position, DeviceBean deviceBean); + void onClick(int position, CloudInverterDeviceBean deviceBean); } } -- Gitblit v1.8.0