Merge branch 'dev'

mac

2024-06-12 12d6db5780d8a2121a3bef2d58bf897b24ff552a

 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;
@@ -63,13 +62,13 @@
        if (!houseIdBean.isMove()) {
            holder.houseSelectIv.setVisibility(View.VISIBLE);
            holder.houseSelectIv.setBackground(null);
            holder.homeNameTv.setTextColor(mContext.getColor(R.color.text_90000000));
            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_90000000));
            holder.homeNameTv.setTextColor(mContext.getColor(R.color.text_E6000000));
            holder.houseSelectIv.setVisibility(View.GONE);
        }

@@ -131,7 +130,9 @@
        } else {
            this.mList.clear();
        }

        if (newData == null) {
            newData = new ArrayList<>();
        }
        this.mList.addAll(newData);
        notifyDataSetChanged();
    }