From 1ef9c12f9e1edd46fd3edac5363d3519a5e0c05f Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 30 五月 2024 21:12:37 +0800
Subject: [PATCH] Merge branch 'wjc_new' into develop_new
---
app/src/main/java/com/hdl/photovoltaic/ui/newC/adapter/HouseListAdapter.java | 97 ++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 88 insertions(+), 9 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 306b948..efa9bbd 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
@@ -8,6 +8,7 @@
import android.widget.TextView;
import androidx.annotation.NonNull;
+import androidx.appcompat.content.res.AppCompatResources;
import androidx.recyclerview.widget.RecyclerView;
import com.hdl.photovoltaic.R;
@@ -24,7 +25,10 @@
private Context mContext;
private List<HouseIdBean> mList;
- public OnClickListener mOnClickListener;
+ public OnMoveClickListener mOnMoveClickListener;
+ public OnDelClickListener mOnDelClickListener;
+ public OnItemClickListener mOnItemClickListener;
+
public HouseListAdapter(Context context) {
this.mContext = context;
@@ -43,18 +47,69 @@
holder.homeNameTv.setText(houseIdBean.getHomeName().trim());
holder.itemView.setTag(position);
- if (houseIdBean.isEdit()) {
+ if (houseIdBean.isDelIcon()) {
+ holder.houseDelIv.setVisibility(View.VISIBLE);
+ } else {
+ holder.houseDelIv.setVisibility(View.GONE);
+ }
+
+ 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_E6000000));
+ if (houseIdBean.isState_select()) {
+ holder.homeNameTv.setTextColor(mContext.getColor(R.color.text_38C494));
+ holder.houseSelectIv.setBackground(AppCompatResources.getDrawable(mContext, R.drawable.select));
+ }
+ } else {
+ holder.homeNameTv.setTextColor(mContext.getColor(R.color.text_E6000000));
+ 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 (mOnClickListener != null) {
- mOnClickListener.onMoveClick((int) holder.itemView.getTag(), houseIdBean);
+ 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);
}
} catch (Exception ignored) {
}
@@ -75,32 +130,56 @@
} else {
this.mList.clear();
}
-
+ if (newData == null) {
+ newData = new ArrayList<>();
+ }
this.mList.addAll(newData);
notifyDataSetChanged();
}
- public void setNoOnclickListener(OnClickListener onClickListener) {
- this.mOnClickListener = onClickListener;
+ public void setMoveOnclickListener(OnMoveClickListener onMoveClickListener) {
+ this.mOnMoveClickListener = onMoveClickListener;
+ }
+
+ public void setDelOnclickListener(OnDelClickListener onDelClickListener) {
+ this.mOnDelClickListener = onDelClickListener;
+ }
+
+ public void setOnItemClickListener(OnItemClickListener onItemClickListener) {
+ this.mOnItemClickListener = onItemClickListener;
}
static class MyViewHolder extends RecyclerView.ViewHolder {
public TextView homeNameTv;//浣忓畢鍚嶇О
- public ImageView homeMoveIv;//浣忓畢鍥剧墖
+ public ImageView houseDelIv;//鍒犻櫎鍥炬爣
+ public ImageView homeMoveIv;//浣嶇疆绉诲姩鍥炬爣
+ public ImageView houseSelectIv;//浣嶇疆绉诲姩鍥炬爣
public MyViewHolder(@NonNull View itemView) {
super(itemView);
homeNameTv = itemView.findViewById(R.id.house_name_tv);
+ houseDelIv = itemView.findViewById(R.id.house_del_iv);
homeMoveIv = itemView.findViewById(R.id.house_move_iv);
+ houseSelectIv = itemView.findViewById(R.id.house_select_iv);
}
}
- public interface OnClickListener {
+ public interface OnMoveClickListener {
void onMoveClick(int position, HouseIdBean houseIdBean);
}
+ public interface OnDelClickListener {
+ void onDelClick(int position, HouseIdBean houseIdBean);
+
+ }
+
+ public interface OnItemClickListener {
+ void onItemClick(int position, HouseIdBean houseIdBean);
+
+ }
+
}
--
Gitblit v1.8.0