diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/adapter/GiftTwoDetailsFragment.java b/moduleUtil/src/main/java/com/xscm/moduleutil/adapter/GiftTwoDetailsFragment.java index 6d577c4..aba27a4 100644 --- a/moduleUtil/src/main/java/com/xscm/moduleutil/adapter/GiftTwoDetailsFragment.java +++ b/moduleUtil/src/main/java/com/xscm/moduleutil/adapter/GiftTwoDetailsFragment.java @@ -43,12 +43,14 @@ public class GiftTwoDetailsFragment extends BaseMvpFragment giftList=new ArrayList<>(); private List giftPackList=new ArrayList<>(); + private String roomId; - public static GiftTwoDetailsFragment newInstance(String id,int type) { + public static GiftTwoDetailsFragment newInstance(String id,int type,String roomId) { Bundle args = new Bundle(); args.putString("id", id); args.putInt("type", type); + args.putString("roomId", roomId); GiftTwoDetailsFragment fragment = new GiftTwoDetailsFragment(); fragment.setArguments(args); return fragment; @@ -59,6 +61,7 @@ public class GiftTwoDetailsFragment extends BaseMvpFragment getXlhDataAsList() { @@ -43,7 +43,77 @@ public class BlindBoxBean { public XlhData getXlhDataAsObject() { if (isXlhDataObject()) { - return (XlhData) xlh_data; + // 如果已经是XlhData类型，直接返回 + if (xlh_data instanceof XlhData) { + return (XlhData) xlh_data; + } + // 如果是Map类型（Gson解析后的LinkedTreeMap），手动转换 + else if (xlh_data instanceof Map) { + Map map = (Map) xlh_data; + XlhData xlhData = new XlhData(); + + // 安全地转换各个字段 + Object waitingStartNum = map.get("waiting_start_num"); + if (waitingStartNum != null) { + xlhData.setWaiting_start_num(waitingStartNum.toString()); + } + + Object startNum = map.get("start_num"); + if (startNum != null) { + xlhData.setStart_num(startNum.toString()); + } + + Object currentNum = map.get("current_num"); + if (currentNum != null) { + if (currentNum instanceof Number) { + xlhData.setCurrent_num(((Number) currentNum).intValue()); + } else { + try { + xlhData.setCurrent_num(Integer.parseInt(currentNum.toString())); + } catch (NumberFormatException e) { + xlhData.setCurrent_num(0); + } + } + } + + Object status = map.get("status"); + if (status != null) { + if (status instanceof Number) { + xlhData.setStatus(((Number) status).intValue()); + } else { + try { + xlhData.setStatus(Integer.parseInt(status.toString())); + } catch (NumberFormatException e) { + xlhData.setStatus(0); + } + } + } + + return xlhData; + } + // 如果是JsonObject，也需要转换 + else if (xlh_data instanceof JsonObject) { + JsonObject jsonObject = (JsonObject) xlh_data; + XlhData xlhData = new XlhData(); + + if (jsonObject.has("waiting_start_num")) { + xlhData.setWaiting_start_num(jsonObject.get("waiting_start_num").getAsString()); + } + + if (jsonObject.has("start_num")) { + xlhData.setStart_num(jsonObject.get("start_num").getAsString()); + } + + if (jsonObject.has("current_num")) { + xlhData.setCurrent_num(jsonObject.get("current_num").getAsInt()); + } + + if (jsonObject.has("status")) { + xlhData.setStatus(jsonObject.get("status").getAsInt()); + } + + return xlhData; + } } return null; } diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/bean/room/EMMessageInfo.java b/moduleUtil/src/main/java/com/xscm/moduleutil/bean/room/EMMessageInfo.java index 0e4a1a9..be5aba4 100644 --- a/moduleUtil/src/main/java/com/xscm/moduleutil/bean/room/EMMessageInfo.java +++ b/moduleUtil/src/main/java/com/xscm/moduleutil/bean/room/EMMessageInfo.java @@ -96,6 +96,10 @@ public class EMMessageInfo implements MultiItemEntity { public static final int QXRoomMessageTypeHeartDidChanged = 1054; /// 小黑屋有人退出房间 public static final int QXRoomMessageTypeHeartDid = 1055; + ///盲盒抽奖进度条 + public static final int QXRoomMessageTypeMangH = 1056; + ///巡乐会 + public static final int QXRoomMessageTypeXlh = 1057; private RoomMessageEvent emMessage; private int custom = 0; diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/GiftLotteryDialog.java b/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/GiftLotteryDialog.java index d231527..3f6f3b6 100644 --- a/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/GiftLotteryDialog.java +++ b/moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/GiftLotteryDialog.java @@ -26,6 +26,7 @@ import com.xscm.moduleutil.R; import com.xscm.moduleutil.activity.IPresenter; import com.xscm.moduleutil.base.BaseMvpDialogFragment; import com.xscm.moduleutil.bean.GiftBean; +import com.xscm.moduleutil.bean.RoomMessageEvent; import com.xscm.moduleutil.bean.WalletBean; import com.xscm.moduleutil.bean.blindboxwheel.BlindBoxBean; import com.xscm.moduleutil.bean.blindboxwheel.BlindReslutBean; @@ -37,6 +38,10 @@ import com.xscm.moduleutil.utils.ARouteConstants; import com.xscm.moduleutil.widget.CircularProgressView; import com.xscm.moduleutil.widget.GiftCardView; +import org.greenrobot.eventbus.EventBus; +import org.greenrobot.eventbus.Subscribe; +import org.greenrobot.eventbus.ThreadMode; + import java.io.IOException; import java.util.ArrayList; import java.util.Iterator; @@ -62,7 +67,7 @@ public class GiftLotteryDialog extends BaseMvpDialogFragment allViewsArray ;//视图的集合 + private List allViewsArray;//视图的集合 private int targetIndex;//目标的下标 private List targetArrayIndex = new ArrayList<>();//中奖的下标 private List finishTargetArrayIndex = new ArrayList<>(); @@ -85,7 +90,7 @@ public class GiftLotteryDialog extends BaseMvpDialogFragment reslutListAll = new ArrayList<>(); + private String blind_box_turntable_id = "";//本次抽奖标识id @Override protected GiftLotteryPresenter bindPresenter() { @@ -108,9 +113,12 @@ public class GiftLotteryDialog extends BaseMvpDialogFragment(); + allViewsArray = new ArrayList<>(); mBinding.mirroeSky.getRoot().setVisibility(View.VISIBLE); giftMaxCount = 12; minRoundCount = 6; @@ -203,6 +214,7 @@ public class GiftLotteryDialog extends BaseMvpDialogFragment(); + allViewsArray = new ArrayList<>(); mBinding.cityTime.getRoot().setVisibility(View.VISIBLE); giftMaxCount = 10; minRoundCount = 7; @@ -241,6 +252,7 @@ public class GiftLotteryDialog extends BaseMvpDialogFragment(); + allViewsArray = new ArrayList<>(); mBinding.pinnacleTime.getRoot().setVisibility(View.VISIBLE); giftMaxCount = 10; minRoundCount = 7; @@ -277,6 +289,7 @@ public class GiftLotteryDialog extends BaseMvpDialogFragment= startNum) { + // 已经达到开启条件，显示完整进度或特殊状态 + progress = 100; + progressText = "100%"; + } else { + // 还未达到等待开始条件，计算相对于waiting_start_num的进度 + progress = (int) (((float) currentNum / startNum) * 100); + progressText = progress + "%"; + } + + if (giftBagId.equals("10")) { + circularProgress.setProgress(progress * 10); + mBinding.mirroeSky.tvProgress.setText(progressText); + } else if (giftBagId.equals("11")) { + circularProgress.setProgress(progress * 10); + mBinding.cityTime.tvProgress.setText(progressText); + } else if (giftBagId.equals("12")) { + circularProgress.setProgress(progress * 10); + mBinding.pinnacleTime.tvProgress.setText(progressText); + } + if (xlhData.getStatus() == 0) { + mBinding.mirroeSky.tvStart.setBackgroundResource(R.mipmap.dengt); + mBinding.cityTime.tvStart.setBackgroundResource(R.mipmap.dengt); + mBinding.pinnacleTime.tvStart.setBackgroundResource(R.mipmap.dengt); + } else if (xlhData.getStatus() == 1) { + mBinding.mirroeSky.tvStart.setBackgroundResource(R.mipmap.zhensgh); + mBinding.cityTime.tvStart.setBackgroundResource(R.mipmap.zhensgh); + mBinding.pinnacleTime.tvStart.setBackgroundResource(R.mipmap.zhensgh); + } else if (xlhData.getStatus() == 2) { + mBinding.mirroeSky.tvStart.setBackgroundResource(R.mipmap.jijang); + mBinding.cityTime.tvStart.setBackgroundResource(R.mipmap.zhensgh); + mBinding.pinnacleTime.tvStart.setBackgroundResource(R.mipmap.zhensgh); + } + } + } @Override public void drawGiftListSuccess(BlindReslutBean blindReslutBean) { @@ -606,10 +671,12 @@ public class GiftLotteryDialog extends BaseMvpDialogFragment>> getGiftList(@Query("label") int label); + Observable>> getGiftList(@Query("label") int label,@Query("room_id")String room_id); @GET(Constants.TOPIC_LIST) //获取话题 diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java b/moduleUtil/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java index f409158..b6ee6d0 100644 --- a/moduleUtil/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java +++ b/moduleUtil/src/main/java/com/xscm/moduleutil/http/RetrofitClient.java @@ -917,8 +917,8 @@ public class RetrofitClient { sApiServer.getGiftLabel(have_hot).compose(new DefaultTransformer<>()).subscribe(observer); } - public void getGiftList(int type, BaseObserver> observer) { - sApiServer.getGiftList(type).compose(new DefaultTransformer<>()).subscribe(observer); + public void getGiftList(int type,String roomId, BaseObserver> observer) { + sApiServer.getGiftList(type,roomId).compose(new DefaultTransformer<>()).subscribe(observer); } diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/presenter/RewardGiftContacts.java b/moduleUtil/src/main/java/com/xscm/moduleutil/presenter/RewardGiftContacts.java index a68c762..020b878 100644 --- a/moduleUtil/src/main/java/com/xscm/moduleutil/presenter/RewardGiftContacts.java +++ b/moduleUtil/src/main/java/com/xscm/moduleutil/presenter/RewardGiftContacts.java @@ -34,7 +34,7 @@ public class RewardGiftContacts { void getGiftLabel(String have_hot); - void getGiftList(String id, int type); + void getGiftList(String id, int type,String roomId); void giveGift(String user_id, String gid, String num, String to_uid, String gift_type); diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/presenter/RewardGiftPresenter.java b/moduleUtil/src/main/java/com/xscm/moduleutil/presenter/RewardGiftPresenter.java index b128685..783cd35 100644 --- a/moduleUtil/src/main/java/com/xscm/moduleutil/presenter/RewardGiftPresenter.java +++ b/moduleUtil/src/main/java/com/xscm/moduleutil/presenter/RewardGiftPresenter.java @@ -55,8 +55,8 @@ public class RewardGiftPresenter extends BasePresenter } @Override - public void getGiftList(String id, int type) { - api.getGiftList(Integer.parseInt(id), new BaseObserver>() { + public void getGiftList(String id, int type,String roomId) { + api.getGiftList(Integer.parseInt(id),roomId, new BaseObserver>() { @Override public void onSubscribe(Disposable d) { diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/service/MyMqttService.java b/moduleUtil/src/main/java/com/xscm/moduleutil/service/MyMqttService.java index fa49d56..f233a47 100644 --- a/moduleUtil/src/main/java/com/xscm/moduleutil/service/MyMqttService.java +++ b/moduleUtil/src/main/java/com/xscm/moduleutil/service/MyMqttService.java @@ -49,7 +49,7 @@ public class MyMqttService extends Service implements MyEmqttConnectListener, My private static int qos = 2; // private static String HOST ="tcp://81.70.45.221";//正式 private static String HOST = "tcp://1.13.181.248";//测试 -// private static String HOST = "tcp://47.120.21.132";//测试 + // private static String HOST = "tcp://47.120.21.132";//测试 private static MqttAndroidClient mqttAndroidClient; private MqttConnectOptions mMqttConnectOptions; private static boolean b = true; @@ -60,6 +60,8 @@ public class MyMqttService extends Service implements MyEmqttConnectListener, My private static MyEmqttSubscribeListener mMyEmqttSubscribeListener; private static final String TOPIC_BOSS = "qx_room_topic"; + + private static final String TOPIC_XLH = "qx_xunlehui"; private static final int NOTIFICATION_ID = 1; @@ -228,7 +230,8 @@ public class MyMqttService extends Service implements MyEmqttConnectListener, My @Override public void onFailure(IMqttToken asyncActionToken, Throwable exception) { - if (!TOPIC_BOSS.equals(topic) && mMyEmqttSubscribeListener != null) { + if ((!TOPIC_BOSS.equals(topic) && mMyEmqttSubscribeListener != null) + || (!TOPIC_XLH.equals(topic) && mMyEmqttSubscribeListener != null)) { mMyEmqttSubscribeListener.onSubscribeFailure(); } Logger.e(TAG, "订阅失败：" + topic + ", error: " + exception.getMessage()); @@ -381,6 +384,7 @@ public class MyMqttService extends Service implements MyEmqttConnectListener, My } Logger.e(TAG, "链接状态：", "链接成功"); subscribe(TOPIC_BOSS); + subscribe(TOPIC_XLH); } @Override @@ -411,16 +415,19 @@ public class MyMqttService extends Service implements MyEmqttConnectListener, My try { String messageStr = message.toString(); Logger.e(TAG, "收到的消息", "主题：" + topic + " 收到的消息：" + messageStr); + if (topic.equals(TOPIC_BOSS)) { + // 处理消息 + receiveMessage(topic, messageStr); - // 处理消息 - receiveMessage(topic, messageStr); - - // 通知监听器 - if (mMyEmqttMesgListener != null) { - // 切换到主线程通知 - new Handler(Looper.getMainLooper()).post(() -> { - mMyEmqttMesgListener.messageArrived(topic, messageStr); - }); + // 通知监听器 + if (mMyEmqttMesgListener != null) { + // 切换到主线程通知 + new Handler(Looper.getMainLooper()).post(() -> { + mMyEmqttMesgListener.messageArrived(topic, messageStr); + }); + } + } else if (topic.equals(TOPIC_XLH)) { + receiveXlhMessage(messageStr); } } catch (Exception e) { Log.e(TAG, "处理MQTT消息异常", e); @@ -454,6 +461,25 @@ public class MyMqttService extends Service implements MyEmqttConnectListener, My } }; + private void receiveXlhMessage(String messageStr) { + try { + String newdata = messageStr;//TextLengthUtil.decode(data); + JSONObject jsonObject = JSON.parseObject(newdata); + + int type = jsonObject.getIntValue("type"); + String message = jsonObject.getString("msg"); + + + + // 将事件处理放到主线程执行 + new Handler(Looper.getMainLooper()).post(() -> { + processMessageType(type, message); + }); + } catch (Exception e) { + Log.e(TAG, "解析MQTT消息异常", e); + } + } + private void receiveMessage(String topic, String data) { try { String newdata = data;//TextLengthUtil.decode(data); @@ -640,6 +666,7 @@ public class MyMqttService extends Service implements MyEmqttConnectListener, My } cleanSubscribe(TOPIC_BOSS); + cleanSubscribe(TOPIC_XLH); if (mqttAndroidClient != null) { mqttAndroidClient.disconnect(); //断开连接 mqttAndroidClient.unregisterResources(); @@ -680,16 +707,16 @@ public class MyMqttService extends Service implements MyEmqttConnectListener, My @Override public void messageArrived(String topic, String mesg) { - + LogUtils.e("lxj", "messageArrived:"+mesg); } @Override public void onSubscribeSuccess(String topic) { - + LogUtils.e("lxj", "onSubscribeSuccess:"+topic); } @Override public void onSubscribeFailure() { - + LogUtils.e("lxj", "onSubscribeFailure"); } } \ No newline at end of file diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/widget/AvatarFrameView.java b/moduleUtil/src/main/java/com/xscm/moduleutil/widget/AvatarFrameView.java index dfebb87..253f764 100644 --- a/moduleUtil/src/main/java/com/xscm/moduleutil/widget/AvatarFrameView.java +++ b/moduleUtil/src/main/java/com/xscm/moduleutil/widget/AvatarFrameView.java @@ -367,7 +367,7 @@ public class AvatarFrameView extends FrameLayout implements IAnimListener { // 在主线程中播放动画 mainHandler.post(() -> { if (isTxk) { - mBinding.playView.setLoop(20); + mBinding.playView.setLoop(1); } mBinding.playView.startPlay(downloadedFile); }); @@ -381,7 +381,7 @@ public class AvatarFrameView extends FrameLayout implements IAnimListener { LogUtils.e("有缓存"); // 直接播放缓存文件 if (isTxk) { - mBinding.playView.setLoop(20); + mBinding.playView.setLoop(1); } mBinding.playView.startPlay(file); } diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/widget/GiftCardView.java b/moduleUtil/src/main/java/com/xscm/moduleutil/widget/GiftCardView.java index 62e7324..1534c06 100644 --- a/moduleUtil/src/main/java/com/xscm/moduleutil/widget/GiftCardView.java +++ b/moduleUtil/src/main/java/com/xscm/moduleutil/widget/GiftCardView.java @@ -132,7 +132,7 @@ public class GiftCardView extends FrameLayout { // 设置礼物数量 setCount(giftBean.getGift_price() != null ? giftBean.getGift_price() : "0"); - setmResultTextView(giftBean.getNumber()); + setmResultTextView(giftBean.getCount()); } } diff --git a/moduleUtil/src/main/java/com/xscm/moduleutil/widget/dialog/RewardGiftDialogFragment.java b/moduleUtil/src/main/java/com/xscm/moduleutil/widget/dialog/RewardGiftDialogFragment.java index 8c809ba..52e076c 100644 --- a/moduleUtil/src/main/java/com/xscm/moduleutil/widget/dialog/RewardGiftDialogFragment.java +++ b/moduleUtil/src/main/java/com/xscm/moduleutil/widget/dialog/RewardGiftDialogFragment.java @@ -191,7 +191,7 @@ public class RewardGiftDialogFragment extends BaseMvpDialogFragment giftLabelBeans) { - mBinding.viewPager.setAdapter(new MyFragmentPagerAdapter(getChildFragmentManager(), giftLabelBeans,fragmentList)); + mBinding.viewPager.setAdapter(new MyFragmentPagerAdapter(getChildFragmentManager(), giftLabelBeans,fragmentList,"")); mBinding.slidingTabLayout.setViewPager(mBinding.viewPager); mBinding.slidingTabLayout.setCurrentTab(0); } @@ -291,17 +291,19 @@ public class RewardGiftDialogFragment extends BaseMvpDialogFragment list; private List fragmentList ; + private String roomId; - public MyFragmentPagerAdapter(FragmentManager fm, List list,List fragmentList) { + public MyFragmentPagerAdapter(FragmentManager fm, List list,List fragmentList,String roomId) { super(fm); this.list = list; this.fragmentList = fragmentList; + this.roomId = roomId; } @Override public Fragment getItem(int position) { GiftLabelBean model = list.get(position); - Fragment fragment = GiftTwoDetailsFragment.newInstance(model.getId(), 2); + Fragment fragment = GiftTwoDetailsFragment.newInstance(model.getId(), 2, roomId); fragmentList.add(fragment); // 保存 Fragment 实例 return fragment; } diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/gift_name_skzd.png b/moduleUtil/src/main/res/mipmap-xxxhdpi/gift_name_skzd.png deleted file mode 100644 index e512c06..0000000 Binary files a/moduleUtil/src/main/res/mipmap-xxxhdpi/gift_name_skzd.png and /dev/null differ diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/gift_name_syzc.png b/moduleUtil/src/main/res/mipmap-xxxhdpi/gift_name_syzc.png deleted file mode 100644 index 9d0b9fa..0000000 Binary files a/moduleUtil/src/main/res/mipmap-xxxhdpi/gift_name_syzc.png and /dev/null differ diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/gift_name_tkzj.png b/moduleUtil/src/main/res/mipmap-xxxhdpi/gift_name_tkzj.png deleted file mode 100644 index bafe126..0000000 Binary files a/moduleUtil/src/main/res/mipmap-xxxhdpi/gift_name_tkzj.png and /dev/null differ diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/gift_sjzd.png b/moduleUtil/src/main/res/mipmap-xxxhdpi/gift_sjzd.png deleted file mode 100644 index ed44e9d..0000000 Binary files a/moduleUtil/src/main/res/mipmap-xxxhdpi/gift_sjzd.png and /dev/null differ diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/gift_syzc.png b/moduleUtil/src/main/res/mipmap-xxxhdpi/gift_syzc.png deleted file mode 100644 index cc077d7..0000000 Binary files a/moduleUtil/src/main/res/mipmap-xxxhdpi/gift_syzc.png and /dev/null differ diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/gift_tkzj.png b/moduleUtil/src/main/res/mipmap-xxxhdpi/gift_tkzj.png deleted file mode 100644 index 0412936..0000000 Binary files a/moduleUtil/src/main/res/mipmap-xxxhdpi/gift_tkzj.png and /dev/null differ diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/skzd_left_bj.png b/moduleUtil/src/main/res/mipmap-xxxhdpi/skzd_left_bj.png deleted file mode 100644 index 931b8d9..0000000 Binary files a/moduleUtil/src/main/res/mipmap-xxxhdpi/skzd_left_bj.png and /dev/null differ diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/skzd_left_bj.webp b/moduleUtil/src/main/res/mipmap-xxxhdpi/skzd_left_bj.webp new file mode 100644 index 0000000..d5d7ccb Binary files /dev/null and b/moduleUtil/src/main/res/mipmap-xxxhdpi/skzd_left_bj.webp differ diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/skzd_rigth_bj.png b/moduleUtil/src/main/res/mipmap-xxxhdpi/skzd_rigth_bj.png deleted file mode 100644 index 188f458..0000000 Binary files a/moduleUtil/src/main/res/mipmap-xxxhdpi/skzd_rigth_bj.png and /dev/null differ diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/skzd_rigth_bj.webp b/moduleUtil/src/main/res/mipmap-xxxhdpi/skzd_rigth_bj.webp new file mode 100644 index 0000000..0ab9ae1 Binary files /dev/null and b/moduleUtil/src/main/res/mipmap-xxxhdpi/skzd_rigth_bj.webp differ diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/skzd_w.png b/moduleUtil/src/main/res/mipmap-xxxhdpi/skzd_w.png deleted file mode 100644 index e532b9b..0000000 Binary files a/moduleUtil/src/main/res/mipmap-xxxhdpi/skzd_w.png and /dev/null differ diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/skzd_w.webp b/moduleUtil/src/main/res/mipmap-xxxhdpi/skzd_w.webp new file mode 100644 index 0000000..564c425 Binary files /dev/null and b/moduleUtil/src/main/res/mipmap-xxxhdpi/skzd_w.webp differ diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/skzd_x.png b/moduleUtil/src/main/res/mipmap-xxxhdpi/skzd_x.png deleted file mode 100644 index 75e9d45..0000000 Binary files a/moduleUtil/src/main/res/mipmap-xxxhdpi/skzd_x.png and /dev/null differ diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/skzd_x.webp b/moduleUtil/src/main/res/mipmap-xxxhdpi/skzd_x.webp new file mode 100644 index 0000000..cc806e1 Binary files /dev/null and b/moduleUtil/src/main/res/mipmap-xxxhdpi/skzd_x.webp differ diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/skzj_z_b.png b/moduleUtil/src/main/res/mipmap-xxxhdpi/skzj_z_b.png deleted file mode 100644 index 12db65f..0000000 Binary files a/moduleUtil/src/main/res/mipmap-xxxhdpi/skzj_z_b.png and /dev/null differ diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/skzj_z_b.webp b/moduleUtil/src/main/res/mipmap-xxxhdpi/skzj_z_b.webp new file mode 100644 index 0000000..8f7d7d6 Binary files /dev/null and b/moduleUtil/src/main/res/mipmap-xxxhdpi/skzj_z_b.webp differ diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/skzl_jc.png b/moduleUtil/src/main/res/mipmap-xxxhdpi/skzl_jc.png deleted file mode 100644 index 3abdfbb..0000000 Binary files a/moduleUtil/src/main/res/mipmap-xxxhdpi/skzl_jc.png and /dev/null differ diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/skzl_jc.webp b/moduleUtil/src/main/res/mipmap-xxxhdpi/skzl_jc.webp new file mode 100644 index 0000000..9343348 Binary files /dev/null and b/moduleUtil/src/main/res/mipmap-xxxhdpi/skzl_jc.webp differ diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/skzl_jl.png b/moduleUtil/src/main/res/mipmap-xxxhdpi/skzl_jl.png deleted file mode 100644 index ca4899e..0000000 Binary files a/moduleUtil/src/main/res/mipmap-xxxhdpi/skzl_jl.png and /dev/null differ diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/skzl_jl.webp b/moduleUtil/src/main/res/mipmap-xxxhdpi/skzl_jl.webp new file mode 100644 index 0000000..f629186 Binary files /dev/null and b/moduleUtil/src/main/res/mipmap-xxxhdpi/skzl_jl.webp differ diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/syzc_jc.png b/moduleUtil/src/main/res/mipmap-xxxhdpi/syzc_jc.png deleted file mode 100644 index 26cc7ba..0000000 Binary files a/moduleUtil/src/main/res/mipmap-xxxhdpi/syzc_jc.png and /dev/null differ diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/syzc_jc.webp b/moduleUtil/src/main/res/mipmap-xxxhdpi/syzc_jc.webp new file mode 100644 index 0000000..640140f Binary files /dev/null and b/moduleUtil/src/main/res/mipmap-xxxhdpi/syzc_jc.webp differ diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/syzc_jl.png b/moduleUtil/src/main/res/mipmap-xxxhdpi/syzc_jl.png deleted file mode 100644 index 2539003..0000000 Binary files a/moduleUtil/src/main/res/mipmap-xxxhdpi/syzc_jl.png and /dev/null differ diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/syzc_jl.webp b/moduleUtil/src/main/res/mipmap-xxxhdpi/syzc_jl.webp new file mode 100644 index 0000000..ef8996f Binary files /dev/null and b/moduleUtil/src/main/res/mipmap-xxxhdpi/syzc_jl.webp differ diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/syzc_left_bj.png b/moduleUtil/src/main/res/mipmap-xxxhdpi/syzc_left_bj.png deleted file mode 100644 index 96fbd1a..0000000 Binary files a/moduleUtil/src/main/res/mipmap-xxxhdpi/syzc_left_bj.png and /dev/null differ diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/syzc_left_bj.webp b/moduleUtil/src/main/res/mipmap-xxxhdpi/syzc_left_bj.webp new file mode 100644 index 0000000..0da9b78 Binary files /dev/null and b/moduleUtil/src/main/res/mipmap-xxxhdpi/syzc_left_bj.webp differ diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/syzc_rigth_bj.png b/moduleUtil/src/main/res/mipmap-xxxhdpi/syzc_rigth_bj.png deleted file mode 100644 index 821e805..0000000 Binary files a/moduleUtil/src/main/res/mipmap-xxxhdpi/syzc_rigth_bj.png and /dev/null differ diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/syzc_rigth_bj.webp b/moduleUtil/src/main/res/mipmap-xxxhdpi/syzc_rigth_bj.webp new file mode 100644 index 0000000..b1a7bdc Binary files /dev/null and b/moduleUtil/src/main/res/mipmap-xxxhdpi/syzc_rigth_bj.webp differ diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/syzc_w.png b/moduleUtil/src/main/res/mipmap-xxxhdpi/syzc_w.png deleted file mode 100644 index d8c2614..0000000 Binary files a/moduleUtil/src/main/res/mipmap-xxxhdpi/syzc_w.png and /dev/null differ diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/syzc_w.webp b/moduleUtil/src/main/res/mipmap-xxxhdpi/syzc_w.webp new file mode 100644 index 0000000..5110cb5 Binary files /dev/null and b/moduleUtil/src/main/res/mipmap-xxxhdpi/syzc_w.webp differ diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/syzc_x.png b/moduleUtil/src/main/res/mipmap-xxxhdpi/syzc_x.png deleted file mode 100644 index 6561628..0000000 Binary files a/moduleUtil/src/main/res/mipmap-xxxhdpi/syzc_x.png and /dev/null differ diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/syzc_x.webp b/moduleUtil/src/main/res/mipmap-xxxhdpi/syzc_x.webp new file mode 100644 index 0000000..9a08b47 Binary files /dev/null and b/moduleUtil/src/main/res/mipmap-xxxhdpi/syzc_x.webp differ diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/syzc_z_b.png b/moduleUtil/src/main/res/mipmap-xxxhdpi/syzc_z_b.png deleted file mode 100644 index f996bc6..0000000 Binary files a/moduleUtil/src/main/res/mipmap-xxxhdpi/syzc_z_b.png and /dev/null differ diff --git a/moduleUtil/src/main/res/mipmap-xxxhdpi/syzc_z_b.webp b/moduleUtil/src/main/res/mipmap-xxxhdpi/syzc_z_b.webp new file mode 100644 index 0000000..7959a1b Binary files /dev/null and b/moduleUtil/src/main/res/mipmap-xxxhdpi/syzc_z_b.webp differ diff --git a/moduleroom/src/main/java/com/example/moduleroom/activity/RoomActivity.java b/moduleroom/src/main/java/com/example/moduleroom/activity/RoomActivity.java index b93a6f8..827bb6d 100644 --- a/moduleroom/src/main/java/com/example/moduleroom/activity/RoomActivity.java +++ b/moduleroom/src/main/java/com/example/moduleroom/activity/RoomActivity.java @@ -2,6 +2,7 @@ package com.example.moduleroom.activity; import static android.app.PendingIntent.getActivity; import static android.view.View.GONE; +import static android.view.View.INVISIBLE; import static android.view.View.VISIBLE; import static com.liulishuo.okdownload.OkDownloadProvider.context; @@ -57,6 +58,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter; import com.example.moduleroom.R; import com.example.moduleroom.contacts.RoomContacts; import com.example.moduleroom.databinding.ActivityRoomBinding; +import com.example.moduleroom.dialog.CardRelationshipFragment; import com.example.moduleroom.dialog.ExitRoomBottomSheet; import com.example.moduleroom.dialog.FriendsDialogFragment; import com.example.moduleroom.dialog.PublishCommentDialogFragment; @@ -83,6 +85,7 @@ import com.xscm.moduleutil.bean.UserInfo; import com.xscm.moduleutil.bean.UserOnlineStatusBean; import com.xscm.moduleutil.bean.room.FriendInfo; import com.xscm.moduleutil.bean.room.FriendUserBean; +import com.xscm.moduleutil.bean.room.RoomAuction; import com.xscm.moduleutil.bean.room.RoomOnline; import com.xscm.moduleutil.color.ThemeableDrawableUtils; import com.xscm.moduleutil.databinding.RoomDialogMusicWindowOpenBinding; @@ -190,6 +193,7 @@ public class RoomActivity extends BaseMvpActivity list; private List fragmentList; + private String roomId; - - public MyFragmentPagerAdapter(FragmentManager fm, List list, List fragmentList) { + public MyFragmentPagerAdapter(FragmentManager fm, List list, List fragmentList,String roomId) { super(fm); this.list = list; this.fragmentList = fragmentList; + this.roomId = roomId; } @Override public Fragment getItem(int position) { GiftLabelBean model = list.get(position); - Fragment fragment = GiftTwoDetailsFragment.newInstance(model.getId(), 1); + Fragment fragment = GiftTwoDetailsFragment.newInstance(model.getId(), 1, roomId); fragmentList.add(fragment); // 保存 Fragment 实例 return fragment; } diff --git a/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomSettingFragment.java b/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomSettingFragment.java index 512a535..c13566d 100644 --- a/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomSettingFragment.java +++ b/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomSettingFragment.java @@ -24,6 +24,7 @@ import com.example.moduleroom.databinding.DialogRoomSettingFragmentBinding; import com.example.moduleroom.fragment.RoomBackgroundDialogFragment; import com.hjq.toast.ToastUtils; import com.xscm.moduleutil.base.CommonAppContext; +import com.xscm.moduleutil.dialog.ConfirmDialog; import com.xscm.moduleutil.event.EffectEvent; import com.xscm.moduleutil.event.MusicEvent; import com.xscm.moduleutil.event.RoomOutEvent; @@ -83,10 +84,9 @@ public class RoomSettingFragment extends BaseMvpDialogFragment filteredList = new ArrayList<>(); // 更新 itemType @@ -247,27 +247,47 @@ public class RoomSettingFragment extends BaseMvpDialogFragment { + // 点击“确认”按钮时执行删除操作 + MvpPre.changeRoomType(roomId, type); + }, + v -> { + // 点击“取消”按钮时什么都不做 + }, false, 0).show(); + } + private void upAdapter() { adapter.notifyDataSetChanged(); } @@ -277,8 +297,8 @@ public class RoomSettingFragment extends BaseMvpDialogFragment>() { + api.getGiftList(Integer.parseInt(id),"", new BaseObserver>() { @Override public void onSubscribe(Disposable d) {