From 0ccb78cfb85fbba31ee16a57b13752747585b9a9 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 15 九月 2025 10:15:12 +0800
Subject: [PATCH] Merge branch 'master' into google
---
app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 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 118d590..c74e722 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
@@ -1,3 +1,4 @@
+
package com.hdl.photovoltaic.ui.adapter;
import android.content.Context;
@@ -107,6 +108,12 @@
if (houseIdBean.getDebugStatus().equals(DebugStatus.Debugging)) {
//鏈氦浠樺畬瑕佹樉绀哄垹闄ゆ寜閽�
holder.home_del_ll.setVisibility(View.VISIBLE);
+ holder.del_home_iv.setImageResource(R.drawable.del_home);
+ }
+ if (houseIdBean.getDebugStatus().equals(DebugStatus.WAIT_DELIVERED)) {
+ //鏇存敼鎴愬洖婊氬浘鏍�
+ holder.home_del_ll.setVisibility(View.VISIBLE);
+ holder.del_home_iv.setImageResource(R.drawable.roll_back);
}
//鍒犻櫎鐢电珯
@@ -278,6 +285,7 @@
public RelativeLayout item_parent_rl;//鏉＄洰鐖跺鍣�
public LinearLayout home_move_ll;//绉诲姩鐢电珯浣嶇疆
public LinearLayout home_del_ll;//鍒犻櫎鐢电珯
+ public ImageView del_home_iv;
public TextView home_location_tv;//鐢电珯鍦板潃
public SwipeLayout item_parent_swipeLayout;//鐖跺鍣�
@@ -299,6 +307,7 @@
item_parent_rl = itemView.findViewById(R.id.item_parent_rl);
home_move_ll = itemView.findViewById(R.id.move_ll);
home_del_ll = itemView.findViewById(R.id.del_ll);
+ del_home_iv = itemView.findViewById(R.id.del_home_iv);
home_location_tv = itemView.findViewById(R.id.home_location_tv);
item_parent_swipeLayout = itemView.findViewById(R.id.item_parent_swipeLayout);
}
@@ -313,4 +322,4 @@
}
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0