From 830913e001a20fac3635e95e81b8051351d87788 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 01:10:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9MQTT=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=20=E4=BF=AE=E6=94=B9bug=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E7=9B=B2=E7=9B=92=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/deploymentTargetSelector.xml | 4 +- app/src/main/res/mipmap-hdpi/ic_launcher.png | Bin 0 -> 8020 bytes app/src/main/res/mipmap-hdpi/ic_launcher.webp | Bin 4148 -> 0 bytes .../mipmap-hdpi/ic_launcher_foreground.png | Bin 0 -> 18117 bytes .../mipmap-hdpi/ic_launcher_foreground.webp | Bin 6912 -> 0 bytes .../res/mipmap-hdpi/ic_launcher_round.png | Bin 0 -> 6713 bytes .../res/mipmap-hdpi/ic_launcher_round.webp | Bin 5586 -> 0 bytes app/src/main/res/mipmap-mdpi/ic_launcher.png | Bin 0 -> 3796 bytes app/src/main/res/mipmap-mdpi/ic_launcher.webp | Bin 2418 -> 0 bytes .../mipmap-mdpi/ic_launcher_foreground.png | Bin 0 -> 10848 bytes .../mipmap-mdpi/ic_launcher_foreground.webp | Bin 4268 -> 0 bytes .../res/mipmap-mdpi/ic_launcher_round.png | Bin 0 -> 3994 bytes .../res/mipmap-mdpi/ic_launcher_round.webp | Bin 3336 -> 0 bytes app/src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 0 -> 9187 bytes .../main/res/mipmap-xhdpi/ic_launcher.webp | Bin 5634 -> 0 bytes .../mipmap-xhdpi/ic_launcher_foreground.png | Bin 0 -> 27072 bytes .../mipmap-xhdpi/ic_launcher_foreground.webp | Bin 9926 -> 0 bytes .../res/mipmap-xhdpi/ic_launcher_round.png | Bin 0 -> 9639 bytes .../res/mipmap-xhdpi/ic_launcher_round.webp | Bin 7838 -> 0 bytes .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin 0 -> 15595 bytes .../main/res/mipmap-xxhdpi/ic_launcher.webp | Bin 9430 -> 0 bytes .../mipmap-xxhdpi/ic_launcher_foreground.png | Bin 0 -> 49661 bytes .../mipmap-xxhdpi/ic_launcher_foreground.webp | Bin 16578 -> 0 bytes .../res/mipmap-xxhdpi/ic_launcher_round.png | Bin 0 -> 15758 bytes .../res/mipmap-xxhdpi/ic_launcher_round.webp | Bin 12726 -> 0 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 0 -> 22830 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.webp | Bin 13094 -> 0 bytes .../mipmap-xxxhdpi/ic_launcher_foreground.png | Bin 0 -> 79601 bytes .../ic_launcher_foreground.webp | Bin 25722 -> 0 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.png | Bin 0 -> 22783 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.webp | Bin 18024 -> 0 bytes gradle.properties | 2 +- .../main/res/layout/activity_improve_info.xml | 2 +- moduleUtil/src/main/AndroidManifest.xml | 14 +- .../moduleutil/base/CommonAppContext.java | 19 +- .../dialog/giftLottery/GiftLotteryDialog.java | 12 +- .../com/xscm/moduleutil/rtc/AgoraManager.java | 9 +- .../xscm/moduleutil/service/MqttConnect.java | 205 ++++++++++++++ .../moduleutil/service/MqttInitCallback.java | 104 +++++++ .../moduleutil/widget/AvatarFrameView.java | 263 +++++++++++------- .../xscm/moduleutil/widget/BaseWheatView.java | 15 +- .../widget/RoomDefaultWheatView.java | 32 ++- .../widget/RoomFriendshipWheatView.java | 9 +- .../moduleutil/widget/RoomKtvWheatView.java | 12 +- .../moduleutil/widget/RoomMakeWheatView.java | 9 +- .../widget/RoomSingSongWheatView.java | 42 +-- .../widget/WheatLayoutSingManager.java | 42 ++- .../moduleutil/widget/dialog/ShareDialog.java | 5 +- .../src/main/res/layout/dialog_city_time.xml | 2 +- .../main/res/layout/dialog_pinnacle_time.xml | 2 +- .../res/layout/room_view_default_wheat.xml | 13 + .../res/layout/room_view_friendship_wheat.xml | 10 + .../main/res/layout/room_view_ktv_wheat.xml | 12 +- .../main/res/layout/room_view_make_wheat.xml | 13 + .../main/res/layout/room_view_sing_wheat.xml | 12 + moduleroom/src/main/AndroidManifest.xml | 2 +- .../moduleroom/activity/RoomActivity.java | 15 +- .../dialog/ExitRoomBottomSheet.java | 17 +- .../dialog/RoomGiftDialogFragment.java | 26 +- .../dialog/RoomUserInfoFragment.java | 4 +- .../fragment/FriendshipRoomFragment.java | 4 + .../PublicScreenEaseChatFragment.java | 5 +- .../fragment/RoomCabinFragment.java | 225 ++++++++++----- .../moduleroom/fragment/RoomFragment.java | 64 ++++- .../moduleroom/fragment/RoomKtvFragment.java | 4 +- .../moduleroom/fragment/SingSongFragment.java | 65 ++++- .../src/main/res/layout/activity_room.xml | 2 +- .../main/res/layout/fragment_room_auction.xml | 1 - moduleroom/src/main/res/layout/popup_menu.xml | 2 +- moduleroom/src/main/res/layout/room_top.xml | 3 +- .../activity/DailyTasksActivity.java | 3 +- .../activity/PersonalityActivity.java | 3 +- .../fragment/VocalRangeFragment.java | 11 +- .../src/main/res/layout/activity_my_money.xml | 2 - .../src/main/res/layout/item_bind_card.xml | 3 +- .../activity/ui/main/PlaceholderFragment.java | 9 +- .../modulevoice/adapter/HotAdapter.java | 2 +- .../res/layout/fragment_voice_category.xml | 13 - 78 files changed, 1027 insertions(+), 322 deletions(-) create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher.png delete mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png delete mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_round.png delete mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher.png delete mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png delete mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher_round.png delete mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher.png delete mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png delete mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_round.png delete mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher.png delete mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png delete mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png delete mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher.png delete mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png delete mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png delete mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp create mode 100644 moduleUtil/src/main/java/com/xscm/moduleutil/service/MqttConnect.java create mode 100644 moduleUtil/src/main/java/com/xscm/moduleutil/service/MqttInitCallback.java diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml index c5bd488..700034b 100644 --- a/.idea/deploymentTargetSelector.xml +++ b/.idea/deploymentTargetSelector.xml @@ -4,10 +4,10 @@