From 87cd5df70918e6ba1af849c5f026d3719bfdb1ac Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 09 四月 2025 09:06:29 +0800
Subject: [PATCH] Merge branch '1.5.2' into dev
---
app/src/main/java/com/hdl/photovoltaic/ui/newC/adapter/HouseListAdapter.java | 69 +++-------------------------------
1 files changed, 7 insertions(+), 62 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 f6903c7..5611e05 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
@@ -12,7 +12,6 @@
import androidx.recyclerview.widget.RecyclerView;
import com.hdl.photovoltaic.R;
-import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.ui.bean.HouseIdBean;
import java.util.ArrayList;
@@ -26,7 +25,6 @@
private Context mContext;
private List<HouseIdBean> mList;
- public OnMoveClickListener mOnMoveClickListener;
public OnDelClickListener mOnDelClickListener;
public OnItemClickListener mOnItemClickListener;
@@ -47,67 +45,16 @@
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);
- holder.homeNameTv.setTextColor(mContext.getColor(R.color.text_90000000));
- if (houseIdBean.isState_select()) {
- holder.homeNameTv.setTextColor(mContext.getColor(R.color.text_38C494));
- holder.houseSelectIv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.select));
- }
- } 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.homeMoveIv.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- try {
- if (mOnMoveClickListener != null) {
- mOnMoveClickListener.onMoveClick((int) holder.itemView.getTag(), houseIdBean);
- }
- } catch (Exception ignored) {
- }
- }
- });
-
- holder.itemView.setTag(position);//鏍囪浣嶇疆
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);
}
@@ -130,15 +77,13 @@
} else {
this.mList.clear();
}
-
+ if (newData == null) {
+ newData = new ArrayList<>();
+ }
this.mList.addAll(newData);
notifyDataSetChanged();
}
-
- public void setMoveOnclickListener(OnMoveClickListener onMoveClickListener) {
- this.mOnMoveClickListener = onMoveClickListener;
- }
public void setDelOnclickListener(OnDelClickListener onDelClickListener) {
this.mOnDelClickListener = onDelClickListener;
--
Gitblit v1.8.0