From 9450a351c5ce0e091254079e96e15947b7ed253c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E5=B0=8F=E6=B1=9F?= <461355754@qq.com> Date: Mon, 26 Jan 2026 09:40:23 +0800 Subject: [PATCH] =?UTF-8?q?1:=E6=B7=BB=E5=8A=A0=E7=83=AD=E5=BA=A6=E5=8D=A1?= =?UTF-8?q?=EF=BC=8C=E5=9C=A8=E8=83=8C=E5=8C=85=E6=98=BE=E7=A4=BA=202:?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=81=93=E5=85=B7=E5=95=86=E5=9F=8E=E5=92=8C?= =?UTF-8?q?=E4=B8=AA=E6=80=A7=E8=A3=85=E6=89=AE=EF=BC=8C=E5=88=86=E5=88=AB?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=83=AD=E8=BA=AB=E5=8D=A1=E5=92=8C=E4=B8=8D?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=203:=E5=AE=8C=E6=88=90=E7=83=AD=E5=BA=A6?= =?UTF-8?q?=E5=8D=A1=E5=9C=A8=E6=88=BF=E9=97=B4=E4=B8=AD=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=EF=BC=8C=E4=B8=80=E9=94=AE=E5=85=A8=E4=BD=BF=E7=94=A8=E5=92=8C?= =?UTF-8?q?=E5=8D=95=E4=B8=AA=E4=BD=BF=E7=94=A8=EF=BC=8C=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../moduleutil/adapter/GiftPackAdapter.java | 177 ++++++---- .../moduleutil/adapter/GiftRoomAdapter.java | 332 +++++++++++------- .../adapter/GiftTwoDetailsFragment.java | 17 +- .../bean/zhuangb/ZhuangBanShangChengBean.java | 1 + .../com/xscm/moduleutil/http/ApiServer.java | 8 +- .../xscm/moduleutil/http/RetrofitClient.java | 32 +- .../presenter/RewardGiftContacts.java | 4 + .../presenter/RewardGiftPresenter.java | 19 + .../com/xscm/moduleutil/widget/Constants.java | 1 + .../widget/dialog/RewardDialogFragment.java | 5 + .../dialog/RewardGiftDialogFragment.java | 5 + .../src/main/res/layout/item_gift_room.xml | 1 + .../src/main/res/layout/room_vp_gift.xml | 7 +- .../activity/GroupChatSettingsActivity.kt | 6 +- .../activity/user/activity/MyBagActivity.java | 16 +- .../user/activity/PersonalityActivity.java | 2 +- .../user/activity/PropMallActivity.kt | 57 ++- .../activity/user/conacts/MyBagConacts.java | 6 + .../user/conacts/PersonalityConacts.java | 2 +- .../user/fragment/mybag/HeatCardFragment.kt | 74 ++++ .../user/fragment/mybag/MyBagFragment.java | 5 + .../fragment/mybag/MyBagListFragment.java | 20 +- .../zhuangb/ZhuangBanShangChengAdapter.java | 27 +- .../user/presenter/MyBagPresenter.java | 19 + .../user/presenter/PersonalityPresenter.java | 4 +- .../dialog/PurchaseOutfitsDialog.kt | 2 +- .../dialog/RoomGiftDialogFragment.java | 151 +++++--- .../dialog/RoomWheatGiftSettingFragment.java | 5 + .../src/main/res/layout/dialog_gift_song.xml | 4 +- .../main/res/layout/fragment_heat_card.xml | 31 ++ .../layout/item_zhuangbanschangcheng_list.xml | 48 ++- 31 files changed, 792 insertions(+), 296 deletions(-) create mode 100644 MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/mybag/HeatCardFragment.kt create mode 100644 MainModule/src/main/res/layout/fragment_heat_card.xml diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/adapter/GiftPackAdapter.java b/BaseModule/src/main/java/com/xscm/moduleutil/adapter/GiftPackAdapter.java index e1e6b4e7..bf5ceca2 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/adapter/GiftPackAdapter.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/adapter/GiftPackAdapter.java @@ -14,8 +14,11 @@ import android.widget.BaseAdapter; import android.widget.ImageView; import android.widget.TextView; +import androidx.annotation.NonNull; import androidx.constraintlayout.widget.ConstraintLayout; +import com.chad.library.adapter.base.BaseQuickAdapter; +import com.chad.library.adapter.base.BaseViewHolder; import com.xscm.moduleutil.R; import com.xscm.moduleutil.bean.GiftPackBean; import com.xscm.moduleutil.event.RoomGiftPackToEvent; @@ -31,7 +34,7 @@ import java.util.List; * @Time 2025年7月29日23:36:25$ $ * @Description 背包礼物适配器$ */ -public class GiftPackAdapter extends BaseAdapter { +public class GiftPackAdapter extends BaseQuickAdapter { private final List mDatas; private final LayoutInflater inflater; private final Context mContext; @@ -47,6 +50,7 @@ public class GiftPackAdapter extends BaseAdapter { private final int pageSize = 100; public GiftPackAdapter(Context context, List mDatas, int curIndex, String type) { + super(R.layout.item_gift_room, mDatas); inflater = LayoutInflater.from(context); this.mDatas = mDatas; this.curIndex = curIndex; @@ -60,14 +64,45 @@ public class GiftPackAdapter extends BaseAdapter { * 如果够，则直接返回每一页显示的最大条目个数pageSize, * 如果不够，则有几项返回几,(mDatas.size() - curIndex * pageSize);(也就是最后一页的时候就显示剩余item) */ - @Override - public int getCount() { - return mDatas.size() > (curIndex + 1) * pageSize ? pageSize : (mDatas.size() - curIndex * pageSize); - } +// @Override +// public int getCount() { +// return mDatas.size() > (curIndex + 1) * pageSize ? pageSize : (mDatas.size() - curIndex * pageSize); +// } +// +// @Override +// public GiftPackBean getItem(int position) { +// return mDatas.get(position + curIndex * pageSize); +// } @Override - public GiftPackBean getItem(int position) { - return mDatas.get(position + curIndex * pageSize); + protected void convert(@NonNull BaseViewHolder helper, GiftPackBean giftModel) { + helper.getView(R.id.cl_gift).setOnClickListener(v -> { +// RoonGiftModel clickedModel = (RoonGiftModel) v.getTag(); + EventBus.getDefault().post(new RoomGiftPackToEvent(this, giftModel, 2)); + + }); + helper.setVisible(R.id.integral, true).setText(R.id.integral, "x" + giftModel.getNum()); + helper.setText(R.id.tv_gift_name, giftModel.getGift_name()); + + //设置礼物价格 + String surplusTxt = giftModel.getGift_price(); + SpannableStringBuilder stringBuilder = new SpannableStringBuilder(surplusTxt); + //ForegroundColorSpan 为文字前景色，BackgroundColorSpan为文字背景色 + ForegroundColorSpan redSpan = new ForegroundColorSpan(mContext.getResources().getColor(R.color.color_FFA9A9A9)); + stringBuilder.setSpan(redSpan, surplusTxt.length(), surplusTxt.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);//修改最后两个字体的颜色 + helper.setText(R.id.tv_gift_price,stringBuilder); + + //加载礼物图片 + ImageUtils.loadImageView(giftModel.getBase_image(),helper.getView(R.id.iv_gift_pic)); + //设置选中后的样式 + + if (giftModel.isChecked()) {//被选中 + helper.getView(R.id.cl_iv_down_on).setBackgroundResource(R.mipmap.room_gift_bjx); + helper.setVisible(R.id.iv_down_on, false); + } else { + helper.setVisible(R.id.iv_down_on, false); + helper.getView(R.id.cl_iv_down_on).setBackgroundResource(0); + } } @Override @@ -107,68 +142,68 @@ public class GiftPackAdapter extends BaseAdapter { - @Override - @SuppressLint({"SetTextI18n", "ClickableViewAccessibility"}) - public View getView(int position, View convertView, ViewGroup parent) { - GiftPackAdapter.ViewHolder viewHolder; - GiftPackBean giftModel = getItem(position); - if (convertView == null) { - convertView = inflater.inflate(R.layout.item_gift_room, parent, false); - viewHolder = new GiftPackAdapter.ViewHolder(); - viewHolder.tv_gift_name = (TextView) convertView.findViewById(R.id.tv_gift_name); - viewHolder.tv_gift_price = (TextView) convertView.findViewById(R.id.tv_gift_price); - viewHolder.iv_gift_pic = (ImageView) convertView.findViewById(R.id.iv_gift_pic); - viewHolder.item_layout = (ConstraintLayout) convertView.findViewById(R.id.cl_gift); - viewHolder.ivDownOn = (ImageView) convertView.findViewById(R.id.iv_down_on); - viewHolder.cl_iv_down_on = (ConstraintLayout) convertView.findViewById(R.id.cl_iv_down_on); - viewHolder.integral = (TextView) convertView.findViewById(R.id.integral); - viewHolder.im_heart = (ImageView) convertView.findViewById(R.id.im_heartssss); - convertView.setTag(viewHolder); - } else { - viewHolder = (GiftPackAdapter.ViewHolder) convertView.getTag(); - } - - viewHolder.item_layout.setOnClickListener(v -> { -// RoonGiftModel clickedModel = (RoonGiftModel) v.getTag(); - EventBus.getDefault().post(new RoomGiftPackToEvent(this, giftModel, 2)); - - }); - viewHolder.integral.setVisibility(View.VISIBLE); - viewHolder.integral.setText("x"+giftModel.getNum()); - //设置礼物名字 - viewHolder.tv_gift_name.setText(giftModel.getGift_name()); - //设置礼物价格 - String surplusTxt = giftModel.getGift_price(); - SpannableStringBuilder stringBuilder = new SpannableStringBuilder(surplusTxt); - //ForegroundColorSpan 为文字前景色，BackgroundColorSpan为文字背景色 - ForegroundColorSpan redSpan = new ForegroundColorSpan(mContext.getResources().getColor(R.color.color_FFA9A9A9)); - stringBuilder.setSpan(redSpan, surplusTxt.length(), surplusTxt.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);//修改最后两个字体的颜色 - viewHolder.tv_gift_price.setText(stringBuilder); -// viewHolder.item_layout.setTag(R.id.id_gift_tag, giftModel); - - //加载礼物图片 - ImageUtils.loadImageView(giftModel.getBase_image(), viewHolder.iv_gift_pic); - //设置选中后的样式 - - if (giftModel.isChecked()) {//被选中 - viewHolder.cl_iv_down_on.setBackgroundResource(R.mipmap.room_gift_bjx); - viewHolder.ivDownOn.setVisibility(View.GONE); - } else { - viewHolder.ivDownOn.setVisibility(View.GONE); - viewHolder.cl_iv_down_on.setBackgroundResource(0); - } - - return convertView; - } - - - static class ViewHolder { - public ConstraintLayout item_layout; - public TextView tv_gift_name, tv_gift_price, integral; - public ImageView iv_gift_pic; - public TextView tv_gift_change_love_values; - public ImageView ivDownOn; - public ConstraintLayout cl_iv_down_on; - public ImageView im_heart; - } +// @Override +// @SuppressLint({"SetTextI18n", "ClickableViewAccessibility"}) +// public View getView(int position, View convertView, ViewGroup parent) { +// GiftPackAdapter.ViewHolder viewHolder; +// GiftPackBean giftModel = getItem(position); +// if (convertView == null) { +// convertView = inflater.inflate(R.layout.item_gift_room, parent, false); +// viewHolder = new GiftPackAdapter.ViewHolder(); +// viewHolder.tv_gift_name = (TextView) convertView.findViewById(R.id.tv_gift_name); +// viewHolder.tv_gift_price = (TextView) convertView.findViewById(R.id.tv_gift_price); +// viewHolder.iv_gift_pic = (ImageView) convertView.findViewById(R.id.iv_gift_pic); +// viewHolder.item_layout = (ConstraintLayout) convertView.findViewById(R.id.cl_gift); +// viewHolder.ivDownOn = (ImageView) convertView.findViewById(R.id.iv_down_on); +// viewHolder.cl_iv_down_on = (ConstraintLayout) convertView.findViewById(R.id.cl_iv_down_on); +// viewHolder.integral = (TextView) convertView.findViewById(R.id.integral); +// viewHolder.im_heart = (ImageView) convertView.findViewById(R.id.im_heartssss); +// convertView.setTag(viewHolder); +// } else { +// viewHolder = (GiftPackAdapter.ViewHolder) convertView.getTag(); +// } +// +// viewHolder.item_layout.setOnClickListener(v -> { +//// RoonGiftModel clickedModel = (RoonGiftModel) v.getTag(); +// EventBus.getDefault().post(new RoomGiftPackToEvent(this, giftModel, 2)); +// +// }); +// viewHolder.integral.setVisibility(View.VISIBLE); +// viewHolder.integral.setText("x"+giftModel.getNum()); +// //设置礼物名字 +// viewHolder.tv_gift_name.setText(giftModel.getGift_name()); +// //设置礼物价格 +// String surplusTxt = giftModel.getGift_price(); +// SpannableStringBuilder stringBuilder = new SpannableStringBuilder(surplusTxt); +// //ForegroundColorSpan 为文字前景色，BackgroundColorSpan为文字背景色 +// ForegroundColorSpan redSpan = new ForegroundColorSpan(mContext.getResources().getColor(R.color.color_FFA9A9A9)); +// stringBuilder.setSpan(redSpan, surplusTxt.length(), surplusTxt.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);//修改最后两个字体的颜色 +// viewHolder.tv_gift_price.setText(stringBuilder); +//// viewHolder.item_layout.setTag(R.id.id_gift_tag, giftModel); +// +// //加载礼物图片 +// ImageUtils.loadImageView(giftModel.getBase_image(), viewHolder.iv_gift_pic); +// //设置选中后的样式 +// +// if (giftModel.isChecked()) {//被选中 +// viewHolder.cl_iv_down_on.setBackgroundResource(R.mipmap.room_gift_bjx); +// viewHolder.ivDownOn.setVisibility(View.GONE); +// } else { +// viewHolder.ivDownOn.setVisibility(View.GONE); +// viewHolder.cl_iv_down_on.setBackgroundResource(0); +// } +// +// return convertView; +// } +// +// +// static class ViewHolder { +// public ConstraintLayout item_layout; +// public TextView tv_gift_name, tv_gift_price, integral; +// public ImageView iv_gift_pic; +// public TextView tv_gift_change_love_values; +// public ImageView ivDownOn; +// public ConstraintLayout cl_iv_down_on; +// public ImageView im_heart; +// } } 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 5fcb776c..c2bae659 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/adapter/GiftRoomAdapter.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/adapter/GiftRoomAdapter.java @@ -18,8 +18,11 @@ import android.widget.BaseAdapter; import android.widget.ImageView; import android.widget.TextView; +import androidx.annotation.NonNull; import androidx.constraintlayout.widget.ConstraintLayout; +import com.chad.library.adapter.base.BaseQuickAdapter; +import com.chad.library.adapter.base.BaseViewHolder; import com.hjq.toast.ToastUtils; import com.xscm.moduleutil.R; import com.xscm.moduleutil.bean.RoonGiftModel; @@ -31,7 +34,7 @@ import org.greenrobot.eventbus.EventBus; import java.lang.ref.WeakReference; import java.util.List; -public class GiftRoomAdapter extends BaseAdapter { +public class GiftRoomAdapter extends BaseQuickAdapter { private final List mDatas; private final LayoutInflater inflater; private final Context mContext; @@ -47,7 +50,7 @@ public class GiftRoomAdapter extends BaseAdapter { private final int pageSize = 100; public GiftRoomAdapter(Context context, List mDatas, int curIndex, String type) { - + super(R.layout.item_gift_room); this.mDatas = mDatas; this.curIndex = curIndex; this.mContext = context; @@ -61,16 +64,83 @@ public class GiftRoomAdapter extends BaseAdapter { * 如果够，则直接返回每一页显示的最大条目个数pageSize, * 如果不够，则有几项返回几,(mDatas.size() - curIndex * pageSize);(也就是最后一页的时候就显示剩余item) */ - @Override - public int getCount() { - return mDatas !=null ? mDatas.size() : 0; -// return mDatas.size() > (curIndex + 1) * pageSize ? pageSize : (mDatas.size() - curIndex * pageSize); - } +// @Override +// public int getCount() { +// return mDatas !=null ? mDatas.size() : 0; +//// return mDatas.size() > (curIndex + 1) * pageSize ? pageSize : (mDatas.size() - curIndex * pageSize); +// } +// +// @Override +// public RoonGiftModel getItem(int position) { +// return mDatas.get(position); +//// return mDatas.get(position + curIndex * pageSize); +// } @Override - public RoonGiftModel getItem(int position) { - return mDatas.get(position); -// return mDatas.get(position + curIndex * pageSize); + protected void convert(@NonNull BaseViewHolder helper, RoonGiftModel giftModel) { + + + helper.getView(R.id.cl_gift).setOnClickListener(v -> { +// RoonGiftModel clickedModel = (RoonGiftModel) v.getTag(); + if (giftModel.getIs_lock() == 0) { + EventBus.getDefault().post(new RoomGiftClickToEvent(this, giftModel, 1)); + } else if (giftModel.getIs_lock() == 1) { + ToastUtils.show("当前属于爵位礼物，请开通爵位"); + } + }); + if (giftModel.getIs_lock() == 0) { + helper.setVisible(R.id.iv_gift_select,false); + } else { + helper.setVisible(R.id.iv_gift_select,true); + } + if (TextUtils.isEmpty(giftModel.getIcon())) { + helper.setVisible(R.id.im_heartssss,false); + }else { + helper.setVisible(R.id.im_heartssss,true); + ImageUtils.loadHead(giftModel.getIcon(), helper.getView(R.id.im_heartssss)); + } + + //设置礼物名字 + helper.setText(R.id.tv_gift_name,giftModel.getGift_name()); + if (TextUtils.isEmpty(giftModel.getNum())){ + helper.setVisible(R.id.integral, false); + }else { + helper.setVisible(R.id.integral, true).setText(R.id.integral, "x" + giftModel.getNum()); + } + + //设置礼物价格 + String surplusTxt = giftModel.getGift_price(); + SpannableStringBuilder stringBuilder = new SpannableStringBuilder(surplusTxt); + //ForegroundColorSpan 为文字前景色，BackgroundColorSpan为文字背景色 + ForegroundColorSpan redSpan = new ForegroundColorSpan(mContext.getResources().getColor(R.color.color_FFA9A9A9)); + stringBuilder.setSpan(redSpan, surplusTxt.length(), surplusTxt.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);//修改最后两个字体的颜色 + helper.setText(R.id.tv_gift_price,stringBuilder); +// viewHolder.item_layout.setTag(R.id.id_gift_tag, giftModel); + + //加载礼物图片 + ImageUtils.loadImageView(giftModel.getBase_image(), helper.getView(R.id.iv_gift_pic)); + //设置选中后的样式 + + if (giftModel.isChecked()) {//被选中 + helper.getView(R.id.cl_iv_down_on).setBackgroundResource(R.mipmap.room_gift_bjx); + helper.setVisible(R.id.iv_down_on,false); + } else { + helper.getView(R.id.cl_iv_down_on).setBackgroundResource(0); + helper.setVisible(R.id.iv_down_on,false); + } + if (giftModel.getGift_bag() == 10) { + helper.setText(R.id.tv_gift_name,""); + helper.getView(R.id.cl_gift).setBackgroundResource(R.mipmap.gift_tkzj); + helper.getView(R.id.tv_gift_name).setBackgroundResource(R.mipmap.gift_name_tkzj); + } else if (giftModel.getGift_bag() == 11) { + helper.setText(R.id.tv_gift_name,""); + helper.getView(R.id.cl_gift).setBackgroundResource(R.mipmap.gift_syzc); + helper.getView(R.id.tv_gift_name).setBackgroundResource(R.mipmap.gift_name_syzc); + } else if (giftModel.getGift_bag() == 12) { + helper.setText(R.id.tv_gift_name,""); + helper.getView(R.id.cl_gift).setBackgroundResource(R.mipmap.gift_sjzd); + helper.getView(R.id.tv_gift_name).setBackgroundResource(R.mipmap.gift_name_skzd); + } } @Override @@ -120,130 +190,130 @@ public class GiftRoomAdapter extends BaseAdapter { } - @Override - @SuppressLint({"SetTextI18n", "ClickableViewAccessibility"}) - public View getView(int position, View convertView, ViewGroup parent) { - ViewHolder viewHolder; - RoonGiftModel giftModel = getItem(position); - if (convertView == null) { - convertView = inflater.inflate(R.layout.item_gift_room, parent, false); - viewHolder = new ViewHolder(); - viewHolder.item_layout = (ConstraintLayout) convertView.findViewById(R.id.cl_gift); - viewHolder.cl_iv_down_on = (ConstraintLayout) convertView.findViewById(R.id.cl_iv_down_on); - viewHolder.tv_gift_name = (TextView) convertView.findViewById(R.id.tv_gift_name); - viewHolder.tv_gift_price = (TextView) convertView.findViewById(R.id.tv_gift_price); - viewHolder.iv_gift_pic = (ImageView) convertView.findViewById(R.id.iv_gift_pic); - viewHolder.ivDownOn = (ImageView) convertView.findViewById(R.id.iv_down_on); - viewHolder.iv_gift_select = (ImageView) convertView.findViewById(R.id.iv_gift_select); - - // im_heart现在位于顶层布局中 - viewHolder.im_heart = (ImageView) convertView.findViewById(R.id.im_heartssss); - convertView.setTag(viewHolder); - } else { - viewHolder = (ViewHolder) convertView.getTag(); - } - - viewHolder.item_layout.setOnClickListener(v -> { -// RoonGiftModel clickedModel = (RoonGiftModel) v.getTag(); - if (giftModel.getIs_lock() == 0) { - EventBus.getDefault().post(new RoomGiftClickToEvent(this, giftModel, 1)); - } else if (giftModel.getIs_lock() == 1) { - ToastUtils.show("当前属于爵位礼物，请开通爵位"); - } - }); - if (giftModel.getIs_lock() == 0) { - viewHolder.iv_gift_select.setVisibility(GONE); - } else { - viewHolder.iv_gift_select.setVisibility(VISIBLE); - } - if (TextUtils.isEmpty(giftModel.getIcon())) { - viewHolder.im_heart.setVisibility(GONE); - }else { - viewHolder.im_heart.setVisibility(VISIBLE); - ImageUtils.loadHead(giftModel.getIcon(), viewHolder.im_heart); - } - -// if (giftModel.getIs_cp() == 0 && giftModel.getIs_teacher() == 0 ) {//这是cp礼物 -// viewHolder.im_heart.setVisibility(GONE); +// @Override +// @SuppressLint({"SetTextI18n", "ClickableViewAccessibility"}) +// public View getView(int position, View convertView, ViewGroup parent) { +// ViewHolder viewHolder; +// RoonGiftModel giftModel = getItem(position); +// if (convertView == null) { +// convertView = inflater.inflate(R.layout.item_gift_room, parent, false); +// viewHolder = new ViewHolder(); +// viewHolder.item_layout = (ConstraintLayout) convertView.findViewById(R.id.cl_gift); +// viewHolder.cl_iv_down_on = (ConstraintLayout) convertView.findViewById(R.id.cl_iv_down_on); +// viewHolder.tv_gift_name = (TextView) convertView.findViewById(R.id.tv_gift_name); +// viewHolder.tv_gift_price = (TextView) convertView.findViewById(R.id.tv_gift_price); +// viewHolder.iv_gift_pic = (ImageView) convertView.findViewById(R.id.iv_gift_pic); +// viewHolder.ivDownOn = (ImageView) convertView.findViewById(R.id.iv_down_on); +// viewHolder.iv_gift_select = (ImageView) convertView.findViewById(R.id.iv_gift_select); +// +// // im_heart现在位于顶层布局中 +// viewHolder.im_heart = (ImageView) convertView.findViewById(R.id.im_heartssss); +// convertView.setTag(viewHolder); // } else { -// if (viewHolder.im_heart != null) { -// viewHolder.im_heart.setVisibility(VISIBLE); -// if (giftModel.getIs_cp() == 1) { -// viewHolder.im_heart.setImageResource(R.mipmap.icon_heart); -// }else if (giftModel.getIs_teacher() == 1) { -// viewHolder.im_heart.setImageResource(R.mipmap.icon_teacher); -// } +// viewHolder = (ViewHolder) convertView.getTag(); +// } +// +// viewHolder.item_layout.setOnClickListener(v -> { +//// RoonGiftModel clickedModel = (RoonGiftModel) v.getTag(); +// if (giftModel.getIs_lock() == 0) { +// EventBus.getDefault().post(new RoomGiftClickToEvent(this, giftModel, 1)); +// } else if (giftModel.getIs_lock() == 1) { +// ToastUtils.show("当前属于爵位礼物，请开通爵位"); // } -// } - - - /* - * 在给View绑定显示的数据时，计算正确的position = position + curIndex * pageSize， - */ -// viewHolder.tv_gift_num.setVisibility(type.equals("1") ? View.VISIBLE : View.INVISIBLE); -// viewHolder.tv_gift_change_love_values.setVisibility(View.GONE); - - - //设置礼物名字 - viewHolder.tv_gift_name.setText(giftModel.getGift_name()); - //设置礼物价格 - String surplusTxt = giftModel.getGift_price(); - SpannableStringBuilder stringBuilder = new SpannableStringBuilder(surplusTxt); - //ForegroundColorSpan 为文字前景色，BackgroundColorSpan为文字背景色 - ForegroundColorSpan redSpan = new ForegroundColorSpan(mContext.getResources().getColor(R.color.color_FFA9A9A9)); - stringBuilder.setSpan(redSpan, surplusTxt.length(), surplusTxt.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);//修改最后两个字体的颜色 - viewHolder.tv_gift_price.setText(stringBuilder); -// viewHolder.item_layout.setTag(R.id.id_gift_tag, giftModel); - - //加载礼物图片 - ImageUtils.loadImageView(giftModel.getBase_image(), viewHolder.iv_gift_pic); - //设置选中后的样式 - - if (giftModel.isChecked()) {//被选中 - viewHolder.cl_iv_down_on.setBackgroundResource(R.mipmap.room_gift_bjx); - viewHolder.ivDownOn.setVisibility(View.GONE); - } else { - viewHolder.ivDownOn.setVisibility(View.GONE); - viewHolder.cl_iv_down_on.setBackgroundResource(0); - } - //设置 -// //设置礼物心动值 -// if (giftModel.getCardiac().equals("0")) { -// viewHolder.tv_gift_change_love_values.setBackgroundResource(R.mipmap.room_gift_xin_dong_reduce); -// viewHolder.tv_gift_change_love_values.setText(String.format("%s", giftModel.getCardiac())); +// }); +// if (giftModel.getIs_lock() == 0) { +// viewHolder.iv_gift_select.setVisibility(GONE); // } else { -// viewHolder.tv_gift_change_love_values.setBackgroundResource(R.mipmap.room_gift_xin_dong_add); -// viewHolder.tv_gift_change_love_values.setText(String.format("+%s", giftModel.getCardiac())); +// viewHolder.iv_gift_select.setVisibility(VISIBLE); // } -// if (giftModel.isManghe()) { -// viewHolder.tv_gift_change_love_values.setVisibility(View.GONE); +// if (TextUtils.isEmpty(giftModel.getIcon())) { +// viewHolder.im_heart.setVisibility(GONE); +// }else { +// viewHolder.im_heart.setVisibility(VISIBLE); +// ImageUtils.loadHead(giftModel.getIcon(), viewHolder.im_heart); // } - if (giftModel.getGift_bag() == 10) { - - viewHolder.item_layout.setBackgroundResource(R.mipmap.gift_tkzj); - viewHolder.tv_gift_name.setText(""); - viewHolder.tv_gift_name.setBackgroundResource(R.mipmap.gift_name_tkzj); - } else if (giftModel.getGift_bag() == 11) { - viewHolder.tv_gift_name.setText(""); - viewHolder.item_layout.setBackgroundResource(R.mipmap.gift_syzc); - viewHolder.tv_gift_name.setBackgroundResource(R.mipmap.gift_name_syzc); - } else if (giftModel.getGift_bag() == 12) { - viewHolder.tv_gift_name.setText(""); - viewHolder.item_layout.setBackgroundResource(R.mipmap.gift_sjzd); - viewHolder.tv_gift_name.setBackgroundResource(R.mipmap.gift_name_skzd); - } - return convertView; - } - - - static class ViewHolder { - public ConstraintLayout item_layout; - public TextView tv_gift_name, tv_gift_price, tv_gift_num; - public ImageView iv_gift_pic; - public TextView tv_gift_change_love_values; - public ImageView ivDownOn; - public ImageView iv_gift_select; - public ImageView im_heart; - public ConstraintLayout cl_iv_down_on; - } +// +//// if (giftModel.getIs_cp() == 0 && giftModel.getIs_teacher() == 0 ) {//这是cp礼物 +//// viewHolder.im_heart.setVisibility(GONE); +//// } else { +//// if (viewHolder.im_heart != null) { +//// viewHolder.im_heart.setVisibility(VISIBLE); +//// if (giftModel.getIs_cp() == 1) { +//// viewHolder.im_heart.setImageResource(R.mipmap.icon_heart); +//// }else if (giftModel.getIs_teacher() == 1) { +//// viewHolder.im_heart.setImageResource(R.mipmap.icon_teacher); +//// } +//// } +//// } +// +// +// /* +// * 在给View绑定显示的数据时，计算正确的position = position + curIndex * pageSize， +// */ +//// viewHolder.tv_gift_num.setVisibility(type.equals("1") ? View.VISIBLE : View.INVISIBLE); +//// viewHolder.tv_gift_change_love_values.setVisibility(View.GONE); +// +// +// //设置礼物名字 +// viewHolder.tv_gift_name.setText(giftModel.getGift_name()); +// //设置礼物价格 +// String surplusTxt = giftModel.getGift_price(); +// SpannableStringBuilder stringBuilder = new SpannableStringBuilder(surplusTxt); +// //ForegroundColorSpan 为文字前景色，BackgroundColorSpan为文字背景色 +// ForegroundColorSpan redSpan = new ForegroundColorSpan(mContext.getResources().getColor(R.color.color_FFA9A9A9)); +// stringBuilder.setSpan(redSpan, surplusTxt.length(), surplusTxt.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);//修改最后两个字体的颜色 +// viewHolder.tv_gift_price.setText(stringBuilder); +//// viewHolder.item_layout.setTag(R.id.id_gift_tag, giftModel); +// +// //加载礼物图片 +// ImageUtils.loadImageView(giftModel.getBase_image(), viewHolder.iv_gift_pic); +// //设置选中后的样式 +// +// if (giftModel.isChecked()) {//被选中 +// viewHolder.cl_iv_down_on.setBackgroundResource(R.mipmap.room_gift_bjx); +// viewHolder.ivDownOn.setVisibility(View.GONE); +// } else { +// viewHolder.ivDownOn.setVisibility(View.GONE); +// viewHolder.cl_iv_down_on.setBackgroundResource(0); +// } +// //设置 +//// //设置礼物心动值 +//// if (giftModel.getCardiac().equals("0")) { +//// viewHolder.tv_gift_change_love_values.setBackgroundResource(R.mipmap.room_gift_xin_dong_reduce); +//// viewHolder.tv_gift_change_love_values.setText(String.format("%s", giftModel.getCardiac())); +//// } else { +//// viewHolder.tv_gift_change_love_values.setBackgroundResource(R.mipmap.room_gift_xin_dong_add); +//// viewHolder.tv_gift_change_love_values.setText(String.format("+%s", giftModel.getCardiac())); +//// } +//// if (giftModel.isManghe()) { +//// viewHolder.tv_gift_change_love_values.setVisibility(View.GONE); +//// } +// if (giftModel.getGift_bag() == 10) { +// +// viewHolder.item_layout.setBackgroundResource(R.mipmap.gift_tkzj); +// viewHolder.tv_gift_name.setText(""); +// viewHolder.tv_gift_name.setBackgroundResource(R.mipmap.gift_name_tkzj); +// } else if (giftModel.getGift_bag() == 11) { +// viewHolder.tv_gift_name.setText(""); +// viewHolder.item_layout.setBackgroundResource(R.mipmap.gift_syzc); +// viewHolder.tv_gift_name.setBackgroundResource(R.mipmap.gift_name_syzc); +// } else if (giftModel.getGift_bag() == 12) { +// viewHolder.tv_gift_name.setText(""); +// viewHolder.item_layout.setBackgroundResource(R.mipmap.gift_sjzd); +// viewHolder.tv_gift_name.setBackgroundResource(R.mipmap.gift_name_skzd); +// } +// return convertView; +// } +// +// +// static class ViewHolder { +// public ConstraintLayout item_layout; +// public TextView tv_gift_name, tv_gift_price, tv_gift_num; +// public ImageView iv_gift_pic; +// public TextView tv_gift_change_love_values; +// public ImageView ivDownOn; +// public ImageView iv_gift_select; +// public ImageView im_heart; +// public ConstraintLayout cl_iv_down_on; +// } } diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/adapter/GiftTwoDetailsFragment.java b/BaseModule/src/main/java/com/xscm/moduleutil/adapter/GiftTwoDetailsFragment.java index 77c6c65b..d831f89e 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/adapter/GiftTwoDetailsFragment.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/adapter/GiftTwoDetailsFragment.java @@ -79,7 +79,7 @@ public class GiftTwoDetailsFragment extends BaseMvpFragment 0) { roomAdapter = new GiftRoomAdapter(CommonAppContext.getInstance(), data, 0, "0"); mBinding.rvGift.setAdapter(roomAdapter); + roomAdapter.setNewData(data); } } @@ -223,6 +225,11 @@ public class GiftTwoDetailsFragment extends BaseMvpFragment rewardUserBeanList) { @@ -300,7 +307,7 @@ public class GiftTwoDetailsFragment extends BaseMvpFragment> getAlbumDetail(@Field("album_id") String albumId, @Field("pwd") String pwd, @Field("page") String page, @Field("page_limit") String page_limit); - @GET(Constants.GET_PERSONALTY) - Call>> getPersonaltyList(); + @GET(Constants.GET_PERSONALTY) // from 来源: 1:道具商城 2：个性装扮 + Call>> getPersonaltyList(@Query("from")String frome); @FormUrlEncoded @POST(Constants.GET_SUBSIDY) @@ -950,6 +950,10 @@ public interface ApiServer { @GET(Constants.GET_GIFT_PACK_LIST_COUNT) Call> getGiftPackListCount(); + @FormUrlEncoded + @POST(Constants.POST_ROOM_HOT_CARD) + Call> roomHotCard(@Field("udid") String udid, @Field("room_id") String room_id, @Field("num") String num); + @GET(Constants.GET_GIFT_INFO_TA) Call> getGiftInfoTa(@Query("room_id") String roomId, @Query("to_user_id") String user_id); 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 41550702..2243f78c 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java @@ -1296,6 +1296,34 @@ public class RetrofitClient { }); } + public void roomHotCard(String udid, String room_id, String num, BaseObserver observer) { + sApiServer.roomHotCard(udid, room_id, num).enqueue(new Callback>(){ + + @Override + public void onResponse(Call> call, Response> response) { + if (response.code() == 200) { + BaseModel baseModel = response.body(); + if (baseModel.getCode() == 1) { + ToastUtils.showLong(baseModel.getMsg()); + observer.onNext(baseModel.getMsg()); + } else if (baseModel.getCode() == 301) { + setCode301(baseModel.getMsg()); + } else if (baseModel.getCode() == 0) { + ToastUtils.showLong(baseModel.getMsg()); + } + }else { + ToastUtils.showLong("使用热度卡出现错误", response.code()); + LogUtils.e("roomHotCard", response.message()); + } + } + + @Override + public void onFailure(Call> call, Throwable t) { + LogUtils.e("roomHotCard", t.fillInStackTrace()); + } + }); + } + public void getGiftInfoTa(String roomId, String userId, BaseObserver observer) { sApiServer.getGiftInfoTa(roomId, userId).enqueue(new Callback>() { @@ -2917,8 +2945,8 @@ public class RetrofitClient { // sApiServer.getSubsidyDetail(roomId).compose(new DefaultTransformer<>()).subscribe(observer); } - public void getPersonaltyList(BaseObserver> observer) { - sApiServer.getPersonaltyList().enqueue(new Callback>>() { + public void getPersonaltyList(String from,BaseObserver> observer) { + sApiServer.getPersonaltyList(from).enqueue(new Callback>>() { @Override public void onResponse(Call>> call, Response>> response) { if (response.code() == 200) { diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/presenter/RewardGiftContacts.java b/BaseModule/src/main/java/com/xscm/moduleutil/presenter/RewardGiftContacts.java index 4842bfa3..7a7c9cf4 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/presenter/RewardGiftContacts.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/presenter/RewardGiftContacts.java @@ -32,6 +32,8 @@ public class RewardGiftContacts { void getGiftPack(String s); void getGiftPackListCount(GiftPackListCount giftPackListCount); + + void roomHotCard(); } public interface IIndexPre extends IPresenter { @@ -57,5 +59,7 @@ public class RewardGiftContacts { void getGiftPack(String roomId,String userId,String heart_id,String auction_id ); void getGiftPackListCount(); + + void roomHotCard(String udid,String room_id,String num); } } diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/presenter/RewardGiftPresenter.java b/BaseModule/src/main/java/com/xscm/moduleutil/presenter/RewardGiftPresenter.java index 21aa53e8..b6574f16 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/presenter/RewardGiftPresenter.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/presenter/RewardGiftPresenter.java @@ -252,4 +252,23 @@ public class RewardGiftPresenter extends BasePresenter } }); } + + @Override + public void roomHotCard(String udid, String room_id, String num) { + RetrofitClient.getInstance().roomHotCard(udid, room_id, num, new BaseObserver() { + + @Override + public void onSubscribe(Disposable d) { + addDisposable(d); + } + + @Override + public void onNext(String s) { + if (MvpRef == null) { + MvpRef = new WeakReference<>(mView); + } + MvpRef.get().roomHotCard(); + } + }); + } } diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/widget/Constants.java b/BaseModule/src/main/java/com/xscm/moduleutil/widget/Constants.java index a36da93f..6daa1fb0 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/widget/Constants.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/widget/Constants.java @@ -434,6 +434,7 @@ public class Constants { public static final String POST_GIFT_ALL_CLEAR = "/api/Room/room_gift_all_clear";//背包礼物全清 public static final String POST_ROOM_USER_CHARM_LIST = "/api/Room/room_user_charm_list";//房间用户当前魅力值列表 public static final String GET_GIFT_PACK_LIST_COUNT = "/api/UserGiftPack/get_gift_pack_list_count";//背包礼物总价值 + public static final String POST_ROOM_HOT_CARD = "/api/Decorate/room_hot_card";//用户房间热度卡使用 public static final String ROOM_USER_RECONNECT = "/api/Room/user_reconnect";//用户重连 public static final String USER_ROOM_BACK = "/api/Room/user_in_room_background";//用户在房间内切后台保留数据操作 public static final String ROOM_HOUR_BEAN = "/api/RoomHourRanking/room_hour_ranking";//房间小时榜 diff --git a/BaseModule/src/main/java/com/xscm/moduleutil/widget/dialog/RewardDialogFragment.java b/BaseModule/src/main/java/com/xscm/moduleutil/widget/dialog/RewardDialogFragment.java index 467ad1b0..d392bb6a 100644 --- a/BaseModule/src/main/java/com/xscm/moduleutil/widget/dialog/RewardDialogFragment.java +++ b/BaseModule/src/main/java/com/xscm/moduleutil/widget/dialog/RewardDialogFragment.java @@ -202,4 +202,9 @@ public class RewardDialogFragment extends BaseMvpDialogFragment + xmlns:app="http://schemas.android.com/apk/res-auto"> - diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/GroupChatSettingsActivity.kt b/MainModule/src/main/java/com/xscm/modulemain/activity/GroupChatSettingsActivity.kt index 6a86b66d..54112bcb 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/GroupChatSettingsActivity.kt +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/GroupChatSettingsActivity.kt @@ -84,11 +84,13 @@ class GroupChatSettingsActivity : mBinding?.switJy?.setOnCheckedChangeListener { compoundButton, b -> v2TIMGroupManager?.muteAllGroupMembers(groupId, b, object : V2TIMCallback { override fun onSuccess() { - mBinding?.switJy?.isChecked = !b +// mBinding?.switJy?.isChecked = !b + ToastUtils.showLong(if (b) "已开启全员禁言" else "已关闭全员禁言") } override fun onError(code: Int, desc: String?) { - + mBinding?.switJy?.isChecked = !b + ToastUtils.showLong("禁言失败",code,desc) } }) } diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/MyBagActivity.java b/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/MyBagActivity.java index 0c9f7015..8e8ba49e 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/MyBagActivity.java +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/user/activity/MyBagActivity.java @@ -6,6 +6,7 @@ import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentStatePagerAdapter; import com.xscm.modulemain.R; +import com.xscm.modulemain.activity.user.fragment.mybag.HeatCardFragment; import com.xscm.modulemain.databinding.ActivityMyBagBinding; import com.xscm.modulemain.activity.user.conacts.MyBagConacts; import com.xscm.modulemain.activity.user.fragment.mybag.MyBagFragment; @@ -15,6 +16,7 @@ import com.xscm.modulemain.BaseMvpActivity; import com.xscm.moduleutil.bean.GiftPackBean; import com.xscm.moduleutil.bean.MyBagBean; import com.xscm.moduleutil.bean.MyBagDataBean; +import com.xscm.moduleutil.bean.zhuangb.ZhuangBanShangChengBean; import java.util.ArrayList; import java.util.List; @@ -34,8 +36,9 @@ public class MyBagActivity extends BaseMvpActivity(); list.add(new MyBagBean("背包道具", "1")); - list.add(new MyBagBean("背包收入", "2")); - list.add(new MyBagBean("背包支出", "3")); + list.add(new MyBagBean("热度卡", "2")); + list.add(new MyBagBean("背包收入", "3")); + list.add(new MyBagBean("背包支出", "4")); mBinding.viewPager.setAdapter(new MyFragmentPagerAdapter(getSupportFragmentManager(), list)); mBinding.slidingTabLayout.setViewPager(mBinding.viewPager); @@ -72,6 +75,11 @@ public class MyBagActivity extends BaseMvpActivity zhuangBanShangChengBeans, int tabIndex) { + + } + private static class MyFragmentPagerAdapter extends FragmentStatePagerAdapter { @@ -88,7 +96,9 @@ public class MyBagActivity extends BaseMvpActivity(), PersonalityConacts.View { + * @Author qx + * @Time 2026/1/3 17:08 + * @Description 道具商城 + */ +class PropMallActivity : BaseMvpActivity(), + PersonalityConacts.View { private lateinit var sectionsPagerAdapter: SectionsPagerAdapter + private var id: String = "" + override fun bindPresenter(): PersonalityPresenter { - return PersonalityPresenter(this,this) + return PersonalityPresenter(this, this) } override fun initData() { // 加载道具商城数据 - - mBinding.topBar.tvTitle.text="道具商城" + id = intent.getStringExtra("id") ?: "" + mBinding.topBar.tvTitle.text = "道具商城" MvpPre.getBanners("7") - MvpPre.getPersonaltyList() + MvpPre.getPersonaltyList("1") mBinding.banner.loadImage(object : XBannerAdapter { override fun loadBanner(banner: XBanner?, model: Any?, view: View?, position: Int) { @@ -77,7 +80,8 @@ class PropMallActivity : BaseMvpActivity?) { - sectionsPagerAdapter = SectionsPagerAdapter( this, + sectionsPagerAdapter = SectionsPagerAdapter( + this, personaltyBean as List ) mBinding.viewPager.adapter = sectionsPagerAdapter @@ -113,6 +117,13 @@ class PropMallActivity : BaseMvpActivity= 0 && position < (mBinding.viewPager.adapter?.itemCount ?: 0)) { + // 设置ViewPager的当前页面 + mBinding.viewPager.setCurrentItem(position, true) + + // 如果有TabLayout，也同步更新 + mBinding.slidingTabLayout?.getTabAt(position)?.select() + } } override fun setBanners(bannerModels: List?) { - if (bannerModels!=null) { - mBinding.banner.visibility= View.VISIBLE + if (bannerModels != null) { + mBinding.banner.visibility = View.VISIBLE mBinding.banner.setBannerData(R.layout.index_image_banner, bannerModels!!) - }else{ - mBinding.banner.visibility= View.GONE + } else { + mBinding.banner.visibility = View.GONE } } diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/user/conacts/MyBagConacts.java b/MainModule/src/main/java/com/xscm/modulemain/activity/user/conacts/MyBagConacts.java index 42527cb4..29452b55 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/user/conacts/MyBagConacts.java +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/user/conacts/MyBagConacts.java @@ -6,6 +6,7 @@ import com.xscm.moduleutil.activity.IPresenter; import com.xscm.moduleutil.activity.IView; import com.xscm.moduleutil.bean.GiftPackBean; import com.xscm.moduleutil.bean.MyBagDataBean; +import com.xscm.moduleutil.bean.zhuangb.ZhuangBanShangChengBean; import java.util.List; @@ -16,11 +17,16 @@ public class MyBagConacts { void packOutcome(List myBagDataBean); void giftPack(List giftPackBean); void finishRefreshLoadMore(); + + void getDecorateList(List zhuangBanShangChengBeans, int tabIndex); + } public interface IMePre extends IPresenter { void packIncome(String page,String page_limit); void packOutcome(String page,String page_limit); void giftPack(); + + void getDecorateList(String type,int tabIndex); } } diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/user/conacts/PersonalityConacts.java b/MainModule/src/main/java/com/xscm/modulemain/activity/user/conacts/PersonalityConacts.java index 079ab62a..cf29aaa0 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/user/conacts/PersonalityConacts.java +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/user/conacts/PersonalityConacts.java @@ -19,7 +19,7 @@ public class PersonalityConacts { } public interface IMePre extends IPresenter { - void getPersonaltyList(); + void getPersonaltyList(String from); void getPersonaltyListBean(String type); } diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/mybag/HeatCardFragment.kt b/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/mybag/HeatCardFragment.kt new file mode 100644 index 00000000..da4d0edf --- /dev/null +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/mybag/HeatCardFragment.kt @@ -0,0 +1,74 @@ +package com.xscm.modulemain.activity.user.fragment.mybag + +import androidx.recyclerview.widget.GridLayoutManager +import com.blankj.utilcode.util.ActivityUtils +import com.xscm.modulemain.R +import com.xscm.modulemain.activity.user.conacts.MyBagConacts +import com.xscm.modulemain.activity.user.fragment.zhuangb.ZhuangBanShangChengAdapter +import com.xscm.modulemain.activity.user.presenter.MyBagPresenter +import com.xscm.modulemain.databinding.FragmentHeatCardBinding +import com.xscm.moduleutil.base.BaseMvpFragment +import com.xscm.moduleutil.bean.GiftPackBean +import com.xscm.moduleutil.bean.MyBagDataBean +import com.xscm.moduleutil.bean.zhuangb.ZhuangBanShangChengBean + +/** + * 项目名称：羽声语音 + * 时间：2026/1/23 14:07 + * 用途：热度卡fragment + */ +class HeatCardFragment : BaseMvpFragment(), + MyBagConacts.View { + var mAdapter: ZhuangBanShangChengAdapter? =null + + override fun bindPresenter(): MyBagPresenter { + return MyBagPresenter(this, ActivityUtils.getTopActivity()) + } + // 无参构造函数 + + companion object { + fun newInstance(): HeatCardFragment { + return HeatCardFragment() + } + } + + override fun initData() { + MvpPre.getDecorateList("13",0) + + val gridLayoutManager = GridLayoutManager(context, 3) + mAdapter = ZhuangBanShangChengAdapter() + mBinding.recyclerView.setLayoutManager(gridLayoutManager) + mBinding.recyclerView.setAdapter(mAdapter) + + + } + + override fun initView() { + + } + + override fun getLayoutId(): Int { + return R.layout.fragment_heat_card + } + + override fun packIncome(myBagDataBean: List?) { + } + + override fun packOutcome(myBagDataBean: List?) { + } + + override fun giftPack(giftPackBean: List?) { + } + + override fun finishRefreshLoadMore() { + } + + override fun getDecorateList( + zhuangBanShangChengBeans: List?, + tabIndex: Int + ) { + mAdapter?.setNewData(zhuangBanShangChengBeans) + } + + +} \ No newline at end of file diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/mybag/MyBagFragment.java b/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/mybag/MyBagFragment.java index 222f2694..d3d3c93f 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/mybag/MyBagFragment.java +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/mybag/MyBagFragment.java @@ -87,4 +87,9 @@ public class MyBagFragment extends BaseMvpFragment zhuangBanShangChengBeans, int tabIndex) { + + } } diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/mybag/MyBagListFragment.java b/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/mybag/MyBagListFragment.java index 9093b0ae..a5fc9731 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/mybag/MyBagListFragment.java +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/mybag/MyBagListFragment.java @@ -14,6 +14,7 @@ import com.xscm.modulemain.activity.user.presenter.MyBagPresenter; import com.xscm.moduleutil.base.BaseMvpFragment; import com.xscm.moduleutil.bean.GiftPackBean; import com.xscm.moduleutil.bean.MyBagDataBean; +import com.xscm.moduleutil.bean.zhuangb.ZhuangBanShangChengBean; import java.util.List; @@ -39,17 +40,17 @@ public class MyBagListFragment extends BaseMvpFragment zhuangBanShangChengBeans, int tabIndex) { + + } } diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/zhuangb/ZhuangBanShangChengAdapter.java b/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/zhuangb/ZhuangBanShangChengAdapter.java index 3ea23695..b02a3f80 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/zhuangb/ZhuangBanShangChengAdapter.java +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/user/fragment/zhuangb/ZhuangBanShangChengAdapter.java @@ -1,6 +1,7 @@ package com.xscm.modulemain.activity.user.fragment.zhuangb; import android.view.View; +import android.widget.LinearLayout; import android.widget.TextView; import com.chad.library.adapter.base.BaseQuickAdapter; @@ -33,20 +34,40 @@ public class ZhuangBanShangChengAdapter extends BaseQuickAdapter implements } }); } + + @Override + public void getDecorateList(String type,int tabIndex) { + api.getDecorateList(type, new BaseObserver>() { + @Override + public void onSubscribe(Disposable d) { + addDisposable(d); + } + + @Override + public void onNext(List zhuangBanShangChengBeans) { + if (MvpRef == null) { + MvpRef = new WeakReference<>(mView); + } + MvpRef.get().getDecorateList(zhuangBanShangChengBeans, tabIndex); + } + }); + } } diff --git a/MainModule/src/main/java/com/xscm/modulemain/activity/user/presenter/PersonalityPresenter.java b/MainModule/src/main/java/com/xscm/modulemain/activity/user/presenter/PersonalityPresenter.java index e3a68a96..ad2e6005 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/activity/user/presenter/PersonalityPresenter.java +++ b/MainModule/src/main/java/com/xscm/modulemain/activity/user/presenter/PersonalityPresenter.java @@ -25,8 +25,8 @@ public class PersonalityPresenter extends BasePresenter } @Override - public void getPersonaltyList() { - api.getPersonaltyList(new BaseObserver>() { + public void getPersonaltyList(String from) { + api.getPersonaltyList(from,new BaseObserver>() { @Override public void onSubscribe(Disposable d) { addDisposable(d); diff --git a/MainModule/src/main/java/com/xscm/modulemain/dialog/PurchaseOutfitsDialog.kt b/MainModule/src/main/java/com/xscm/modulemain/dialog/PurchaseOutfitsDialog.kt index b5205a17..4f8fd649 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/dialog/PurchaseOutfitsDialog.kt +++ b/MainModule/src/main/java/com/xscm/modulemain/dialog/PurchaseOutfitsDialog.kt @@ -148,7 +148,7 @@ class PurchaseOutfitsDialog(context: Context) : startActivity(Intent(context, RechargeActivity::class.java)) } if (personaltyListBean != null) { - if (personaltyListBean?.type == 12) { + if (personaltyListBean?.type == 12 || personaltyListBean?.type == 13) { mBinding.ivOutfits.visibility = View.GONE mBinding.imJsk.visibility = View.VISIBLE mBinding.imageHeadPortrait.visibility= View.GONE diff --git a/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomGiftDialogFragment.java b/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomGiftDialogFragment.java index edc8d851..b7207240 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomGiftDialogFragment.java +++ b/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomGiftDialogFragment.java @@ -1,5 +1,8 @@ package com.xscm.modulemain.dialog; +import static android.view.View.GONE; +import static android.view.View.VISIBLE; + import android.app.Dialog; import android.content.Context; import android.content.Intent; @@ -26,6 +29,7 @@ import com.blankj.utilcode.util.LogUtils; import com.hjq.toast.ToastUtils; import com.xscm.modulemain.Application; import com.xscm.modulemain.R; +import com.xscm.modulemain.activity.user.activity.PropMallActivity; import com.xscm.modulemain.adapter.GiftUserAdapter; import com.xscm.modulemain.databinding.RoomGiftDialogBinding; import com.xscm.modulemain.activity.WebViewActivity; @@ -93,6 +97,9 @@ public class RoomGiftDialogFragment extends BaseMvpDialogFragment 1) { - ToastUtils.show("一键全送只能选择一个用户"); - return; - } - if (userInfo != null) { - if (userInfo.getAuction_id() != null) { - auction_id = userInfo.getAuction_id(); - } else { - auction_id = ""; + } else if (view1.getId() == R.id.tv_bb_qs) {//一键全送，当是热度卡的时候，这里显示的是一件全使用，不需要选择人员的 + if (isCard) { + queren2("", "1"); + } else { + int count = gifyuseradapter.getSelectCount(); + if (count <= 0) { + ToastUtils.show("请选择打赏的用户"); + return; } + if (gifyuseradapter.getUserIdCount() > 1) { + ToastUtils.show("一键全送只能选择一个用户"); + return; + } + if (userInfo != null) { + if (userInfo.getAuction_id() != null) { + auction_id = userInfo.getAuction_id(); + } else { + auction_id = ""; + } + } + queren(); } - queren(); } } + private void queren2(String udid, String num) { + // 创建并显示确认对话框 + new ConfirmDialog(ActivityUtils.getTopActivity(), + "提示", + "是否是全部使用？", + "确认", + "取消", + v -> { + // 点击“确认”按钮时执行删除操作 + MvpPre.roomHotCard(udid, roomId, num); + }, + v -> { + // 点击“取消”按钮时什么都不做 + }, false, 0).show(); + } + private void queren() { // 创建并显示确认对话框 new ConfirmDialog(ActivityUtils.getTopActivity(), @@ -498,14 +543,14 @@ public class RoomGiftDialogFragment extends BaseMvpDialogFragment rewardUserBeanList) { if (rewardUserBeanList != null && !rewardUserBeanList.isEmpty()) { - mBinding.rvGiftUser.setVisibility(View.VISIBLE); + mBinding.rvGiftUser.setVisibility(VISIBLE); int limit = Math.min(rewardUserBeanList.size(), 6); List limitedList = rewardUserBeanList.subList(0, limit); gifyuseradapter.setNewData(limitedList); @@ -785,7 +830,7 @@ public class RoomGiftDialogFragment extends BaseMvpDialogFragment list; diff --git a/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomWheatGiftSettingFragment.java b/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomWheatGiftSettingFragment.java index 9837bd4f..ade946fc 100644 --- a/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomWheatGiftSettingFragment.java +++ b/MainModule/src/main/java/com/xscm/modulemain/dialog/RoomWheatGiftSettingFragment.java @@ -224,6 +224,11 @@ public class RoomWheatGiftSettingFragment extends BaseMvpDialogFragment fragmentList; diff --git a/MainModule/src/main/res/layout/dialog_gift_song.xml b/MainModule/src/main/res/layout/dialog_gift_song.xml index 9936e477..0f4ba657 100644 --- a/MainModule/src/main/res/layout/dialog_gift_song.xml +++ b/MainModule/src/main/res/layout/dialog_gift_song.xml @@ -19,13 +19,15 @@ > - + + + + + + + + + + + + \ No newline at end of file diff --git a/MainModule/src/main/res/layout/item_zhuangbanschangcheng_list.xml b/MainModule/src/main/res/layout/item_zhuangbanschangcheng_list.xml index 33601c8e..f7ba0b5e 100644 --- a/MainModule/src/main/res/layout/item_zhuangbanschangcheng_list.xml +++ b/MainModule/src/main/res/layout/item_zhuangbanschangcheng_list.xml @@ -6,19 +6,26 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="vertical" - android:padding="8dp"> + android:layout_margin="8dp"> + + + + + + + + +