From 1b8af0e73392f60aa2730ccc54c845aaf08c0667 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E5=B0=8F=E6=B1=9F?= <461355754@qq.com> Date: Thu, 4 Sep 2025 19:36:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A1=E4=B9=90=E4=BC=9A=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=A6=9C=E5=8D=95=E5=92=8C=E8=AE=B0=E5=BD=95=20=E5=89=A9?= =?UTF-8?q?=E4=BD=99=E8=BD=AC=E7=9B=98=EF=BC=8C=E5=B1=8F=E5=B9=95=E9=80=82?= =?UTF-8?q?=E9=85=8D=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/deploymentTargetSelector.xml | 4 +- app/src/main/AndroidManifest.xml | 9 +- gradle.properties | 2 +- moduleUtil/build.gradle | 3 + .../com/xscm/moduleutil/bean/GiftBean.java | 1 + .../moduleutil/bean/RoomMessageEvent.java | 3 + .../bean/blindboxwheel/BlindBoxBean.java | 1 + .../bean/blindboxwheel/XlhDrawBean.java | 16 + .../moduleutil/bean/room/EMMessageInfo.java | 2 +- .../xscm/moduleutil/dialog/WebViewDialog.java | 3 + .../giftLottery/GiftLotteryContacts.java | 9 + .../dialog/giftLottery/GiftLotteryDialog.java | 26 +- .../GiftLotteryDialogFragment.java | 20 +- .../giftLottery/GiftLotteryPresenter.java | 75 ++++- .../dialog/giftLottery/GiftRecordAdapter.java | 46 +++ .../giftLottery/GiftXlhChouAdapter.java | 20 ++ .../dialog/giftLottery/PrizePoolAdapter.java | 12 +- .../dialog/giftLottery/PrizePoolDialog.java | 5 +- .../giftLottery/TourClubDialogFragment.java | 296 +++++++++++++++++- .../dialog/giftLottery/XlhObtainDialog.java | 70 ++++- .../dialog/giftLottery/XlhRankingDialog.java | 176 +++++++++++ .../dialog/giftLottery/XlhRecordDialog.java | 182 +++++++++++ .../com/xscm/moduleutil/http/ApiServer.java | 17 +- .../xscm/moduleutil/http/RetrofitClient.java | 93 +++++- .../presenter/RewardGiftPresenter.java | 27 ++ .../com/xscm/moduleutil/widget/Constants.java | 5 + .../moduleutil/widget/RoomSingWheatView.java | 169 ++++++++++ .../src/main/res/layout/dialog_city_time.xml | 7 +- .../src/main/res/layout/dialog_mirroe_sky.xml | 7 +- .../main/res/layout/dialog_pinnacle_time.xml | 7 +- .../res/layout/fragment_tour_club_dialog.xml | 24 +- .../src/main/res/layout/item_my_record.xml | 56 ++++ moduleUtil/src/main/res/layout/item_xlh.xml | 48 +++ .../src/main/res/layout/item_xlh_gift.xml | 42 +++ .../src/main/res/mipmap-hdpi/ic_launcher.png | Bin 0 -> 8020 bytes .../src/main/res/mipmap-hdpi/ic_launcher.webp | Bin 16403 -> 0 bytes .../main/res/mipmap-hdpi/ic_launcher_app.png | Bin 0 -> 8020 bytes .../mipmap-hdpi/ic_launcher_foreground.png | Bin 0 -> 18117 bytes .../mipmap-hdpi/ic_launcher_foreground.webp | Bin 5936 -> 0 bytes .../res/mipmap-hdpi/ic_launcher_round.png | Bin 0 -> 6713 bytes .../res/mipmap-hdpi/ic_launcher_round.webp | Bin 5218 -> 0 bytes .../res/mipmap-hdpi/ic_launcher_round_app.png | Bin 0 -> 6713 bytes .../src/main/res/mipmap-mdpi/ic_launcher.png | Bin 0 -> 3796 bytes .../src/main/res/mipmap-mdpi/ic_launcher.webp | Bin 8301 -> 0 bytes .../main/res/mipmap-mdpi/ic_launcher_app.png | Bin 0 -> 3796 bytes .../mipmap-mdpi/ic_launcher_foreground.png | Bin 0 -> 10848 bytes .../mipmap-mdpi/ic_launcher_foreground.webp | Bin 3752 -> 0 bytes .../res/mipmap-mdpi/ic_launcher_round.png | Bin 0 -> 3994 bytes .../res/mipmap-mdpi/ic_launcher_round.webp | Bin 3166 -> 0 bytes .../res/mipmap-mdpi/ic_launcher_round_app.png | Bin 0 -> 3994 bytes .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 0 -> 9187 bytes .../main/res/mipmap-xhdpi/ic_launcher.webp | Bin 22595 -> 0 bytes .../main/res/mipmap-xhdpi/ic_launcher_app.png | Bin 0 -> 9187 bytes .../mipmap-xhdpi/ic_launcher_foreground.png | Bin 0 -> 27072 bytes .../mipmap-xhdpi/ic_launcher_foreground.webp | Bin 8578 -> 0 bytes .../res/mipmap-xhdpi/ic_launcher_round.png | Bin 0 -> 9639 bytes .../res/mipmap-xhdpi/ic_launcher_round.webp | Bin 7400 -> 0 bytes .../mipmap-xhdpi/ic_launcher_round_app.png | Bin 0 -> 9639 bytes .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin 0 -> 15595 bytes .../main/res/mipmap-xxhdpi/ic_launcher.webp | Bin 43491 -> 0 bytes .../res/mipmap-xxhdpi/ic_launcher_app.png | Bin 0 -> 15595 bytes .../mipmap-xxhdpi/ic_launcher_foreground.png | Bin 0 -> 49661 bytes .../mipmap-xxhdpi/ic_launcher_foreground.webp | Bin 14262 -> 0 bytes .../res/mipmap-xxhdpi/ic_launcher_round.png | Bin 0 -> 15758 bytes .../res/mipmap-xxhdpi/ic_launcher_round.webp | Bin 12230 -> 0 bytes .../mipmap-xxhdpi/ic_launcher_round_app.png | Bin 0 -> 15758 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 0 -> 22830 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.webp | Bin 63331 -> 0 bytes .../res/mipmap-xxxhdpi/ic_launcher_app.png | Bin 0 -> 22830 bytes .../mipmap-xxxhdpi/ic_launcher_foreground.png | Bin 0 -> 79601 bytes .../ic_launcher_foreground.webp | Bin 23058 -> 0 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.png | Bin 0 -> 22783 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.webp | Bin 16798 -> 0 bytes .../mipmap-xxxhdpi/ic_launcher_round_app.png | Bin 0 -> 22783 bytes .../src/main/res/mipmap-xxxhdpi/xlh.png | Bin 0 -> 2704822 bytes .../src/main/res/mipmap-xxxhdpi/xlh_bd.png | Bin 0 -> 332550 bytes .../main/res/mipmap-xxxhdpi/xlh_cj_item.png | Bin 0 -> 376094 bytes .../src/main/res/mipmap-xxxhdpi/xlh_gz.png | Bin 0 -> 308331 bytes .../src/main/res/mipmap-xxxhdpi/xlh_hd.png | Bin 0 -> 305940 bytes .../src/main/res/mipmap-xxxhdpi/xlh_jc.png | Bin 0 -> 236733 bytes .../src/main/res/mipmap-xxxhdpi/xlh_jl.png | Bin 0 -> 303253 bytes .../src/main/res/mipmap-xxxhdpi/xlh_xz.png | Bin 0 -> 342851 bytes moduleUtil/src/main/res/values-v23/themes.xml | 25 ++ moduleUtil/src/main/res/values/themes.xml | 15 + modulecircle/src/main/AndroidManifest.xml | 4 +- modulemain/src/main/AndroidManifest.xml | 4 +- modulenews/src/main/AndroidManifest.xml | 4 +- .../moduleroom/activity/RoomActivity.java | 100 ++++-- .../moduleroom/adapter/EaseChatAdapter.java | 91 ++++-- .../dialog/ExitRoomBottomSheet.java | 50 ++- .../dialog/RoomUserInfoFragment.java | 31 +- .../fragment/RoomCabinFragment.java | 4 +- .../src/main/res/layout/activity_room.xml | 2 +- .../main/res/layout/dialog_room_bid_list.xml | 8 +- moduleroom/src/main/res/layout/room_top.xml | 3 +- modulevocal/src/main/AndroidManifest.xml | 4 +- modulevoice/src/main/AndroidManifest.xml | 4 +- 97 files changed, 1682 insertions(+), 150 deletions(-) create mode 100644 moduleUtil/src/main/java/com/xscm/moduleutil/bean/blindboxwheel/XlhDrawBean.java create mode 100644 moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/GiftRecordAdapter.java create mode 100644 moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/GiftXlhChouAdapter.java create mode 100644 moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/XlhRankingDialog.java create mode 100644 moduleUtil/src/main/java/com/xscm/moduleutil/dialog/giftLottery/XlhRecordDialog.java create mode 100644 moduleUtil/src/main/java/com/xscm/moduleutil/widget/RoomSingWheatView.java create mode 100644 moduleUtil/src/main/res/layout/item_my_record.xml create mode 100644 moduleUtil/src/main/res/layout/item_xlh.xml create mode 100644 moduleUtil/src/main/res/layout/item_xlh_gift.xml create mode 100644 moduleUtil/src/main/res/mipmap-hdpi/ic_launcher.png delete mode 100644 moduleUtil/src/main/res/mipmap-hdpi/ic_launcher.webp create mode 100644 moduleUtil/src/main/res/mipmap-hdpi/ic_launcher_app.png create mode 100644 moduleUtil/src/main/res/mipmap-hdpi/ic_launcher_foreground.png delete mode 100644 moduleUtil/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp create mode 100644 moduleUtil/src/main/res/mipmap-hdpi/ic_launcher_round.png delete mode 100644 moduleUtil/src/main/res/mipmap-hdpi/ic_launcher_round.webp create mode 100644 moduleUtil/src/main/res/mipmap-hdpi/ic_launcher_round_app.png create mode 100644 moduleUtil/src/main/res/mipmap-mdpi/ic_launcher.png delete mode 100644 moduleUtil/src/main/res/mipmap-mdpi/ic_launcher.webp create mode 100644 moduleUtil/src/main/res/mipmap-mdpi/ic_launcher_app.png create mode 100644 moduleUtil/src/main/res/mipmap-mdpi/ic_launcher_foreground.png delete mode 100644 moduleUtil/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp create mode 100644 moduleUtil/src/main/res/mipmap-mdpi/ic_launcher_round.png delete mode 100644 moduleUtil/src/main/res/mipmap-mdpi/ic_launcher_round.webp create mode 100644 moduleUtil/src/main/res/mipmap-mdpi/ic_launcher_round_app.png create mode 100644 moduleUtil/src/main/res/mipmap-xhdpi/ic_launcher.png delete mode 100644 moduleUtil/src/main/res/mipmap-xhdpi/ic_launcher.webp create mode 100644 moduleUtil/src/main/res/mipmap-xhdpi/ic_launcher_app.png create mode 100644 moduleUtil/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png delete mode 100644 moduleUtil/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp create mode 100644 moduleUtil/src/main/res/mipmap-xhdpi/ic_launcher_round.png delete mode 100644 moduleUtil/src/main/res/mipmap-xhdpi/ic_launcher_round.webp create mode 100644 moduleUtil/src/main/res/mipmap-xhdpi/ic_launcher_round_app.png create mode 100644 moduleUtil/src/main/res/mipmap-xxhdpi/ic_launcher.png delete mode 100644 moduleUtil/src/main/res/mipmap-xxhdpi/ic_launcher.webp create mode 100644 moduleUtil/src/main/res/mipmap-xxhdpi/ic_launcher_app.png create mode 100644 moduleUtil/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png delete mode 100644 moduleUtil/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp create mode 100644 moduleUtil/src/main/res/mipmap-xxhdpi/ic_launcher_round.png delete mode 100644 moduleUtil/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp create mode 100644 moduleUtil/src/main/res/mipmap-xxhdpi/ic_launcher_round_app.png create mode 100644 moduleUtil/src/main/res/mipmap-xxxhdpi/ic_launcher.png delete mode 100644 moduleUtil/src/main/res/mipmap-xxxhdpi/ic_launcher.webp create mode 100644 moduleUtil/src/main/res/mipmap-xxxhdpi/ic_launcher_app.png create mode 100644 moduleUtil/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png delete mode 100644 moduleUtil/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp create mode 100644 moduleUtil/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png delete mode 100644 moduleUtil/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp create mode 100644 moduleUtil/src/main/res/mipmap-xxxhdpi/ic_launcher_round_app.png create mode 100644 moduleUtil/src/main/res/mipmap-xxxhdpi/xlh.png create mode 100644 moduleUtil/src/main/res/mipmap-xxxhdpi/xlh_bd.png create mode 100644 moduleUtil/src/main/res/mipmap-xxxhdpi/xlh_cj_item.png create mode 100644 moduleUtil/src/main/res/mipmap-xxxhdpi/xlh_gz.png create mode 100644 moduleUtil/src/main/res/mipmap-xxxhdpi/xlh_hd.png create mode 100644 moduleUtil/src/main/res/mipmap-xxxhdpi/xlh_jc.png create mode 100644 moduleUtil/src/main/res/mipmap-xxxhdpi/xlh_jl.png create mode 100644 moduleUtil/src/main/res/mipmap-xxxhdpi/xlh_xz.png create mode 100644 moduleUtil/src/main/res/values-v23/themes.xml diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml index 700034b..a7ca769 100644 --- a/.idea/deploymentTargetSelector.xml +++ b/.idea/deploymentTargetSelector.xml @@ -4,10 +4,10 @@