From 101eb87e5f2199222ceea315dacbd91ed53c4fc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E5=B0=8F=E6=B1=9F?= <461355754@qq.com> Date: Tue, 2 Sep 2025 23:03:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/deploymentTargetSelector.xml | 4 +- gradle.properties | 2 +- moduleUtil/src/main/AndroidManifest.xml | 20 +- .../activity/news/OfficialNoticeActivity.java | 2 +- .../moduleutil/base/CommonAppContext.java | 14 +- .../moduleutil/bean/RoomMessageEvent.java | 4 +- .../com/xscm/moduleutil/bean/XLHBean.java | 16 + .../bean/blindboxwheel/BlindBoxBean.java | 23 +- .../moduleutil/bean/room/EMMessageInfo.java | 4 + .../moduleutil/bean/room/RoomAuction.java | 2 +- .../xscm/moduleutil/dialog/PolicyDialog.java | 2 +- .../xscm/moduleutil/dialog/WebViewDialog.java | 46 +- .../giftLottery/GiftLotteryAdapter.java | 2 +- .../giftLottery/GiftLotteryContacts.java | 2 + .../dialog/giftLottery/GiftLotteryDialog.java | 35 +- .../GiftLotteryDialogFragment.java | 30 +- .../giftLottery/GiftLotteryPresenter.java | 5 + .../dialog/giftLottery/PrizePoolDialog.java | 18 +- .../giftLottery/TourClubDialogFragment.java | 78 ++ .../dialog/giftLottery/XlhObtainDialog.java | 43 + .../moduleutil/event/RoomGiftGiveEvent.java | 5 +- .../xscm/moduleutil/http/RetrofitClient.java | 2 +- .../moduleutil/presenter/BasePresenter.java | 3 + .../com/xscm/moduleutil/rtc/AgoraManager.java | 4 +- .../moduleutil/service/MyMqttService.java | 529 +++----- .../utils/MemoryOptimizationUtils.java | 30 +- .../utils/config/EnvironmentEnum.java | 20 +- .../utils/config/EnvironmentPrefs.java | 4 +- .../moduleutil/widget/AvatarFrameView.java | 191 ++- .../xscm/moduleutil/widget/BaseWheatView.java | 18 +- .../moduleutil/widget/PiaoPingManager.java | 107 ++ .../moduleutil/widget/RoomMakeWheatView.java | 2 +- .../widget/RoomSingSongWheatView.java | 2 +- .../moduleutil/widget/WheatLayoutManager.java | 1 + .../src/main/res/drawable/bg_r4_eff2f8.xml | 2 +- .../src/main/res/layout/dialog_city_time.xml | 36 +- .../src/main/res/layout/dialog_mirroe_sky.xml | 28 +- .../main/res/layout/dialog_pinnacle_time.xml | 36 +- .../src/main/res/layout/dialog_prize_pool.xml | 6 +- .../src/main/res/layout/web_view_dialog.xml | 17 +- .../src/main/res/mipmap-xxxhdpi/jinb.webp | Bin 2960 -> 5240 bytes .../src/main/res/mipmap-xxxhdpi/skzj_gz.webp | Bin 0 -> 304254 bytes .../src/main/res/mipmap-xxxhdpi/syzc_gz.webp | Bin 0 -> 310422 bytes .../src/main/res/mipmap-xxxhdpi/time_b.webp | Bin 0 -> 3920 bytes .../src/main/res/mipmap-xxxhdpi/tkzj_gz.webp | Bin 0 -> 286756 bytes .../src/main/res/mipmap-xxxhdpi/tour_bj.webp | Bin 0 -> 2866240 bytes .../main/res/mipmap-xxxhdpi/tour_zj_bj.webp | Bin 0 -> 612600 bytes .../src/main/res/mipmap-xxxhdpi/xlh_cj_w.webp | Bin 0 -> 35948 bytes .../src/main/res/mipmap-xxxhdpi/xlh_g_2.webp | Bin 0 -> 105790 bytes .../src/main/res/mipmap-xxxhdpi/xlh_gb.webp | Bin 0 -> 10074 bytes .../res/mipmap-xxxhdpi/xlh_gift_user.webp | Bin 0 -> 50520 bytes .../main/res/mipmap-xxxhdpi/xlh_image.webp | Bin 0 -> 48332 bytes .../src/main/res/mipmap-xxxhdpi/xlh_jjks.webp | Bin 0 -> 715708 bytes .../src/main/res/mipmap-xxxhdpi/xlh_num.webp | Bin 0 -> 40528 bytes .../src/main/res/mipmap-xxxhdpi/xlh_ob.webp | Bin 0 -> 737952 bytes .../src/main/res/mipmap-xxxhdpi/xlh_xj_x.webp | Bin 0 -> 36322 bytes .../src/main/res/mipmap-xxxhdpi/xlh_zl.webp | Bin 0 -> 108830 bytes .../src/main/res/mipmap-xxxhdpi/xlh_zsks.webp | Bin 0 -> 609538 bytes moduleUtil/src/main/res/values/styles.xml | 13 +- .../activity/ReleaseActivity.java | 6 + .../fragment/CircleCategoryFragment.java | 2 + .../fragment/ExpandColumnFragment.java | 37 +- moduleroom/src/main/AndroidManifest.xml | 3 +- .../moduleroom/activity/RoomActivity.java | 1134 ++++++----------- .../adapter/WheatFeedingSelectAdapter.java | 2 +- .../dialog/RoomConcernDialogFragment.java | 11 +- .../dialog/RoomGiftDialogFragment.java | 47 +- .../dialog/RoomOnlineDialogFragment.java | 1 + .../dialog/RoomSettingFragment.java | 10 + .../dialog/TunerDialogFragment.java | 2 +- .../fragment/FriendshipRoomFragment.java | 25 +- .../PublicScreenEaseChatFragment.java | 11 + .../fragment/RoomAuctionFragment.java | 123 +- .../moduleroom/fragment/RoomFragment.java | 571 ++------- .../moduleroom/fragment/SingSongFragment.java | 184 ++- .../moduleroom/presenter/RoomPresenter.java | 7 + .../presenter/RoomSettingPresenter.java | 7 + .../presenter/RoomUserPresenter.java | 67 + .../moduleroom/presenter/WheatPresenter.java | 27 + .../main/res/layout/dialog_with_countdown.xml | 3 +- .../res/layout/fragment_friendship_room.xml | 4 +- .../src/main/res/layout/fragment_room.xml | 2 +- .../main/res/layout/fragment_room_auction.xml | 19 +- .../layout/fragment_wheat_feeding_dialog.xml | 152 ++- .../main/res/layout/room_concern_dialog.xml | 95 +- .../src/main/res/layout/room_dialog_tuner.xml | 261 ++-- moduleroom/src/main/res/layout/room_top.xml | 2 +- .../activity/AlbumDetailActivity.java | 36 +- .../activity/WithdrawalActivity.java | 4 + .../fragment/UserGiftWallFragment.java | 3 +- .../presenter/AlbumDetailPresenter.java | 6 + .../main/res/layout/activity_bind_card.xml | 13 +- .../fragment/VoiceCategoryFragment.java | 60 +- .../res/layout/fragment_voice_category.xml | 5 +- 94 files changed, 2147 insertions(+), 2203 deletions(-) create mode 100644 moduleUtil/src/main/java/com/xscm/moduleutil/bean/XLHBean.java create mode 100644 moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/TourClubDialogFragment.java create mode 100644 moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/XlhObtainDialog.java create mode 100644 moduleUtil/src/main/res/mipmap-xxxhdpi/skzj_gz.webp create mode 100644 moduleUtil/src/main/res/mipmap-xxxhdpi/syzc_gz.webp create mode 100644 moduleUtil/src/main/res/mipmap-xxxhdpi/time_b.webp create mode 100644 moduleUtil/src/main/res/mipmap-xxxhdpi/tkzj_gz.webp create mode 100644 moduleUtil/src/main/res/mipmap-xxxhdpi/tour_bj.webp create mode 100644 moduleUtil/src/main/res/mipmap-xxxhdpi/tour_zj_bj.webp create mode 100644 moduleUtil/src/main/res/mipmap-xxxhdpi/xlh_cj_w.webp create mode 100644 moduleUtil/src/main/res/mipmap-xxxhdpi/xlh_g_2.webp create mode 100644 moduleUtil/src/main/res/mipmap-xxxhdpi/xlh_gb.webp create mode 100644 moduleUtil/src/main/res/mipmap-xxxhdpi/xlh_gift_user.webp create mode 100644 moduleUtil/src/main/res/mipmap-xxxhdpi/xlh_image.webp create mode 100644 moduleUtil/src/main/res/mipmap-xxxhdpi/xlh_jjks.webp create mode 100644 moduleUtil/src/main/res/mipmap-xxxhdpi/xlh_num.webp create mode 100644 moduleUtil/src/main/res/mipmap-xxxhdpi/xlh_ob.webp create mode 100644 moduleUtil/src/main/res/mipmap-xxxhdpi/xlh_xj_x.webp create mode 100644 moduleUtil/src/main/res/mipmap-xxxhdpi/xlh_zl.webp create mode 100644 moduleUtil/src/main/res/mipmap-xxxhdpi/xlh_zsks.webp diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml index 710f9d2..c5bd488 100644 --- a/.idea/deploymentTargetSelector.xml +++ b/.idea/deploymentTargetSelector.xml @@ -4,10 +4,10 @@