From 0770fc4f03196a27e8f4c899a44da63bb1a683e2 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 12 六月 2025 18:17:29 +0800
Subject: [PATCH] 2025年06月12日18:17:27

---
 app/src/main/java/com/hdl/photovoltaic/ui/newC/adapter/HouseListAdapter.java |   66 ++++++++++----------------------
 1 files changed, 21 insertions(+), 45 deletions(-)

diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/newC/adapter/HouseListAdapter.java b/app/src/main/java/com/hdl/photovoltaic/ui/newC/adapter/HouseListAdapter.java
index c11bd0b..208ad4a 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/newC/adapter/HouseListAdapter.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/newC/adapter/HouseListAdapter.java
@@ -5,10 +5,12 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
+import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.content.res.AppCompatResources;
+import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.hdl.photovoltaic.R;
@@ -45,52 +47,30 @@
         HouseIdBean houseIdBean = this.mList.get(position);
         holder.homeNameTv.setText(houseIdBean.getHomeName().trim());
         holder.itemView.setTag(position);
-
-        if (houseIdBean.isDelIcon()) {
-            holder.houseDelIv.setVisibility(View.VISIBLE);
-        } else {
-            holder.houseDelIv.setVisibility(View.GONE);
+        holder.houseSelectIv.setVisibility(View.VISIBLE);
+        holder.houseSelectIv.setBackground(null);
+        if (houseIdBean.isState_select()) {
+            holder.houseSelectIv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.select));
         }
-
-        if (houseIdBean.isMove()) {
-            holder.homeMoveIv.setVisibility(View.VISIBLE);
-        } else {
-            holder.homeMoveIv.setVisibility(View.GONE);
-        }
-
-        if (!houseIdBean.isMove()) {
-            holder.houseSelectIv.setVisibility(View.VISIBLE);
-            holder.houseSelectIv.setBackground(null);
-            if (houseIdBean.isState_select()) {
-                holder.houseSelectIv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.select));
+        //鐢电珯閫変腑
+        holder.item_parent_rl.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                try {
+                    if (mOnItemClickListener != null) {
+                        mOnItemClickListener.onItemClick((int) holder.itemView.getTag(), houseIdBean);
+                    }
+                } catch (Exception ignored) {
+                }
             }
-        } else {
-            holder.houseSelectIv.setVisibility(View.GONE);
-        }
-
-        //鍒犻櫎鐢电珯浣嶇疆
+        });
+        //鐢电珯鍒犻櫎
         holder.houseDelIv.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 try {
                     if (mOnDelClickListener != null) {
                         mOnDelClickListener.onDelClick((int) holder.itemView.getTag(), houseIdBean);
-                    }
-                } catch (Exception ignored) {
-                }
-            }
-        });
-
-        holder.itemView.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                try {
-                    if (holder.houseSelectIv.getVisibility() == View.GONE) {
-                        //閫変腑鍥炬爣缁勪欢闅愯棌鐨勬椂鍊欑偣鍑绘棤鏁�
-                        return;
-                    }
-                    if (mOnItemClickListener != null) {
-                        mOnItemClickListener.onItemClick((int) holder.itemView.getTag(), houseIdBean);
                     }
                 } catch (Exception ignored) {
                 }
@@ -128,26 +108,22 @@
     }
 
     static class MyViewHolder extends RecyclerView.ViewHolder {
+        public ConstraintLayout item_parent_rl;//鏉$洰鐖跺鍣�
         public TextView homeNameTv;//浣忓畢鍚嶇О
         public ImageView houseDelIv;//鍒犻櫎鍥炬爣
-        public ImageView homeMoveIv;//浣嶇疆绉诲姩鍥炬爣
         public ImageView houseSelectIv;//浣嶇疆绉诲姩鍥炬爣
 
 
         public MyViewHolder(@NonNull View itemView) {
             super(itemView);
+            item_parent_rl = itemView.findViewById(R.id.item_parent_cl);
             homeNameTv = itemView.findViewById(R.id.house_name_tv);
-            houseDelIv = itemView.findViewById(R.id.house_del_iv);
-            homeMoveIv = itemView.findViewById(R.id.house_move_iv);
+            houseDelIv = itemView.findViewById(R.id.del_c_home_iv);
             houseSelectIv = itemView.findViewById(R.id.house_select_iv);
 
         }
     }
 
-    public interface OnMoveClickListener {
-        void onMoveClick(int position, HouseIdBean houseIdBean);
-
-    }
 
     public interface OnDelClickListener {
         void onDelClick(int position, HouseIdBean houseIdBean);

--
Gitblit v1.8.0