From d1ebb94e1a17b7c25d4fcf73d85345d92cc86b5c Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 02 一月 2024 18:41:34 +0800
Subject: [PATCH] 2024年01月02日18:41:32

---
 app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java |   29 ++++++++++++++++++++++-------
 1 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java b/app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java
index ce3effe..dad0918 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java
@@ -18,6 +18,7 @@
 import com.hdl.photovoltaic.ui.bean.HouseIdBean;
 import com.hdl.photovoltaic.utils.GlideUtils;
 
+import java.util.ArrayList;
 import java.util.List;
 
 public class HouseInfoAdapter extends RecyclerView.Adapter<HouseInfoAdapter.MyViewHolder> {
@@ -26,9 +27,8 @@
     private final Context mContext;
     private OnclickListener noOnclickListener;//鐐瑰嚮浜嗙殑鐩戝惉鍣�
 
-    public HouseInfoAdapter(List<HouseIdBean> list, Context context) {
+    public HouseInfoAdapter(Context context) {
 
-        this.mList = list;
         this.mContext = context;
     }
 
@@ -47,14 +47,18 @@
         //瑁呮満瀹归噺
         String capacity = mContext.getString(R.string.my_power_station_installed_capacity) + houseIdBean.getInstalledCapacity() + "kW";
         holder.capacityTv.setText(capacity);
-        String kw = "0.0";
+        String kw = "0";
         try {
-            double d = Double.parseDouble(houseIdBean.getPower());
-            int intValue = (int) d;
+            if (houseIdBean.getPower().contains(".")) {
+                int indexOf = houseIdBean.getPower().indexOf(".");
+                houseIdBean.setPower(houseIdBean.getPower().substring(0, indexOf));
+            }
+            int intValue = Integer.parseInt(houseIdBean.getPower());
             int k = intValue / 1000;
             int w = intValue % 1000;
             kw = k + "." + w;
         } catch (Exception ignored) {
+            kw = "0.0";
         }
         //鍙戠數鍔熺巼
         String power = mContext.getString(R.string.power_station_generated_power) + kw + "kW";
@@ -78,8 +82,15 @@
     }
 
 
-    public void setList(List<HouseIdBean> list) {
-        this.mList = list;
+    public void setList(List<HouseIdBean> newData) {
+        if (this.mList == null) {
+            this.mList = new ArrayList<>();
+        } else {
+            this.mList.clear();
+        }
+
+        this.mList.addAll(newData);
+        notifyDataSetChanged();
     }
 
     public void setNoOnclickListener(OnclickListener onclickListener) {
@@ -90,6 +101,10 @@
      * 鏀瑰彉缁勪欢鏍峰紡
      *
      * @param textView    鏄剧ず缁勪欢
+     *                    濡傛灉璁惧浠庢潵娌′笂鎶ヨ繃鏁版嵁鏁版嵁 鐘舵�侊細杩炴帴涓�
+     *                    璁惧鍦ㄧ嚎 浣嗘槸褰撳墠澶勪簬鏁呴殰 鐘舵�侊細鏁呴殰
+     *                    璁惧鍦ㄧ嚎锛堟湁涓婃姤杩囨暟鎹紝娌℃湁鏁呴殰锛�  鐘舵�侊細鍦ㄧ嚎
+     *                    璁惧绂荤嚎 鐘舵�侊細绂荤嚎
      * @param state_value 鐢电珯鐘舵��(1:姝e父(杩愯),2:绂荤嚎,3:杩炴帴涓�,4:鏁呴殰)
      */
     private void setTextViewStyle(TextView textView, int state_value) {

--
Gitblit v1.8.0