diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/adapter/GiftRoomAdapter.java b/BaseModule/src/main/java/com/xscm/moduleutil/adapter/GiftRoomAdapter.java index be5435b9..e0ef56b6 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/adapter/GiftRoomAdapter.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/adapter/GiftRoomAdapter.java @@ -156,6 +156,7 @@ public class GiftRoomAdapter extends BaseAdapter { if (TextUtils.isEmpty(giftModel.getIcon())) { viewHolder.im_heart.setVisibility(GONE); }else { + viewHolder.im_heart.setVisibility(VISIBLE); ImageUtils.loadHead(giftModel.getIcon(), viewHolder.im_heart); } diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java b/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java index 9d0b43e6..098cfdc1 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java @@ -1470,7 +1470,10 @@ public class RetrofitClient { observer.onNext(baseModel.getData()); } else if (baseModel.getCode() == 301) { ToastUtils.showShort(baseModel.getMsg()); - observer.onNext(null); + observer.onNext(new ArrayList<>()); + }else if (baseModel.getCode() == 0) { + ToastUtils.showShort(baseModel.getMsg()); + observer.onNext(new ArrayList<>()); } } } diff --git a/BaseModule/src/main/res/layout/item_gift_room.xml b/BaseModule/src/main/res/layout/item_gift_room.xml index 064c40ad..a4cc566b 100644 --- a/BaseModule/src/main/res/layout/item_gift_room.xml +++ b/BaseModule/src/main/res/layout/item_gift_room.xml @@ -88,8 +88,8 @@ implement } public void loginSuccess(List userBean) { - if (userBean == null) { + if (userBean == null || userBean.isEmpty()) { // ToastUtils.showShort("登录失败请重试"); return; } diff --git a/MainModule/src/main/java/com/xscm/modulemain/adapter/HorizontalListAdapter.java b/MainModule/src/main/java/com/xscm/modulemain/adapter/HorizontalListAdapter.java index 108d46ae..e129532b 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/adapter/HorizontalListAdapter.java +++ b/MainModule/src/main/java/com/xscm/modulemain/adapter/HorizontalListAdapter.java @@ -19,7 +19,7 @@ public class HorizontalListAdapter extends RecyclerView.Adapter data) { @@ -38,6 +38,22 @@ public class HorizontalListAdapter extends RecyclerView.Adapter payloads) { + super.onBindViewHolder(holder, position, payloads); + if (payloads.isEmpty()) { + for (Object payload : payloads) { + if(((Integer)payload) == 1){ + RoomSettingBean item = mData.get(position); + if (item.isStatus()) { + holder.tvName.setText(getName(item.getType(), item.isSelect(), item.getName())); + holder.ivIcon.setImageResource(getIconResId(item.getType(), item.isSelect())); + } + } + } + } + } + @Override public void onBindViewHolder(@NonNull ViewHolder holder, int position) { RoomSettingBean item = mData.get(position); @@ -47,7 +63,7 @@ public class HorizontalListAdapter extends RecyclerView.Adapter { if (mListener != null) { - mListener.onItemClick(item); + mListener.onItemClick(position,item,HorizontalListAdapter.this); } }); } diff --git a/MainModule/src/main/java/com/xscm/modulemain/adapter/RoomSettingAdapter.java b/MainModule/src/main/java/com/xscm/modulemain/adapter/RoomSettingAdapter.java index 6585f766..bf258c21 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/adapter/RoomSettingAdapter.java +++ b/MainModule/src/main/java/com/xscm/modulemain/adapter/RoomSettingAdapter.java @@ -2,6 +2,7 @@ package com.xscm.modulemain.adapter; import android.view.View; +import androidx.annotation.NonNull; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; @@ -11,14 +12,23 @@ import com.chad.library.adapter.base.BaseViewHolder; import com.xscm.modulemain.R; import com.xscm.moduleutil.bean.room.RoomSettingBean; +import java.util.HashMap; import java.util.List; +import java.util.Map; public class RoomSettingAdapter extends BaseQuickAdapter { + private OnItemClickListener mListener; + private int itemPos = 0; + + public void setItemPos(int itemPos) { + this.itemPos = itemPos; + } + public interface OnItemClickListener { - void onItemClick(RoomSettingBean item,int position); + void onItemClick(RoomSettingBean item,int position,int itemPos,HorizontalListAdapter horizontalListAdapter); } public void setOnItemClickListener(OnItemClickListener listener) { @@ -35,6 +45,7 @@ public class RoomSettingAdapter extends BaseQuickAdapter