From 28bd8e9eb640b9ca5257ea361fada93c2ff5165d Mon Sep 17 00:00:00 2001
From: lzl <1239365383@qq.com>
Date: Tue, 28 Oct 2025 16:56:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6module=201?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml              |   6 -
 .../com/qxcm/qxlive/LaunchPageActivity.java   |   1 -
 .../java/com/qxcm/qxlive/LaunchPresenter.java |   6 +-
 .../qxcm/qxlive/PasswordLoginActivity.java    |  11 +-
 moduleLogin/.gitignore                        |   1 -
 moduleLogin/build.gradle                      |  51 -----
 moduleLogin/proguard-rules.pro                |  21 --
 moduleLogin/src/main/AndroidManifest.xml      |  24 ---
 .../modulelogin/even/LoginFinishEvent.java    |   4 -
 .../res/drawable/ic_launcher_background.xml   | 170 ----------------
 .../res/drawable/ic_launcher_foreground.xml   |  30 ---
 .../src/main/res/values-en-rUs/strings.xml    |   6 -
 moduleLogin/src/main/res/values/colors.xml    |  10 -
 moduleLogin/src/main/res/values/strings.xml   |   3 -
 moduleUtil/build.gradle                       |   2 +-
 modulecircle/.gitignore                       |   1 -
 modulecircle/build.gradle                     |  64 ------
 modulecircle/proguard-rules.pro               |  21 --
 modulecircle/src/main/AndroidManifest.xml     |  27 ---
 .../res/drawable/ic_launcher_background.xml   | 170 ----------------
 .../res/drawable/ic_launcher_foreground.xml   |  30 ---
 modulecircle/src/main/res/values/colors.xml   |  10 -
 modulecircle/src/main/res/values/strings.xml  |   4 -
 modulemain/build.gradle                       |  22 ++-
 ...bCloudFaceLiveSdk-face-v6.6.2-8e4718fc.aar | Bin
 .../libs/WbCloudNormal-v5.1.10-4e3e198.aar    | Bin
 modulemain/src/main/AndroidManifest.xml       | 182 +++++++++++++++++-
 .../activity/ForgetPasswordActivity.java      |  25 ++-
 .../login}/activity/ImproveInfoActivity.java  |  13 +-
 .../login}/activity/LoginActivity.java        |  25 ++-
 .../activity/SwitchAccountsActivity.java      |  12 +-
 .../login/contacts}/ImproveInfoContacts.java  |   3 +-
 .../login/contacts}/ImproveInfoPresenter.java |   3 +-
 .../login}/present/LoginContacter.java        |   2 +-
 .../login}/present/LoginPresenter.java        |  10 +-
 .../{ => main/activity}/MainActivity.java     |  14 +-
 .../main}/contacts/HomeContacts.java          |   2 +-
 .../main}/presenter/HomePresenter.java        |   6 +-
 .../activity/msg}/contacts/NewsContacts.java  |   2 +-
 .../activity/msg}/fragment/NewsFragment.java  |  24 ++-
 .../msg}/presenter/NewsPresenter.java         |   4 +-
 .../activity/DynamicDetailActivity.java       |  10 +-
 .../plaza}/activity/DynamicListActivity.java  |  13 +-
 .../plaza}/activity/ReleaseActivity.java      |  15 +-
 .../plaza}/contacts/CircleContacts.java       |   2 +-
 .../plaza}/contacts/ReleaseContract.java      |   2 +-
 .../fragment/CircleCategoryFragment.java      |  25 ++-
 .../plaza}/fragment/CircleFragment.java       |  12 +-
 .../plaza}/fragment/ExpandColumnFragment.java |  20 +-
 .../plaza}/presenter/CirclePresenter.java     |   4 +-
 .../plaza}/presenter/ReleasePresenter.java    |   4 +-
 .../room}/activity/PopularRoomActivity.java   |  19 +-
 .../room}/activity/RankingListActivity.java   |  12 +-
 .../room}/activity/RedResultActivity.java     |  18 +-
 .../activity/room}/activity/RoomActivity.kt   |  45 +++--
 .../room}/activity/SearchActivity.java        |  18 +-
 .../room}/contacts/BidListContacts.java       |   2 +-
 .../contacts/CardRelationshipContacts.java    |   2 +-
 .../room}/contacts/DataListContacts.java      |   3 +-
 .../contacts/FriendshipRoomContacts.java      |   2 +-
 .../room}/contacts/HotListContacts.java       |   3 +-
 .../room}/contacts/HourlyChartContacts.java   |   2 +-
 .../room}/contacts/PkTimeContract.java        |   2 +-
 .../room}/contacts/PlaceholderContacts.java   |   2 +-
 .../PublicScreenEaseChatContacts.java         |   2 +-
 .../contacts/PublishCommentContacts.java      |   2 +-
 .../room}/contacts/RedEnvelopesContacts.java  |   3 +-
 .../room}/contacts/RequestContacts.java       |   2 +-
 .../room}/contacts/RoomAuctionContacts.java   |   2 +-
 .../contacts/RoomBackgroundContacts.java      |   2 +-
 .../room}/contacts/RoomCabinContacts.java     |   2 +-
 .../contacts/RoomCharmDialogContacts.java     |   2 +-
 .../room}/contacts/RoomChartsContacts.java    |   2 +-
 .../room}/contacts/RoomCloseContacts.java     |   6 +-
 .../activity/room}/contacts/RoomContacts.java |   2 +-
 .../room}/contacts/RoomHostContacts.java      |   3 +-
 .../contacts/RoomPasswordSetContacts.java     |   2 +-
 .../room}/contacts/RoomPkContacts.java        |   2 +-
 .../room}/contacts/RoomSettingContacts.java   |   2 +-
 .../room}/contacts/RoomUserContacts.java      |   2 +-
 .../room}/contacts/SearchContacts.java        |   4 +-
 .../room}/contacts/SingSongContacts.java      |   2 +-
 .../room}/contacts/UserGiftWallConacts.java   |   3 +-
 .../room}/contacts/VoiceCategoryContacts.java |   3 +-
 .../room}/contacts/VoiceContacts.java         |   2 +-
 .../room}/contacts/WheatContacts.java         |   2 +-
 .../fragment/FriendshipRoomFragment.java      |  30 ++-
 .../room}/fragment/HotListFragment.java       |  20 +-
 .../room}/fragment/MusicSongListFragment.java |  14 +-
 .../PublicScreenEaseChatFragment.java         |  41 ++--
 .../room}/fragment/RankingChildFragment.java  |  16 +-
 .../room}/fragment/RankingParentFragment.java |   7 +-
 .../room}/fragment/RedEnvelopesFragment.java  |  21 +-
 .../activity/room}/fragment/RedViewModel.java |   2 +-
 .../room}/fragment/RelationshipFragment.java  |  19 +-
 .../room}/fragment/RequestFragment.java       |  27 ++-
 .../room}/fragment/RoomAuctionFragment.java   |  26 +--
 .../RoomBackgroundDialogFragment.java         |  10 +-
 .../room}/fragment/RoomCabinFragment.java     |  24 +--
 .../room}/fragment/RoomChartsFragment.java    |  15 +-
 .../activity/room}/fragment/RoomFragment.java |  28 ++-
 .../room}/fragment/RoomKtvFragment.java       |  36 ++--
 .../fragment/RoomNoticeDialogFragment.java    |   9 +-
 .../RoomPasswordSetDialogFragment.java        |  10 +-
 .../room}/fragment/SingSongFragment.java      |  32 ++-
 .../room}/fragment/VoiceCategoryFragment.java |  37 ++--
 .../room}/fragment/VoiceFragment.java         |  17 +-
 .../room}/presenter/BidListPresenter.java     |   4 +-
 .../presenter/CardRelationshipPresenter.java  |   4 +-
 .../room}/presenter/DataListPresenter.java    |   5 +-
 .../presenter/FriendshipRoomPresenter.java    |   4 +-
 .../room}/presenter/HotListPresenter.java     |   4 +-
 .../room}/presenter/HourlyChartPresenter.java |   9 +-
 .../room}/presenter/PkTimePresenter.java      |   4 +-
 .../room}/presenter/PlaceholderPresenter.java |   4 +-
 .../PublicScreenEaseChatPresenter.java        |   5 +-
 .../presenter/PublishCommentPresenter.java    |   4 +-
 .../presenter/RedEnvelopesPresenter.java      |   9 +-
 .../room}/presenter/RequestPresenter.java     |   4 +-
 .../room}/presenter/RoomAuctionPresenter.java |   4 +-
 .../presenter/RoomAuctionPresenterTow.java    |   4 +-
 .../presenter/RoomBackgroundPresenter.java    |   5 +-
 .../room}/presenter/RoomCabinPresenter.java   |   4 +-
 .../presenter/RoomCharmDialogPresenter.java   |   5 +-
 .../room}/presenter/RoomChartsPresenter.java  |   4 +-
 .../room}/presenter/RoomClosePresenter.java   |   5 +-
 .../room}/presenter/RoomHostPresenter.java    |   4 +-
 .../presenter/RoomPasswordSetPresenter.java   |   4 +-
 .../room}/presenter/RoomPkPresenter.java      |   4 +-
 .../room}/presenter/RoomPresenter.java        |   8 +-
 .../room}/presenter/RoomSettingPresenter.java |   4 +-
 .../room}/presenter/RoomUserPresenter.java    |   4 +-
 .../room}/presenter/SearchPresenter.java      |   5 +-
 .../room}/presenter/SingSongPresenter.java    |   4 +-
 .../presenter/UserGiftWallPresenter.java      |   5 +-
 .../presenter/VoiceCategoryPresenter.java     |   4 +-
 .../room}/presenter/VoicePresenter.java       |   8 +-
 .../room}/presenter/WheatPresenter.java       |   4 +-
 .../user}/activity/AboutUsActivity.java       |   8 +-
 .../user}/activity/AlbumDetailActivity.java   |  19 +-
 .../user}/activity/BindCardActivity.java      |  12 +-
 .../activity/BindCardDetailsActivity.java     |  10 +-
 .../user}/activity/BlacklistActivity.java     |  12 +-
 .../activity/BriefIntroductionActivity.java   |  10 +-
 .../user}/activity/ChangPassActivity.java     |  10 +-
 .../activity/ChangeNicknameActivity.java      |  10 +-
 .../user}/activity/CreateAlbumActivity.java   |  12 +-
 .../user}/activity/CreatedRoomActivity.java   |  10 +-
 .../activity/CurrencyExchangeActivity.java    |  16 +-
 .../user}/activity/DailyTasksActivity.java    |  20 +-
 .../user}/activity/EditUserInfoActivity.java  |  17 +-
 .../user}/activity/GiftBoxRecordActivity.java |  12 +-
 .../activity/MessageReminderActivity.java     |   6 +-
 .../user}/activity/MyBagActivity.java         |  14 +-
 .../user}/activity/MyMoneyActivity.java       |  10 +-
 .../user}/activity/MyRoomActivity.java        |  18 +-
 .../user}/activity/NotificationActivity.java  |   6 +-
 .../user}/activity/PersonalityActivity.java   |  15 +-
 .../activity/PhoneReplacementActivity.java    |  13 +-
 .../user}/activity/RealDetailActivity.java    |  10 +-
 .../user}/activity/RealNameActivity.java      |  10 +-
 .../user}/activity/RechargeActivity.java      |  26 ++-
 .../user}/activity/RevenueActivity.java       |  12 +-
 .../user}/activity/RoomAllowanceActivity.java |  10 +-
 .../activity/RoomAllowanceDetailActivity.java |  16 +-
 .../user}/activity/RoomDetailsActivity.java   |  16 +-
 .../user}/activity/SettingActivity.java       |  15 +-
 .../user}/activity/UnderageActivity.java      |  10 +-
 .../user}/activity/UserHomepageActivity.java  |  14 +-
 .../user}/activity/WithdrawalActivity.java    |  13 +-
 .../activity/WithdrawalListActivity.java      |  14 +-
 .../user}/conacts/AlbumDetailConacts.java     |   2 +-
 .../user}/conacts/BlacklistConacts.java       |   2 +-
 .../conacts/BriefIntroductionConacts.java     |   2 +-
 .../user}/conacts/ChangeNicknameConacts.java  |   2 +-
 .../user}/conacts/ChangePasswordConactos.java |   2 +-
 .../user}/conacts/CreatedRoomConactos.java    |   3 +-
 .../conacts/CurrencyExchangeConacts.java      |   2 +-
 .../user}/conacts/DailyTasksConacts.java      |   2 +-
 .../user}/conacts/EditUserConactos.java       |   2 +-
 .../user}/conacts/GiftBoxRecordConacts.java   |   2 +-
 .../activity/user}/conacts/MeConacts.java     |   2 +-
 .../user}/conacts/MyAlbumConacts.java         |   2 +-
 .../activity/user}/conacts/MyBagConacts.java  |   2 +-
 .../user}/conacts/MyMoneyConactos.java        |   2 +-
 .../user}/conacts/MyRoomListContacts.java     |   3 +-
 .../user}/conacts/PersonalityConacts.java     |   2 +-
 .../conacts/PhoneReplacementConacts.java      |   2 +-
 .../user}/conacts/RealDetailConacts.java      |   2 +-
 .../user}/conacts/RealNameConacts.java        |   2 +-
 .../user}/conacts/RechargeConactos.java       |   2 +-
 .../user}/conacts/RevenueConacts.java         |   2 +-
 .../user}/conacts/RoomAllowanceContacts.java  |   2 +-
 .../user}/conacts/SettingConacts.java         |   2 +-
 .../user}/conacts/UnderageConacts.java        |   2 +-
 .../user}/conacts/UserGiftWallConacts.java    |   3 +-
 .../user}/conacts/UserHomepageConacts.java    |   2 +-
 .../user}/conacts/WithdrawalConacts.java      |   2 +-
 .../user}/fragment/CirleListFragment.java     |  14 +-
 .../user}/fragment/MyAlbumFragment.java       |  21 +-
 .../user}/fragment/MyCreateFragment.java      |  16 +-
 .../user}/fragment/MyFollowFragment.java      |  20 +-
 .../user}/fragment/MyManageFragment.java      |  20 +-
 .../user}/fragment/MyRoomListFragment.java    |  16 +-
 .../user}/fragment/RevenueFragment.java       |  19 +-
 .../user}/fragment/UserGiftWallFragment.java  |  16 +-
 .../user}/fragment/UserHomepageFragment.java  |  18 +-
 .../user}/fragment/VocalRangeFragment.java    |  38 ++--
 .../user}/fragment/mybag/MyBagAdapter.java    |   4 +-
 .../user}/fragment/mybag/MyBagFragment.java   |  10 +-
 .../fragment/mybag/MyBagListAdapter.java      |   4 +-
 .../fragment/mybag/MyBagListFragment.java     |  11 +-
 .../zhuangb/ZhuangBanShangChengAdapter.java   |   4 +-
 .../zhuangb/ZhuangBanShangChengConactos.java  |   2 +-
 .../zhuangb/ZhuangBanShangChengFragment.java  |  11 +-
 .../zhuangb/ZhuangBanShangChengPresenter.java |   2 +-
 .../user}/presenter/AlbumDetailPresenter.java |   4 +-
 .../user}/presenter/BlacklistPresenter.java   |   4 +-
 .../presenter/BriefIntroductionPresenter.java |   4 +-
 .../presenter/ChangeNicknamePresenter.java    |   4 +-
 .../presenter/ChangePasswordPresenter.java    |   5 +-
 .../user}/presenter/CreatedRoomPresenter.java |   4 +-
 .../presenter/CurrencyExchangePresenter.java  |   4 +-
 .../user}/presenter/DailyTasksPresenter.java  |   4 +-
 .../user}/presenter/EditUserPresenter.java    |   4 +-
 .../presenter/GiftBoxRecordPresenter.java     |   4 +-
 .../activity/user}/presenter/MePresenter.java |   4 +-
 .../user}/presenter/MyAlbumPresenter.java     |   4 +-
 .../user}/presenter/MyBagPresenter.java       |   4 +-
 .../user}/presenter/MyMoneyPresenter.java     |   4 +-
 .../user}/presenter/MyRoomPresenter.java      |   5 +-
 .../user}/presenter/PersonalityPresenter.java |   4 +-
 .../presenter/PhoneReplacementPresenter.java  |   4 +-
 .../user}/presenter/RealDetailPresenter.java  |   4 +-
 .../user}/presenter/RealNamePresenter.java    |   4 +-
 .../user}/presenter/RechargePresenter.java    |   4 +-
 .../user}/presenter/RevenuePresenter.java     |   4 +-
 .../presenter/RoomAllowancePresenter.java     |   5 +-
 .../user}/presenter/RoomDetailsPresenter.java |   5 +-
 .../user}/presenter/SettingPresenter.java     |   4 +-
 .../user}/presenter/UnderagePresenter.java    |   4 +-
 .../presenter/UserGiftWallPresenter.java      |   5 +-
 .../presenter/UserHomepagePresenter.java      |   4 +-
 .../user}/presenter/WithdrawalPresenter.java  |   4 +-
 .../adapter/AlbumPhotoAdapter.java            |   4 +-
 .../modulemain}/adapter/BindCardAdapter.java  |   4 +-
 .../modulemain}/adapter/BlackAdapter.java     |   4 +-
 .../adapter/CardRelationAdapter.java          |   4 +-
 .../adapter/CarouselBannerAdapter.java        |  13 +-
 .../adapter/CarouselImgAdapter.java           |   4 +-
 .../adapter/ChatRoomMyFollowAdapter.java      |   4 +-
 .../adapter/ChatRoomMyFootAdapter.java        |   4 +-
 .../adapter/ChatRoomMyManageAdapter.java      |   4 +-
 .../adapter/CircleCategoryAdapter.java        |   4 +-
 .../adapter/CirleCategoryBannerAdapter.java   |   4 +-
 .../modulemain}/adapter/EaseChatAdapter.java  |  12 +-
 .../modulemain}/adapter/EmotionAdapter.java   |   4 +-
 .../adapter/ExpandColumnAdapter.java          |   4 +-
 .../modulemain}/adapter/FragmentAdapter.java  |   2 +-
 .../modulemain}/adapter/GiftBoxAdapter.java   |   4 +-
 .../modulemain}/adapter/GiftUserAdapter.java  |   4 +-
 .../xscm/modulemain}/adapter/HotAdapter.java  |   6 +-
 .../adapter/MultiSelectAdapter.java           |   4 +-
 .../adapter/MyAlbumListAdapter.java           |   4 +-
 .../modulemain}/adapter/MyCreateAdapter.java  |  11 +-
 .../modulemain}/adapter/PkTimeAdapter.java    |   4 +-
 .../adapter}/PlaceholderFragment.java         |  18 +-
 .../adapter/PopularRoomAdapter.java           |  20 +-
 .../adapter/RankingAutcionAdapter.java        |   4 +-
 .../adapter/RankingCharmListAdapter.java      |   4 +-
 .../adapter/RankingWealthListAdapter.java     |   4 +-
 .../xscm/modulemain}/adapter/RedAdapter.java  |   7 +-
 .../modulemain}/adapter/RedBagAdapter.java    |   6 +-
 .../adapter/RelationshipAdapter.java          |   4 +-
 .../modulemain}/adapter/RevenueAdapter.java   |   4 +-
 .../adapter/RoomAllowanceDetailAdapter.java   |   4 +-
 .../modulemain}/adapter/RoomCharmAdapter.java |   4 +-
 .../adapter/RoomDetailsAdapter.java           |   4 +-
 .../adapter/RoomHourlyAdapter.java            |   5 +-
 .../adapter/RoomOnlineAdapter.java            |   4 +-
 .../adapter/RoomSettingAdapter.java           |   4 +-
 .../adapter/SearchHistoryAdapter.java         |   4 +-
 .../adapter/SearchRecordAdapter.java          |   4 +-
 .../adapter/SearchRoomResultAdapter.java      |   9 +-
 .../adapter/SearchUserResultAdapter.java      |  12 +-
 .../adapter}/SectionsPagerAdapter.java        |   2 +-
 .../adapter/SingleChoiceAdapter.java          |   4 +-
 .../adapter/SwitchAccountsAdapter.java        |   7 +-
 .../modulemain}/adapter/TaskBoxAdapter.java   |   4 +-
 .../modulemain}/adapter/TaskDataAdapter.java  |   4 +-
 .../adapter/TaskSectionAdapter.java           |   4 +-
 .../modulemain}/adapter/TopUsersAdapter.java  |   4 +-
 .../modulemain}/adapter/TunerListAdapter.java |   4 +-
 .../adapter/UserGiftWallAdapter.java          |   6 +-
 .../adapter/UserPhotoWallAdapter.java         |   4 +-
 .../adapter/WheatFeedingSelectAdapter.java    |   4 +-
 .../adapter/WithdrawalAdapter.java            |   7 +-
 .../xscm/modulemain}/bean/UserFillResp.java   |   2 +-
 .../dialog/BidListDialogFragment.java         |  12 +-
 .../dialog/CardRelationshipFragment.java      |  12 +-
 .../dialog/CustomCenterDialogFragment.java    |   4 +-
 .../modulemain}/dialog/EmotionPickerDialog.kt |   6 +-
 .../dialog/ExitRoomBottomSheet.java           |   4 +-
 .../dialog/FriendsDialogFragment.java         |   5 +-
 .../modulemain}/dialog/HourlyChartDialog.java |  14 +-
 .../dialog/LiveBattleSettingsDialog.java      |   4 +-
 .../dialog/PkResultDialogFragment.java        |   6 +-
 .../dialog/PkTimeDialogFragment.java          |  12 +-
 .../dialog/PublishCommentDialogFragment.java  |  10 +-
 .../modulemain}/dialog/RedBagSendDialog.java  |  17 +-
 .../modulemain}/dialog/RedListDialog.java     |   8 +-
 .../dialog/RequestDialogFragment.java         |  14 +-
 .../modulemain}/dialog/RoomCharmDialog.java   |  12 +-
 .../dialog/RoomConcernDialogFragment.java     |  14 +-
 .../dialog/RoomGiftDialogFragment.java        |  27 +--
 .../dialog/RoomHostAddFragment.java           |  10 +-
 .../modulemain}/dialog/RoomHostFragment.java  |  10 +-
 .../dialog/RoomHostIncomeDialog.java          |   6 +-
 .../modulemain}/dialog/RoomHostZBDialog.java  |   6 +-
 .../dialog/RoomMessageDialogFragment.java     |   6 +-
 .../dialog/RoomOnlineDialogFragment.java      |  14 +-
 .../dialog/RoomPkDialogFragment.java          |  10 +-
 .../dialog/RoomSettingFragment.java           |  19 +-
 .../dialog/RoomUserInfoFragment.java          |  12 +-
 .../dialog/RoomWheatGiftSettingFragment.java  |   6 +-
 .../dialog/SoundEffectsDialogFragment.java    |  12 +-
 .../dialog/TunerDialogFragment.java           |  12 +-
 .../dialog/UserGiftWallRoomFragment.java      |  10 +-
 .../dialog/WheatFeedingDialogFragment.java    |  12 +-
 .../service/CancelNoticeService.kt            |   2 +-
 .../xscm/modulemain}/service/Extensions.kt    |   2 +-
 .../service/ForegroundNotification.kt         |   4 +-
 .../modulemain}/service/ForegroundService.kt  |   2 +-
 .../service/MediaProjectionService.java       |   4 +-
 .../modulemain}/service/RoomPlayService.java  |   2 +-
 .../xscm/modulemain}/service/ServiceHelper.kt |   2 +-
 .../res/drawable/index_bg_search_avatar.xml   |   0
 .../res/drawable/index_bg_search_item.xml     |   0
 .../res/drawable/selector_custom_checkbox.xml |   0
 .../src/main/res/drawable/shape_search_in.xml |   0
 .../src/main/res/layout/activity_about_us.xml |   0
 .../main/res/layout/activity_album_detail.xml |   0
 .../main/res/layout/activity_bind_card.xml    |   0
 .../res/layout/activity_bind_card_details.xml |   0
 .../main/res/layout/activity_blacklist.xml    |   0
 .../layout/activity_brief_introduction.xml    |   0
 .../res/layout/activity_change_nickname.xml   |   0
 .../res/layout/activity_change_password.xml   |   0
 .../main/res/layout/activity_create_album.xml |   0
 .../main/res/layout/activity_created_room.xml |   0
 .../res/layout/activity_currency_exchange.xml |   0
 .../main/res/layout/activity_daily_tasks.xml  |   0
 .../res/layout/activity_dynamic_detail.xml    |   0
 .../main/res/layout/activity_dynamic_list.xml |   0
 .../main/res/layout/activity_edit_user.xml    |   0
 .../res/layout/activity_forget_password.xml   |   0
 .../res/layout/activity_gift_box_record.xml   |   0
 .../main/res/layout/activity_improve_info.xml |   0
 .../src/main/res/layout/activity_login.xml    |   0
 .../src/main/res/layout/activity_main.xml     |   2 +-
 .../res/layout/activity_message_reminder.xml  |   0
 .../src/main/res/layout/activity_my_bag.xml   |   0
 .../src/main/res/layout/activity_my_money.xml |   0
 .../src/main/res/layout/activity_my_room.xml  |   0
 .../main/res/layout/activity_notification.xml |   0
 .../main/res/layout/activity_personality.xml  |   0
 .../res/layout/activity_phone_replacement.xml |   0
 .../main/res/layout/activity_popular_room.xml |   0
 .../main/res/layout/activity_ranking_list.xml |   0
 .../main/res/layout/activity_real_deatil.xml  |   0
 .../main/res/layout/activity_real_name.xml    |   0
 .../src/main/res/layout/activity_recharge.xml |   0
 .../src/main/res/layout/activity_release.xml  |   0
 .../src/main/res/layout/activity_revenue.xml  |   0
 .../src/main/res/layout/activity_room.xml     |   0
 .../res/layout/activity_room_allowance.xml    |   0
 .../layout/activity_room_allowance_detail.xml |   0
 .../main/res/layout/activity_room_details.xml |   0
 .../src/main/res/layout/activity_search.xml   |   0
 .../src/main/res/layout/activity_setting.xml  |   0
 .../src/main/res/layout/activity_setting1.xml |   0
 .../res/layout/activity_switch_accounts.xml   |   0
 .../src/main/res/layout/activity_underage.xml |   0
 .../res/layout/activity_user_homepage.xml     |   0
 .../main/res/layout/activity_withdrawal.xml   |   0
 .../res/layout/activity_withdrawal_list.xml   |   0
 .../res/layout/bottom_sheet_recyclerview.xml  |   0
 .../res/layout/custom_tab_layou_giftt.xml     |   0
 .../src/main/res/layout/custom_tab_layout.xml |   0
 .../main/res/layout/dialog_card_relation.xml  |   0
 .../main/res/layout/dialog_charm_fragment.xml |   0
 .../main/res/layout/dialog_emotion_picker.xml |   0
 .../layout/dialog_exit_room_bottom_sheet.xml  |   0
 .../main/res/layout/dialog_friends_room.xml   |   0
 .../layout/dialog_hourly_chart_fragment.xml   |   0
 .../layout/dialog_live_battle_settings.xml    |   0
 .../res/layout/dialog_publish_comment.xml     |   0
 .../main/res/layout/dialog_red_bag_send.xml   |   0
 .../src/main/res/layout/dialog_red_list.xml   |   0
 .../main/res/layout/dialog_room_auction.xml   |   0
 .../main/res/layout/dialog_room_bid_list.xml  |   0
 .../layout/dialog_room_setting_fragment.xml   |   0
 .../res/layout/dialog_room_wheat_gift.xml     |   0
 .../layout/dialog_secondary_verification.xml  |   0
 .../main/res/layout/dialog_with_countdown.xml |   0
 .../src/main/res/layout/fragment_circle.xml   |   0
 .../res/layout/fragment_circle_category.xml   |   0
 .../main/res/layout/fragment_cirle_list.xml   |   0
 .../res/layout/fragment_expand_column.xml     |   0
 .../res/layout/fragment_friendship_room.xml   |   0
 .../src/main/res/layout/fragment_hot_list.xml |   0
 .../main/res/layout/fragment_muisc_song.xml   |   0
 .../src/main/res/layout/fragment_my_album.xml |   0
 .../src/main/res/layout/fragment_my_bag.xml   |   0
 .../main/res/layout/fragment_my_bag_list.xml  |   0
 .../src/main/res/layout/fragment_news.xml     |   0
 .../res/layout/fragment_pk_result_dialog.xml  |   0
 .../res/layout/fragment_pk_time_fragment.xml  |   0
 .../main/res/layout/fragment_ranking_list.xml |   0
 .../src/main/res/layout/fragment_red.xml      |   0
 .../res/layout/fragment_red_envelopes.xml     |   0
 .../main/res/layout/fragment_relationship.xml |   0
 .../src/main/res/layout/fragment_request.xml  |   0
 .../res/layout/fragment_request_dialog.xml    |   0
 .../src/main/res/layout/fragment_revenue.xml  |   0
 .../src/main/res/layout/fragment_room.xml     |   0
 .../main/res/layout/fragment_room_auction.xml |   0
 .../main/res/layout/fragment_room_charts.xml  |   0
 .../src/main/res/layout/fragment_room_ktv.xml |   0
 .../layout/fragment_room_notice_dialog.xml    |   0
 .../layout/fragment_room_online_dialog.xml    |   0
 .../src/main/res/layout/fragment_room_pk.xml  |   0
 .../res/layout/fragment_room_user_info.xml    |   0
 .../main/res/layout/fragment_sing_song.xml    |   0
 .../main/res/layout/fragment_sound_dialog.xml |   0
 .../main/res/layout/fragment_user_hompage.xml |   0
 .../main/res/layout/fragment_vocal_range.xml  |   0
 .../src/main/res/layout/fragment_voice.xml    |   0
 .../res/layout/fragment_voice_category.xml    |   0
 .../layout/fragment_wheat_feeding_dialog.xml  |   0
 .../main/res/layout/index_image_banner.xml    |   0
 .../main/res/layout/index_item_carousel.xml   |   0
 .../main/res/layout/index_item_history.xml    |   0
 .../src/main/res/layout/index_item_image.xml  |   0
 .../src/main/res/layout/index_item_record.xml |   0
 .../layout/index_item_search_room_result.xml  |   0
 .../layout/index_item_search_user_result.xml  |   0
 .../res/layout/index_item_tecord_head.xml     |   0
 .../res/layout/index_rv_item_ranking_list.xml |   0
 .../res/layout/index_rv_item_room_hot0.xml    |   0
 .../src/main/res/layout/index_view_empty.xml  |   0
 .../src/main/res/layout/item_album_list.xml   |   0
 .../src/main/res/layout/item_bind_card.xml    |   0
 .../src/main/res/layout/item_black.xml        |   0
 .../res/layout/item_brief_introduction.xml    |   0
 .../src/main/res/layout/item_charm_dialog.xml |   0
 .../main/res/layout/item_circle_category.xml  |   0
 .../res/layout/item_cirle_category_grid.xml   |   0
 .../src/main/res/layout/item_date_header.xml  |   0
 .../src/main/res/layout/item_emotion.xml      |   0
 .../main/res/layout/item_expand_column.xml    |   0
 .../src/main/res/layout/item_gift_box.xml     |   0
 .../src/main/res/layout/item_gift_card.xml    |   0
 .../src/main/res/layout/item_group.xml        |   0
 .../src/main/res/layout/item_hourly.xml       |   0
 .../src/main/res/layout/item_multi_select.xml |   0
 .../main/res/layout/item_multi_select_t.xml   |   0
 .../src/main/res/layout/item_my_bag.xml       |   0
 .../src/main/res/layout/item_my_bag_data.xml  |   0
 .../src/main/res/layout/item_onlie_room.xml   |   0
 .../src/main/res/layout/item_photo.xml        |   0
 .../src/main/res/layout/item_popular_room.xml |   0
 .../main/res/layout/item_ranking_auction.xml  |   0
 .../src/main/res/layout/item_red.xml          |   0
 .../src/main/res/layout/item_red_bag.xml      |   0
 .../src/main/res/layout/item_relation.xml     |   0
 .../src/main/res/layout/item_relationship.xml |   0
 .../src/main/res/layout/item_revenue.xml      |   0
 .../src/main/res/layout/item_reward.xml       |   0
 .../main/res/layout/item_room_charm_rank.xml  |   0
 .../src/main/res/layout/item_room_gift.xml    |   0
 .../main/res/layout/item_room_online_text.xml |   0
 .../src/main/res/layout/item_setting.xml      |   0
 .../src/main/res/layout/item_song_list.xml    |   0
 .../main/res/layout/item_switch_accounts.xml  |   0
 .../res/layout/item_tablayout_headerzb.xml    |   0
 .../src/main/res/layout/item_tag.xml          |   0
 .../src/main/res/layout/item_task_box.xml     |   0
 .../src/main/res/layout/item_task_data.xml    |   0
 .../src/main/res/layout/item_task_header.xml  |   0
 .../src/main/res/layout/item_text_view.xml    |   0
 .../src/main/res/layout/item_title.xml        |   0
 .../src/main/res/layout/item_top_user.xml     |   0
 .../res/layout/item_wheat_feeding_select.xml  |   0
 .../src/main/res/layout/item_withdrawal.xml   |   0
 .../layout/item_zhuangbanschangcheng_list.xml |   0
 .../src/main/res/layout/layout_empty_no.xml   |   0
 .../res/layout/me_fagment_user_gift_wall.xml  |   0
 .../layout/me_fagment_user_gift_wall_2.xml    |   0
 .../res/layout/me_item_user_gift_wall.xml     |   0
 .../res/layout/me_item_user_gift_wall_2.xml   |   0
 .../res/layout/me_item_user_photo_wall.xml    |   0
 .../src/main/res/layout/pop_layout1.xml       |   0
 .../src/main/res/layout/pop_menu.xml          |   0
 .../src/main/res/layout/popup_menu.xml        |   0
 .../src/main/res/layout/ranking_list.xml      |   0
 .../main/res/layout/room_activity_my_room.xml |   0
 .../main/res/layout/room_cabin_fragment.xml   |   0
 .../main/res/layout/room_concern_dialog.xml   |   0
 .../src/main/res/layout/room_concern_item.xml |   0
 .../src/main/res/layout/room_details_list.xml |   0
 .../res/layout/room_dialog_message_list.xml   |   0
 .../layout/room_dialog_room_pw_setting.xml    |   0
 .../src/main/res/layout/room_dialog_tuner.xml |   0
 .../room_fragement_dialog_room_background.xml |   0
 .../layout/room_fragement_trans_ease_chat.xml |   0
 .../main/res/layout/room_fragment_item.xml    |   0
 .../res/layout/room_fragment_item_list.xml    |   0
 .../res/layout/room_fragment_my_create.xml    |   0
 .../res/layout/room_fragment_my_follow.xml    |   0
 .../res/layout/room_fragment_my_manage.xml    |   0
 .../layout/room_fragment_my_room_cp_list.xml  |   0
 .../res/layout/room_fragment_my_room_list.xml |   0
 .../room_fragment_my_room_list_list.xml       |   0
 .../src/main/res/layout/room_gift_dialog.xml  |   0
 .../res/layout/room_host_add_fragment.xml     |   0
 .../main/res/layout/room_host_add_item.xml    |   0
 .../res/layout/room_host_income_dialog.xml    |   0
 .../main/res/layout/room_host_zb_dialog.xml   |   0
 .../room_index_item_chatroom_my_foot.xml      |   0
 .../res/layout/room_index_item_subsidy.xml    |   0
 .../src/main/res/layout/room_li_bu.xml        |   0
 .../main/res/layout/room_ranking_child.xml    |   0
 .../main/res/layout/room_ranking_parent.xml   |   0
 .../res/layout/room_rv_item_gift_wheat.xml    |   0
 .../main/res/layout/room_rv_item_ranking.xml  |   0
 .../res/layout/room_rv_item_ranking_rich.xml  |   0
 .../main/res/layout/room_rv_item_room_bg.xml  |   0
 .../main/res/layout/room_rv_item_tuner.xml    |   0
 .../src/main/res/layout/room_top.xml          |   0
 .../main/res/layout/top_overlay_buttons.xml   |   0
 .../src/main/res/layout/user_home.xml         |   0
 .../src/main/res/layout/user_top.xml          |   0
 .../layout/zhuangban_recyclerview_noref.xml   |   0
 .../src/main/res/mipmap-xxhdpi/jiaoyou.webp   | Bin
 .../main/res/mipmap-xxxhdpi/me_head_bg.png    | Bin
 .../src/main/res/mipmap-xxxhdpi/xing.webp     | Bin
 modulenews/.gitignore                         |   1 -
 modulenews/build.gradle                       |  45 -----
 modulenews/proguard-rules.pro                 |  21 --
 modulenews/src/main/AndroidManifest.xml       |  13 --
 .../res/drawable/ic_launcher_background.xml   | 170 ----------------
 .../res/drawable/ic_launcher_foreground.xml   |  30 ---
 modulenews/src/main/res/values/colors.xml     |  10 -
 modulenews/src/main/res/values/strings.xml    |   1 -
 moduleroom/.gitignore                         |   1 -
 moduleroom/build.gradle                       |  73 -------
 moduleroom/consumer-rules.pro                 |   0
 moduleroom/proguard-rules.pro                 |  21 --
 moduleroom/src/main/AndroidManifest.xml       |  59 ------
 .../src/main/res/layout/custom_tab_layout.xml |  36 ----
 moduleroom/src/main/res/values/strings.xml    |   4 -
 modulevocal/.gitignore                        |   1 -
 modulevocal/build.gradle                      |  69 -------
 modulevocal/proguard-rules.pro                |  21 --
 modulevocal/src/main/AndroidManifest.xml      | 148 --------------
 .../res/drawable/ic_launcher_background.xml   | 170 ----------------
 .../res/drawable/ic_launcher_foreground.xml   |  30 ---
 modulevocal/src/main/res/values/colors.xml    |  10 -
 modulevocal/src/main/res/values/strings.xml   |   4 -
 modulevocal/src/main/res/values/styles.xml    |   8 -
 modulevoice/.gitignore                        |   1 -
 modulevoice/build.gradle                      |  66 -------
 modulevoice/proguard-rules.pro                |  21 --
 modulevoice/src/main/AndroidManifest.xml      |  24 ---
 .../activity/ui/main/PageViewModel.java       |  21 --
 .../modulevoice/view/MarqueeTextView.java     |  25 ---
 .../res/drawable/ic_launcher_background.xml   | 170 ----------------
 .../res/drawable/ic_launcher_foreground.xml   |  30 ---
 .../src/main/res/values-en-rUs/strings.xml    |   3 -
 modulevoice/src/main/res/values/colors.xml    |  10 -
 modulevoice/src/main/res/values/strings.xml   |   3 -
 settings.gradle                               |  12 +-
 583 files changed, 1391 insertions(+), 3329 deletions(-)
 delete mode 100644 moduleLogin/.gitignore
 delete mode 100644 moduleLogin/build.gradle
 delete mode 100644 moduleLogin/proguard-rules.pro
 delete mode 100644 moduleLogin/src/main/AndroidManifest.xml
 delete mode 100644 moduleLogin/src/main/java/com/xscm/modulelogin/even/LoginFinishEvent.java
 delete mode 100644 moduleLogin/src/main/res/drawable/ic_launcher_background.xml
 delete mode 100644 moduleLogin/src/main/res/drawable/ic_launcher_foreground.xml
 delete mode 100644 moduleLogin/src/main/res/values-en-rUs/strings.xml
 delete mode 100644 moduleLogin/src/main/res/values/colors.xml
 delete mode 100644 moduleLogin/src/main/res/values/strings.xml
 delete mode 100644 modulecircle/.gitignore
 delete mode 100644 modulecircle/build.gradle
 delete mode 100644 modulecircle/proguard-rules.pro
 delete mode 100644 modulecircle/src/main/AndroidManifest.xml
 delete mode 100644 modulecircle/src/main/res/drawable/ic_launcher_background.xml
 delete mode 100644 modulecircle/src/main/res/drawable/ic_launcher_foreground.xml
 delete mode 100644 modulecircle/src/main/res/values/colors.xml
 delete mode 100644 modulecircle/src/main/res/values/strings.xml
 rename {modulevocal => modulemain}/libs/WbCloudFaceLiveSdk-face-v6.6.2-8e4718fc.aar (100%)
 rename {modulevocal => modulemain}/libs/WbCloudNormal-v5.1.10-4e3e198.aar (100%)
 rename {moduleLogin/src/main/java/com/xscm/modulelogin => modulemain/src/main/java/com/xscm/modulemain/activity/login}/activity/ForgetPasswordActivity.java (79%)
 rename {moduleLogin/src/main/java/com/xscm/modulelogin => modulemain/src/main/java/com/xscm/modulemain/activity/login}/activity/ImproveInfoActivity.java (96%)
 rename {moduleLogin/src/main/java/com/xscm/modulelogin => modulemain/src/main/java/com/xscm/modulemain/activity/login}/activity/LoginActivity.java (97%)
 rename {moduleLogin/src/main/java/com/xscm/modulelogin => modulemain/src/main/java/com/xscm/modulemain/activity/login}/activity/SwitchAccountsActivity.java (89%)
 rename {moduleLogin/src/main/java/com/xscm/modulelogin/present => modulemain/src/main/java/com/xscm/modulemain/activity/login/contacts}/ImproveInfoContacts.java (94%)
 rename {moduleLogin/src/main/java/com/xscm/modulelogin/present => modulemain/src/main/java/com/xscm/modulemain/activity/login/contacts}/ImproveInfoPresenter.java (98%)
 rename {moduleLogin/src/main/java/com/xscm/modulelogin => modulemain/src/main/java/com/xscm/modulemain/activity/login}/present/LoginContacter.java (95%)
 rename {moduleLogin/src/main/java/com/xscm/modulelogin => modulemain/src/main/java/com/xscm/modulemain/activity/login}/present/LoginPresenter.java (96%)
 rename modulemain/src/main/java/com/xscm/modulemain/activity/{ => main/activity}/MainActivity.java (98%)
 rename modulemain/src/main/java/com/xscm/modulemain/{ => activity/main}/contacts/HomeContacts.java (96%)
 rename modulemain/src/main/java/com/xscm/modulemain/{ => activity/main}/presenter/HomePresenter.java (98%)
 rename {modulenews/src/main/java/com/example/modulenews => modulemain/src/main/java/com/xscm/modulemain/activity/msg}/contacts/NewsContacts.java (91%)
 rename {modulenews/src/main/java/com/example/modulenews => modulemain/src/main/java/com/xscm/modulemain/activity/msg}/fragment/NewsFragment.java (91%)
 rename {modulenews/src/main/java/com/example/modulenews => modulemain/src/main/java/com/xscm/modulemain/activity/msg}/presenter/NewsPresenter.java (91%)
 rename {modulecircle/src/main/java/com/example/modulecircle => modulemain/src/main/java/com/xscm/modulemain/activity/plaza}/activity/DynamicDetailActivity.java (98%)
 rename {modulecircle/src/main/java/com/example/modulecircle => modulemain/src/main/java/com/xscm/modulemain/activity/plaza}/activity/DynamicListActivity.java (95%)
 rename {modulecircle/src/main/java/com/example/modulecircle => modulemain/src/main/java/com/xscm/modulemain/activity/plaza}/activity/ReleaseActivity.java (97%)
 rename {modulecircle/src/main/java/com/example/modulecircle => modulemain/src/main/java/com/xscm/modulemain/activity/plaza}/contacts/CircleContacts.java (96%)
 rename {modulecircle/src/main/java/com/example/modulecircle => modulemain/src/main/java/com/xscm/modulemain/activity/plaza}/contacts/ReleaseContract.java (93%)
 rename {modulecircle/src/main/java/com/example/modulecircle => modulemain/src/main/java/com/xscm/modulemain/activity/plaza}/fragment/CircleCategoryFragment.java (96%)
 rename {modulecircle/src/main/java/com/example/modulecircle => modulemain/src/main/java/com/xscm/modulemain/activity/plaza}/fragment/CircleFragment.java (90%)
 rename {modulecircle/src/main/java/com/example/modulecircle => modulemain/src/main/java/com/xscm/modulemain/activity/plaza}/fragment/ExpandColumnFragment.java (95%)
 rename {modulecircle/src/main/java/com/example/modulecircle => modulemain/src/main/java/com/xscm/modulemain/activity/plaza}/presenter/CirclePresenter.java (98%)
 rename {modulecircle/src/main/java/com/example/modulecircle => modulemain/src/main/java/com/xscm/modulemain/activity/plaza}/presenter/ReleasePresenter.java (96%)
 rename {modulevoice/src/main/java/com/example/modulevoice => modulemain/src/main/java/com/xscm/modulemain/activity/room}/activity/PopularRoomActivity.java (92%)
 rename {modulevoice/src/main/java/com/example/modulevoice => modulemain/src/main/java/com/xscm/modulemain/activity/room}/activity/RankingListActivity.java (90%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain/activity/room}/activity/RedResultActivity.java (89%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain/activity/room}/activity/RoomActivity.kt (98%)
 rename {modulevoice/src/main/java/com/example/modulevoice => modulemain/src/main/java/com/xscm/modulemain/activity/room}/activity/SearchActivity.java (96%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain/activity/room}/contacts/BidListContacts.java (92%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain/activity/room}/contacts/CardRelationshipContacts.java (94%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain/activity/room}/contacts/DataListContacts.java (95%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain/activity/room}/contacts/FriendshipRoomContacts.java (95%)
 rename {modulevoice/src/main/java/com/example/modulevoice => modulemain/src/main/java/com/xscm/modulemain/activity/room}/contacts/HotListContacts.java (94%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain/activity/room}/contacts/HourlyChartContacts.java (90%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain/activity/room}/contacts/PkTimeContract.java (86%)
 rename {modulevoice/src/main/java/com/example/modulevoice => modulemain/src/main/java/com/xscm/modulemain/activity/room}/contacts/PlaceholderContacts.java (93%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain/activity/room}/contacts/PublicScreenEaseChatContacts.java (89%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain/activity/room}/contacts/PublishCommentContacts.java (90%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain/activity/room}/contacts/RedEnvelopesContacts.java (89%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain/activity/room}/contacts/RequestContacts.java (93%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain/activity/room}/contacts/RoomAuctionContacts.java (95%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain/activity/room}/contacts/RoomBackgroundContacts.java (93%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain/activity/room}/contacts/RoomCabinContacts.java (87%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain/activity/room}/contacts/RoomCharmDialogContacts.java (90%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain/activity/room}/contacts/RoomChartsContacts.java (84%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain/activity/room}/contacts/RoomCloseContacts.java (74%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain/activity/room}/contacts/RoomContacts.java (97%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain/activity/room}/contacts/RoomHostContacts.java (94%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain/activity/room}/contacts/RoomPasswordSetContacts.java (88%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain/activity/room}/contacts/RoomPkContacts.java (92%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain/activity/room}/contacts/RoomSettingContacts.java (92%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain/activity/room}/contacts/RoomUserContacts.java (97%)
 rename {modulevoice/src/main/java/com/example/modulevoice => modulemain/src/main/java/com/xscm/modulemain/activity/room}/contacts/SearchContacts.java (90%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain/activity/room}/contacts/SingSongContacts.java (95%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain/activity/room}/contacts/UserGiftWallConacts.java (89%)
 rename {modulevoice/src/main/java/com/example/modulevoice => modulemain/src/main/java/com/xscm/modulemain/activity/room}/contacts/VoiceCategoryContacts.java (94%)
 rename {modulevoice/src/main/java/com/example/modulevoice => modulemain/src/main/java/com/xscm/modulemain/activity/room}/contacts/VoiceContacts.java (92%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain/activity/room}/contacts/WheatContacts.java (94%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain/activity/room}/fragment/FriendshipRoomFragment.java (99%)
 rename {modulevoice/src/main/java/com/example/modulevoice => modulemain/src/main/java/com/xscm/modulemain/activity/room}/fragment/HotListFragment.java (93%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain/activity/room}/fragment/MusicSongListFragment.java (97%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain/activity/room}/fragment/PublicScreenEaseChatFragment.java (98%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain/activity/room}/fragment/RankingChildFragment.java (96%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain/activity/room}/fragment/RankingParentFragment.java (94%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain/activity/room}/fragment/RedEnvelopesFragment.java (96%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain/activity/room}/fragment/RedViewModel.java (70%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain/activity/room}/fragment/RelationshipFragment.java (95%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain/activity/room}/fragment/RequestFragment.java (96%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain/activity/room}/fragment/RoomAuctionFragment.java (99%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain/activity/room}/fragment/RoomBackgroundDialogFragment.java (97%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain/activity/room}/fragment/RoomCabinFragment.java (97%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain/activity/room}/fragment/RoomChartsFragment.java (95%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain/activity/room}/fragment/RoomFragment.java (99%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain/activity/room}/fragment/RoomKtvFragment.java (98%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain/activity/room}/fragment/RoomNoticeDialogFragment.java (94%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain/activity/room}/fragment/RoomPasswordSetDialogFragment.java (91%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain/activity/room}/fragment/SingSongFragment.java (99%)
 rename {modulevoice/src/main/java/com/example/modulevoice => modulemain/src/main/java/com/xscm/modulemain/activity/room}/fragment/VoiceCategoryFragment.java (95%)
 rename {modulevoice/src/main/java/com/example/modulevoice => modulemain/src/main/java/com/xscm/modulemain/activity/room}/fragment/VoiceFragment.java (94%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain/activity/room}/presenter/BidListPresenter.java (93%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain/activity/room}/presenter/CardRelationshipPresenter.java (95%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain/activity/room}/presenter/DataListPresenter.java (96%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain/activity/room}/presenter/FriendshipRoomPresenter.java (96%)
 rename {modulevoice/src/main/java/com/example/modulevoice => modulemain/src/main/java/com/xscm/modulemain/activity/room}/presenter/HotListPresenter.java (98%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain/activity/room}/presenter/HourlyChartPresenter.java (88%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain/activity/room}/presenter/PkTimePresenter.java (87%)
 rename {modulevoice/src/main/java/com/example/modulevoice => modulemain/src/main/java/com/xscm/modulemain/activity/room}/presenter/PlaceholderPresenter.java (94%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain/activity/room}/presenter/PublicScreenEaseChatPresenter.java (93%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain/activity/room}/presenter/PublishCommentPresenter.java (91%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain/activity/room}/presenter/RedEnvelopesPresenter.java (90%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain/activity/room}/presenter/RequestPresenter.java (94%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain/activity/room}/presenter/RoomAuctionPresenter.java (95%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain/activity/room}/presenter/RoomAuctionPresenterTow.java (96%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain/activity/room}/presenter/RoomBackgroundPresenter.java (96%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain/activity/room}/presenter/RoomCabinPresenter.java (87%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain/activity/room}/presenter/RoomCharmDialogPresenter.java (88%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain/activity/room}/presenter/RoomChartsPresenter.java (72%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain/activity/room}/presenter/RoomClosePresenter.java (90%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain/activity/room}/presenter/RoomHostPresenter.java (95%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain/activity/room}/presenter/RoomPasswordSetPresenter.java (88%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain/activity/room}/presenter/RoomPkPresenter.java (93%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain/activity/room}/presenter/RoomPresenter.java (98%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain/activity/room}/presenter/RoomSettingPresenter.java (94%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain/activity/room}/presenter/RoomUserPresenter.java (98%)
 rename {modulevoice/src/main/java/com/example/modulevoice => modulemain/src/main/java/com/xscm/modulemain/activity/room}/presenter/SearchPresenter.java (96%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain/activity/room}/presenter/SingSongPresenter.java (98%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain/activity/room}/presenter/UserGiftWallPresenter.java (87%)
 rename {modulevoice/src/main/java/com/example/modulevoice => modulemain/src/main/java/com/xscm/modulemain/activity/room}/presenter/VoiceCategoryPresenter.java (97%)
 rename {modulevoice/src/main/java/com/example/modulevoice => modulemain/src/main/java/com/xscm/modulemain/activity/room}/presenter/VoicePresenter.java (97%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain/activity/room}/presenter/WheatPresenter.java (97%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/activity/AboutUsActivity.java (88%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/activity/AlbumDetailActivity.java (97%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/activity/BindCardActivity.java (90%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/activity/BindCardDetailsActivity.java (95%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/activity/BlacklistActivity.java (93%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/activity/BriefIntroductionActivity.java (91%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/activity/ChangPassActivity.java (93%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/activity/ChangeNicknameActivity.java (86%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/activity/CreateAlbumActivity.java (96%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/activity/CreatedRoomActivity.java (97%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/activity/CurrencyExchangeActivity.java (85%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/activity/DailyTasksActivity.java (93%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/activity/EditUserInfoActivity.java (97%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/activity/GiftBoxRecordActivity.java (78%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/activity/MessageReminderActivity.java (89%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/activity/MyBagActivity.java (86%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/activity/MyMoneyActivity.java (94%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/activity/MyRoomActivity.java (96%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/activity/NotificationActivity.java (85%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/activity/PersonalityActivity.java (94%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/activity/PhoneReplacementActivity.java (91%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/activity/RealDetailActivity.java (85%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/activity/RealNameActivity.java (96%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/activity/RechargeActivity.java (96%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/activity/RevenueActivity.java (94%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/activity/RoomAllowanceActivity.java (93%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/activity/RoomAllowanceDetailActivity.java (89%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/activity/RoomDetailsActivity.java (95%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/activity/SettingActivity.java (94%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/activity/UnderageActivity.java (96%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/activity/UserHomepageActivity.java (92%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/activity/WithdrawalActivity.java (97%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/activity/WithdrawalListActivity.java (93%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/conacts/AlbumDetailConacts.java (95%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/conacts/BlacklistConacts.java (92%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/conacts/BriefIntroductionConacts.java (92%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/conacts/ChangeNicknameConacts.java (89%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/conacts/ChangePasswordConactos.java (91%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/conacts/CreatedRoomConactos.java (94%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/conacts/CurrencyExchangeConacts.java (92%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/conacts/DailyTasksConacts.java (92%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/conacts/EditUserConactos.java (94%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/conacts/GiftBoxRecordConacts.java (90%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/conacts/MeConacts.java (94%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/conacts/MyAlbumConacts.java (94%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/conacts/MyBagConacts.java (93%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/conacts/MyMoneyConactos.java (92%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/conacts/MyRoomListContacts.java (96%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/conacts/PersonalityConacts.java (89%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/conacts/PhoneReplacementConacts.java (91%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/conacts/RealDetailConacts.java (88%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/conacts/RealNameConacts.java (90%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/conacts/RechargeConactos.java (94%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/conacts/RevenueConacts.java (91%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/conacts/RoomAllowanceContacts.java (92%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/conacts/SettingConacts.java (88%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/conacts/UnderageConacts.java (84%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/conacts/UserGiftWallConacts.java (89%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/conacts/UserHomepageConacts.java (93%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/conacts/WithdrawalConacts.java (96%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/fragment/CirleListFragment.java (95%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/fragment/MyAlbumFragment.java (93%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/fragment/MyCreateFragment.java (94%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/fragment/MyFollowFragment.java (90%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/fragment/MyManageFragment.java (90%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/fragment/MyRoomListFragment.java (96%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/fragment/RevenueFragment.java (94%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/fragment/UserGiftWallFragment.java (89%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/fragment/UserHomepageFragment.java (96%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/fragment/VocalRangeFragment.java (94%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/fragment/mybag/MyBagAdapter.java (92%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/fragment/mybag/MyBagFragment.java (89%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/fragment/mybag/MyBagListAdapter.java (87%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/fragment/mybag/MyBagListFragment.java (92%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/fragment/zhuangb/ZhuangBanShangChengAdapter.java (96%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/fragment/zhuangb/ZhuangBanShangChengConactos.java (92%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/fragment/zhuangb/ZhuangBanShangChengFragment.java (97%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/fragment/zhuangb/ZhuangBanShangChengPresenter.java (97%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/presenter/AlbumDetailPresenter.java (97%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/presenter/BlacklistPresenter.java (96%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/presenter/BriefIntroductionPresenter.java (92%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/presenter/ChangeNicknamePresenter.java (88%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/presenter/ChangePasswordPresenter.java (91%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/presenter/CreatedRoomPresenter.java (97%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/presenter/CurrencyExchangePresenter.java (93%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/presenter/DailyTasksPresenter.java (93%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/presenter/EditUserPresenter.java (97%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/presenter/GiftBoxRecordPresenter.java (88%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/presenter/MePresenter.java (98%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/presenter/MyAlbumPresenter.java (97%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/presenter/MyBagPresenter.java (95%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/presenter/MyMoneyPresenter.java (93%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/presenter/MyRoomPresenter.java (98%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/presenter/PersonalityPresenter.java (88%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/presenter/PhoneReplacementPresenter.java (95%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/presenter/RealDetailPresenter.java (87%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/presenter/RealNamePresenter.java (93%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/presenter/RechargePresenter.java (95%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/presenter/RevenuePresenter.java (91%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/presenter/RoomAllowancePresenter.java (92%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/presenter/RoomDetailsPresenter.java (95%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/presenter/SettingPresenter.java (90%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/presenter/UnderagePresenter.java (72%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/presenter/UserGiftWallPresenter.java (88%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/presenter/UserHomepagePresenter.java (95%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain/activity/user}/presenter/WithdrawalPresenter.java (97%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain}/adapter/AlbumPhotoAdapter.java (98%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain}/adapter/BindCardAdapter.java (94%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain}/adapter/BlackAdapter.java (98%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain}/adapter/CardRelationAdapter.java (99%)
 rename {modulevoice/src/main/java/com/example/modulevoice => modulemain/src/main/java/com/xscm/modulemain}/adapter/CarouselBannerAdapter.java (90%)
 rename {modulevoice/src/main/java/com/example/modulevoice => modulemain/src/main/java/com/xscm/modulemain}/adapter/CarouselImgAdapter.java (88%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain}/adapter/ChatRoomMyFollowAdapter.java (94%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain}/adapter/ChatRoomMyFootAdapter.java (96%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain}/adapter/ChatRoomMyManageAdapter.java (94%)
 rename {modulecircle/src/main/java/com/example/modulecircle => modulemain/src/main/java/com/xscm/modulemain}/adapter/CircleCategoryAdapter.java (96%)
 rename {modulecircle/src/main/java/com/example/modulecircle => modulemain/src/main/java/com/xscm/modulemain}/adapter/CirleCategoryBannerAdapter.java (95%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain}/adapter/EaseChatAdapter.java (99%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain}/adapter/EmotionAdapter.java (94%)
 rename {modulecircle/src/main/java/com/example/modulecircle => modulemain/src/main/java/com/xscm/modulemain}/adapter/ExpandColumnAdapter.java (98%)
 rename {modulenews/src/main/java/com/example/modulenews => modulemain/src/main/java/com/xscm/modulemain}/adapter/FragmentAdapter.java (96%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain}/adapter/GiftBoxAdapter.java (98%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain}/adapter/GiftUserAdapter.java (98%)
 rename {modulevoice/src/main/java/com/example/modulevoice => modulemain/src/main/java/com/xscm/modulemain}/adapter/HotAdapter.java (94%)
 rename {modulecircle/src/main/java/com/example/modulecircle => modulemain/src/main/java/com/xscm/modulemain}/adapter/MultiSelectAdapter.java (97%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain}/adapter/MyAlbumListAdapter.java (96%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain}/adapter/MyCreateAdapter.java (98%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain}/adapter/PkTimeAdapter.java (96%)
 rename {modulevoice/src/main/java/com/example/modulevoice/activity/ui/main => modulemain/src/main/java/com/xscm/modulemain/adapter}/PlaceholderFragment.java (98%)
 rename {modulevoice/src/main/java/com/example/modulevoice => modulemain/src/main/java/com/xscm/modulemain}/adapter/PopularRoomAdapter.java (84%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain}/adapter/RankingAutcionAdapter.java (97%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain}/adapter/RankingCharmListAdapter.java (98%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain}/adapter/RankingWealthListAdapter.java (98%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain}/adapter/RedAdapter.java (83%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain}/adapter/RedBagAdapter.java (98%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain}/adapter/RelationshipAdapter.java (97%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain}/adapter/RevenueAdapter.java (94%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain}/adapter/RoomAllowanceDetailAdapter.java (94%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain}/adapter/RoomCharmAdapter.java (96%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain}/adapter/RoomDetailsAdapter.java (97%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain}/adapter/RoomHourlyAdapter.java (97%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain}/adapter/RoomOnlineAdapter.java (98%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain}/adapter/RoomSettingAdapter.java (98%)
 rename {modulevoice/src/main/java/com/example/modulevoice => modulemain/src/main/java/com/xscm/modulemain}/adapter/SearchHistoryAdapter.java (85%)
 rename {modulevoice/src/main/java/com/example/modulevoice => modulemain/src/main/java/com/xscm/modulemain}/adapter/SearchRecordAdapter.java (93%)
 rename {modulevoice/src/main/java/com/example/modulevoice => modulemain/src/main/java/com/xscm/modulemain}/adapter/SearchRoomResultAdapter.java (87%)
 rename {modulevoice/src/main/java/com/example/modulevoice => modulemain/src/main/java/com/xscm/modulemain}/adapter/SearchUserResultAdapter.java (85%)
 rename {modulevoice/src/main/java/com/example/modulevoice/activity/ui/main => modulemain/src/main/java/com/xscm/modulemain/adapter}/SectionsPagerAdapter.java (96%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain}/adapter/SingleChoiceAdapter.java (96%)
 rename {moduleLogin/src/main/java/com/xscm/modulelogin => modulemain/src/main/java/com/xscm/modulemain}/adapter/SwitchAccountsAdapter.java (93%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain}/adapter/TaskBoxAdapter.java (98%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain}/adapter/TaskDataAdapter.java (97%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain}/adapter/TaskSectionAdapter.java (97%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain}/adapter/TopUsersAdapter.java (91%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain}/adapter/TunerListAdapter.java (96%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain}/adapter/UserGiftWallAdapter.java (95%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain}/adapter/UserPhotoWallAdapter.java (96%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain}/adapter/WheatFeedingSelectAdapter.java (98%)
 rename {modulevocal/src/main/java/com/example/modulevocal => modulemain/src/main/java/com/xscm/modulemain}/adapter/WithdrawalAdapter.java (97%)
 rename {moduleLogin/src/main/java/com/xscm/modulelogin => modulemain/src/main/java/com/xscm/modulemain}/bean/UserFillResp.java (94%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain}/dialog/BidListDialogFragment.java (95%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain}/dialog/CardRelationshipFragment.java (96%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain}/dialog/CustomCenterDialogFragment.java (99%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain}/dialog/EmotionPickerDialog.kt (97%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain}/dialog/ExitRoomBottomSheet.java (98%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain}/dialog/FriendsDialogFragment.java (97%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain}/dialog/HourlyChartDialog.java (94%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain}/dialog/LiveBattleSettingsDialog.java (97%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain}/dialog/PkResultDialogFragment.java (95%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain}/dialog/PkTimeDialogFragment.java (93%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain}/dialog/PublishCommentDialogFragment.java (93%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain}/dialog/RedBagSendDialog.java (98%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain}/dialog/RedListDialog.java (96%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain}/dialog/RequestDialogFragment.java (93%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain}/dialog/RoomCharmDialog.java (88%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain}/dialog/RoomConcernDialogFragment.java (94%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain}/dialog/RoomGiftDialogFragment.java (97%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain}/dialog/RoomHostAddFragment.java (96%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain}/dialog/RoomHostFragment.java (96%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain}/dialog/RoomHostIncomeDialog.java (93%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain}/dialog/RoomHostZBDialog.java (91%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain}/dialog/RoomMessageDialogFragment.java (95%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain}/dialog/RoomOnlineDialogFragment.java (97%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain}/dialog/RoomPkDialogFragment.java (96%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain}/dialog/RoomSettingFragment.java (97%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain}/dialog/RoomUserInfoFragment.java (98%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain}/dialog/RoomWheatGiftSettingFragment.java (98%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain}/dialog/SoundEffectsDialogFragment.java (96%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain}/dialog/TunerDialogFragment.java (97%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain}/dialog/UserGiftWallRoomFragment.java (94%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain}/dialog/WheatFeedingDialogFragment.java (97%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain}/service/CancelNoticeService.kt (97%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain}/service/Extensions.kt (98%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain}/service/ForegroundNotification.kt (96%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain}/service/ForegroundService.kt (97%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain}/service/MediaProjectionService.java (97%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain}/service/RoomPlayService.java (98%)
 rename {moduleroom/src/main/java/com/example/moduleroom => modulemain/src/main/java/com/xscm/modulemain}/service/ServiceHelper.kt (58%)
 rename {modulevoice => modulemain}/src/main/res/drawable/index_bg_search_avatar.xml (100%)
 rename {modulevoice => modulemain}/src/main/res/drawable/index_bg_search_item.xml (100%)
 rename {modulecircle => modulemain}/src/main/res/drawable/selector_custom_checkbox.xml (100%)
 rename {modulevoice => modulemain}/src/main/res/drawable/shape_search_in.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/activity_about_us.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/activity_album_detail.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/activity_bind_card.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/activity_bind_card_details.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/activity_blacklist.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/activity_brief_introduction.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/activity_change_nickname.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/activity_change_password.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/activity_create_album.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/activity_created_room.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/activity_currency_exchange.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/activity_daily_tasks.xml (100%)
 rename {modulecircle => modulemain}/src/main/res/layout/activity_dynamic_detail.xml (100%)
 rename {modulecircle => modulemain}/src/main/res/layout/activity_dynamic_list.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/activity_edit_user.xml (100%)
 rename {moduleLogin => modulemain}/src/main/res/layout/activity_forget_password.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/activity_gift_box_record.xml (100%)
 rename {moduleLogin => modulemain}/src/main/res/layout/activity_improve_info.xml (100%)
 rename {moduleLogin => modulemain}/src/main/res/layout/activity_login.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/activity_message_reminder.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/activity_my_bag.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/activity_my_money.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/activity_my_room.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/activity_notification.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/activity_personality.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/activity_phone_replacement.xml (100%)
 rename {modulevoice => modulemain}/src/main/res/layout/activity_popular_room.xml (100%)
 rename {modulevoice => modulemain}/src/main/res/layout/activity_ranking_list.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/activity_real_deatil.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/activity_real_name.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/activity_recharge.xml (100%)
 rename {modulecircle => modulemain}/src/main/res/layout/activity_release.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/activity_revenue.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/activity_room.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/activity_room_allowance.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/activity_room_allowance_detail.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/activity_room_details.xml (100%)
 rename {modulevoice => modulemain}/src/main/res/layout/activity_search.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/activity_setting.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/activity_setting1.xml (100%)
 rename {moduleLogin => modulemain}/src/main/res/layout/activity_switch_accounts.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/activity_underage.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/activity_user_homepage.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/activity_withdrawal.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/activity_withdrawal_list.xml (100%)
 rename {modulecircle => modulemain}/src/main/res/layout/bottom_sheet_recyclerview.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/custom_tab_layou_giftt.xml (100%)
 rename {modulevoice => modulemain}/src/main/res/layout/custom_tab_layout.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/dialog_card_relation.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/dialog_charm_fragment.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/dialog_emotion_picker.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/dialog_exit_room_bottom_sheet.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/dialog_friends_room.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/dialog_hourly_chart_fragment.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/dialog_live_battle_settings.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/dialog_publish_comment.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/dialog_red_bag_send.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/dialog_red_list.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/dialog_room_auction.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/dialog_room_bid_list.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/dialog_room_setting_fragment.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/dialog_room_wheat_gift.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/dialog_secondary_verification.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/dialog_with_countdown.xml (100%)
 rename {modulecircle => modulemain}/src/main/res/layout/fragment_circle.xml (100%)
 rename {modulecircle => modulemain}/src/main/res/layout/fragment_circle_category.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/fragment_cirle_list.xml (100%)
 rename {modulecircle => modulemain}/src/main/res/layout/fragment_expand_column.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/fragment_friendship_room.xml (100%)
 rename {modulevoice => modulemain}/src/main/res/layout/fragment_hot_list.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/fragment_muisc_song.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/fragment_my_album.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/fragment_my_bag.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/fragment_my_bag_list.xml (100%)
 rename {modulenews => modulemain}/src/main/res/layout/fragment_news.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/fragment_pk_result_dialog.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/fragment_pk_time_fragment.xml (100%)
 rename {modulevoice => modulemain}/src/main/res/layout/fragment_ranking_list.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/fragment_red.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/fragment_red_envelopes.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/fragment_relationship.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/fragment_request.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/fragment_request_dialog.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/fragment_revenue.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/fragment_room.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/fragment_room_auction.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/fragment_room_charts.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/fragment_room_ktv.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/fragment_room_notice_dialog.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/fragment_room_online_dialog.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/fragment_room_pk.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/fragment_room_user_info.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/fragment_sing_song.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/fragment_sound_dialog.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/fragment_user_hompage.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/fragment_vocal_range.xml (100%)
 rename {modulevoice => modulemain}/src/main/res/layout/fragment_voice.xml (100%)
 rename {modulevoice => modulemain}/src/main/res/layout/fragment_voice_category.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/fragment_wheat_feeding_dialog.xml (100%)
 rename {modulevoice => modulemain}/src/main/res/layout/index_image_banner.xml (100%)
 rename {modulevoice => modulemain}/src/main/res/layout/index_item_carousel.xml (100%)
 rename {modulevoice => modulemain}/src/main/res/layout/index_item_history.xml (100%)
 rename {modulevoice => modulemain}/src/main/res/layout/index_item_image.xml (100%)
 rename {modulevoice => modulemain}/src/main/res/layout/index_item_record.xml (100%)
 rename {modulevoice => modulemain}/src/main/res/layout/index_item_search_room_result.xml (100%)
 rename {modulevoice => modulemain}/src/main/res/layout/index_item_search_user_result.xml (100%)
 rename {modulevoice => modulemain}/src/main/res/layout/index_item_tecord_head.xml (100%)
 rename {modulevoice => modulemain}/src/main/res/layout/index_rv_item_ranking_list.xml (100%)
 rename {modulevoice => modulemain}/src/main/res/layout/index_rv_item_room_hot0.xml (100%)
 rename {modulevoice => modulemain}/src/main/res/layout/index_view_empty.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/item_album_list.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/item_bind_card.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/item_black.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/item_brief_introduction.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/item_charm_dialog.xml (100%)
 rename {modulecircle => modulemain}/src/main/res/layout/item_circle_category.xml (100%)
 rename {modulecircle => modulemain}/src/main/res/layout/item_cirle_category_grid.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/item_date_header.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/item_emotion.xml (100%)
 rename {modulecircle => modulemain}/src/main/res/layout/item_expand_column.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/item_gift_box.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/item_gift_card.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/item_group.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/item_hourly.xml (100%)
 rename {modulecircle => modulemain}/src/main/res/layout/item_multi_select.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/item_multi_select_t.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/item_my_bag.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/item_my_bag_data.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/item_onlie_room.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/item_photo.xml (100%)
 rename {modulevoice => modulemain}/src/main/res/layout/item_popular_room.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/item_ranking_auction.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/item_red.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/item_red_bag.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/item_relation.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/item_relationship.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/item_revenue.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/item_reward.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/item_room_charm_rank.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/item_room_gift.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/item_room_online_text.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/item_setting.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/item_song_list.xml (100%)
 rename {moduleLogin => modulemain}/src/main/res/layout/item_switch_accounts.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/item_tablayout_headerzb.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/item_tag.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/item_task_box.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/item_task_data.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/item_task_header.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/item_text_view.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/item_title.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/item_top_user.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/item_wheat_feeding_select.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/item_withdrawal.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/item_zhuangbanschangcheng_list.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/layout_empty_no.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/me_fagment_user_gift_wall.xml (100%)
 rename modulevocal/src/main/res/layout/me_fagment_user_gift_wall.xml => modulemain/src/main/res/layout/me_fagment_user_gift_wall_2.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/me_item_user_gift_wall.xml (100%)
 rename modulevocal/src/main/res/layout/me_item_user_gift_wall.xml => modulemain/src/main/res/layout/me_item_user_gift_wall_2.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/me_item_user_photo_wall.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/pop_layout1.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/pop_menu.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/popup_menu.xml (100%)
 rename {modulevoice => modulemain}/src/main/res/layout/ranking_list.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/room_activity_my_room.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/room_cabin_fragment.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/room_concern_dialog.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/room_concern_item.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/room_details_list.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/room_dialog_message_list.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/room_dialog_room_pw_setting.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/room_dialog_tuner.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/room_fragement_dialog_room_background.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/room_fragement_trans_ease_chat.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/room_fragment_item.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/room_fragment_item_list.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/room_fragment_my_create.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/room_fragment_my_follow.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/room_fragment_my_manage.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/room_fragment_my_room_cp_list.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/room_fragment_my_room_list.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/room_fragment_my_room_list_list.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/room_gift_dialog.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/room_host_add_fragment.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/room_host_add_item.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/room_host_income_dialog.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/room_host_zb_dialog.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/room_index_item_chatroom_my_foot.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/room_index_item_subsidy.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/room_li_bu.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/room_ranking_child.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/room_ranking_parent.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/room_rv_item_gift_wheat.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/room_rv_item_ranking.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/room_rv_item_ranking_rich.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/room_rv_item_room_bg.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/room_rv_item_tuner.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/room_top.xml (100%)
 rename {moduleroom => modulemain}/src/main/res/layout/top_overlay_buttons.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/user_home.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/user_top.xml (100%)
 rename {modulevocal => modulemain}/src/main/res/layout/zhuangban_recyclerview_noref.xml (100%)
 rename {modulevoice => modulemain}/src/main/res/mipmap-xxhdpi/jiaoyou.webp (100%)
 rename {modulevoice => modulemain}/src/main/res/mipmap-xxxhdpi/me_head_bg.png (100%)
 rename {modulevoice => modulemain}/src/main/res/mipmap-xxxhdpi/xing.webp (100%)
 delete mode 100644 modulenews/.gitignore
 delete mode 100644 modulenews/build.gradle
 delete mode 100644 modulenews/proguard-rules.pro
 delete mode 100644 modulenews/src/main/AndroidManifest.xml
 delete mode 100644 modulenews/src/main/res/drawable/ic_launcher_background.xml
 delete mode 100644 modulenews/src/main/res/drawable/ic_launcher_foreground.xml
 delete mode 100644 modulenews/src/main/res/values/colors.xml
 delete mode 100644 modulenews/src/main/res/values/strings.xml
 delete mode 100644 moduleroom/.gitignore
 delete mode 100644 moduleroom/build.gradle
 delete mode 100644 moduleroom/consumer-rules.pro
 delete mode 100644 moduleroom/proguard-rules.pro
 delete mode 100644 moduleroom/src/main/AndroidManifest.xml
 delete mode 100644 moduleroom/src/main/res/layout/custom_tab_layout.xml
 delete mode 100644 moduleroom/src/main/res/values/strings.xml
 delete mode 100644 modulevocal/.gitignore
 delete mode 100644 modulevocal/build.gradle
 delete mode 100644 modulevocal/proguard-rules.pro
 delete mode 100644 modulevocal/src/main/AndroidManifest.xml
 delete mode 100644 modulevocal/src/main/res/drawable/ic_launcher_background.xml
 delete mode 100644 modulevocal/src/main/res/drawable/ic_launcher_foreground.xml
 delete mode 100644 modulevocal/src/main/res/values/colors.xml
 delete mode 100644 modulevocal/src/main/res/values/strings.xml
 delete mode 100644 modulevocal/src/main/res/values/styles.xml
 delete mode 100644 modulevoice/.gitignore
 delete mode 100644 modulevoice/build.gradle
 delete mode 100644 modulevoice/proguard-rules.pro
 delete mode 100644 modulevoice/src/main/AndroidManifest.xml
 delete mode 100644 modulevoice/src/main/java/com/example/modulevoice/activity/ui/main/PageViewModel.java
 delete mode 100644 modulevoice/src/main/java/com/example/modulevoice/view/MarqueeTextView.java
 delete mode 100644 modulevoice/src/main/res/drawable/ic_launcher_background.xml
 delete mode 100644 modulevoice/src/main/res/drawable/ic_launcher_foreground.xml
 delete mode 100644 modulevoice/src/main/res/values-en-rUs/strings.xml
 delete mode 100644 modulevoice/src/main/res/values/colors.xml
 delete mode 100644 modulevoice/src/main/res/values/strings.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f9872c1b..564c2fbd 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -185,12 +185,6 @@
 <!--            android:launchMode="singleTop"-->
 <!--            android:screenOrientation="behind" />-->
 
-        <activity
-            android:name="com.cmic.sso.sdk.activity.LoginAuthActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize"
-            android:launchMode="singleTop"
-            android:screenOrientation="behind"
-            android:theme="@style/authsdk_activity_dialog" />
 
         <activity
             android:name=".wxapi.WXEntryActivity"
diff --git a/app/src/main/java/com/qxcm/qxlive/LaunchPageActivity.java b/app/src/main/java/com/qxcm/qxlive/LaunchPageActivity.java
index de4a7447..6140d44d 100644
--- a/app/src/main/java/com/qxcm/qxlive/LaunchPageActivity.java
+++ b/app/src/main/java/com/qxcm/qxlive/LaunchPageActivity.java
@@ -11,7 +11,6 @@ import androidx.annotation.Nullable;
 
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.qxcm.qxlive.databinding.ActivityLaunchPageBinding;
-import com.xscm.modulelogin.activity.ImproveInfoActivity;
 import com.xscm.moduleutil.activity.BaseAppCompatActivity;
 import com.xscm.moduleutil.activity.WebViewActivity;
 import com.xscm.moduleutil.base.AppStateListener;
diff --git a/app/src/main/java/com/qxcm/qxlive/LaunchPresenter.java b/app/src/main/java/com/qxcm/qxlive/LaunchPresenter.java
index f95ad366..6cdb300d 100644
--- a/app/src/main/java/com/qxcm/qxlive/LaunchPresenter.java
+++ b/app/src/main/java/com/qxcm/qxlive/LaunchPresenter.java
@@ -5,9 +5,9 @@ import android.content.Intent;
 import android.os.Bundle;
 
 import com.blankj.utilcode.util.ToastUtils;
-import com.xscm.modulelogin.activity.ImproveInfoActivity;
-import com.xscm.modulelogin.activity.SwitchAccountsActivity;
-import com.xscm.modulemain.activity.MainActivity;
+import com.xscm.modulemain.activity.login.activity.ImproveInfoActivity;
+import com.xscm.modulemain.activity.login.activity.SwitchAccountsActivity;
+import com.xscm.modulemain.activity.main.activity.MainActivity;
 import com.xscm.moduleutil.base.CommonAppContext;
 import com.xscm.moduleutil.bean.UserBean;
 import com.xscm.moduleutil.http.BaseObserver;
diff --git a/app/src/main/java/com/qxcm/qxlive/PasswordLoginActivity.java b/app/src/main/java/com/qxcm/qxlive/PasswordLoginActivity.java
index 59a3206d..0d71595d 100644
--- a/app/src/main/java/com/qxcm/qxlive/PasswordLoginActivity.java
+++ b/app/src/main/java/com/qxcm/qxlive/PasswordLoginActivity.java
@@ -28,11 +28,10 @@ import com.mobile.auth.gatewayauth.PreLoginResultListener;
 import com.mobile.auth.gatewayauth.TokenResultListener;
 import com.mobile.auth.gatewayauth.model.TokenRet;
 import com.qxcm.qxlive.databinding.ActivityPasswordLoginBinding;
-import com.xscm.modulelogin.activity.ImproveInfoActivity;
-import com.xscm.modulelogin.even.LoginFinishEvent;
-import com.xscm.modulelogin.present.LoginContacter;
-import com.xscm.modulelogin.present.LoginPresenter;
-import com.xscm.modulemain.activity.MainActivity;
+import com.xscm.modulemain.activity.login.activity.ImproveInfoActivity;
+import com.xscm.modulemain.activity.login.present.LoginContacter;
+import com.xscm.modulemain.activity.login.present.LoginPresenter;
+import com.xscm.modulemain.activity.main.activity.MainActivity;
 import com.xscm.moduleutil.activity.BaseMvpActivity;
 import com.xscm.moduleutil.base.CommonAppContext;
 import com.xscm.moduleutil.bean.ThemeBean;
@@ -136,7 +135,7 @@ public class PasswordLoginActivity extends BaseMvpActivity<LoginPresenter, Activ
     }
 
     @Subscribe(threadMode = ThreadMode.MAIN)
-    public void finishEvent(LoginFinishEvent event) {
+    public void finishEvent() {
         finish();
     }
 
diff --git a/moduleLogin/.gitignore b/moduleLogin/.gitignore
deleted file mode 100644
index 42afabfd..00000000
--- a/moduleLogin/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
\ No newline at end of file
diff --git a/moduleLogin/build.gradle b/moduleLogin/build.gradle
deleted file mode 100644
index 137f3c86..00000000
--- a/moduleLogin/build.gradle
+++ /dev/null
@@ -1,51 +0,0 @@
-plugins {
-    alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
-}
-
-android {
-    namespace 'com.xscm.modulelogin'
-    compileSdk 35
-
-    defaultConfig {
-        minSdk 24
-        targetSdk 35
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
-    }
-    dataBinding {
-        enabled = true
-    }
-    kotlinOptions {
-        jvmTarget = '11'
-    }
-}
-
-dependencies {
-
-    implementation libs.appcompat
-    implementation libs.material
-    implementation libs.activity
-    implementation libs.constraintlayout
-    implementation project(':modulemain')
-    implementation project(':modulevocal')
-    testImplementation libs.junit
-    androidTestImplementation libs.ext.junit
-    androidTestImplementation libs.espresso.core
-
-    implementation project(":moduleUtil")
-}
-
-apply plugin: 'com.alibaba.arouter' // ⚠️ 添加这一行
\ No newline at end of file
diff --git a/moduleLogin/proguard-rules.pro b/moduleLogin/proguard-rules.pro
deleted file mode 100644
index 481bb434..00000000
--- a/moduleLogin/proguard-rules.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/moduleLogin/src/main/AndroidManifest.xml b/moduleLogin/src/main/AndroidManifest.xml
deleted file mode 100644
index 005e324b..00000000
--- a/moduleLogin/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    <application android:allowBackup="true">
-        <activity
-            android:name=".activity.SwitchAccountsActivity"
-            android:exported="true"
-          />
-        <activity
-            android:name=".activity.ImproveInfoActivity"
-            android:exported="true"
-          />
-        <activity
-            android:name=".activity.ForgetPasswordActivity"
-            android:exported="true"
-          />
-
-        <activity
-            android:name=".activity.LoginActivity"
-          
-            android:screenOrientation="portrait" />
-
-    </application>
-
-</manifest>
\ No newline at end of file
diff --git a/moduleLogin/src/main/java/com/xscm/modulelogin/even/LoginFinishEvent.java b/moduleLogin/src/main/java/com/xscm/modulelogin/even/LoginFinishEvent.java
deleted file mode 100644
index 1b46189e..00000000
--- a/moduleLogin/src/main/java/com/xscm/modulelogin/even/LoginFinishEvent.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.xscm.modulelogin.even;
-
-public class LoginFinishEvent {
-}
diff --git a/moduleLogin/src/main/res/drawable/ic_launcher_background.xml b/moduleLogin/src/main/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index 07d5da9c..00000000
--- a/moduleLogin/src/main/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>
diff --git a/moduleLogin/src/main/res/drawable/ic_launcher_foreground.xml b/moduleLogin/src/main/res/drawable/ic_launcher_foreground.xml
deleted file mode 100644
index 2b068d11..00000000
--- a/moduleLogin/src/main/res/drawable/ic_launcher_foreground.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
-        <aapt:attr name="android:fillColor">
-            <gradient
-                android:endX="85.84757"
-                android:endY="92.4963"
-                android:startX="42.9492"
-                android:startY="49.59793"
-                android:type="linear">
-                <item
-                    android:color="#44000000"
-                    android:offset="0.0" />
-                <item
-                    android:color="#00000000"
-                    android:offset="1.0" />
-            </gradient>
-        </aapt:attr>
-    </path>
-    <path
-        android:fillColor="#FFFFFF"
-        android:fillType="nonZero"
-        android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
-        android:strokeWidth="1"
-        android:strokeColor="#00000000" />
-</vector>
\ No newline at end of file
diff --git a/moduleLogin/src/main/res/values-en-rUs/strings.xml b/moduleLogin/src/main/res/values-en-rUs/strings.xml
deleted file mode 100644
index 888faa38..00000000
--- a/moduleLogin/src/main/res/values-en-rUs/strings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
-
-    <string name="recommend_skip">Skip</string>
-
-
-</resources>
\ No newline at end of file
diff --git a/moduleLogin/src/main/res/values/colors.xml b/moduleLogin/src/main/res/values/colors.xml
deleted file mode 100644
index f8c6127d..00000000
--- a/moduleLogin/src/main/res/values/colors.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="purple_200">#FFBB86FC</color>
-    <color name="purple_500">#FF6200EE</color>
-    <color name="purple_700">#FF3700B3</color>
-    <color name="teal_200">#FF03DAC5</color>
-    <color name="teal_700">#FF018786</color>
-    <color name="black">#FF000000</color>
-    <color name="white">#FFFFFFFF</color>
-</resources>
\ No newline at end of file
diff --git a/moduleLogin/src/main/res/values/strings.xml b/moduleLogin/src/main/res/values/strings.xml
deleted file mode 100644
index 6b30d8d9..00000000
--- a/moduleLogin/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources>
-
-</resources>
\ No newline at end of file
diff --git a/moduleUtil/build.gradle b/moduleUtil/build.gradle
index ddb2a3b8..870c171c 100644
--- a/moduleUtil/build.gradle
+++ b/moduleUtil/build.gradle
@@ -222,7 +222,7 @@ dependencies {
     api 'com.qcloud.cos:cos-android:5.9.+'
 
     api project(':Loadinglibrary')
-
+    api project(':moduletablayout')
 //    room数据库
 //    def room_version = "2.5.0"
 //    implementation "androidx.room:room-runtime:$room_version"
diff --git a/modulecircle/.gitignore b/modulecircle/.gitignore
deleted file mode 100644
index 42afabfd..00000000
--- a/modulecircle/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
\ No newline at end of file
diff --git a/modulecircle/build.gradle b/modulecircle/build.gradle
deleted file mode 100644
index e02d7c0d..00000000
--- a/modulecircle/build.gradle
+++ /dev/null
@@ -1,64 +0,0 @@
-plugins {
-    alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
-
-}
-
-android {
-    namespace 'com.example.modulecircle'
-    compileSdk 35
-
-    defaultConfig {
-        minSdk 24
-        targetSdk 35
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-
-        javaCompileOptions {
-            annotationProcessorOptions {
-                arguments = [
-                        AROUTER_MODULE_NAME: project.getName()
-                ]
-            }
-        }
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
-    }
-    dataBinding {
-        enabled = true
-    }
-    kotlinOptions {
-        jvmTarget = '11'
-    }
-}
-
-dependencies {
-
-    implementation libs.appcompat
-    implementation libs.material
-    implementation libs.activity
-    implementation libs.constraintlayout
-    testImplementation libs.junit
-    androidTestImplementation libs.ext.junit
-    androidTestImplementation libs.espresso.core
-
-
-
-    implementation(libs.arouter.api.v150)
-    //annotationProcessor
-    annotationProcessor libs.arouter.compiler
-    implementation project(':moduleUtil')
-    implementation project(':moduletablayout')
-    implementation project(':modulevocal')
-}
-
-apply plugin: 'com.alibaba.arouter' // ⚠️ 添加这一行
\ No newline at end of file
diff --git a/modulecircle/proguard-rules.pro b/modulecircle/proguard-rules.pro
deleted file mode 100644
index 481bb434..00000000
--- a/modulecircle/proguard-rules.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/modulecircle/src/main/AndroidManifest.xml b/modulecircle/src/main/AndroidManifest.xml
deleted file mode 100644
index faa4b3a0..00000000
--- a/modulecircle/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <application
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
-        android:supportsRtl="true">
-        <activity
-            android:name=".activity.DynamicDetailActivity"
-            android:exported="false"
-            
-            android:windowSoftInputMode="stateHidden|adjustResize"
-            android:screenOrientation="portrait"/>
-        <activity
-            android:name=".activity.DynamicListActivity"
-            android:exported="false"
-            
-            android:windowSoftInputMode="stateHidden|adjustResize"/>
-        <activity
-            android:name=".activity.ReleaseActivity"
-            android:exported="false"
-            />
-    </application>
-
-</manifest>
\ No newline at end of file
diff --git a/modulecircle/src/main/res/drawable/ic_launcher_background.xml b/modulecircle/src/main/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index 07d5da9c..00000000
--- a/modulecircle/src/main/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>
diff --git a/modulecircle/src/main/res/drawable/ic_launcher_foreground.xml b/modulecircle/src/main/res/drawable/ic_launcher_foreground.xml
deleted file mode 100644
index 2b068d11..00000000
--- a/modulecircle/src/main/res/drawable/ic_launcher_foreground.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
-        <aapt:attr name="android:fillColor">
-            <gradient
-                android:endX="85.84757"
-                android:endY="92.4963"
-                android:startX="42.9492"
-                android:startY="49.59793"
-                android:type="linear">
-                <item
-                    android:color="#44000000"
-                    android:offset="0.0" />
-                <item
-                    android:color="#00000000"
-                    android:offset="1.0" />
-            </gradient>
-        </aapt:attr>
-    </path>
-    <path
-        android:fillColor="#FFFFFF"
-        android:fillType="nonZero"
-        android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
-        android:strokeWidth="1"
-        android:strokeColor="#00000000" />
-</vector>
\ No newline at end of file
diff --git a/modulecircle/src/main/res/values/colors.xml b/modulecircle/src/main/res/values/colors.xml
deleted file mode 100644
index f8c6127d..00000000
--- a/modulecircle/src/main/res/values/colors.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="purple_200">#FFBB86FC</color>
-    <color name="purple_500">#FF6200EE</color>
-    <color name="purple_700">#FF3700B3</color>
-    <color name="teal_200">#FF03DAC5</color>
-    <color name="teal_700">#FF018786</color>
-    <color name="black">#FF000000</color>
-    <color name="white">#FFFFFFFF</color>
-</resources>
\ No newline at end of file
diff --git a/modulecircle/src/main/res/values/strings.xml b/modulecircle/src/main/res/values/strings.xml
deleted file mode 100644
index 6048840e..00000000
--- a/modulecircle/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<resources>
-    <!-- TODO: Remove or change this placeholder text -->
-    <string name="hello_blank_fragment">Hello blank fragment</string>
-</resources>
\ No newline at end of file
diff --git a/modulemain/build.gradle b/modulemain/build.gradle
index e4c4af7f..8c200f97 100644
--- a/modulemain/build.gradle
+++ b/modulemain/build.gradle
@@ -38,6 +38,10 @@ android {
     kotlinOptions {
         jvmTarget = '11'
     }
+
+    buildFeatures {
+        viewBinding true
+    }
 }
 
 dependencies {
@@ -46,11 +50,11 @@ dependencies {
     implementation libs.material
     implementation libs.activity
     implementation libs.constraintlayout
-    implementation project(':modulevoice')
-    implementation project(':modulecircle')
-    implementation project(':modulevocal')
-    implementation project(':modulenews')
-    implementation project(':moduleroom')
+//    implementation project(':modulevoice')
+//    implementation project(':modulecircle')
+//    implementation project(':modulevocal')
+//    implementation project(':modulenews')
+//    implementation project(':moduleroom')
 
     testImplementation libs.junit
     androidTestImplementation libs.ext.junit
@@ -62,5 +66,13 @@ dependencies {
     annotationProcessor libs.arouter.compiler
     implementation libs.permissionx
 
+    implementation files('libs/WbCloudFaceLiveSdk-face-v6.6.2-8e4718fc.aar')
+    implementation files('libs/WbCloudNormal-v5.1.10-4e3e198.aar')
+    api project(':tuiconversation')
+    api project(':tuichat')
+
+
+    api project(":moduleUtil")
+
 }
 apply plugin: 'com.alibaba.arouter' // ⚠️ 添加这一行
\ No newline at end of file
diff --git a/modulevocal/libs/WbCloudFaceLiveSdk-face-v6.6.2-8e4718fc.aar b/modulemain/libs/WbCloudFaceLiveSdk-face-v6.6.2-8e4718fc.aar
similarity index 100%
rename from modulevocal/libs/WbCloudFaceLiveSdk-face-v6.6.2-8e4718fc.aar
rename to modulemain/libs/WbCloudFaceLiveSdk-face-v6.6.2-8e4718fc.aar
diff --git a/modulevocal/libs/WbCloudNormal-v5.1.10-4e3e198.aar b/modulemain/libs/WbCloudNormal-v5.1.10-4e3e198.aar
similarity index 100%
rename from modulevocal/libs/WbCloudNormal-v5.1.10-4e3e198.aar
rename to modulemain/libs/WbCloudNormal-v5.1.10-4e3e198.aar
diff --git a/modulemain/src/main/AndroidManifest.xml b/modulemain/src/main/AndroidManifest.xml
index 3c40bf31..434df3f7 100644
--- a/modulemain/src/main/AndroidManifest.xml
+++ b/modulemain/src/main/AndroidManifest.xml
@@ -1,16 +1,186 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- 前台定位权限 -->
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/> <!-- 后台定位权限（Android 10+） -->
-    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> <!-- 后台定位权限（Android 10+） -->
+    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
 
     <application>
+        <activity
+            android:name=".activity.login.activity.SwitchAccountsActivity"
+            android:exported="false" />
+        <activity
+            android:name=".activity.login.activity.ImproveInfoActivity"
+            android:exported="false" />
+        <activity
+            android:name=".activity.login.activity.ForgetPasswordActivity"
+            android:exported="false" />
 
         <activity
-                android:name=".activity.MainActivity"
-                android:configChanges="fontScale"
-                android:screenOrientation="portrait">
-        </activity>
+            android:name=".activity.login.activity.LoginActivity"
+            android:exported="false" />
+
+        <activity
+            android:name=".activity.main.activity.MainActivity"
+            android:configChanges="fontScale" />
+
+
+        <activity
+            android:name=".activity.room.activity.RoomActivity"
+            android:alwaysRetainTaskState="true"
+            android:configChanges="orientation|screenSize|keyboardHidden"
+            android:enableOnBackInvokedCallback="false"
+            android:excludeFromRecents="false"
+            android:exported="false"
+            android:launchMode="singleTask"
+            android:screenOrientation="portrait"
+            android:theme="@style/TransparentActivityTheme"
+            android:windowSoftInputMode="adjustPan" />
+
+        <activity
+            android:name=".activity.room.activity.RedResultActivity"
+            android:exported="true" />
+
+
+        <activity
+            android:name=".activity.room.activity.SearchActivity"
+            android:exported="false" />
+
+        <activity
+            android:name=".activity.room.activity.RankingListActivity"
+
+            android:exported="false" />
+        <activity
+            android:name=".activity.room.activity.PopularRoomActivity"
+            android:exported="false" />
+
+        <activity
+            android:name=".activity.plaza.activity.DynamicDetailActivity"
+            android:exported="false"
+            android:windowSoftInputMode="stateHidden|adjustResize" />
+        <activity
+            android:name=".activity.plaza.activity.DynamicListActivity"
+            android:exported="false"
+            android:windowSoftInputMode="stateHidden|adjustResize" />
+        <activity
+            android:name=".activity.plaza.activity.ReleaseActivity"
+            android:exported="false" />
+
+
+        <activity
+            android:name=".activity.user.activity.AboutUsActivity"
+            android:exported="false" />
+        <activity
+            android:name=".activity.user.activity.WithdrawalListActivity"
+            android:exported="false" />
+        <activity
+            android:name=".activity.user.activity.GiftBoxRecordActivity"
+            android:exported="false" />
+        <activity
+            android:name=".activity.user.activity.BindCardDetailsActivity"
+            android:exported="false" />
+        <activity
+            android:name=".activity.user.activity.BindCardActivity"
+            android:exported="false" />
+        <activity
+            android:name=".activity.user.activity.AlbumDetailActivity"
+            android:exported="false" />
+        <activity
+            android:name=".activity.user.activity.SettingActivity"
+            android:exported="false" />
+        <activity
+            android:name=".activity.user.activity.CreateAlbumActivity"
+            android:exported="false" />
+        <activity
+            android:name=".activity.user.activity.RevenueActivity"
+            android:exported="false" />
+        <activity
+            android:name=".activity.user.activity.DailyTasksActivity"
+            android:exported="false" />
+        <activity
+            android:name=".activity.user.activity.UserHomepageActivity"
+            android:exported="false" />
+        <activity
+            android:name=".activity.user.activity.MyBagActivity"
+            android:exported="false" />
+        <activity
+            android:name=".activity.user.activity.BriefIntroductionActivity"
+            android:exported="false" />
+        <activity
+            android:name=".activity.user.activity.ChangeNicknameActivity"
+            android:exported="false" />
+        <activity
+            android:name=".activity.user.activity.CurrencyExchangeActivity"
+            android:exported="false" />
+        <activity
+            android:name=".activity.user.activity.WithdrawalActivity"
+            android:exported="false" />
+        <activity
+            android:name=".activity.user.activity.RechargeActivity"
+            android:exported="false" />
+        <activity
+            android:name=".activity.user.activity.MyMoneyActivity"
+            android:exported="false" />
+        <activity
+            android:name=".activity.user.activity.EditUserInfoActivity"
+            android:exported="false" />
+        <activity
+            android:name=".activity.user.activity.ChangPassActivity"
+            android:exported="false" />
+        <activity
+            android:name=".activity.user.activity.PersonalityActivity"
+            android:exported="false" />
+        <activity
+            android:name=".activity.user.activity.RealDetailActivity"
+            android:exported="false" />
+        <activity
+            android:name=".activity.user.activity.RoomAllowanceDetailActivity"
+            android:exported="false" />
+        <activity
+            android:name=".activity.user.activity.RoomAllowanceActivity"
+            android:exported="false" />
+        <activity
+            android:name=".activity.user.activity.RoomDetailsActivity"
+            android:exported="false" />
+        <activity
+            android:name=".activity.user.activity.CreatedRoomActivity"
+            android:exported="false" />
+        <activity
+            android:name=".activity.user.activity.MyRoomActivity"
+            android:exported="false" />
+        <activity
+            android:name=".activity.user.activity.PhoneReplacementActivity"
+            android:exported="false" />
+        <activity
+            android:name=".activity.user.activity.BlacklistActivity"
+            android:exported="false" />
+        <activity
+            android:name=".activity.user.activity.MessageReminderActivity"
+            android:exported="false" />
+        <activity
+            android:name=".activity.user.activity.NotificationActivity"
+            android:exported="false" />
+        <activity
+            android:name=".activity.user.activity.UnderageActivity"
+            android:exported="true" />
+        <activity
+            android:name=".activity.user.activity.RealNameActivity"
+            android:exported="false" />
+
+        <service
+            android:name=".service.MediaProjectionService"
+            android:foregroundServiceType="mediaProjection" />
+
+        <service
+            android:name=".service.ForegroundService"
+            android:enabled="true"
+            android:exported="true"
+            android:foregroundServiceType="microphone|camera|mediaPlayback" />
+        <service
+            android:name=".service.CancelNoticeService"
+            android:enabled="true"
+            android:exported="true" />
+
+
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/moduleLogin/src/main/java/com/xscm/modulelogin/activity/ForgetPasswordActivity.java b/modulemain/src/main/java/com/xscm/modulemain/activity/login/activity/ForgetPasswordActivity.java
similarity index 79%
rename from moduleLogin/src/main/java/com/xscm/modulelogin/activity/ForgetPasswordActivity.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/login/activity/ForgetPasswordActivity.java
index cd43d72b..44025afb 100644
--- a/moduleLogin/src/main/java/com/xscm/modulelogin/activity/ForgetPasswordActivity.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/login/activity/ForgetPasswordActivity.java
@@ -1,4 +1,4 @@
-package com.xscm.modulelogin.activity;
+package com.xscm.modulemain.activity.login.activity;
 
 import android.os.CountDownTimer;
 import android.text.TextUtils;
@@ -6,11 +6,10 @@ import android.view.View;
 
 import com.blankj.utilcode.util.LogUtils;
 import com.blankj.utilcode.util.ToastUtils;
-import com.xscm.modulelogin.R;
-import com.xscm.modulelogin.databinding.ActivityForgetPasswordBinding;
-import com.xscm.modulelogin.databinding.ActivityLoginBinding;
-import com.xscm.modulelogin.present.LoginContacter;
-import com.xscm.modulelogin.present.LoginPresenter;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.activity.login.present.LoginContacter;
+import com.xscm.modulemain.activity.login.present.LoginPresenter;
+import com.xscm.modulemain.databinding.ActivityForgetPasswordBinding;
 import com.xscm.moduleutil.activity.BaseMvpActivity;
 import com.xscm.moduleutil.bean.ThemeBean;
 import com.xscm.moduleutil.bean.UserBean;
@@ -39,7 +38,7 @@ public class ForgetPasswordActivity extends BaseMvpActivity<LoginPresenter, Acti
         if (v.getId() == R.id.tv_send_code) {
             String phone = mBinding.edPhone.getText().toString().trim();
             if (TextUtils.isEmpty(phone)) {
-                com.blankj.utilcode.util.ToastUtils.showShort("请输入手机号");
+                ToastUtils.showShort("请输入手机号");
                 return;
             }
             sendCodeSuccess(phone);
@@ -51,23 +50,23 @@ public class ForgetPasswordActivity extends BaseMvpActivity<LoginPresenter, Acti
             String password = mBinding.editTextNewPassword.getText().toString().trim();
             String confirmPassword = mBinding.editTextConfirmPassword.getText().toString().trim();
             if (TextUtils.isEmpty(phone)){
-                com.blankj.utilcode.util.ToastUtils.showShort("请输入手机号");
+                ToastUtils.showShort("请输入手机号");
                 return;
             }
             if (TextUtils.isEmpty(code)){
-                com.blankj.utilcode.util.ToastUtils.showShort("请输入验证码");
+                ToastUtils.showShort("请输入验证码");
                 return;
             }
             if (TextUtils.isEmpty(password)){
-                com.blankj.utilcode.util.ToastUtils.showShort("请输入密码");
+                ToastUtils.showShort("请输入密码");
                 return;
             }
             if (TextUtils.isEmpty(confirmPassword)){
-                com.blankj.utilcode.util.ToastUtils.showShort("两次密码不一致");
+                ToastUtils.showShort("两次密码不一致");
                 return;
             }
             if (!password.equals(confirmPassword)){
-                com.blankj.utilcode.util.ToastUtils.showShort("两次密码不一致");
+                ToastUtils.showShort("两次密码不一致");
                 return;
             }
             MvpPre.forgotPassword(password,phone,code);
@@ -81,7 +80,7 @@ public class ForgetPasswordActivity extends BaseMvpActivity<LoginPresenter, Acti
         }
     }
     public void sendCodeSuccess(String phoneNumber) {
-        com.blankj.utilcode.util.ToastUtils.showShort("短信验证码发送成功请注意查收");
+        ToastUtils.showShort("短信验证码发送成功请注意查收");
         mBinding.tvSendCode.setEnabled(false);
         mBinding.tvSendCode.setAlpha(0.5f);
         releaseTimer();
diff --git a/moduleLogin/src/main/java/com/xscm/modulelogin/activity/ImproveInfoActivity.java b/modulemain/src/main/java/com/xscm/modulemain/activity/login/activity/ImproveInfoActivity.java
similarity index 96%
rename from moduleLogin/src/main/java/com/xscm/modulelogin/activity/ImproveInfoActivity.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/login/activity/ImproveInfoActivity.java
index fae7a9ab..1164de22 100644
--- a/moduleLogin/src/main/java/com/xscm/modulelogin/activity/ImproveInfoActivity.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/login/activity/ImproveInfoActivity.java
@@ -1,4 +1,4 @@
-package com.xscm.modulelogin.activity;
+package com.xscm.modulemain.activity.login.activity;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -11,11 +11,11 @@ import com.luck.picture.lib.basic.PictureSelector;
 import com.luck.picture.lib.config.PictureConfig;
 import com.luck.picture.lib.entity.LocalMedia;
 import com.luck.picture.lib.style.PictureSelectorStyle;
-import com.xscm.modulelogin.R;
-import com.xscm.modulelogin.databinding.ActivityImproveInfoBinding;
-import com.xscm.modulelogin.present.ImproveInfoContacts;
-import com.xscm.modulelogin.present.ImproveInfoPresenter;
-import com.xscm.modulemain.activity.MainActivity;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.activity.login.contacts.ImproveInfoContacts;
+import com.xscm.modulemain.activity.login.contacts.ImproveInfoPresenter;
+import com.xscm.modulemain.activity.main.activity.MainActivity;
+import com.xscm.modulemain.databinding.ActivityImproveInfoBinding;
 import com.xscm.moduleutil.activity.BaseMvpActivity;
 import com.xscm.moduleutil.bean.UserBean;
 import com.xscm.moduleutil.utils.DateSelectDialog;
@@ -25,7 +25,6 @@ import com.xscm.moduleutil.utils.ImageUtils;
 import com.xscm.moduleutil.utils.SpUtil;
 import com.xscm.moduleutil.widget.Constants;
 
-
 import org.greenrobot.eventbus.EventBus;
 
 import java.io.File;
diff --git a/moduleLogin/src/main/java/com/xscm/modulelogin/activity/LoginActivity.java b/modulemain/src/main/java/com/xscm/modulemain/activity/login/activity/LoginActivity.java
similarity index 97%
rename from moduleLogin/src/main/java/com/xscm/modulelogin/activity/LoginActivity.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/login/activity/LoginActivity.java
index e4320ad8..de9bb62f 100644
--- a/moduleLogin/src/main/java/com/xscm/modulelogin/activity/LoginActivity.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/login/activity/LoginActivity.java
@@ -1,4 +1,4 @@
-package com.xscm.modulelogin.activity;
+package com.xscm.modulemain.activity.login.activity;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
@@ -15,21 +15,20 @@ import androidx.annotation.Nullable;
 import com.alipay.sdk.app.AuthTask;
 import com.blankj.utilcode.util.LogUtils;
 import com.blankj.utilcode.util.ToastUtils;
-import com.xscm.modulelogin.R;
-import com.xscm.modulelogin.databinding.ActivityLoginBinding;
-import com.xscm.modulelogin.even.LoginFinishEvent;
-import com.xscm.modulelogin.present.LoginContacter;
-import com.xscm.modulelogin.present.LoginPresenter;
-import com.xscm.moduleutil.activity.BaseMvpActivity;
-import com.xscm.moduleutil.bean.ThemeBean;
-import com.xscm.moduleutil.bean.UserBean;
-import com.xscm.moduleutil.utils.BarUtils;
-import com.xscm.moduleutil.utils.PreferencesUtils;
-import com.xscm.moduleutil.base.CommonAppContext;
 import com.tencent.mm.opensdk.modelbase.BaseResp;
 import com.tencent.mm.opensdk.modelmsg.SendAuth;
 import com.tencent.mm.opensdk.openapi.IWXAPI;
 import com.tencent.mm.opensdk.openapi.WXAPIFactory;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.activity.login.present.LoginContacter;
+import com.xscm.modulemain.activity.login.present.LoginPresenter;
+import com.xscm.modulemain.databinding.ActivityLoginBinding;
+import com.xscm.moduleutil.activity.BaseMvpActivity;
+import com.xscm.moduleutil.base.CommonAppContext;
+import com.xscm.moduleutil.bean.ThemeBean;
+import com.xscm.moduleutil.bean.UserBean;
+import com.xscm.moduleutil.utils.BarUtils;
+import com.xscm.moduleutil.utils.PreferencesUtils;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -72,7 +71,7 @@ public class LoginActivity extends BaseMvpActivity<LoginPresenter, ActivityLogin
     }
 
     @Subscribe(threadMode = ThreadMode.MAIN)
-    public void finishEvent(LoginFinishEvent event) {
+    public void finishEvent() {
         finish();
     }
 
diff --git a/moduleLogin/src/main/java/com/xscm/modulelogin/activity/SwitchAccountsActivity.java b/modulemain/src/main/java/com/xscm/modulemain/activity/login/activity/SwitchAccountsActivity.java
similarity index 89%
rename from moduleLogin/src/main/java/com/xscm/modulelogin/activity/SwitchAccountsActivity.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/login/activity/SwitchAccountsActivity.java
index eac20f45..03d4359f 100644
--- a/moduleLogin/src/main/java/com/xscm/modulelogin/activity/SwitchAccountsActivity.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/login/activity/SwitchAccountsActivity.java
@@ -1,4 +1,4 @@
-package com.xscm.modulelogin.activity;
+package com.xscm.modulemain.activity.login.activity;
 
 import android.os.Build;
 import android.os.Bundle;
@@ -6,11 +6,11 @@ import android.util.Log;
 
 import androidx.recyclerview.widget.LinearLayoutManager;
 
-import com.xscm.modulelogin.R;
-import com.xscm.modulelogin.adapter.SwitchAccountsAdapter;
-import com.xscm.modulelogin.databinding.ActivitySwitchAccountsBinding;
-import com.xscm.modulelogin.present.LoginContacter;
-import com.xscm.modulelogin.present.LoginPresenter;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.activity.login.present.LoginContacter;
+import com.xscm.modulemain.activity.login.present.LoginPresenter;
+import com.xscm.modulemain.adapter.SwitchAccountsAdapter;
+import com.xscm.modulemain.databinding.ActivitySwitchAccountsBinding;
 import com.xscm.moduleutil.activity.BaseMvpActivity;
 import com.xscm.moduleutil.bean.ThemeBean;
 import com.xscm.moduleutil.bean.UserBean;
diff --git a/moduleLogin/src/main/java/com/xscm/modulelogin/present/ImproveInfoContacts.java b/modulemain/src/main/java/com/xscm/modulemain/activity/login/contacts/ImproveInfoContacts.java
similarity index 94%
rename from moduleLogin/src/main/java/com/xscm/modulelogin/present/ImproveInfoContacts.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/login/contacts/ImproveInfoContacts.java
index 127783a4..55003c3c 100644
--- a/moduleLogin/src/main/java/com/xscm/modulelogin/present/ImproveInfoContacts.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/login/contacts/ImproveInfoContacts.java
@@ -1,8 +1,7 @@
-package com.xscm.modulelogin.present;
+package com.xscm.modulemain.activity.login.contacts;
 
 import android.app.Activity;
 
-
 import com.xscm.moduleutil.activity.IPresenter;
 import com.xscm.moduleutil.activity.IView;
 import com.xscm.moduleutil.bean.UserBean;
diff --git a/moduleLogin/src/main/java/com/xscm/modulelogin/present/ImproveInfoPresenter.java b/modulemain/src/main/java/com/xscm/modulemain/activity/login/contacts/ImproveInfoPresenter.java
similarity index 98%
rename from moduleLogin/src/main/java/com/xscm/modulelogin/present/ImproveInfoPresenter.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/login/contacts/ImproveInfoPresenter.java
index 1245787b..56dd037b 100644
--- a/moduleLogin/src/main/java/com/xscm/modulelogin/present/ImproveInfoPresenter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/login/contacts/ImproveInfoPresenter.java
@@ -1,8 +1,7 @@
-package com.xscm.modulelogin.present;
+package com.xscm.modulemain.activity.login.contacts;
 
 import android.content.Context;
 
-
 import com.hjq.toast.ToastUtils;
 import com.xscm.moduleutil.base.CommonAppContext;
 import com.xscm.moduleutil.bean.UserBean;
diff --git a/moduleLogin/src/main/java/com/xscm/modulelogin/present/LoginContacter.java b/modulemain/src/main/java/com/xscm/modulemain/activity/login/present/LoginContacter.java
similarity index 95%
rename from moduleLogin/src/main/java/com/xscm/modulelogin/present/LoginContacter.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/login/present/LoginContacter.java
index 1fc2545f..7f4bf1ae 100644
--- a/moduleLogin/src/main/java/com/xscm/modulelogin/present/LoginContacter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/login/present/LoginContacter.java
@@ -1,4 +1,4 @@
-package com.xscm.modulelogin.present;
+package com.xscm.modulemain.activity.login.present;
 
 import android.app.Activity;
 
diff --git a/moduleLogin/src/main/java/com/xscm/modulelogin/present/LoginPresenter.java b/modulemain/src/main/java/com/xscm/modulemain/activity/login/present/LoginPresenter.java
similarity index 96%
rename from moduleLogin/src/main/java/com/xscm/modulelogin/present/LoginPresenter.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/login/present/LoginPresenter.java
index 0354d4eb..e2bf1d02 100644
--- a/moduleLogin/src/main/java/com/xscm/modulelogin/present/LoginPresenter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/login/present/LoginPresenter.java
@@ -1,22 +1,20 @@
-package com.xscm.modulelogin.present;
+package com.xscm.modulemain.activity.login.present;
 
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 
-import com.alibaba.android.arouter.launcher.ARouter;
 import com.blankj.utilcode.util.AppUtils;
 import com.blankj.utilcode.util.ToastUtils;
-import com.xscm.modulelogin.activity.ImproveInfoActivity;
-import com.xscm.modulelogin.activity.SwitchAccountsActivity;
-import com.xscm.modulemain.activity.MainActivity;
+import com.xscm.modulemain.activity.login.activity.ImproveInfoActivity;
+import com.xscm.modulemain.activity.login.activity.SwitchAccountsActivity;
+import com.xscm.modulemain.activity.main.activity.MainActivity;
 import com.xscm.moduleutil.activity.WebViewActivity;
 import com.xscm.moduleutil.base.CommonAppContext;
 import com.xscm.moduleutil.bean.ThemeBean;
 import com.xscm.moduleutil.bean.UserBean;
 import com.xscm.moduleutil.http.BaseObserver;
 import com.xscm.moduleutil.presenter.BasePresenter;
-import com.xscm.moduleutil.utils.ARouteConstants;
 import com.xscm.moduleutil.utils.SpUtil;
 
 import org.greenrobot.eventbus.EventBus;
diff --git a/modulemain/src/main/java/com/xscm/modulemain/activity/MainActivity.java b/modulemain/src/main/java/com/xscm/modulemain/activity/main/activity/MainActivity.java
similarity index 98%
rename from modulemain/src/main/java/com/xscm/modulemain/activity/MainActivity.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/main/activity/MainActivity.java
index 48e40c86..4a1b7127 100644
--- a/modulemain/src/main/java/com/xscm/modulemain/activity/MainActivity.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/main/activity/MainActivity.java
@@ -1,4 +1,4 @@
-package com.xscm.modulemain.activity;
+package com.xscm.modulemain.activity.main.activity;
 
 import android.Manifest;
 import android.content.Context;
@@ -29,17 +29,17 @@ import com.blankj.utilcode.util.FragmentUtils;
 import com.blankj.utilcode.util.LogUtils;
 import com.blankj.utilcode.util.ToastUtils;
 import com.bumptech.glide.Glide;
-import com.example.modulecircle.fragment.CircleFragment;
-import com.example.modulenews.fragment.NewsFragment;
-import com.example.modulevocal.fragment.VocalRangeFragment;
-import com.example.modulevoice.fragment.VoiceFragment;
+import com.xscm.modulemain.activity.msg.fragment.NewsFragment;
+import com.xscm.modulemain.activity.user.fragment.VocalRangeFragment;
+import com.xscm.modulemain.activity.plaza.fragment.CircleFragment;
+import com.xscm.modulemain.activity.room.fragment.VoiceFragment;
 import com.permissionx.guolindev.PermissionX;
 import com.permissionx.guolindev.callback.RequestCallback;
 import com.stx.xhb.xbanner.XBanner;
 import com.xscm.modulemain.R;
-import com.xscm.modulemain.contacts.HomeContacts;
+import com.xscm.modulemain.activity.main.contacts.HomeContacts;
 import com.xscm.modulemain.databinding.ActivityMainBinding;
-import com.xscm.modulemain.presenter.HomePresenter;
+import com.xscm.modulemain.activity.main.presenter.HomePresenter;
 import com.xscm.moduleutil.activity.BaseMvpActivity;
 import com.xscm.moduleutil.adapter.AppUpdateDialog;
 import com.xscm.moduleutil.base.CommonAppContext;
diff --git a/modulemain/src/main/java/com/xscm/modulemain/contacts/HomeContacts.java b/modulemain/src/main/java/com/xscm/modulemain/activity/main/contacts/HomeContacts.java
similarity index 96%
rename from modulemain/src/main/java/com/xscm/modulemain/contacts/HomeContacts.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/main/contacts/HomeContacts.java
index af787ac5..b9a407b6 100644
--- a/modulemain/src/main/java/com/xscm/modulemain/contacts/HomeContacts.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/main/contacts/HomeContacts.java
@@ -1,4 +1,4 @@
-package com.xscm.modulemain.contacts;
+package com.xscm.modulemain.activity.main.contacts;
 
 import android.app.Activity;
 
diff --git a/modulemain/src/main/java/com/xscm/modulemain/presenter/HomePresenter.java b/modulemain/src/main/java/com/xscm/modulemain/activity/main/presenter/HomePresenter.java
similarity index 98%
rename from modulemain/src/main/java/com/xscm/modulemain/presenter/HomePresenter.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/main/presenter/HomePresenter.java
index 9a6ebd74..0702027a 100644
--- a/modulemain/src/main/java/com/xscm/modulemain/presenter/HomePresenter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/main/presenter/HomePresenter.java
@@ -1,4 +1,4 @@
-package com.xscm.modulemain.presenter;
+package com.xscm.modulemain.activity.main.presenter;
 
 import android.content.ComponentName;
 import android.content.Context;
@@ -11,18 +11,16 @@ import android.provider.Settings;
 import androidx.annotation.NonNull;
 import androidx.annotation.RequiresApi;
 
-import com.xscm.modulemain.contacts.HomeContacts;
+import com.xscm.modulemain.activity.main.contacts.HomeContacts;
 import com.xscm.moduleutil.bean.*;
 import com.xscm.moduleutil.bean.room.RoomOnline;
 import com.xscm.moduleutil.http.BaseObserver;
 import com.xscm.moduleutil.presenter.BasePresenter;
-import com.xscm.moduleutil.utils.GsonUtils;
 import com.xscm.moduleutil.utils.SpUtil;
 
 import org.greenrobot.eventbus.EventBus;
 
 import java.lang.ref.WeakReference;
-import java.util.List;
 
 import io.reactivex.disposables.Disposable;
 import org.jetbrains.annotations.NotNull;
diff --git a/modulenews/src/main/java/com/example/modulenews/contacts/NewsContacts.java b/modulemain/src/main/java/com/xscm/modulemain/activity/msg/contacts/NewsContacts.java
similarity index 91%
rename from modulenews/src/main/java/com/example/modulenews/contacts/NewsContacts.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/msg/contacts/NewsContacts.java
index 499bd1f2..bf085ce3 100644
--- a/modulenews/src/main/java/com/example/modulenews/contacts/NewsContacts.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/msg/contacts/NewsContacts.java
@@ -1,4 +1,4 @@
-package com.example.modulenews.contacts;
+package com.xscm.modulemain.activity.msg.contacts;
 
 import android.app.Activity;
 
diff --git a/modulenews/src/main/java/com/example/modulenews/fragment/NewsFragment.java b/modulemain/src/main/java/com/xscm/modulemain/activity/msg/fragment/NewsFragment.java
similarity index 91%
rename from modulenews/src/main/java/com/example/modulenews/fragment/NewsFragment.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/msg/fragment/NewsFragment.java
index f17844fc..5d40f958 100644
--- a/modulenews/src/main/java/com/example/modulenews/fragment/NewsFragment.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/msg/fragment/NewsFragment.java
@@ -1,4 +1,4 @@
-package com.example.modulenews.fragment;
+package com.xscm.modulemain.activity.msg.fragment;
 
 
 import android.content.Intent;
@@ -6,21 +6,19 @@ import android.view.View;
 
 import androidx.fragment.app.Fragment;
 
-import com.example.modulenews.R;
-import com.example.modulenews.contacts.NewsContacts;
-import com.example.modulenews.databinding.FragmentNewsBinding;
-import com.example.modulenews.presenter.NewsPresenter;
-import com.tencent.imsdk.v2.V2TIMManager;
-import com.tencent.imsdk.v2.V2TIMValueCallback;
+import com.xscm.modulemain.R;
+import com.tencent.imsdk.v2.V2TIMConversation;
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuikit.tuichat.classicui.page.TUIC2CChatActivity;
+import com.tencent.qcloud.tuikit.tuiconversation.classicui.page.TUIConversationFragment;
+import com.xscm.modulemain.activity.msg.contacts.NewsContacts;
+import com.xscm.modulemain.activity.msg.presenter.NewsPresenter;
+import com.xscm.modulemain.databinding.FragmentNewsBinding;
 import com.xscm.moduleutil.activity.news.OfficialNoticeActivity;
 import com.xscm.moduleutil.adapter.MyFragmentPagerAdapter;
 import com.xscm.moduleutil.base.BaseMvpFragment;
 import com.xscm.moduleutil.base.CommonAppContext;
 import com.xscm.moduleutil.bean.NewsDataBean;
-import com.tencent.imsdk.v2.V2TIMConversation;
-import com.tencent.qcloud.tuicore.TUIConstants;
-import com.tencent.qcloud.tuikit.tuichat.classicui.page.TUIC2CChatActivity;
-import com.tencent.qcloud.tuikit.tuiconversation.classicui.page.TUIConversationFragment;
 import com.xscm.moduleutil.bean.UserInfo;
 import com.xscm.moduleutil.event.UnreadCountEvent;
 import com.xscm.moduleutil.utils.SpUtil;
@@ -66,10 +64,10 @@ public class NewsFragment extends BaseMvpFragment<NewsPresenter, FragmentNewsBin
     protected void initView () {
 
         List<Fragment> fragments = new ArrayList<>();
-// 添加 tuiconversation 组件提供的经典版会话界面
+        // 添加 tuiconversation 组件提供的经典版会话界面
         fragments.add(new TUIConversationFragment());
 
-// 添加 tuicontact 组件提供的经典版联系人界面
+        // 添加 tuicontact 组件提供的经典版联系人界面
 //        fragments.add(new TUIContactFragment());
 
 //        FragmentAdapter fragmentAdapter = new FragmentAdapter(this);
diff --git a/modulenews/src/main/java/com/example/modulenews/presenter/NewsPresenter.java b/modulemain/src/main/java/com/xscm/modulemain/activity/msg/presenter/NewsPresenter.java
similarity index 91%
rename from modulenews/src/main/java/com/example/modulenews/presenter/NewsPresenter.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/msg/presenter/NewsPresenter.java
index 32538f54..4d83bec1 100644
--- a/modulenews/src/main/java/com/example/modulenews/presenter/NewsPresenter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/msg/presenter/NewsPresenter.java
@@ -1,8 +1,8 @@
-package com.example.modulenews.presenter;
+package com.xscm.modulemain.activity.msg.presenter;
 
 import android.content.Context;
 
-import com.example.modulenews.contacts.NewsContacts;
+import com.xscm.modulemain.activity.msg.contacts.NewsContacts;
 import com.xscm.moduleutil.bean.NewsDataBean;
 import com.xscm.moduleutil.bean.UserInfo;
 import com.xscm.moduleutil.http.BaseObserver;
diff --git a/modulecircle/src/main/java/com/example/modulecircle/activity/DynamicDetailActivity.java b/modulemain/src/main/java/com/xscm/modulemain/activity/plaza/activity/DynamicDetailActivity.java
similarity index 98%
rename from modulecircle/src/main/java/com/example/modulecircle/activity/DynamicDetailActivity.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/plaza/activity/DynamicDetailActivity.java
index d77f686e..1b195b83 100644
--- a/modulecircle/src/main/java/com/example/modulecircle/activity/DynamicDetailActivity.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/plaza/activity/DynamicDetailActivity.java
@@ -1,4 +1,4 @@
-package com.example.modulecircle.activity;
+package com.xscm.modulemain.activity.plaza.activity;
 
 import android.content.ClipData;
 import android.content.ClipboardManager;
@@ -20,11 +20,11 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.blankj.utilcode.util.ToastUtils;
-import com.example.modulecircle.R;
-import com.example.modulecircle.contacts.CircleContacts;
-import com.example.modulecircle.databinding.ActivityDynamicDetailBinding;
-import com.example.modulecircle.presenter.CirclePresenter;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.databinding.ActivityDynamicDetailBinding;
 import com.google.android.material.bottomsheet.BottomSheetDialog;
+import com.xscm.modulemain.activity.plaza.contacts.CircleContacts;
+import com.xscm.modulemain.activity.plaza.presenter.CirclePresenter;
 import com.xscm.moduleutil.activity.BaseMvpActivity;
 import com.xscm.moduleutil.adapter.CirleListAdapter;
 import com.xscm.moduleutil.adapter.CommentAdapter;
diff --git a/modulecircle/src/main/java/com/example/modulecircle/activity/DynamicListActivity.java b/modulemain/src/main/java/com/xscm/modulemain/activity/plaza/activity/DynamicListActivity.java
similarity index 95%
rename from modulecircle/src/main/java/com/example/modulecircle/activity/DynamicListActivity.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/plaza/activity/DynamicListActivity.java
index 3b74aece..fd10b340 100644
--- a/modulecircle/src/main/java/com/example/modulecircle/activity/DynamicListActivity.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/plaza/activity/DynamicListActivity.java
@@ -1,4 +1,4 @@
-package com.example.modulecircle.activity;
+package com.xscm.modulemain.activity.plaza.activity;
 
 import android.content.Intent;
 import android.text.SpannableString;
@@ -8,12 +8,11 @@ import android.text.style.LeadingMarginSpan;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
-import com.alibaba.android.arouter.launcher.ARouter;
-import com.example.modulecircle.R;
-import com.example.modulecircle.contacts.CircleContacts;
-import com.example.modulecircle.databinding.ActivityDynamicListBinding;
-import com.example.modulecircle.presenter.CirclePresenter;
-import com.example.modulevocal.activity.UserHomepageActivity;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.databinding.ActivityDynamicListBinding;
+import com.xscm.modulemain.activity.user.activity.UserHomepageActivity;
+import com.xscm.modulemain.activity.plaza.contacts.CircleContacts;
+import com.xscm.modulemain.activity.plaza.presenter.CirclePresenter;
 import com.xscm.moduleutil.activity.BaseMvpActivity;
 import com.xscm.moduleutil.adapter.CirleListAdapter;
 import com.xscm.moduleutil.base.RoomManager;
diff --git a/modulecircle/src/main/java/com/example/modulecircle/activity/ReleaseActivity.java b/modulemain/src/main/java/com/xscm/modulemain/activity/plaza/activity/ReleaseActivity.java
similarity index 97%
rename from modulecircle/src/main/java/com/example/modulecircle/activity/ReleaseActivity.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/plaza/activity/ReleaseActivity.java
index 6b3c1be7..c95c7898 100644
--- a/modulecircle/src/main/java/com/example/modulecircle/activity/ReleaseActivity.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/plaza/activity/ReleaseActivity.java
@@ -1,4 +1,4 @@
-package com.example.modulecircle.activity;
+package com.xscm.modulemain.activity.plaza.activity;
 
 import android.Manifest;
 import android.app.Activity;
@@ -22,16 +22,15 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.blankj.utilcode.util.ToastUtils;
 import com.chad.library.adapter.base.BaseQuickAdapter;
-import com.example.modulecircle.R;
-import com.example.modulecircle.contacts.ReleaseContract;
-import com.example.modulecircle.databinding.ActivityReleaseBinding;
-import com.example.modulecircle.adapter.MultiSelectAdapter;
-import com.example.modulecircle.presenter.ReleasePresenter;
-import com.example.modulevocal.activity.EditUserInfoActivity;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.adapter.MultiSelectAdapter;
+import com.xscm.modulemain.databinding.ActivityReleaseBinding;
 import com.google.android.material.bottomsheet.BottomSheetDialog;
 import com.luck.picture.lib.basic.PictureSelector;
 import com.luck.picture.lib.config.PictureConfig;
 import com.luck.picture.lib.entity.LocalMedia;
+import com.xscm.modulemain.activity.plaza.contacts.ReleaseContract;
+import com.xscm.modulemain.activity.plaza.presenter.ReleasePresenter;
 import com.xscm.moduleutil.activity.BaseMvpActivity;
 import com.xscm.moduleutil.adapter.UserPhotoWallAdapter;
 import com.xscm.moduleutil.bean.HeatedBean;
@@ -93,7 +92,7 @@ public class ReleaseActivity extends BaseMvpActivity<ReleasePresenter, ActivityR
             public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {
                 String item = list.get(position);
                 int id = view.getId();
-                if (id == com.example.modulevocal.R.id.iv_close) {
+                if (id == R.id.iv_close) {
                     uploadedUrls.remove(item);
                     updateAdapterData();
                 } else {
diff --git a/modulecircle/src/main/java/com/example/modulecircle/contacts/CircleContacts.java b/modulemain/src/main/java/com/xscm/modulemain/activity/plaza/contacts/CircleContacts.java
similarity index 96%
rename from modulecircle/src/main/java/com/example/modulecircle/contacts/CircleContacts.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/plaza/contacts/CircleContacts.java
index 9d79dccb..722f4ece 100644
--- a/modulecircle/src/main/java/com/example/modulecircle/contacts/CircleContacts.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/plaza/contacts/CircleContacts.java
@@ -1,4 +1,4 @@
-package com.example.modulecircle.contacts;
+package com.xscm.modulemain.activity.plaza.contacts;
 
 import android.app.Activity;
 
diff --git a/modulecircle/src/main/java/com/example/modulecircle/contacts/ReleaseContract.java b/modulemain/src/main/java/com/xscm/modulemain/activity/plaza/contacts/ReleaseContract.java
similarity index 93%
rename from modulecircle/src/main/java/com/example/modulecircle/contacts/ReleaseContract.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/plaza/contacts/ReleaseContract.java
index 8a6248bb..ab307d7d 100644
--- a/modulecircle/src/main/java/com/example/modulecircle/contacts/ReleaseContract.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/plaza/contacts/ReleaseContract.java
@@ -1,4 +1,4 @@
-package com.example.modulecircle.contacts;
+package com.xscm.modulemain.activity.plaza.contacts;
 
 import android.app.Activity;
 
diff --git a/modulecircle/src/main/java/com/example/modulecircle/fragment/CircleCategoryFragment.java b/modulemain/src/main/java/com/xscm/modulemain/activity/plaza/fragment/CircleCategoryFragment.java
similarity index 96%
rename from modulecircle/src/main/java/com/example/modulecircle/fragment/CircleCategoryFragment.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/plaza/fragment/CircleCategoryFragment.java
index cbba009a..e13c91a1 100644
--- a/modulecircle/src/main/java/com/example/modulecircle/fragment/CircleCategoryFragment.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/plaza/fragment/CircleCategoryFragment.java
@@ -1,23 +1,24 @@
-package com.example.modulecircle.fragment;
+package com.xscm.modulemain.activity.plaza.fragment;
 
 import android.annotation.SuppressLint;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.View;
-
 import com.alibaba.android.arouter.launcher.ARouter;
-import com.example.modulecircle.R;
-import com.example.modulecircle.activity.DynamicListActivity;
-import com.example.modulecircle.adapter.CirleCategoryBannerAdapter;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.adapter.CirleCategoryBannerAdapter;
+import com.xscm.modulemain.databinding.FragmentCircleCategoryBinding;
+import com.scwang.smartrefresh.layout.api.RefreshLayout;
+import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener;
+import com.xscm.modulemain.activity.plaza.activity.DynamicListActivity;
+import com.xscm.modulemain.activity.plaza.contacts.CircleContacts;
+import com.xscm.modulemain.activity.plaza.presenter.CirclePresenter;
 import com.xscm.moduleutil.adapter.CirleListAdapter;
-import com.example.modulecircle.contacts.CircleContacts;
-import com.example.modulecircle.databinding.FragmentCircleCategoryBinding;
-import com.example.modulecircle.presenter.CirclePresenter;
 import com.xscm.moduleutil.base.BaseMvpFragment;
 import com.xscm.moduleutil.base.RoomManager;
 import com.xscm.moduleutil.bean.BaseListData;
@@ -30,8 +31,6 @@ import com.xscm.moduleutil.utils.ARouteConstants;
 import com.xscm.moduleutil.utils.ChatLauncher;
 import com.xscm.moduleutil.widget.dialog.RewardGiftDialogFragment;
 import com.xscm.moduleutil.widget.dialog.ShareDialog;
-import com.scwang.smartrefresh.layout.api.RefreshLayout;
-import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener;
 import com.zhpan.bannerview.indicator.DrawableIndicator;
 import com.zhpan.indicator.base.IIndicator;
 import com.zhpan.indicator.enums.IndicatorSlideMode;
diff --git a/modulecircle/src/main/java/com/example/modulecircle/fragment/CircleFragment.java b/modulemain/src/main/java/com/xscm/modulemain/activity/plaza/fragment/CircleFragment.java
similarity index 90%
rename from modulecircle/src/main/java/com/example/modulecircle/fragment/CircleFragment.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/plaza/fragment/CircleFragment.java
index 56aa663a..990abac6 100644
--- a/modulecircle/src/main/java/com/example/modulecircle/fragment/CircleFragment.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/plaza/fragment/CircleFragment.java
@@ -1,4 +1,4 @@
-package com.example.modulecircle.fragment;
+package com.xscm.modulemain.activity.plaza.fragment;
 
 
 import android.content.Intent;
@@ -9,11 +9,11 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentStatePagerAdapter;
 
-import com.example.modulecircle.R;
-import com.example.modulecircle.activity.ReleaseActivity;
-import com.example.modulecircle.contacts.CircleContacts;
-import com.example.modulecircle.databinding.FragmentCircleBinding;
-import com.example.modulecircle.presenter.CirclePresenter;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.databinding.FragmentCircleBinding;
+import com.xscm.modulemain.activity.plaza.activity.ReleaseActivity;
+import com.xscm.modulemain.activity.plaza.contacts.CircleContacts;
+import com.xscm.modulemain.activity.plaza.presenter.CirclePresenter;
 import com.xscm.moduleutil.base.BaseMvpFragment;
 import com.xscm.moduleutil.bean.CircleListBean;
 import com.xscm.moduleutil.bean.CommentBean;
diff --git a/modulecircle/src/main/java/com/example/modulecircle/fragment/ExpandColumnFragment.java b/modulemain/src/main/java/com/xscm/modulemain/activity/plaza/fragment/ExpandColumnFragment.java
similarity index 95%
rename from modulecircle/src/main/java/com/example/modulecircle/fragment/ExpandColumnFragment.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/plaza/fragment/ExpandColumnFragment.java
index b4b70bb5..c0b4ad2b 100644
--- a/modulecircle/src/main/java/com/example/modulecircle/fragment/ExpandColumnFragment.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/plaza/fragment/ExpandColumnFragment.java
@@ -1,17 +1,19 @@
-package com.example.modulecircle.fragment;
+package com.xscm.modulemain.activity.plaza.fragment;
+
+import android.view.View;
 
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
-import android.view.View;
-
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.blankj.utilcode.util.LogUtils;
-import com.example.modulecircle.R;
-import com.example.modulecircle.adapter.ExpandColumnAdapter;
-import com.example.modulecircle.contacts.CircleContacts;
-import com.example.modulecircle.databinding.FragmentExpandColumnBinding;
-import com.example.modulecircle.presenter.CirclePresenter;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.adapter.ExpandColumnAdapter;
+import com.xscm.modulemain.databinding.FragmentExpandColumnBinding;
+import com.scwang.smartrefresh.layout.api.RefreshLayout;
+import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener;
+import com.xscm.modulemain.activity.plaza.contacts.CircleContacts;
+import com.xscm.modulemain.activity.plaza.presenter.CirclePresenter;
 import com.xscm.moduleutil.base.BaseMvpFragment;
 import com.xscm.moduleutil.base.RoomManager;
 import com.xscm.moduleutil.bean.CircleListBean;
@@ -20,8 +22,6 @@ import com.xscm.moduleutil.bean.ExpandColumnBean;
 import com.xscm.moduleutil.bean.HeatedBean;
 import com.xscm.moduleutil.utils.ARouteConstants;
 import com.xscm.moduleutil.utils.ChatLauncher;
-import com.scwang.smartrefresh.layout.api.RefreshLayout;
-import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener;
 
 import org.angmarch.views.NiceSpinner;
 import org.angmarch.views.OnSpinnerItemSelectedListener;
diff --git a/modulecircle/src/main/java/com/example/modulecircle/presenter/CirclePresenter.java b/modulemain/src/main/java/com/xscm/modulemain/activity/plaza/presenter/CirclePresenter.java
similarity index 98%
rename from modulecircle/src/main/java/com/example/modulecircle/presenter/CirclePresenter.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/plaza/presenter/CirclePresenter.java
index 2a80fb17..f7f95085 100644
--- a/modulecircle/src/main/java/com/example/modulecircle/presenter/CirclePresenter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/plaza/presenter/CirclePresenter.java
@@ -1,8 +1,8 @@
-package com.example.modulecircle.presenter;
+package com.xscm.modulemain.activity.plaza.presenter;
 
 import android.content.Context;
 
-import com.example.modulecircle.contacts.CircleContacts;
+import com.xscm.modulemain.activity.plaza.contacts.CircleContacts;
 import com.xscm.moduleutil.bean.CircleListBean;
 import com.xscm.moduleutil.bean.CommentBean;
 import com.xscm.moduleutil.bean.ExpandColumnBean;
diff --git a/modulecircle/src/main/java/com/example/modulecircle/presenter/ReleasePresenter.java b/modulemain/src/main/java/com/xscm/modulemain/activity/plaza/presenter/ReleasePresenter.java
similarity index 96%
rename from modulecircle/src/main/java/com/example/modulecircle/presenter/ReleasePresenter.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/plaza/presenter/ReleasePresenter.java
index a07bd877..af282c2b 100644
--- a/modulecircle/src/main/java/com/example/modulecircle/presenter/ReleasePresenter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/plaza/presenter/ReleasePresenter.java
@@ -1,9 +1,9 @@
-package com.example.modulecircle.presenter;
+package com.xscm.modulemain.activity.plaza.presenter;
 
 import android.content.Context;
 
-import com.example.modulecircle.contacts.ReleaseContract;
 import com.hjq.toast.ToastUtils;
+import com.xscm.modulemain.activity.plaza.contacts.ReleaseContract;
 import com.xscm.moduleutil.base.CommonAppContext;
 import com.xscm.moduleutil.bean.HeatedBean;
 import com.xscm.moduleutil.http.BaseObserver;
diff --git a/modulevoice/src/main/java/com/example/modulevoice/activity/PopularRoomActivity.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/activity/PopularRoomActivity.java
similarity index 92%
rename from modulevoice/src/main/java/com/example/modulevoice/activity/PopularRoomActivity.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/activity/PopularRoomActivity.java
index 159df31b..7607caae 100644
--- a/modulevoice/src/main/java/com/example/modulevoice/activity/PopularRoomActivity.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/activity/PopularRoomActivity.java
@@ -1,20 +1,23 @@
-package com.example.modulevoice.activity;
+package com.xscm.modulemain.activity.room.activity;
 
 import android.view.View;
+
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.GridLayoutManager;
-import com.example.modulevoice.R;
-import com.example.modulevoice.adapter.PopularRoomAdapter;
-import com.example.modulevoice.contacts.VoiceCategoryContacts;
-import com.example.modulevoice.databinding.ActivityPopularRoomBinding;
-import com.example.modulevoice.presenter.VoiceCategoryPresenter;
+
 import com.scwang.smartrefresh.layout.api.RefreshLayout;
 import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.activity.room.contacts.VoiceCategoryContacts;
+import com.xscm.modulemain.activity.room.presenter.VoiceCategoryPresenter;
+import com.xscm.modulemain.adapter.PopularRoomAdapter;
+import com.xscm.modulemain.databinding.ActivityPopularRoomBinding;
 import com.xscm.moduleutil.activity.BaseMvpActivity;
 import com.xscm.moduleutil.base.CommonAppContext;
 import com.xscm.moduleutil.base.RoomManager;
-import com.xscm.moduleutil.bean.*;
-import com.xscm.moduleutil.bean.room.RoomOnline;
+import com.xscm.moduleutil.bean.BannerModel;
+import com.xscm.moduleutil.bean.RoomTypeModel;
+import com.xscm.moduleutil.bean.TopRoom;
 import com.xscm.moduleutil.listener.MessageListenerSingleton;
 import com.xscm.moduleutil.utils.ClickUtils;
 
diff --git a/modulevoice/src/main/java/com/example/modulevoice/activity/RankingListActivity.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/activity/RankingListActivity.java
similarity index 90%
rename from modulevoice/src/main/java/com/example/modulevoice/activity/RankingListActivity.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/activity/RankingListActivity.java
index f1371d31..e5cc8551 100644
--- a/modulevoice/src/main/java/com/example/modulevoice/activity/RankingListActivity.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/activity/RankingListActivity.java
@@ -1,19 +1,15 @@
-package com.example.modulevoice.activity;
+package com.xscm.modulemain.activity.room.activity;
 
-import android.annotation.SuppressLint;
 import android.graphics.Color;
 import android.text.TextUtils;
 import android.util.TypedValue;
 import android.view.Gravity;
-import android.view.LayoutInflater;
-import android.view.View;
 import android.widget.TextView;
 
-import com.example.modulevoice.R;
-import com.example.modulevoice.activity.ui.main.SectionsPagerAdapter;
-import com.example.modulevoice.databinding.ActivityRankingListBinding;
 import com.google.android.material.tabs.TabLayout;
-import com.google.android.material.tabs.TabLayoutMediator;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.adapter.SectionsPagerAdapter;
+import com.xscm.modulemain.databinding.ActivityRankingListBinding;
 import com.xscm.moduleutil.activity.BaseAppCompatActivity;
 /**
  *@author lxj
diff --git a/moduleroom/src/main/java/com/example/moduleroom/activity/RedResultActivity.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/activity/RedResultActivity.java
similarity index 89%
rename from moduleroom/src/main/java/com/example/moduleroom/activity/RedResultActivity.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/activity/RedResultActivity.java
index a01a3023..41e0368f 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/activity/RedResultActivity.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/activity/RedResultActivity.java
@@ -1,22 +1,22 @@
-package com.example.moduleroom.activity;
+package com.xscm.modulemain.activity.room.activity;
 
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.LinearLayoutManager;
-import com.alibaba.android.arouter.facade.annotation.Autowired;
+
 import com.alibaba.android.arouter.facade.annotation.Route;
-import com.example.moduleroom.R;
-import com.example.moduleroom.adapter.RedAdapter;
-import com.example.moduleroom.contacts.RedEnvelopesContacts;
-import com.example.moduleroom.databinding.FragmentRedBinding;
-import com.example.moduleroom.fragment.RedViewModel;
-import com.example.moduleroom.presenter.RedEnvelopesPresenter;
 import com.scwang.smartrefresh.layout.api.RefreshLayout;
 import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.activity.room.contacts.RedEnvelopesContacts;
+import com.xscm.modulemain.activity.room.fragment.RedViewModel;
+import com.xscm.modulemain.activity.room.presenter.RedEnvelopesPresenter;
+import com.xscm.modulemain.adapter.RedAdapter;
+import com.xscm.modulemain.databinding.FragmentRedBinding;
 import com.xscm.moduleutil.activity.BaseMvpActivity;
-import com.xscm.moduleutil.base.BaseMvpFragment;
 import com.xscm.moduleutil.bean.RedpacketDetail;
 import com.xscm.moduleutil.utils.ARouteConstants;
 import com.xscm.moduleutil.utils.ImageUtils;
+
 import org.jetbrains.annotations.NotNull;
 
 /**
diff --git a/moduleroom/src/main/java/com/example/moduleroom/activity/RoomActivity.kt b/modulemain/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt
similarity index 98%
rename from moduleroom/src/main/java/com/example/moduleroom/activity/RoomActivity.kt
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt
index 4774ec22..e75f2a43 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/activity/RoomActivity.kt
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/activity/RoomActivity.kt
@@ -1,4 +1,4 @@
-package com.example.moduleroom.activity
+package com.xscm.modulemain.activity.room.activity
 
 import android.Manifest
 import android.annotation.SuppressLint
@@ -37,16 +37,7 @@ import com.blankj.utilcode.util.LogUtils
 import com.blankj.utilcode.util.ThreadUtils
 import com.blankj.utilcode.util.TimeUtils
 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.*
-import com.example.moduleroom.dialog.ExitRoomBottomSheet.OnOptionSelectedListener
-import com.example.moduleroom.fragment.*
-import com.example.moduleroom.presenter.RoomPresenter
-import com.example.moduleroom.service.ForegroundService
-import com.example.moduleroom.service.RoomPlayService
-import com.google.common.collect.Sets.SetView
+import com.xscm.modulemain.dialog.*
 import com.hjq.toast.ToastUtils
 import com.liulishuo.okdownload.OkDownloadProvider
 import com.orhanobut.logger.Logger
@@ -56,6 +47,32 @@ import com.tencent.imsdk.v2.V2TIMManager
 import com.tencent.imsdk.v2.V2TIMSDKListener
 import com.tencent.imsdk.v2.V2TIMUserFullInfo
 import com.tencent.imsdk.v2.V2TIMValueCallback
+import com.xscm.modulemain.R
+import com.xscm.modulemain.activity.room.contacts.RoomContacts
+import com.xscm.modulemain.activity.room.fragment.PublicScreenEaseChatFragment
+import com.xscm.modulemain.activity.room.fragment.RedEnvelopesFragment
+import com.xscm.modulemain.activity.room.fragment.RoomCabinFragment
+import com.xscm.modulemain.activity.room.fragment.RoomChartsFragment
+import com.xscm.modulemain.activity.room.fragment.RoomFragment
+import com.xscm.modulemain.activity.room.fragment.RoomNoticeDialogFragment
+import com.xscm.modulemain.activity.room.fragment.RoomPasswordSetDialogFragment
+import com.xscm.modulemain.activity.room.presenter.RoomPresenter
+import com.xscm.modulemain.databinding.ActivityRoomBinding
+import com.xscm.modulemain.dialog.ExitRoomBottomSheet
+import com.xscm.modulemain.dialog.FriendsDialogFragment
+import com.xscm.modulemain.dialog.HourlyChartDialog
+import com.xscm.modulemain.dialog.PublishCommentDialogFragment
+import com.xscm.modulemain.dialog.RedBagSendDialog
+import com.xscm.modulemain.dialog.RedListDialog
+import com.xscm.modulemain.dialog.RequestDialogFragment
+import com.xscm.modulemain.dialog.RoomGiftDialogFragment
+import com.xscm.modulemain.dialog.RoomMessageDialogFragment
+import com.xscm.modulemain.dialog.RoomOnlineDialogFragment
+import com.xscm.modulemain.dialog.RoomPkDialogFragment
+import com.xscm.modulemain.dialog.RoomSettingFragment
+import com.xscm.modulemain.dialog.SoundEffectsDialogFragment
+import com.xscm.modulemain.service.ForegroundService
+import com.xscm.modulemain.service.RoomPlayService
 import com.xscm.moduleutil.activity.BaseMvpActivity
 import com.xscm.moduleutil.adapter.CommonPageAdapter
 import com.xscm.moduleutil.adapter.LikeUserAdapter
@@ -361,7 +378,8 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
     private fun showExitRoomDialog() {
         if (mRoomInfoResp?.room_info?.type_id.equals("6")) {
             val bottomSheet = ExitRoomBottomSheet.newInstance(false, true, true);
-            bottomSheet.setOnOptionSelectedListener(object : OnOptionSelectedListener {
+            bottomSheet.setOnOptionSelectedListener(object :
+                ExitRoomBottomSheet.OnOptionSelectedListener {
                 override fun onMinimize() {
                 }
 
@@ -394,7 +412,8 @@ class RoomActivity : BaseMvpActivity<RoomPresenter?, ActivityRoomBinding?>(),
         }
 
         val bottomSheet = ExitRoomBottomSheet.newInstance()
-        bottomSheet.setOnOptionSelectedListener(object : OnOptionSelectedListener {
+        bottomSheet.setOnOptionSelectedListener(object :
+            ExitRoomBottomSheet.OnOptionSelectedListener {
             override fun onMinimize() {
                 // 处理最小化逻辑，比如不销毁 Activity，仅移至后台
                 minimizeToBackground()
diff --git a/modulevoice/src/main/java/com/example/modulevoice/activity/SearchActivity.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/activity/SearchActivity.java
similarity index 96%
rename from modulevoice/src/main/java/com/example/modulevoice/activity/SearchActivity.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/activity/SearchActivity.java
index 3cdccf5b..68338369 100644
--- a/modulevoice/src/main/java/com/example/modulevoice/activity/SearchActivity.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/activity/SearchActivity.java
@@ -1,4 +1,4 @@
-package com.example.modulevoice.activity;
+package com.xscm.modulemain.activity.room.activity;
 
 import android.text.Editable;
 import android.text.TextWatcher;
@@ -10,14 +10,14 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.blankj.utilcode.util.StringUtils;
 import com.chad.library.adapter.base.BaseQuickAdapter;
-import com.example.modulevoice.R;
-import com.example.modulevoice.adapter.SearchHistoryAdapter;
-import com.example.modulevoice.adapter.SearchRecordAdapter;
-import com.example.modulevoice.adapter.SearchRoomResultAdapter;
-import com.example.modulevoice.adapter.SearchUserResultAdapter;
-import com.example.modulevoice.contacts.SearchContacts;
-import com.example.modulevoice.databinding.ActivitySearchBinding;
-import com.example.modulevoice.presenter.SearchPresenter;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.adapter.SearchHistoryAdapter;
+import com.xscm.modulemain.adapter.SearchRecordAdapter;
+import com.xscm.modulemain.adapter.SearchRoomResultAdapter;
+import com.xscm.modulemain.adapter.SearchUserResultAdapter;
+import com.xscm.modulemain.activity.room.contacts.SearchContacts;
+import com.xscm.modulemain.databinding.ActivitySearchBinding;
+import com.xscm.modulemain.activity.room.presenter.SearchPresenter;
 import com.google.android.flexbox.FlexDirection;
 import com.google.android.flexbox.FlexWrap;
 import com.google.android.flexbox.FlexboxLayoutManager;
diff --git a/moduleroom/src/main/java/com/example/moduleroom/contacts/BidListContacts.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/BidListContacts.java
similarity index 92%
rename from moduleroom/src/main/java/com/example/moduleroom/contacts/BidListContacts.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/BidListContacts.java
index 7d45568e..ff946042 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/contacts/BidListContacts.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/BidListContacts.java
@@ -1,4 +1,4 @@
-package com.example.moduleroom.contacts;
+package com.xscm.modulemain.activity.room.contacts;
 
 import android.app.Activity;
 
diff --git a/moduleroom/src/main/java/com/example/moduleroom/contacts/CardRelationshipContacts.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/CardRelationshipContacts.java
similarity index 94%
rename from moduleroom/src/main/java/com/example/moduleroom/contacts/CardRelationshipContacts.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/CardRelationshipContacts.java
index 088a5cb1..bcdc8d92 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/contacts/CardRelationshipContacts.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/CardRelationshipContacts.java
@@ -1,4 +1,4 @@
-package com.example.moduleroom.contacts;
+package com.xscm.modulemain.activity.room.contacts;
 
 import android.app.Activity;
 
diff --git a/moduleroom/src/main/java/com/example/moduleroom/contacts/DataListContacts.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/DataListContacts.java
similarity index 95%
rename from moduleroom/src/main/java/com/example/moduleroom/contacts/DataListContacts.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/DataListContacts.java
index 73117fca..cef85e49 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/contacts/DataListContacts.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/DataListContacts.java
@@ -1,8 +1,7 @@
-package com.example.moduleroom.contacts;
+package com.xscm.modulemain.activity.room.contacts;
 
 import android.app.Activity;
 
-
 import com.xscm.moduleutil.activity.IPresenter;
 import com.xscm.moduleutil.activity.IView;
 import com.xscm.moduleutil.bean.CharmRankingResp;
diff --git a/moduleroom/src/main/java/com/example/moduleroom/contacts/FriendshipRoomContacts.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/FriendshipRoomContacts.java
similarity index 95%
rename from moduleroom/src/main/java/com/example/moduleroom/contacts/FriendshipRoomContacts.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/FriendshipRoomContacts.java
index dbdc3eb9..786dbf5d 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/contacts/FriendshipRoomContacts.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/FriendshipRoomContacts.java
@@ -1,4 +1,4 @@
-package com.example.moduleroom.contacts;
+package com.xscm.modulemain.activity.room.contacts;
 
 import android.app.Activity;
 
diff --git a/modulevoice/src/main/java/com/example/modulevoice/contacts/HotListContacts.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/HotListContacts.java
similarity index 94%
rename from modulevoice/src/main/java/com/example/modulevoice/contacts/HotListContacts.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/HotListContacts.java
index 6e72f9df..0b18cac0 100644
--- a/modulevoice/src/main/java/com/example/modulevoice/contacts/HotListContacts.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/HotListContacts.java
@@ -1,8 +1,7 @@
-package com.example.modulevoice.contacts;
+package com.xscm.modulemain.activity.room.contacts;
 
 import android.app.Activity;
 
-
 import com.xscm.moduleutil.activity.IPresenter;
 import com.xscm.moduleutil.activity.IView;
 import com.xscm.moduleutil.bean.HomeBean;
diff --git a/moduleroom/src/main/java/com/example/moduleroom/contacts/HourlyChartContacts.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/HourlyChartContacts.java
similarity index 90%
rename from moduleroom/src/main/java/com/example/moduleroom/contacts/HourlyChartContacts.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/HourlyChartContacts.java
index 74f6f606..50bb3898 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/contacts/HourlyChartContacts.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/HourlyChartContacts.java
@@ -1,4 +1,4 @@
-package com.example.moduleroom.contacts;
+package com.xscm.modulemain.activity.room.contacts;
 
 import android.app.Activity;
 
diff --git a/moduleroom/src/main/java/com/example/moduleroom/contacts/PkTimeContract.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/PkTimeContract.java
similarity index 86%
rename from moduleroom/src/main/java/com/example/moduleroom/contacts/PkTimeContract.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/PkTimeContract.java
index 624b1568..b7fca2df 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/contacts/PkTimeContract.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/PkTimeContract.java
@@ -1,4 +1,4 @@
-package com.example.moduleroom.contacts;
+package com.xscm.modulemain.activity.room.contacts;
 
 import android.app.Activity;
 
diff --git a/modulevoice/src/main/java/com/example/modulevoice/contacts/PlaceholderContacts.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/PlaceholderContacts.java
similarity index 93%
rename from modulevoice/src/main/java/com/example/modulevoice/contacts/PlaceholderContacts.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/PlaceholderContacts.java
index baf1146a..9097a059 100644
--- a/modulevoice/src/main/java/com/example/modulevoice/contacts/PlaceholderContacts.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/PlaceholderContacts.java
@@ -1,4 +1,4 @@
-package com.example.modulevoice.contacts;
+package com.xscm.modulemain.activity.room.contacts;
 
 import android.app.Activity;
 
diff --git a/moduleroom/src/main/java/com/example/moduleroom/contacts/PublicScreenEaseChatContacts.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/PublicScreenEaseChatContacts.java
similarity index 89%
rename from moduleroom/src/main/java/com/example/moduleroom/contacts/PublicScreenEaseChatContacts.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/PublicScreenEaseChatContacts.java
index e990e98e..b5727f10 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/contacts/PublicScreenEaseChatContacts.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/PublicScreenEaseChatContacts.java
@@ -1,4 +1,4 @@
-package com.example.moduleroom.contacts;
+package com.xscm.modulemain.activity.room.contacts;
 
 import android.app.Activity;
 
diff --git a/moduleroom/src/main/java/com/example/moduleroom/contacts/PublishCommentContacts.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/PublishCommentContacts.java
similarity index 90%
rename from moduleroom/src/main/java/com/example/moduleroom/contacts/PublishCommentContacts.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/PublishCommentContacts.java
index c589342c..b495d9a2 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/contacts/PublishCommentContacts.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/PublishCommentContacts.java
@@ -1,4 +1,4 @@
-package com.example.moduleroom.contacts;
+package com.xscm.modulemain.activity.room.contacts;
 
 import android.app.Activity;
 
diff --git a/moduleroom/src/main/java/com/example/moduleroom/contacts/RedEnvelopesContacts.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/RedEnvelopesContacts.java
similarity index 89%
rename from moduleroom/src/main/java/com/example/moduleroom/contacts/RedEnvelopesContacts.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/RedEnvelopesContacts.java
index c49593fb..09bda3da 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/contacts/RedEnvelopesContacts.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/RedEnvelopesContacts.java
@@ -1,6 +1,7 @@
-package com.example.moduleroom.contacts;
+package com.xscm.modulemain.activity.room.contacts;
 
 import android.app.Activity;
+
 import com.xscm.moduleutil.activity.IPresenter;
 import com.xscm.moduleutil.activity.IView;
 import com.xscm.moduleutil.bean.RedpacketDetail;
diff --git a/moduleroom/src/main/java/com/example/moduleroom/contacts/RequestContacts.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/RequestContacts.java
similarity index 93%
rename from moduleroom/src/main/java/com/example/moduleroom/contacts/RequestContacts.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/RequestContacts.java
index 60bf6681..23d32ecd 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/contacts/RequestContacts.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/RequestContacts.java
@@ -1,4 +1,4 @@
-package com.example.moduleroom.contacts;
+package com.xscm.modulemain.activity.room.contacts;
 
 import android.app.Activity;
 
diff --git a/moduleroom/src/main/java/com/example/moduleroom/contacts/RoomAuctionContacts.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/RoomAuctionContacts.java
similarity index 95%
rename from moduleroom/src/main/java/com/example/moduleroom/contacts/RoomAuctionContacts.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/RoomAuctionContacts.java
index 2016d29e..4fd922d6 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/contacts/RoomAuctionContacts.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/RoomAuctionContacts.java
@@ -1,4 +1,4 @@
-package com.example.moduleroom.contacts;
+package com.xscm.modulemain.activity.room.contacts;
 
 import android.app.Activity;
 
diff --git a/moduleroom/src/main/java/com/example/moduleroom/contacts/RoomBackgroundContacts.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/RoomBackgroundContacts.java
similarity index 93%
rename from moduleroom/src/main/java/com/example/moduleroom/contacts/RoomBackgroundContacts.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/RoomBackgroundContacts.java
index 701c9848..ab2c477e 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/contacts/RoomBackgroundContacts.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/RoomBackgroundContacts.java
@@ -1,4 +1,4 @@
-package com.example.moduleroom.contacts;
+package com.xscm.modulemain.activity.room.contacts;
 
 import android.app.Activity;
 
diff --git a/moduleroom/src/main/java/com/example/moduleroom/contacts/RoomCabinContacts.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/RoomCabinContacts.java
similarity index 87%
rename from moduleroom/src/main/java/com/example/moduleroom/contacts/RoomCabinContacts.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/RoomCabinContacts.java
index 4f46a730..e8b987f3 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/contacts/RoomCabinContacts.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/RoomCabinContacts.java
@@ -1,4 +1,4 @@
-package com.example.moduleroom.contacts;
+package com.xscm.modulemain.activity.room.contacts;
 
 import android.app.Activity;
 
diff --git a/moduleroom/src/main/java/com/example/moduleroom/contacts/RoomCharmDialogContacts.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/RoomCharmDialogContacts.java
similarity index 90%
rename from moduleroom/src/main/java/com/example/moduleroom/contacts/RoomCharmDialogContacts.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/RoomCharmDialogContacts.java
index 3b83f1bd..af892efc 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/contacts/RoomCharmDialogContacts.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/RoomCharmDialogContacts.java
@@ -1,4 +1,4 @@
-package com.example.moduleroom.contacts;
+package com.xscm.modulemain.activity.room.contacts;
 
 import android.app.Activity;
 
diff --git a/moduleroom/src/main/java/com/example/moduleroom/contacts/RoomChartsContacts.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/RoomChartsContacts.java
similarity index 84%
rename from moduleroom/src/main/java/com/example/moduleroom/contacts/RoomChartsContacts.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/RoomChartsContacts.java
index 483c7f45..7e6df84f 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/contacts/RoomChartsContacts.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/RoomChartsContacts.java
@@ -1,4 +1,4 @@
-package com.example.moduleroom.contacts;
+package com.xscm.modulemain.activity.room.contacts;
 
 import android.app.Activity;
 
diff --git a/moduleroom/src/main/java/com/example/moduleroom/contacts/RoomCloseContacts.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/RoomCloseContacts.java
similarity index 74%
rename from moduleroom/src/main/java/com/example/moduleroom/contacts/RoomCloseContacts.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/RoomCloseContacts.java
index 294c5161..1c4f9a5f 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/contacts/RoomCloseContacts.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/RoomCloseContacts.java
@@ -1,14 +1,10 @@
-package com.example.moduleroom.contacts;
+package com.xscm.modulemain.activity.room.contacts;
 
 import android.app.Activity;
 
-
 import com.xscm.moduleutil.activity.IPresenter;
 import com.xscm.moduleutil.activity.IView;
-import com.xscm.moduleutil.bean.GiftUserWallBean;
 import com.xscm.moduleutil.bean.RoomRelationBean;
-import com.xscm.moduleutil.bean.room.CloseBean;
-import com.xscm.moduleutil.bean.room.RoomConcernDean;
 
 import java.util.List;
 
diff --git a/moduleroom/src/main/java/com/example/moduleroom/contacts/RoomContacts.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/RoomContacts.java
similarity index 97%
rename from moduleroom/src/main/java/com/example/moduleroom/contacts/RoomContacts.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/RoomContacts.java
index 7692b208..da94ea47 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/contacts/RoomContacts.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/RoomContacts.java
@@ -1,4 +1,4 @@
-package com.example.moduleroom.contacts;
+package com.xscm.modulemain.activity.room.contacts;
 
 import android.app.Activity;
 
diff --git a/moduleroom/src/main/java/com/example/moduleroom/contacts/RoomHostContacts.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/RoomHostContacts.java
similarity index 94%
rename from moduleroom/src/main/java/com/example/moduleroom/contacts/RoomHostContacts.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/RoomHostContacts.java
index 081f38f8..d5489847 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/contacts/RoomHostContacts.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/RoomHostContacts.java
@@ -1,8 +1,7 @@
-package com.example.moduleroom.contacts;
+package com.xscm.modulemain.activity.room.contacts;
 
 import android.app.Activity;
 
-
 import com.xscm.moduleutil.activity.IPresenter;
 import com.xscm.moduleutil.activity.IView;
 import com.xscm.moduleutil.bean.HostBean;
diff --git a/moduleroom/src/main/java/com/example/moduleroom/contacts/RoomPasswordSetContacts.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/RoomPasswordSetContacts.java
similarity index 88%
rename from moduleroom/src/main/java/com/example/moduleroom/contacts/RoomPasswordSetContacts.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/RoomPasswordSetContacts.java
index 4087bc29..7f84097c 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/contacts/RoomPasswordSetContacts.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/RoomPasswordSetContacts.java
@@ -1,4 +1,4 @@
-package com.example.moduleroom.contacts;
+package com.xscm.modulemain.activity.room.contacts;
 
 import android.app.Activity;
 
diff --git a/moduleroom/src/main/java/com/example/moduleroom/contacts/RoomPkContacts.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/RoomPkContacts.java
similarity index 92%
rename from moduleroom/src/main/java/com/example/moduleroom/contacts/RoomPkContacts.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/RoomPkContacts.java
index 664d5559..24493472 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/contacts/RoomPkContacts.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/RoomPkContacts.java
@@ -1,4 +1,4 @@
-package com.example.moduleroom.contacts;
+package com.xscm.modulemain.activity.room.contacts;
 
 import android.app.Activity;
 
diff --git a/moduleroom/src/main/java/com/example/moduleroom/contacts/RoomSettingContacts.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/RoomSettingContacts.java
similarity index 92%
rename from moduleroom/src/main/java/com/example/moduleroom/contacts/RoomSettingContacts.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/RoomSettingContacts.java
index ae9b191e..db57b583 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/contacts/RoomSettingContacts.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/RoomSettingContacts.java
@@ -1,4 +1,4 @@
-package com.example.moduleroom.contacts;
+package com.xscm.modulemain.activity.room.contacts;
 
 import android.app.Activity;
 
diff --git a/moduleroom/src/main/java/com/example/moduleroom/contacts/RoomUserContacts.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/RoomUserContacts.java
similarity index 97%
rename from moduleroom/src/main/java/com/example/moduleroom/contacts/RoomUserContacts.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/RoomUserContacts.java
index cdc999b0..d27fdc15 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/contacts/RoomUserContacts.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/RoomUserContacts.java
@@ -1,4 +1,4 @@
-package com.example.moduleroom.contacts;
+package com.xscm.modulemain.activity.room.contacts;
 
 import android.app.Activity;
 
diff --git a/modulevoice/src/main/java/com/example/modulevoice/contacts/SearchContacts.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/SearchContacts.java
similarity index 90%
rename from modulevoice/src/main/java/com/example/modulevoice/contacts/SearchContacts.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/SearchContacts.java
index 23205829..f7dc6965 100644
--- a/modulevoice/src/main/java/com/example/modulevoice/contacts/SearchContacts.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/SearchContacts.java
@@ -1,12 +1,10 @@
-package com.example.modulevoice.contacts;
+package com.xscm.modulemain.activity.room.contacts;
 
 import android.app.Activity;
 
-
 import com.xscm.moduleutil.activity.IPresenter;
 import com.xscm.moduleutil.activity.IView;
 import com.xscm.moduleutil.bean.RecordSection;
-import com.xscm.moduleutil.bean.RoomSearchResp;
 import com.xscm.moduleutil.bean.SearchAll;
 
 import java.util.List;
diff --git a/moduleroom/src/main/java/com/example/moduleroom/contacts/SingSongContacts.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/SingSongContacts.java
similarity index 95%
rename from moduleroom/src/main/java/com/example/moduleroom/contacts/SingSongContacts.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/SingSongContacts.java
index ac26735f..57b0b51e 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/contacts/SingSongContacts.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/SingSongContacts.java
@@ -1,4 +1,4 @@
-package com.example.moduleroom.contacts;
+package com.xscm.modulemain.activity.room.contacts;
 
 import android.app.Activity;
 
diff --git a/moduleroom/src/main/java/com/example/moduleroom/contacts/UserGiftWallConacts.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/UserGiftWallConacts.java
similarity index 89%
rename from moduleroom/src/main/java/com/example/moduleroom/contacts/UserGiftWallConacts.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/UserGiftWallConacts.java
index 9753d440..5ce550ff 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/contacts/UserGiftWallConacts.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/UserGiftWallConacts.java
@@ -1,8 +1,7 @@
-package com.example.moduleroom.contacts;
+package com.xscm.modulemain.activity.room.contacts;
 
 import android.app.Activity;
 
-
 import com.xscm.moduleutil.activity.IPresenter;
 import com.xscm.moduleutil.activity.IView;
 import com.xscm.moduleutil.bean.GiftUserWallBean;
diff --git a/modulevoice/src/main/java/com/example/modulevoice/contacts/VoiceCategoryContacts.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/VoiceCategoryContacts.java
similarity index 94%
rename from modulevoice/src/main/java/com/example/modulevoice/contacts/VoiceCategoryContacts.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/VoiceCategoryContacts.java
index 83a27785..bbf8710e 100644
--- a/modulevoice/src/main/java/com/example/modulevoice/contacts/VoiceCategoryContacts.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/VoiceCategoryContacts.java
@@ -1,8 +1,7 @@
-package com.example.modulevoice.contacts;
+package com.xscm.modulemain.activity.room.contacts;
 
 import android.app.Activity;
 
-
 import com.xscm.moduleutil.activity.IPresenter;
 import com.xscm.moduleutil.activity.IView;
 import com.xscm.moduleutil.bean.BannerModel;
diff --git a/modulevoice/src/main/java/com/example/modulevoice/contacts/VoiceContacts.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/VoiceContacts.java
similarity index 92%
rename from modulevoice/src/main/java/com/example/modulevoice/contacts/VoiceContacts.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/VoiceContacts.java
index b6fed5f9..aa63a302 100644
--- a/modulevoice/src/main/java/com/example/modulevoice/contacts/VoiceContacts.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/VoiceContacts.java
@@ -1,4 +1,4 @@
-package com.example.modulevoice.contacts;
+package com.xscm.modulemain.activity.room.contacts;
 
 import android.app.Activity;
 
diff --git a/moduleroom/src/main/java/com/example/moduleroom/contacts/WheatContacts.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/WheatContacts.java
similarity index 94%
rename from moduleroom/src/main/java/com/example/moduleroom/contacts/WheatContacts.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/WheatContacts.java
index bd50774b..b39b5444 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/contacts/WheatContacts.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/contacts/WheatContacts.java
@@ -1,4 +1,4 @@
-package com.example.moduleroom.contacts;
+package com.xscm.modulemain.activity.room.contacts;
 
 import android.app.Activity;
 
diff --git a/moduleroom/src/main/java/com/example/moduleroom/fragment/FriendshipRoomFragment.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/FriendshipRoomFragment.java
similarity index 99%
rename from moduleroom/src/main/java/com/example/moduleroom/fragment/FriendshipRoomFragment.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/FriendshipRoomFragment.java
index 45220685..e41769af 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/fragment/FriendshipRoomFragment.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/FriendshipRoomFragment.java
@@ -1,4 +1,4 @@
-package com.example.moduleroom.fragment;
+package com.xscm.modulemain.activity.room.fragment;
 
 import static android.view.View.GONE;
 import static android.view.View.VISIBLE;
@@ -6,10 +6,6 @@ import static android.view.View.VISIBLE;
 import android.annotation.SuppressLint;
 import android.graphics.Color;
 import android.os.Bundle;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
 import android.os.CountDownTimer;
 import android.util.DisplayMetrics;
 import android.view.Gravity;
@@ -20,20 +16,22 @@ import android.widget.PopupWindow;
 import android.widget.Switch;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import com.blankj.utilcode.util.LogUtils;
 import com.blankj.utilcode.util.ToastUtils;
-import com.example.moduleroom.R;
-import com.example.moduleroom.activity.RoomActivity;
-import com.example.moduleroom.contacts.FriendshipRoomContacts;
-import com.example.moduleroom.databinding.FragmentFriendshipRoomBinding;
-import com.example.moduleroom.dialog.RoomCharmDialog;
-import com.example.moduleroom.dialog.RoomConcernDialogFragment;
-import com.example.moduleroom.dialog.RoomGiftDialogFragment;
-import com.example.moduleroom.dialog.RoomOnlineDialogFragment;
-import com.example.moduleroom.dialog.RoomUserInfoFragment;
-import com.example.moduleroom.presenter.FriendshipRoomPresenter;
-import com.example.moduleroom.presenter.SingSongPresenter;
 import com.orhanobut.logger.Logger;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.activity.room.activity.RoomActivity;
+import com.xscm.modulemain.activity.room.contacts.FriendshipRoomContacts;
+import com.xscm.modulemain.activity.room.presenter.FriendshipRoomPresenter;
+import com.xscm.modulemain.databinding.FragmentFriendshipRoomBinding;
+import com.xscm.modulemain.dialog.RoomCharmDialog;
+import com.xscm.modulemain.dialog.RoomConcernDialogFragment;
+import com.xscm.modulemain.dialog.RoomGiftDialogFragment;
+import com.xscm.modulemain.dialog.RoomOnlineDialogFragment;
+import com.xscm.modulemain.dialog.RoomUserInfoFragment;
 import com.xscm.moduleutil.base.BaseRoomFragment;
 import com.xscm.moduleutil.base.CommonAppContext;
 import com.xscm.moduleutil.bean.RoomMessageEvent;
diff --git a/modulevoice/src/main/java/com/example/modulevoice/fragment/HotListFragment.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/HotListFragment.java
similarity index 93%
rename from modulevoice/src/main/java/com/example/modulevoice/fragment/HotListFragment.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/HotListFragment.java
index af9699b2..ad7e7266 100644
--- a/modulevoice/src/main/java/com/example/modulevoice/fragment/HotListFragment.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/HotListFragment.java
@@ -1,4 +1,4 @@
-package com.example.modulevoice.fragment;
+package com.xscm.modulemain.activity.room.fragment;
 
 import android.os.Bundle;
 import android.view.View;
@@ -7,13 +7,13 @@ import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.GridLayoutManager;
 
 import com.alibaba.android.arouter.launcher.ARouter;
-import com.chad.library.adapter.base.BaseQuickAdapter;
-import com.example.moduleroom.activity.RoomActivity;
-import com.example.modulevoice.R;
-import com.example.modulevoice.adapter.HotAdapter;
-import com.example.modulevoice.contacts.HotListContacts;
-import com.example.modulevoice.databinding.FragmentHotListBinding;
-import com.example.modulevoice.presenter.HotListPresenter;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.adapter.HotAdapter;
+import com.xscm.modulemain.activity.room.contacts.HotListContacts;
+import com.xscm.modulemain.databinding.FragmentHotListBinding;
+import com.xscm.modulemain.activity.room.presenter.HotListPresenter;
+import com.scwang.smartrefresh.layout.api.RefreshLayout;
+import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener;
 import com.xscm.moduleutil.base.BaseMvpFragment;
 import com.xscm.moduleutil.base.CommonAppContext;
 import com.xscm.moduleutil.base.RoomManager;
@@ -22,8 +22,6 @@ import com.xscm.moduleutil.bean.TopRoom;
 import com.xscm.moduleutil.bean.room.RoomInfoResp;
 import com.xscm.moduleutil.listener.MessageListenerSingleton;
 import com.xscm.moduleutil.utils.ARouteConstants;
-import com.scwang.smartrefresh.layout.api.RefreshLayout;
-import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener;
 import com.xscm.moduleutil.utils.ClickUtils;
 
 import java.util.ArrayList;
@@ -40,7 +38,7 @@ public class HotListFragment extends BaseMvpFragment<HotListPresenter, FragmentH
     public HotListFragment(VoiceCategoryFragment voiceCategoryFragment){
         this.voiceCategoryFragment = voiceCategoryFragment;
     }
-    public static HotListFragment newInstance(VoiceCategoryFragment voiceCategoryFragment,String type, String tag) {
+    public static HotListFragment newInstance(VoiceCategoryFragment voiceCategoryFragment, String type, String tag) {
         Bundle args = new Bundle();
         args.putString("label_id", type);
         args.putString("tag", tag);
diff --git a/moduleroom/src/main/java/com/example/moduleroom/fragment/MusicSongListFragment.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/MusicSongListFragment.java
similarity index 97%
rename from moduleroom/src/main/java/com/example/moduleroom/fragment/MusicSongListFragment.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/MusicSongListFragment.java
index 8c7c5c29..091e14db 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/fragment/MusicSongListFragment.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/MusicSongListFragment.java
@@ -1,4 +1,4 @@
-package com.example.moduleroom.fragment;
+package com.xscm.modulemain.activity.room.fragment;
 
 import android.content.Context;
 import android.os.Bundle;
@@ -15,10 +15,12 @@ import com.blankj.utilcode.util.LogUtils;
 import com.blankj.utilcode.util.ToastUtils;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.example.moduleroom.R;
-import com.example.moduleroom.contacts.RequestContacts;
-import com.example.moduleroom.databinding.FragmentMuiscSongBinding;
-import com.example.moduleroom.presenter.RequestPresenter;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.databinding.FragmentMuiscSongBinding;
+import com.scwang.smartrefresh.layout.api.RefreshLayout;
+import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener;
+import com.xscm.modulemain.activity.room.contacts.RequestContacts;
+import com.xscm.modulemain.activity.room.presenter.RequestPresenter;
 import com.xscm.moduleutil.base.BaseMvpFragment;
 import com.xscm.moduleutil.bean.MusicSongBean;
 import com.xscm.moduleutil.bean.SongMusicBean;
@@ -29,8 +31,6 @@ import com.xscm.moduleutil.utils.ColorManager;
 import com.xscm.moduleutil.utils.ImageUtils;
 import com.xscm.moduleutil.utils.SpUtil;
 import com.xscm.moduleutil.utils.TimeUtils;
-import com.scwang.smartrefresh.layout.api.RefreshLayout;
-import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener;
 
 import org.greenrobot.eventbus.EventBus;
 
diff --git a/moduleroom/src/main/java/com/example/moduleroom/fragment/PublicScreenEaseChatFragment.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/PublicScreenEaseChatFragment.java
similarity index 98%
rename from moduleroom/src/main/java/com/example/moduleroom/fragment/PublicScreenEaseChatFragment.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/PublicScreenEaseChatFragment.java
index 4aa35d9b..ce3a0fba 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/fragment/PublicScreenEaseChatFragment.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/PublicScreenEaseChatFragment.java
@@ -1,4 +1,4 @@
-package com.example.moduleroom.fragment;
+package com.xscm.modulemain.activity.room.fragment;
 
 import android.content.Context;
 import android.graphics.Color;
@@ -16,25 +16,32 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.blankj.utilcode.util.GsonUtils;
 import com.blankj.utilcode.util.LogUtils;
-import com.example.moduleroom.R;
-import com.example.moduleroom.activity.RoomActivity;
-import com.example.moduleroom.adapter.EaseChatAdapter;
-import com.example.moduleroom.contacts.PublicScreenEaseChatContacts;
-import com.example.moduleroom.databinding.RoomFragementTransEaseChatBinding;
-import com.example.moduleroom.dialog.RoomUserInfoFragment;
-import com.xscm.moduleutil.bean.*;
-import com.xscm.moduleutil.bean.room.*;
-import com.xscm.moduleutil.event.RoomTaskEvent;
-import com.xscm.moduleutil.listener.MessageListenerSingleton;
-import com.example.moduleroom.presenter.PublicScreenEaseChatPresenter;
-import com.xscm.moduleutil.base.BaseMvpFragment;
-import com.xscm.moduleutil.event.RoomJoinMountModel;
-import com.xscm.moduleutil.rtc.MusicPlayBean;
-import com.xscm.moduleutil.utils.SpUtil;
-import com.xscm.moduleutil.utils.logger.Logger;
 import com.tencent.imsdk.v2.V2TIMManager;
 import com.tencent.imsdk.v2.V2TIMMessage;
 import com.tencent.imsdk.v2.V2TIMSendCallback;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.activity.room.activity.RoomActivity;
+import com.xscm.modulemain.activity.room.contacts.PublicScreenEaseChatContacts;
+import com.xscm.modulemain.activity.room.presenter.PublicScreenEaseChatPresenter;
+import com.xscm.modulemain.adapter.EaseChatAdapter;
+import com.xscm.modulemain.databinding.RoomFragementTransEaseChatBinding;
+import com.xscm.modulemain.dialog.RoomUserInfoFragment;
+import com.xscm.moduleutil.base.BaseMvpFragment;
+import com.xscm.moduleutil.bean.RoomInputEvent;
+import com.xscm.moduleutil.bean.RoomMessageEvent;
+import com.xscm.moduleutil.bean.RoomSettingEvent;
+import com.xscm.moduleutil.bean.UserInfo;
+import com.xscm.moduleutil.bean.room.Children;
+import com.xscm.moduleutil.bean.room.EMMessageInfo;
+import com.xscm.moduleutil.bean.room.EmotionDeatils;
+import com.xscm.moduleutil.bean.room.RoomInfoResp;
+import com.xscm.moduleutil.bean.room.RoomUserBean;
+import com.xscm.moduleutil.event.RoomJoinMountModel;
+import com.xscm.moduleutil.event.RoomTaskEvent;
+import com.xscm.moduleutil.listener.MessageListenerSingleton;
+import com.xscm.moduleutil.rtc.MusicPlayBean;
+import com.xscm.moduleutil.utils.SpUtil;
+import com.xscm.moduleutil.utils.logger.Logger;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
diff --git a/moduleroom/src/main/java/com/example/moduleroom/fragment/RankingChildFragment.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/RankingChildFragment.java
similarity index 96%
rename from moduleroom/src/main/java/com/example/moduleroom/fragment/RankingChildFragment.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/RankingChildFragment.java
index 4d18422e..582c7607 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/fragment/RankingChildFragment.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/RankingChildFragment.java
@@ -1,4 +1,4 @@
-package com.example.moduleroom.fragment;
+package com.xscm.modulemain.activity.room.fragment;
 
 import android.os.Bundle;
 import android.util.Log;
@@ -11,18 +11,16 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
-import com.alibaba.android.arouter.launcher.ARouter;
 import com.chad.library.adapter.base.BaseQuickAdapter;
-import com.example.moduleroom.R;
-import com.example.moduleroom.adapter.RankingCharmListAdapter;
-import com.example.moduleroom.contacts.DataListContacts;
-import com.example.moduleroom.databinding.RoomRankingChildBinding;
-import com.example.moduleroom.dialog.RoomUserInfoFragment;
-import com.example.moduleroom.presenter.DataListPresenter;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.adapter.RankingCharmListAdapter;
+import com.xscm.modulemain.databinding.RoomRankingChildBinding;
+import com.xscm.modulemain.dialog.RoomUserInfoFragment;
+import com.xscm.modulemain.activity.room.contacts.DataListContacts;
+import com.xscm.modulemain.activity.room.presenter.DataListPresenter;
 import com.xscm.moduleutil.base.BaseMvpFragment;
 import com.xscm.moduleutil.bean.CharmRankingResp;
 import com.xscm.moduleutil.bean.room.RoomInfoResp;
-import com.xscm.moduleutil.utils.ARouteConstants;
 import com.xscm.moduleutil.utils.ImageUtils;
 import com.xscm.moduleutil.utils.StringUtil;
 import com.xscm.moduleutil.widget.CommonEmptyView;
diff --git a/moduleroom/src/main/java/com/example/moduleroom/fragment/RankingParentFragment.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/RankingParentFragment.java
similarity index 94%
rename from moduleroom/src/main/java/com/example/moduleroom/fragment/RankingParentFragment.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/RankingParentFragment.java
index 8849999e..ffa9470a 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/fragment/RankingParentFragment.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/RankingParentFragment.java
@@ -1,12 +1,11 @@
-package com.example.moduleroom.fragment;
+package com.xscm.modulemain.activity.room.fragment;
 
 import android.os.Bundle;
 
 import androidx.fragment.app.Fragment;
 
-
-import com.example.moduleroom.R;
-import com.example.moduleroom.databinding.RoomRankingParentBinding;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.databinding.RoomRankingParentBinding;
 import com.xscm.moduleutil.activity.IPresenter;
 import com.xscm.moduleutil.adapter.MyFragmentPagerAdapter;
 import com.xscm.moduleutil.base.BaseMvpFragment;
diff --git a/moduleroom/src/main/java/com/example/moduleroom/fragment/RedEnvelopesFragment.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/RedEnvelopesFragment.java
similarity index 96%
rename from moduleroom/src/main/java/com/example/moduleroom/fragment/RedEnvelopesFragment.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/RedEnvelopesFragment.java
index d3ee3b31..749c78f2 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/fragment/RedEnvelopesFragment.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/RedEnvelopesFragment.java
@@ -1,4 +1,9 @@
-package com.example.moduleroom.fragment;
+package com.xscm.modulemain.activity.room.fragment;
+
+import static com.xscm.moduleutil.event.RedEnvelopeStatus.QXRedBagDrawTypeCollect;
+import static com.xscm.moduleutil.event.RedEnvelopeStatus.QXRedBagDrawTypeOpen;
+import static com.xscm.moduleutil.event.RedEnvelopeStatus.QXRedBagDrawTypePwdSend;
+import static com.xscm.moduleutil.event.RedEnvelopeStatus.QXRedBagDrawTypeTimeDown;
 
 import android.content.Context;
 import android.os.CountDownTimer;
@@ -6,14 +11,16 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.Window;
 import android.view.WindowManager;
+
 import androidx.annotation.NonNull;
+
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.blankj.utilcode.util.ScreenUtils;
 import com.blankj.utilcode.util.TimeUtils;
 import com.blankj.utilcode.util.ToastUtils;
-import com.example.moduleroom.R;
-import com.example.moduleroom.activity.RoomActivity;
-import com.example.moduleroom.databinding.FragmentRedEnvelopesBinding;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.activity.room.activity.RoomActivity;
+import com.xscm.modulemain.databinding.FragmentRedEnvelopesBinding;
 import com.xscm.moduleutil.bean.RedPackGrab;
 import com.xscm.moduleutil.bean.RedPacketInfo;
 import com.xscm.moduleutil.bean.UserInfo;
@@ -22,15 +29,13 @@ import com.xscm.moduleutil.http.BaseObserver;
 import com.xscm.moduleutil.http.RetrofitClient;
 import com.xscm.moduleutil.utils.ARouteConstants;
 import com.xscm.moduleutil.utils.ImageUtils;
-import com.xscm.moduleutil.utils.QXRedPacketManager;
 import com.xscm.moduleutil.view.QXRedBagSendView;
 import com.xscm.moduleutil.widget.dialog.BaseDialog;
-import com.xscm.moduleutil.widget.floatingView.IFloatingView;
-import io.reactivex.disposables.Disposable;
+
 import org.greenrobot.eventbus.EventBus;
 import org.jetbrains.annotations.NotNull;
 
-import static com.xscm.moduleutil.event.RedEnvelopeStatus.*;
+import io.reactivex.disposables.Disposable;
 
 /**
  * @author xscm
diff --git a/moduleroom/src/main/java/com/example/moduleroom/fragment/RedViewModel.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/RedViewModel.java
similarity index 70%
rename from moduleroom/src/main/java/com/example/moduleroom/fragment/RedViewModel.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/RedViewModel.java
index b76d6e1a..34d2d142 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/fragment/RedViewModel.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/RedViewModel.java
@@ -1,4 +1,4 @@
-package com.example.moduleroom.fragment;
+package com.xscm.modulemain.activity.room.fragment;
 
 import androidx.lifecycle.ViewModel;
 
diff --git a/moduleroom/src/main/java/com/example/moduleroom/fragment/RelationshipFragment.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/RelationshipFragment.java
similarity index 95%
rename from moduleroom/src/main/java/com/example/moduleroom/fragment/RelationshipFragment.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/RelationshipFragment.java
index d9fe507a..0df70a16 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/fragment/RelationshipFragment.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/RelationshipFragment.java
@@ -1,22 +1,21 @@
-package com.example.moduleroom.fragment;
+package com.xscm.modulemain.activity.room.fragment;
 
 
 import android.content.Context;
 import android.os.Bundle;
+import android.view.Gravity;
+import android.view.View;
+import android.view.Window;
 
 import androidx.annotation.NonNull;
 import androidx.fragment.app.FragmentManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
-import android.view.Gravity;
-import android.view.View;
-import android.view.Window;
-
-import com.example.moduleroom.R;
-import com.example.moduleroom.adapter.RelationshipAdapter;
-import com.example.moduleroom.contacts.RoomUserContacts;
-import com.example.moduleroom.databinding.FragmentRelationshipBinding;
-import com.example.moduleroom.presenter.RoomUserPresenter;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.adapter.RelationshipAdapter;
+import com.xscm.modulemain.databinding.FragmentRelationshipBinding;
+import com.xscm.modulemain.activity.room.contacts.RoomUserContacts;
+import com.xscm.modulemain.activity.room.presenter.RoomUserPresenter;
 import com.xscm.moduleutil.base.BaseMvpDialogFragment;
 import com.xscm.moduleutil.bean.RelationCardBean;
 import com.xscm.moduleutil.bean.RelationshipBean;
diff --git a/moduleroom/src/main/java/com/example/moduleroom/fragment/RequestFragment.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/RequestFragment.java
similarity index 96%
rename from moduleroom/src/main/java/com/example/moduleroom/fragment/RequestFragment.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/RequestFragment.java
index 1d90df0a..4de3997d 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/fragment/RequestFragment.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/RequestFragment.java
@@ -1,25 +1,26 @@
-package com.example.moduleroom.fragment;
+package com.xscm.modulemain.activity.room.fragment;
 
 import android.content.Context;
 import android.os.Bundle;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.recyclerview.widget.LinearLayoutManager;
-
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.view.View;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
+
 import com.blankj.utilcode.util.LogUtils;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.example.moduleroom.R;
-import com.example.moduleroom.contacts.RequestContacts;
-import com.example.moduleroom.databinding.FragmentRequestBinding;
-import com.example.moduleroom.presenter.RequestPresenter;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.databinding.FragmentRequestBinding;
 import com.hjq.toast.ToastUtils;
+import com.scwang.smartrefresh.layout.api.RefreshLayout;
+import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener;
+import com.xscm.modulemain.activity.room.contacts.RequestContacts;
+import com.xscm.modulemain.activity.room.presenter.RequestPresenter;
 import com.xscm.moduleutil.base.BaseMvpFragment;
 import com.xscm.moduleutil.bean.MusicSongBean;
 import com.xscm.moduleutil.bean.SongMusicBean;
@@ -30,8 +31,6 @@ import com.xscm.moduleutil.utils.ColorManager;
 import com.xscm.moduleutil.utils.ImageUtils;
 import com.xscm.moduleutil.utils.SpUtil;
 import com.xscm.moduleutil.utils.TimeUtils;
-import com.scwang.smartrefresh.layout.api.RefreshLayout;
-import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -64,12 +63,12 @@ public class RequestFragment extends BaseMvpFragment<RequestPresenter, FragmentR
 
     @Override
     public void upSong(String S) {
-        com.hjq.toast.ToastUtils.show(S);
+        ToastUtils.show(S);
     }
 
     @Override
     public void song(List<SongMusicBean> music) {
-        com.hjq.toast.ToastUtils.show("操作成功");
+        ToastUtils.show("操作成功");
     }
 
     public interface OnRequestFragmentListener {
diff --git a/moduleroom/src/main/java/com/example/moduleroom/fragment/RoomAuctionFragment.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomAuctionFragment.java
similarity index 99%
rename from moduleroom/src/main/java/com/example/moduleroom/fragment/RoomAuctionFragment.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomAuctionFragment.java
index 456f0453..8ec2c434 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/fragment/RoomAuctionFragment.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomAuctionFragment.java
@@ -1,4 +1,4 @@
-package com.example.moduleroom.fragment;
+package com.xscm.modulemain.activity.room.fragment;
 
 import static android.view.View.GONE;
 import static android.view.View.INVISIBLE;
@@ -21,20 +21,20 @@ import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
 
 import com.blankj.utilcode.util.LogUtils;
-import com.example.moduleroom.R;
-import com.example.moduleroom.activity.RoomActivity;
-import com.example.moduleroom.contacts.RoomAuctionContacts;
-import com.example.moduleroom.databinding.FragmentRoomAuctionBinding;
-import com.example.moduleroom.dialog.BidListDialogFragment;
-import com.example.moduleroom.dialog.CardRelationshipFragment;
-import com.example.moduleroom.dialog.CustomCenterDialogFragment;
-import com.example.moduleroom.dialog.RoomCharmDialog;
-import com.example.moduleroom.dialog.RoomGiftDialogFragment;
-import com.example.moduleroom.dialog.RoomOnlineDialogFragment;
-import com.example.moduleroom.dialog.RoomUserInfoFragment;
-import com.example.moduleroom.presenter.RoomAuctionPresenterTow;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.activity.room.activity.RoomActivity;
+import com.xscm.modulemain.databinding.FragmentRoomAuctionBinding;
+import com.xscm.modulemain.dialog.BidListDialogFragment;
+import com.xscm.modulemain.dialog.CardRelationshipFragment;
+import com.xscm.modulemain.dialog.CustomCenterDialogFragment;
+import com.xscm.modulemain.dialog.RoomCharmDialog;
+import com.xscm.modulemain.dialog.RoomGiftDialogFragment;
+import com.xscm.modulemain.dialog.RoomOnlineDialogFragment;
+import com.xscm.modulemain.dialog.RoomUserInfoFragment;
 import com.hjq.toast.ToastUtils;
 import com.orhanobut.logger.Logger;
+import com.xscm.modulemain.activity.room.contacts.RoomAuctionContacts;
+import com.xscm.modulemain.activity.room.presenter.RoomAuctionPresenterTow;
 import com.xscm.moduleutil.base.BaseMvpFragment;
 import com.xscm.moduleutil.base.CommonAppContext;
 import com.xscm.moduleutil.bean.RoomMessageEvent;
diff --git a/moduleroom/src/main/java/com/example/moduleroom/fragment/RoomBackgroundDialogFragment.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomBackgroundDialogFragment.java
similarity index 97%
rename from moduleroom/src/main/java/com/example/moduleroom/fragment/RoomBackgroundDialogFragment.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomBackgroundDialogFragment.java
index a208af4a..0f03a77c 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/fragment/RoomBackgroundDialogFragment.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomBackgroundDialogFragment.java
@@ -1,4 +1,4 @@
-package com.example.moduleroom.fragment;
+package com.xscm.modulemain.activity.room.fragment;
 
 import static android.app.Activity.RESULT_OK;
 
@@ -17,13 +17,13 @@ import androidx.recyclerview.widget.GridLayoutManager;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.example.moduleroom.R;
-import com.example.moduleroom.contacts.RoomBackgroundContacts;
-import com.example.moduleroom.databinding.RoomFragementDialogRoomBackgroundBinding;
-import com.example.moduleroom.presenter.RoomBackgroundPresenter;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.databinding.RoomFragementDialogRoomBackgroundBinding;
 import com.luck.picture.lib.basic.PictureSelector;
 import com.luck.picture.lib.config.PictureConfig;
 import com.luck.picture.lib.entity.LocalMedia;
+import com.xscm.modulemain.activity.room.contacts.RoomBackgroundContacts;
+import com.xscm.modulemain.activity.room.presenter.RoomBackgroundPresenter;
 import com.xscm.moduleutil.base.BaseMvpDialogFragment;
 import com.xscm.moduleutil.bean.RoomBgBean;
 import com.xscm.moduleutil.dialog.ConfirmDialog;
diff --git a/moduleroom/src/main/java/com/example/moduleroom/fragment/RoomCabinFragment.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomCabinFragment.java
similarity index 97%
rename from moduleroom/src/main/java/com/example/moduleroom/fragment/RoomCabinFragment.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomCabinFragment.java
index 55d649e0..768c4b4e 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/fragment/RoomCabinFragment.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomCabinFragment.java
@@ -1,14 +1,10 @@
-package com.example.moduleroom.fragment;
+package com.xscm.modulemain.activity.room.fragment;
 
 import static android.view.View.GONE;
 import static android.view.View.VISIBLE;
 
 import android.annotation.SuppressLint;
-import android.app.Activity;
-import android.content.Context;
 import android.content.Intent;
-import android.media.projection.MediaProjection;
-import android.media.projection.MediaProjectionManager;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.CountDownTimer;
@@ -19,8 +15,6 @@ import android.view.SurfaceView;
 import android.view.View;
 import android.view.ViewGroup;
 
-import androidx.activity.result.ActivityResultLauncher;
-import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
@@ -29,15 +23,15 @@ import androidx.core.app.NotificationManagerCompat;
 import com.blankj.utilcode.util.LogUtils;
 import com.blankj.utilcode.util.ObjectUtils;
 import com.blankj.utilcode.util.TimeUtils;
-import com.example.moduleroom.R;
-import com.example.moduleroom.activity.RoomActivity;
-import com.example.moduleroom.contacts.RoomCabinContacts;
-import com.example.moduleroom.databinding.RoomCabinFragmentBinding;
-import com.example.moduleroom.dialog.ExitRoomBottomSheet;
-import com.example.moduleroom.dialog.RoomGiftDialogFragment;
-import com.example.moduleroom.presenter.RoomCabinPresenter;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.activity.room.activity.RoomActivity;
+import com.xscm.modulemain.databinding.RoomCabinFragmentBinding;
+import com.xscm.modulemain.dialog.ExitRoomBottomSheet;
+import com.xscm.modulemain.dialog.RoomGiftDialogFragment;
 import com.hjq.toast.ToastUtils;
 import com.orhanobut.logger.Logger;
+import com.xscm.modulemain.activity.room.contacts.RoomCabinContacts;
+import com.xscm.modulemain.activity.room.presenter.RoomCabinPresenter;
 import com.xscm.moduleutil.base.BaseRoomFragment;
 import com.xscm.moduleutil.base.CommonAppContext;
 import com.xscm.moduleutil.bean.RoomMessageEvent;
@@ -49,7 +43,6 @@ import com.xscm.moduleutil.event.CabinEvent;
 import com.xscm.moduleutil.event.RoomBeckoningEvent;
 import com.xscm.moduleutil.listener.MessageListenerSingleton;
 import com.xscm.moduleutil.rtc.AgoraManager;
-import com.xscm.moduleutil.utils.ImageUtils;
 import com.xscm.moduleutil.utils.SpUtil;
 import com.xscm.moduleutil.widget.SharedViewModel;
 import com.xscm.moduleutil.widget.dialog.CommonDialog;
@@ -65,7 +58,6 @@ import io.agora.rtc2.Constants;
 import io.agora.rtc2.IRtcEngineEventHandler;
 import io.agora.rtc2.RtcEngine;
 import io.agora.rtc2.RtcEngineEx;
-import io.agora.rtc2.ScreenCaptureParameters;
 import io.agora.rtc2.video.VideoCanvas;
 
 /**
diff --git a/moduleroom/src/main/java/com/example/moduleroom/fragment/RoomChartsFragment.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomChartsFragment.java
similarity index 95%
rename from moduleroom/src/main/java/com/example/moduleroom/fragment/RoomChartsFragment.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomChartsFragment.java
index 8631abc6..0a47b5b1 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/fragment/RoomChartsFragment.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomChartsFragment.java
@@ -1,22 +1,21 @@
-package com.example.moduleroom.fragment;
+package com.xscm.modulemain.activity.room.fragment;
 
 import android.content.Context;
 import android.os.Bundle;
-
-import androidx.annotation.NonNull;
-
 import android.view.Gravity;
 import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
 
+import androidx.annotation.NonNull;
+
 import com.blankj.utilcode.util.FragmentUtils;
-import com.example.moduleroom.R;
-import com.example.moduleroom.contacts.RoomChartsContacts;
-import com.example.moduleroom.databinding.FragmentRoomChartsBinding;
-import com.example.moduleroom.presenter.RoomChartsPresenter;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.databinding.FragmentRoomChartsBinding;
 import com.example.moduletablayout.listener.CustomTabEntity;
 import com.example.moduletablayout.listener.OnTabSelectListener;
+import com.xscm.modulemain.activity.room.contacts.RoomChartsContacts;
+import com.xscm.modulemain.activity.room.presenter.RoomChartsPresenter;
 import com.xscm.moduleutil.base.BaseMvpDialogFragment;
 import com.xscm.moduleutil.bean.room.RoomInfoResp;
 
diff --git a/moduleroom/src/main/java/com/example/moduleroom/fragment/RoomFragment.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomFragment.java
similarity index 99%
rename from moduleroom/src/main/java/com/example/moduleroom/fragment/RoomFragment.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomFragment.java
index 7de3421c..618fce48 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/fragment/RoomFragment.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomFragment.java
@@ -1,14 +1,7 @@
-package com.example.moduleroom.fragment;
+package com.xscm.modulemain.activity.room.fragment;
 
 import android.Manifest;
 import android.os.Bundle;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.core.content.ContextCompat;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentTransaction;
-
 import android.os.CountDownTimer;
 import android.text.Spannable;
 import android.text.SpannableStringBuilder;
@@ -17,15 +10,21 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentTransaction;
+
 import com.blankj.utilcode.util.LogUtils;
 import com.blankj.utilcode.util.TimeUtils;
-import com.example.moduleroom.R;
-import com.example.moduleroom.activity.RoomActivity;
-import com.example.moduleroom.contacts.RoomContacts;
-import com.example.moduleroom.databinding.FragmentRoomBinding;
-import com.example.moduleroom.dialog.WheatFeedingDialogFragment;
-import com.example.moduleroom.presenter.RoomPresenter;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.activity.room.activity.RoomActivity;
+import com.xscm.modulemain.databinding.FragmentRoomBinding;
+import com.xscm.modulemain.dialog.WheatFeedingDialogFragment;
 import com.hjq.toast.ToastUtils;
+import com.xscm.modulemain.activity.room.contacts.RoomContacts;
+import com.xscm.modulemain.activity.room.presenter.RoomPresenter;
 import com.xscm.moduleutil.base.BaseMvpFragment;
 import com.xscm.moduleutil.base.CommonAppContext;
 import com.xscm.moduleutil.bean.RedPacketInfo;
@@ -43,7 +42,6 @@ import com.xscm.moduleutil.dialog.ConfirmDialog;
 import com.xscm.moduleutil.event.QXRoomSeatViewType;
 import com.xscm.moduleutil.listener.MessageListenerSingleton;
 import com.xscm.moduleutil.rtc.AgoraManager;
-import com.xscm.moduleutil.utils.ImageUtils;
 import com.xscm.moduleutil.utils.SpUtil;
 import com.xscm.moduleutil.widget.SharedViewModel;
 
diff --git a/moduleroom/src/main/java/com/example/moduleroom/fragment/RoomKtvFragment.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomKtvFragment.java
similarity index 98%
rename from moduleroom/src/main/java/com/example/moduleroom/fragment/RoomKtvFragment.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomKtvFragment.java
index 9aa11a82..ef954df4 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/fragment/RoomKtvFragment.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomKtvFragment.java
@@ -1,12 +1,7 @@
-package com.example.moduleroom.fragment;
+package com.xscm.modulemain.activity.room.fragment;
 
 import android.content.Context;
 import android.os.Bundle;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.recyclerview.widget.LinearLayoutManager;
-
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -14,21 +9,30 @@ import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
 import android.view.animation.LinearInterpolator;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
+
 import com.blankj.utilcode.util.LogUtils;
 import com.blankj.utilcode.util.ToastUtils;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.example.moduleroom.R;
-import com.example.moduleroom.activity.RoomActivity;
-import com.example.moduleroom.contacts.RoomContacts;
-import com.example.moduleroom.databinding.FragmentRoomKtvBinding;
-import com.example.moduleroom.dialog.RoomCharmDialog;
-import com.example.moduleroom.dialog.RoomGiftDialogFragment;
-import com.example.moduleroom.dialog.RoomOnlineDialogFragment;
-import com.example.moduleroom.dialog.RoomUserInfoFragment;
-import com.example.moduleroom.presenter.RoomPresenter;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.activity.room.activity.RoomActivity;
+import com.xscm.modulemain.databinding.FragmentRoomKtvBinding;
+import com.xscm.modulemain.dialog.RoomCharmDialog;
+import com.xscm.modulemain.dialog.RoomGiftDialogFragment;
+import com.xscm.modulemain.dialog.RoomOnlineDialogFragment;
+import com.xscm.modulemain.dialog.RoomUserInfoFragment;
+import com.xscm.modulemain.activity.room.contacts.RoomContacts;
+import com.xscm.modulemain.activity.room.presenter.RoomPresenter;
 import com.xscm.moduleutil.base.BaseMvpFragment;
-import com.xscm.moduleutil.bean.*;
+import com.xscm.moduleutil.bean.MusicSongBean;
+import com.xscm.moduleutil.bean.RedPacketInfo;
+import com.xscm.moduleutil.bean.RoomCharmRankBean;
+import com.xscm.moduleutil.bean.RoomMessageEvent;
+import com.xscm.moduleutil.bean.UserInfo;
+import com.xscm.moduleutil.bean.UserOnlineStatusBean;
 import com.xscm.moduleutil.bean.room.RoomInfoResp;
 import com.xscm.moduleutil.bean.room.RoomOnline;
 import com.xscm.moduleutil.bean.room.RoomPitBean;
diff --git a/moduleroom/src/main/java/com/example/moduleroom/fragment/RoomNoticeDialogFragment.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomNoticeDialogFragment.java
similarity index 94%
rename from moduleroom/src/main/java/com/example/moduleroom/fragment/RoomNoticeDialogFragment.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomNoticeDialogFragment.java
index 90e550fe..fc215d87 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/fragment/RoomNoticeDialogFragment.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomNoticeDialogFragment.java
@@ -1,16 +1,15 @@
-package com.example.moduleroom.fragment;
+package com.xscm.modulemain.activity.room.fragment;
 
 import android.content.Context;
-
-import androidx.annotation.NonNull;
-
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+
 import com.blankj.utilcode.util.ScreenUtils;
-import com.example.moduleroom.R;
+import com.xscm.modulemain.R;
 import com.xscm.moduleutil.widget.dialog.BaseDialog;
 
 /**
diff --git a/moduleroom/src/main/java/com/example/moduleroom/fragment/RoomPasswordSetDialogFragment.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomPasswordSetDialogFragment.java
similarity index 91%
rename from moduleroom/src/main/java/com/example/moduleroom/fragment/RoomPasswordSetDialogFragment.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomPasswordSetDialogFragment.java
index fb4bb9c5..675745d9 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/fragment/RoomPasswordSetDialogFragment.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/RoomPasswordSetDialogFragment.java
@@ -1,4 +1,4 @@
-package com.example.moduleroom.fragment;
+package com.xscm.modulemain.activity.room.fragment;
 
 import android.os.Bundle;
 import android.view.View;
@@ -8,11 +8,11 @@ import android.view.WindowManager;
 import androidx.fragment.app.FragmentManager;
 
 import com.blankj.utilcode.util.ScreenUtils;
-import com.example.moduleroom.R;
-import com.example.moduleroom.contacts.RoomPasswordSetContacts;
-import com.example.moduleroom.databinding.RoomDialogRoomPwSettingBinding;
-import com.example.moduleroom.presenter.RoomPasswordSetPresenter;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.databinding.RoomDialogRoomPwSettingBinding;
 import com.hjq.toast.ToastUtils;
+import com.xscm.modulemain.activity.room.contacts.RoomPasswordSetContacts;
+import com.xscm.modulemain.activity.room.presenter.RoomPasswordSetPresenter;
 import com.xscm.moduleutil.base.BaseMvpDialogFragment;
 import com.xscm.moduleutil.event.PasswordInputEvent;
 import com.xscm.moduleutil.event.RoomOutEvent;
diff --git a/moduleroom/src/main/java/com/example/moduleroom/fragment/SingSongFragment.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/SingSongFragment.java
similarity index 99%
rename from moduleroom/src/main/java/com/example/moduleroom/fragment/SingSongFragment.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/SingSongFragment.java
index 2bc77aec..4c55976a 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/fragment/SingSongFragment.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/SingSongFragment.java
@@ -1,17 +1,15 @@
-package com.example.moduleroom.fragment;
+package com.xscm.modulemain.activity.room.fragment;
 
 import static android.view.View.GONE;
 import static android.view.View.INVISIBLE;
 import static android.view.View.VISIBLE;
 
-
 import android.annotation.SuppressLint;
 import android.app.AlertDialog;
 import android.content.Context;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
-
 import android.os.CountDownTimer;
 import android.os.Handler;
 import android.os.Looper;
@@ -33,29 +31,28 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.constraintlayout.widget.ConstraintLayout;
 
-import com.blankj.utilcode.util.ActivityUtils;
 import com.blankj.utilcode.util.ObjectUtils;
-import com.example.moduleroom.R;
-import com.example.moduleroom.activity.RoomActivity;
-import com.example.moduleroom.contacts.SingSongContacts;
-import com.example.moduleroom.databinding.FragmentSingSongBinding;
-import com.example.moduleroom.dialog.PkTimeDialogFragment;
-import com.example.moduleroom.dialog.RoomCharmDialog;
-import com.example.moduleroom.dialog.RoomOnlineDialogFragment;
-import com.example.moduleroom.dialog.RoomUserInfoFragment;
-import com.example.moduleroom.presenter.SingSongPresenter;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.activity.room.activity.RoomActivity;
+import com.xscm.modulemain.databinding.FragmentSingSongBinding;
+import com.xscm.modulemain.dialog.PkTimeDialogFragment;
+import com.xscm.modulemain.dialog.RoomCharmDialog;
+import com.xscm.modulemain.dialog.RoomOnlineDialogFragment;
+import com.xscm.modulemain.dialog.RoomUserInfoFragment;
 import com.google.android.flexbox.FlexboxLayout;
 import com.hjq.toast.ToastUtils;
 import com.luck.picture.lib.utils.DoubleUtils;
+import com.xscm.modulemain.activity.room.contacts.SingSongContacts;
+import com.xscm.modulemain.activity.room.presenter.SingSongPresenter;
 import com.xscm.moduleutil.base.BaseRoomFragment;
 import com.xscm.moduleutil.base.CommonAppContext;
 import com.xscm.moduleutil.bean.RoomMessageEvent;
 import com.xscm.moduleutil.bean.UserInfo;
 import com.xscm.moduleutil.bean.UserOnlineStatusBean;
-import com.xscm.moduleutil.bean.room.RoomUpPitBean;
-import com.xscm.moduleutil.bean.room.RoomUserJoinModel;
 import com.xscm.moduleutil.bean.room.RoomInfoResp;
 import com.xscm.moduleutil.bean.room.RoomPitBean;
+import com.xscm.moduleutil.bean.room.RoomUpPitBean;
+import com.xscm.moduleutil.bean.room.RoomUserJoinModel;
 import com.xscm.moduleutil.dialog.ConfirmDialog;
 import com.xscm.moduleutil.event.RoomBeckoningEvent;
 import com.xscm.moduleutil.event.RoomOwnerLeaveEvent;
@@ -75,8 +72,6 @@ import com.xscm.moduleutil.widget.WheatLayoutManager;
 import com.xscm.moduleutil.widget.WheatLayoutSingManager;
 import com.xscm.moduleutil.widget.dialog.CommonDialog;
 
-import io.reactivex.Observable;
-import io.reactivex.android.schedulers.AndroidSchedulers;
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
@@ -87,6 +82,9 @@ import java.util.Calendar;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
+import io.reactivex.Observable;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+
 /**
  * @author qx
  * @data 2025/6/9
diff --git a/modulevoice/src/main/java/com/example/modulevoice/fragment/VoiceCategoryFragment.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/VoiceCategoryFragment.java
similarity index 95%
rename from modulevoice/src/main/java/com/example/modulevoice/fragment/VoiceCategoryFragment.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/VoiceCategoryFragment.java
index 95e9f8ee..ade9190f 100644
--- a/modulevoice/src/main/java/com/example/modulevoice/fragment/VoiceCategoryFragment.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/VoiceCategoryFragment.java
@@ -1,18 +1,10 @@
-package com.example.modulevoice.fragment;
+package com.xscm.modulemain.activity.room.fragment;
 
 import static android.view.View.GONE;
 
-import android.annotation.SuppressLint;
 import android.content.Intent;
 import android.graphics.Color;
 import android.os.Bundle;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentActivity;
-import androidx.viewpager2.adapter.FragmentStateAdapter;
-
 import android.util.DisplayMetrics;
 import android.util.TypedValue;
 import android.view.LayoutInflater;
@@ -21,17 +13,24 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.viewpager2.adapter.FragmentStateAdapter;
+
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.blankj.utilcode.util.ToastUtils;
-import com.example.modulevoice.R;
-import com.example.modulevoice.activity.PopularRoomActivity;
-import com.example.modulevoice.activity.RankingListActivity;
-import com.example.modulevoice.adapter.CarouselBannerAdapter;
-import com.example.modulevoice.contacts.VoiceCategoryContacts;
-import com.example.modulevoice.databinding.FragmentVoiceCategoryBinding;
-import com.example.modulevoice.presenter.VoiceCategoryPresenter;
 import com.google.android.material.tabs.TabLayout;
 import com.google.android.material.tabs.TabLayoutMediator;
+import com.stx.xhb.xbanner.XBanner;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.activity.room.activity.PopularRoomActivity;
+import com.xscm.modulemain.activity.room.activity.RankingListActivity;
+import com.xscm.modulemain.activity.room.contacts.VoiceCategoryContacts;
+import com.xscm.modulemain.activity.room.presenter.VoiceCategoryPresenter;
+import com.xscm.modulemain.adapter.CarouselBannerAdapter;
+import com.xscm.modulemain.databinding.FragmentVoiceCategoryBinding;
 import com.xscm.moduleutil.activity.WebViewActivity;
 import com.xscm.moduleutil.activity.news.OfficialNoticeActivity;
 import com.xscm.moduleutil.base.BaseMvpFragment;
@@ -44,15 +43,9 @@ import com.xscm.moduleutil.event.MqttBean;
 import com.xscm.moduleutil.event.RoomGiftRunable;
 import com.xscm.moduleutil.utils.ARouteConstants;
 import com.xscm.moduleutil.utils.ImageUtils;
-import com.stx.xhb.xbanner.XBanner;
 import com.xscm.moduleutil.utils.logger.DataLogger;
-import com.zhpan.bannerview.constants.PageStyle;
-import com.zhpan.bannerview.utils.BannerUtils;
 
 import org.greenrobot.eventbus.EventBus;
-import org.greenrobot.eventbus.Logger;
-import org.greenrobot.eventbus.Subscribe;
-import org.greenrobot.eventbus.ThreadMode;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/modulevoice/src/main/java/com/example/modulevoice/fragment/VoiceFragment.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/VoiceFragment.java
similarity index 94%
rename from modulevoice/src/main/java/com/example/modulevoice/fragment/VoiceFragment.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/VoiceFragment.java
index 6794ad9c..3558fda9 100644
--- a/modulevoice/src/main/java/com/example/modulevoice/fragment/VoiceFragment.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/fragment/VoiceFragment.java
@@ -1,18 +1,19 @@
-package com.example.modulevoice.fragment;
+package com.xscm.modulemain.activity.room.fragment;
 
 import android.content.DialogInterface;
 import android.content.Intent;
-
 import android.view.View;
+
 import androidx.fragment.app.Fragment;
+
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.blankj.utilcode.util.ToastUtils;
-import com.example.modulevoice.R;
-import com.example.modulevoice.activity.RankingListActivity;
-import com.example.modulevoice.activity.SearchActivity;
-import com.example.modulevoice.contacts.VoiceContacts;
-import com.example.modulevoice.databinding.FragmentVoiceBinding;
-import com.example.modulevoice.presenter.VoicePresenter;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.activity.room.activity.RankingListActivity;
+import com.xscm.modulemain.activity.room.activity.SearchActivity;
+import com.xscm.modulemain.activity.room.contacts.VoiceContacts;
+import com.xscm.modulemain.databinding.FragmentVoiceBinding;
+import com.xscm.modulemain.activity.room.presenter.VoicePresenter;
 import com.xscm.moduleutil.adapter.MyFragmentPagerAdapter;
 import com.xscm.moduleutil.base.BaseMvpFragment;
 import com.xscm.moduleutil.bean.ActivitiesPermission;
diff --git a/moduleroom/src/main/java/com/example/moduleroom/presenter/BidListPresenter.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/BidListPresenter.java
similarity index 93%
rename from moduleroom/src/main/java/com/example/moduleroom/presenter/BidListPresenter.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/BidListPresenter.java
index e1aac7d3..3103e0a3 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/presenter/BidListPresenter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/BidListPresenter.java
@@ -1,9 +1,9 @@
-package com.example.moduleroom.presenter;
+package com.xscm.modulemain.activity.room.presenter;
 
 import android.content.Context;
 
 import com.blankj.utilcode.util.ObjectUtils;
-import com.example.moduleroom.contacts.BidListContacts;
+import com.xscm.modulemain.activity.room.contacts.BidListContacts;
 import com.xscm.moduleutil.bean.room.RoomAuction;
 import com.xscm.moduleutil.http.BaseObserver;
 import com.xscm.moduleutil.presenter.BasePresenter;
diff --git a/moduleroom/src/main/java/com/example/moduleroom/presenter/CardRelationshipPresenter.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/CardRelationshipPresenter.java
similarity index 95%
rename from moduleroom/src/main/java/com/example/moduleroom/presenter/CardRelationshipPresenter.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/CardRelationshipPresenter.java
index 50dd9b0f..ca84ddea 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/presenter/CardRelationshipPresenter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/CardRelationshipPresenter.java
@@ -1,8 +1,8 @@
-package com.example.moduleroom.presenter;
+package com.xscm.modulemain.activity.room.presenter;
 
 import android.content.Context;
 
-import com.example.moduleroom.contacts.CardRelationshipContacts;
+import com.xscm.modulemain.activity.room.contacts.CardRelationshipContacts;
 import com.xscm.moduleutil.bean.RoomRelationBean;
 import com.xscm.moduleutil.bean.RoomTime;
 import com.xscm.moduleutil.bean.RoonGiftModel;
diff --git a/moduleroom/src/main/java/com/example/moduleroom/presenter/DataListPresenter.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/DataListPresenter.java
similarity index 96%
rename from moduleroom/src/main/java/com/example/moduleroom/presenter/DataListPresenter.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/DataListPresenter.java
index bb09fac0..85e33b94 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/presenter/DataListPresenter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/DataListPresenter.java
@@ -1,15 +1,14 @@
-package com.example.moduleroom.presenter;
+package com.xscm.modulemain.activity.room.presenter;
 
 
 import android.content.Context;
 
 import com.blankj.utilcode.util.ObjectUtils;
-import com.example.moduleroom.contacts.DataListContacts;
+import com.xscm.modulemain.activity.room.contacts.DataListContacts;
 import com.xscm.moduleutil.base.BaseRoomPresenter;
 import com.xscm.moduleutil.bean.CharmRankingResp;
 import com.xscm.moduleutil.http.BaseObserver;
 
-
 import java.util.List;
 
 import io.reactivex.disposables.Disposable;
diff --git a/moduleroom/src/main/java/com/example/moduleroom/presenter/FriendshipRoomPresenter.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/FriendshipRoomPresenter.java
similarity index 96%
rename from moduleroom/src/main/java/com/example/moduleroom/presenter/FriendshipRoomPresenter.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/FriendshipRoomPresenter.java
index 9820a94d..3a3293b6 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/presenter/FriendshipRoomPresenter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/FriendshipRoomPresenter.java
@@ -1,8 +1,8 @@
-package com.example.moduleroom.presenter;
+package com.xscm.modulemain.activity.room.presenter;
 
 import android.content.Context;
 
-import com.example.moduleroom.contacts.FriendshipRoomContacts;
+import com.xscm.modulemain.activity.room.contacts.FriendshipRoomContacts;
 import com.xscm.moduleutil.base.BaseRoomPresenter;
 import com.xscm.moduleutil.bean.UserOnlineStatusBean;
 import com.xscm.moduleutil.bean.room.FriendUserBean;
diff --git a/modulevoice/src/main/java/com/example/modulevoice/presenter/HotListPresenter.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/HotListPresenter.java
similarity index 98%
rename from modulevoice/src/main/java/com/example/modulevoice/presenter/HotListPresenter.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/HotListPresenter.java
index 41eecd62..096e1295 100644
--- a/modulevoice/src/main/java/com/example/modulevoice/presenter/HotListPresenter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/HotListPresenter.java
@@ -1,9 +1,9 @@
-package com.example.modulevoice.presenter;
+package com.xscm.modulemain.activity.room.presenter;
 
 import android.content.Context;
 
 import com.blankj.utilcode.util.LogUtils;
-import com.example.modulevoice.contacts.HotListContacts;
+import com.xscm.modulemain.activity.room.contacts.HotListContacts;
 import com.google.gson.reflect.TypeToken;
 import com.xscm.moduleutil.base.CommonAppContext;
 import com.xscm.moduleutil.bean.TopRoom;
diff --git a/moduleroom/src/main/java/com/example/moduleroom/presenter/HourlyChartPresenter.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/HourlyChartPresenter.java
similarity index 88%
rename from moduleroom/src/main/java/com/example/moduleroom/presenter/HourlyChartPresenter.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/HourlyChartPresenter.java
index 36484cfe..638662aa 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/presenter/HourlyChartPresenter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/HourlyChartPresenter.java
@@ -1,17 +1,18 @@
-package com.example.moduleroom.presenter;
+package com.xscm.modulemain.activity.room.presenter;
 
 import android.content.Context;
 
-import com.example.moduleroom.contacts.BidListContacts;
-import com.example.moduleroom.contacts.HourlyChartContacts;
+import com.xscm.modulemain.activity.room.contacts.HourlyChartContacts;
 import com.xscm.moduleutil.bean.room.RoomHourBean;
 import com.xscm.moduleutil.http.BaseObserver;
 import com.xscm.moduleutil.presenter.BasePresenter;
-import io.reactivex.disposables.Disposable;
+
 import org.jetbrains.annotations.NotNull;
 
 import java.lang.ref.WeakReference;
 
+import io.reactivex.disposables.Disposable;
+
 public class HourlyChartPresenter extends BasePresenter<HourlyChartContacts.View> implements HourlyChartContacts.IRoomPre{
 
     HourlyChartContacts.View mView;
diff --git a/moduleroom/src/main/java/com/example/moduleroom/presenter/PkTimePresenter.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/PkTimePresenter.java
similarity index 87%
rename from moduleroom/src/main/java/com/example/moduleroom/presenter/PkTimePresenter.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/PkTimePresenter.java
index a3968b9b..ff2f5e85 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/presenter/PkTimePresenter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/PkTimePresenter.java
@@ -1,9 +1,9 @@
-package com.example.moduleroom.presenter;
+package com.xscm.modulemain.activity.room.presenter;
 
 
 import android.content.Context;
 
-import com.example.moduleroom.contacts.PkTimeContract;
+import com.xscm.modulemain.activity.room.contacts.PkTimeContract;
 import com.xscm.moduleutil.http.BaseObserver;
 import com.xscm.moduleutil.presenter.BasePresenter;
 
diff --git a/modulevoice/src/main/java/com/example/modulevoice/presenter/PlaceholderPresenter.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/PlaceholderPresenter.java
similarity index 94%
rename from modulevoice/src/main/java/com/example/modulevoice/presenter/PlaceholderPresenter.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/PlaceholderPresenter.java
index 1d3e61f2..cff09c35 100644
--- a/modulevoice/src/main/java/com/example/modulevoice/presenter/PlaceholderPresenter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/PlaceholderPresenter.java
@@ -1,9 +1,9 @@
-package com.example.modulevoice.presenter;
+package com.xscm.modulemain.activity.room.presenter;
 
 import android.content.Context;
 
 import com.blankj.utilcode.util.ObjectUtils;
-import com.example.modulevoice.contacts.PlaceholderContacts;
+import com.xscm.modulemain.activity.room.contacts.PlaceholderContacts;
 import com.xscm.moduleutil.bean.PlaceholderBean;
 import com.xscm.moduleutil.http.BaseObserver;
 import com.xscm.moduleutil.presenter.BasePresenter;
diff --git a/moduleroom/src/main/java/com/example/moduleroom/presenter/PublicScreenEaseChatPresenter.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/PublicScreenEaseChatPresenter.java
similarity index 93%
rename from moduleroom/src/main/java/com/example/moduleroom/presenter/PublicScreenEaseChatPresenter.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/PublicScreenEaseChatPresenter.java
index ac41b003..edad2d79 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/presenter/PublicScreenEaseChatPresenter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/PublicScreenEaseChatPresenter.java
@@ -1,9 +1,8 @@
-package com.example.moduleroom.presenter;
+package com.xscm.modulemain.activity.room.presenter;
 
 import android.content.Context;
 
-
-import com.example.moduleroom.contacts.PublicScreenEaseChatContacts;
+import com.xscm.modulemain.activity.room.contacts.PublicScreenEaseChatContacts;
 import com.xscm.moduleutil.presenter.BasePresenter;
 
 public class PublicScreenEaseChatPresenter extends BasePresenter<PublicScreenEaseChatContacts.View> implements PublicScreenEaseChatContacts.IPublicScreenEaseChatPre {
diff --git a/moduleroom/src/main/java/com/example/moduleroom/presenter/PublishCommentPresenter.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/PublishCommentPresenter.java
similarity index 91%
rename from moduleroom/src/main/java/com/example/moduleroom/presenter/PublishCommentPresenter.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/PublishCommentPresenter.java
index a475640f..d89fce79 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/presenter/PublishCommentPresenter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/PublishCommentPresenter.java
@@ -1,8 +1,8 @@
-package com.example.moduleroom.presenter;
+package com.xscm.modulemain.activity.room.presenter;
 
 import android.content.Context;
 
-import com.example.moduleroom.contacts.PublishCommentContacts;
+import com.xscm.modulemain.activity.room.contacts.PublishCommentContacts;
 import com.xscm.moduleutil.bean.HeadlineBean;
 import com.xscm.moduleutil.http.BaseObserver;
 import com.xscm.moduleutil.presenter.BasePresenter;
diff --git a/moduleroom/src/main/java/com/example/moduleroom/presenter/RedEnvelopesPresenter.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/RedEnvelopesPresenter.java
similarity index 90%
rename from moduleroom/src/main/java/com/example/moduleroom/presenter/RedEnvelopesPresenter.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/RedEnvelopesPresenter.java
index aaf15287..1135be07 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/presenter/RedEnvelopesPresenter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/RedEnvelopesPresenter.java
@@ -1,15 +1,18 @@
-package com.example.moduleroom.presenter;
+package com.xscm.modulemain.activity.room.presenter;
 
 import android.content.Context;
-import com.example.moduleroom.contacts.RedEnvelopesContacts;
+
+import com.xscm.modulemain.activity.room.contacts.RedEnvelopesContacts;
 import com.xscm.moduleutil.bean.RedpacketDetail;
 import com.xscm.moduleutil.http.BaseObserver;
 import com.xscm.moduleutil.presenter.BasePresenter;
-import io.reactivex.disposables.Disposable;
+
 import org.jetbrains.annotations.NotNull;
 
 import java.lang.ref.WeakReference;
 
+import io.reactivex.disposables.Disposable;
+
 public class RedEnvelopesPresenter extends BasePresenter<RedEnvelopesContacts.View> implements RedEnvelopesContacts.IRoomPre{
     RedEnvelopesContacts.View mView;
     public RedEnvelopesPresenter(RedEnvelopesContacts.View view, Context context) {
diff --git a/moduleroom/src/main/java/com/example/moduleroom/presenter/RequestPresenter.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/RequestPresenter.java
similarity index 94%
rename from moduleroom/src/main/java/com/example/moduleroom/presenter/RequestPresenter.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/RequestPresenter.java
index e034a52b..3f686292 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/presenter/RequestPresenter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/RequestPresenter.java
@@ -1,8 +1,8 @@
-package com.example.moduleroom.presenter;
+package com.xscm.modulemain.activity.room.presenter;
 
 import android.content.Context;
 
-import com.example.moduleroom.contacts.RequestContacts;
+import com.xscm.modulemain.activity.room.contacts.RequestContacts;
 import com.xscm.moduleutil.bean.MusicSongBean;
 import com.xscm.moduleutil.bean.SongMusicBean;
 import com.xscm.moduleutil.http.BaseObserver;
diff --git a/moduleroom/src/main/java/com/example/moduleroom/presenter/RoomAuctionPresenter.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/RoomAuctionPresenter.java
similarity index 95%
rename from moduleroom/src/main/java/com/example/moduleroom/presenter/RoomAuctionPresenter.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/RoomAuctionPresenter.java
index 1a65cb94..25a5ae57 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/presenter/RoomAuctionPresenter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/RoomAuctionPresenter.java
@@ -1,8 +1,8 @@
-package com.example.moduleroom.presenter;
+package com.xscm.modulemain.activity.room.presenter;
 
 import android.content.Context;
 
-import com.example.moduleroom.contacts.RoomAuctionContacts;
+import com.xscm.modulemain.activity.room.contacts.RoomAuctionContacts;
 import com.xscm.moduleutil.bean.room.AuctionBean;
 import com.xscm.moduleutil.http.BaseObserver;
 import com.xscm.moduleutil.http.RetrofitClient;
diff --git a/moduleroom/src/main/java/com/example/moduleroom/presenter/RoomAuctionPresenterTow.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/RoomAuctionPresenterTow.java
similarity index 96%
rename from moduleroom/src/main/java/com/example/moduleroom/presenter/RoomAuctionPresenterTow.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/RoomAuctionPresenterTow.java
index cbda30d8..b684a85c 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/presenter/RoomAuctionPresenterTow.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/RoomAuctionPresenterTow.java
@@ -1,8 +1,8 @@
-package com.example.moduleroom.presenter;
+package com.xscm.modulemain.activity.room.presenter;
 
 import android.content.Context;
 
-import com.example.moduleroom.contacts.RoomAuctionContacts;
+import com.xscm.modulemain.activity.room.contacts.RoomAuctionContacts;
 import com.xscm.moduleutil.bean.UserOnlineStatusBean;
 import com.xscm.moduleutil.bean.room.AuctionBean;
 import com.xscm.moduleutil.http.BaseObserver;
diff --git a/moduleroom/src/main/java/com/example/moduleroom/presenter/RoomBackgroundPresenter.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/RoomBackgroundPresenter.java
similarity index 96%
rename from moduleroom/src/main/java/com/example/moduleroom/presenter/RoomBackgroundPresenter.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/RoomBackgroundPresenter.java
index 651c0a42..c0bcd3fd 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/presenter/RoomBackgroundPresenter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/RoomBackgroundPresenter.java
@@ -1,9 +1,9 @@
-package com.example.moduleroom.presenter;
+package com.xscm.modulemain.activity.room.presenter;
 
 import android.content.Context;
 
-import com.example.moduleroom.contacts.RoomBackgroundContacts;
 import com.hjq.toast.ToastUtils;
+import com.xscm.modulemain.activity.room.contacts.RoomBackgroundContacts;
 import com.xscm.moduleutil.base.CommonAppContext;
 import com.xscm.moduleutil.bean.RoomBgBean;
 import com.xscm.moduleutil.http.BaseObserver;
@@ -12,7 +12,6 @@ import com.xscm.moduleutil.utils.cos.CosUploadManager;
 import com.xscm.moduleutil.utils.oss.OSSOperUtils;
 
 import java.io.File;
-import java.lang.ref.WeakReference;
 
 import io.reactivex.disposables.Disposable;
 
diff --git a/moduleroom/src/main/java/com/example/moduleroom/presenter/RoomCabinPresenter.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/RoomCabinPresenter.java
similarity index 87%
rename from moduleroom/src/main/java/com/example/moduleroom/presenter/RoomCabinPresenter.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/RoomCabinPresenter.java
index 5889040e..547b1421 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/presenter/RoomCabinPresenter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/RoomCabinPresenter.java
@@ -1,8 +1,8 @@
-package com.example.moduleroom.presenter;
+package com.xscm.modulemain.activity.room.presenter;
 
 import android.content.Context;
 
-import com.example.moduleroom.contacts.RoomCabinContacts;
+import com.xscm.modulemain.activity.room.contacts.RoomCabinContacts;
 import com.xscm.moduleutil.base.BaseRoomPresenter;
 import com.xscm.moduleutil.http.BaseObserver;
 
diff --git a/moduleroom/src/main/java/com/example/moduleroom/presenter/RoomCharmDialogPresenter.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/RoomCharmDialogPresenter.java
similarity index 88%
rename from moduleroom/src/main/java/com/example/moduleroom/presenter/RoomCharmDialogPresenter.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/RoomCharmDialogPresenter.java
index 0e4677ba..144e87a0 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/presenter/RoomCharmDialogPresenter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/RoomCharmDialogPresenter.java
@@ -1,9 +1,8 @@
-package com.example.moduleroom.presenter;
+package com.xscm.modulemain.activity.room.presenter;
 
 import android.content.Context;
 
-import com.example.moduleroom.contacts.BidListContacts;
-import com.example.moduleroom.contacts.RoomCharmDialogContacts;
+import com.xscm.modulemain.activity.room.contacts.RoomCharmDialogContacts;
 import com.xscm.moduleutil.bean.RoomUserCharmListBean;
 import com.xscm.moduleutil.http.BaseObserver;
 import com.xscm.moduleutil.presenter.BasePresenter;
diff --git a/moduleroom/src/main/java/com/example/moduleroom/presenter/RoomChartsPresenter.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/RoomChartsPresenter.java
similarity index 72%
rename from moduleroom/src/main/java/com/example/moduleroom/presenter/RoomChartsPresenter.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/RoomChartsPresenter.java
index 27a8f3c1..23b08652 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/presenter/RoomChartsPresenter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/RoomChartsPresenter.java
@@ -1,8 +1,8 @@
-package com.example.moduleroom.presenter;
+package com.xscm.modulemain.activity.room.presenter;
 
 import android.content.Context;
 
-import com.example.moduleroom.contacts.RoomChartsContacts;
+import com.xscm.modulemain.activity.room.contacts.RoomChartsContacts;
 import com.xscm.moduleutil.presenter.BasePresenter;
 
 public class RoomChartsPresenter extends BasePresenter<RoomChartsContacts.View> implements RoomChartsContacts.IRoomPre {
diff --git a/moduleroom/src/main/java/com/example/moduleroom/presenter/RoomClosePresenter.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/RoomClosePresenter.java
similarity index 90%
rename from moduleroom/src/main/java/com/example/moduleroom/presenter/RoomClosePresenter.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/RoomClosePresenter.java
index 551c1108..f1763e94 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/presenter/RoomClosePresenter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/RoomClosePresenter.java
@@ -1,9 +1,8 @@
-package com.example.moduleroom.presenter;
+package com.xscm.modulemain.activity.room.presenter;
 
 import android.content.Context;
 
-
-import com.example.moduleroom.contacts.RoomCloseContacts;
+import com.xscm.modulemain.activity.room.contacts.RoomCloseContacts;
 import com.xscm.moduleutil.bean.RoomRelationBean;
 import com.xscm.moduleutil.http.BaseObserver;
 import com.xscm.moduleutil.presenter.BasePresenter;
diff --git a/moduleroom/src/main/java/com/example/moduleroom/presenter/RoomHostPresenter.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/RoomHostPresenter.java
similarity index 95%
rename from moduleroom/src/main/java/com/example/moduleroom/presenter/RoomHostPresenter.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/RoomHostPresenter.java
index 380cc83e..da0e2e57 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/presenter/RoomHostPresenter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/RoomHostPresenter.java
@@ -1,8 +1,8 @@
-package com.example.moduleroom.presenter;
+package com.xscm.modulemain.activity.room.presenter;
 
 import android.content.Context;
 
-import com.example.moduleroom.contacts.RoomHostContacts;
+import com.xscm.modulemain.activity.room.contacts.RoomHostContacts;
 import com.xscm.moduleutil.bean.HostBean;
 import com.xscm.moduleutil.bean.RoomSearchResp;
 import com.xscm.moduleutil.http.BaseObserver;
diff --git a/moduleroom/src/main/java/com/example/moduleroom/presenter/RoomPasswordSetPresenter.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/RoomPasswordSetPresenter.java
similarity index 88%
rename from moduleroom/src/main/java/com/example/moduleroom/presenter/RoomPasswordSetPresenter.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/RoomPasswordSetPresenter.java
index d2abacad..95ff3c04 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/presenter/RoomPasswordSetPresenter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/RoomPasswordSetPresenter.java
@@ -1,8 +1,8 @@
-package com.example.moduleroom.presenter;
+package com.xscm.modulemain.activity.room.presenter;
 
 import android.content.Context;
 
-import com.example.moduleroom.contacts.RoomPasswordSetContacts;
+import com.xscm.modulemain.activity.room.contacts.RoomPasswordSetContacts;
 import com.xscm.moduleutil.http.BaseObserver;
 import com.xscm.moduleutil.presenter.BasePresenter;
 
diff --git a/moduleroom/src/main/java/com/example/moduleroom/presenter/RoomPkPresenter.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/RoomPkPresenter.java
similarity index 93%
rename from moduleroom/src/main/java/com/example/moduleroom/presenter/RoomPkPresenter.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/RoomPkPresenter.java
index 69f8854c..a78f2f60 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/presenter/RoomPkPresenter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/RoomPkPresenter.java
@@ -1,8 +1,8 @@
-package com.example.moduleroom.presenter;
+package com.xscm.modulemain.activity.room.presenter;
 
 import android.content.Context;
 
-import com.example.moduleroom.contacts.RoomPkContacts;
+import com.xscm.modulemain.activity.room.contacts.RoomPkContacts;
 import com.xscm.moduleutil.bean.room.RoomBean;
 import com.xscm.moduleutil.http.BaseObserver;
 import com.xscm.moduleutil.presenter.BasePresenter;
diff --git a/moduleroom/src/main/java/com/example/moduleroom/presenter/RoomPresenter.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/RoomPresenter.java
similarity index 98%
rename from moduleroom/src/main/java/com/example/moduleroom/presenter/RoomPresenter.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/RoomPresenter.java
index cb9316be..c14ddf66 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/presenter/RoomPresenter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/RoomPresenter.java
@@ -1,9 +1,9 @@
-package com.example.moduleroom.presenter;
+package com.xscm.modulemain.activity.room.presenter;
 
 import android.content.Context;
 
 import com.blankj.utilcode.util.LogUtils;
-import com.example.moduleroom.contacts.RoomContacts;
+import com.xscm.modulemain.activity.room.contacts.RoomContacts;
 import com.xscm.moduleutil.base.CommonAppContext;
 import com.xscm.moduleutil.bean.RedPacketInfo;
 import com.xscm.moduleutil.bean.RoomCharmRankBean;
@@ -13,16 +13,16 @@ import com.xscm.moduleutil.bean.room.RoomOnline;
 import com.xscm.moduleutil.http.APIException;
 import com.xscm.moduleutil.http.BaseObserver;
 import com.xscm.moduleutil.http.RetrofitClient;
-import com.xscm.moduleutil.listener.MessageListenerSingleton;
 import com.xscm.moduleutil.presenter.BasePresenter;
 import com.xscm.moduleutil.rtc.AgoraManager;
 import com.xscm.moduleutil.utils.SpUtil;
 
+import org.jetbrains.annotations.NotNull;
+
 import java.lang.ref.WeakReference;
 import java.util.List;
 
 import io.reactivex.disposables.Disposable;
-import org.jetbrains.annotations.NotNull;
 
 public class RoomPresenter extends BasePresenter<RoomContacts.View> implements RoomContacts.IRoomPre {
     RoomContacts.View mView;
diff --git a/moduleroom/src/main/java/com/example/moduleroom/presenter/RoomSettingPresenter.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/RoomSettingPresenter.java
similarity index 94%
rename from moduleroom/src/main/java/com/example/moduleroom/presenter/RoomSettingPresenter.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/RoomSettingPresenter.java
index 6373b4de..cbf4163f 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/presenter/RoomSettingPresenter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/RoomSettingPresenter.java
@@ -1,8 +1,8 @@
-package com.example.moduleroom.presenter;
+package com.xscm.modulemain.activity.room.presenter;
 
 import android.content.Context;
 
-import com.example.moduleroom.contacts.RoomSettingContacts;
+import com.xscm.modulemain.activity.room.contacts.RoomSettingContacts;
 import com.xscm.moduleutil.bean.room.RoomSettingBean;
 import com.xscm.moduleutil.http.BaseObserver;
 import com.xscm.moduleutil.http.RetrofitClient;
diff --git a/moduleroom/src/main/java/com/example/moduleroom/presenter/RoomUserPresenter.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/RoomUserPresenter.java
similarity index 98%
rename from moduleroom/src/main/java/com/example/moduleroom/presenter/RoomUserPresenter.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/RoomUserPresenter.java
index 1ba56a3c..292deec8 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/presenter/RoomUserPresenter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/RoomUserPresenter.java
@@ -1,8 +1,8 @@
-package com.example.moduleroom.presenter;
+package com.xscm.modulemain.activity.room.presenter;
 
 import android.content.Context;
 
-import com.example.moduleroom.contacts.RoomUserContacts;
+import com.xscm.modulemain.activity.room.contacts.RoomUserContacts;
 import com.xscm.moduleutil.bean.RelationCardBean;
 import com.xscm.moduleutil.bean.UserInfo;
 import com.xscm.moduleutil.http.BaseObserver;
diff --git a/modulevoice/src/main/java/com/example/modulevoice/presenter/SearchPresenter.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/SearchPresenter.java
similarity index 96%
rename from modulevoice/src/main/java/com/example/modulevoice/presenter/SearchPresenter.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/SearchPresenter.java
index c8c62cc3..ddabc31f 100644
--- a/modulevoice/src/main/java/com/example/modulevoice/presenter/SearchPresenter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/SearchPresenter.java
@@ -1,11 +1,10 @@
-package com.example.modulevoice.presenter;
+package com.xscm.modulemain.activity.room.presenter;
 
 import android.content.Context;
 
 import com.alibaba.fastjson.JSON;
 import com.blankj.utilcode.util.StringUtils;
-import com.example.modulevoice.contacts.SearchContacts;
-import com.xscm.moduleutil.bean.RoomSearchResp;
+import com.xscm.modulemain.activity.room.contacts.SearchContacts;
 import com.xscm.moduleutil.bean.SearchAll;
 import com.xscm.moduleutil.http.BaseObserver;
 import com.xscm.moduleutil.presenter.BasePresenter;
diff --git a/moduleroom/src/main/java/com/example/moduleroom/presenter/SingSongPresenter.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/SingSongPresenter.java
similarity index 98%
rename from moduleroom/src/main/java/com/example/moduleroom/presenter/SingSongPresenter.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/SingSongPresenter.java
index 350d338b..2325bdde 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/presenter/SingSongPresenter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/SingSongPresenter.java
@@ -1,8 +1,8 @@
-package com.example.moduleroom.presenter;
+package com.xscm.modulemain.activity.room.presenter;
 
 import android.content.Context;
 
-import com.example.moduleroom.contacts.SingSongContacts;
+import com.xscm.modulemain.activity.room.contacts.SingSongContacts;
 import com.xscm.moduleutil.base.BaseRoomPresenter;
 import com.xscm.moduleutil.base.CommonAppContext;
 import com.xscm.moduleutil.bean.PkSwTokenBean;
diff --git a/moduleroom/src/main/java/com/example/moduleroom/presenter/UserGiftWallPresenter.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/UserGiftWallPresenter.java
similarity index 87%
rename from moduleroom/src/main/java/com/example/moduleroom/presenter/UserGiftWallPresenter.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/UserGiftWallPresenter.java
index 5feafa78..8f6f3948 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/presenter/UserGiftWallPresenter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/UserGiftWallPresenter.java
@@ -1,9 +1,8 @@
-package com.example.moduleroom.presenter;
+package com.xscm.modulemain.activity.room.presenter;
 
 import android.content.Context;
 
-
-import com.example.moduleroom.contacts.UserGiftWallConacts;
+import com.xscm.modulemain.activity.room.contacts.UserGiftWallConacts;
 import com.xscm.moduleutil.bean.GiftUserWallBean;
 import com.xscm.moduleutil.http.BaseObserver;
 import com.xscm.moduleutil.presenter.BasePresenter;
diff --git a/modulevoice/src/main/java/com/example/modulevoice/presenter/VoiceCategoryPresenter.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/VoiceCategoryPresenter.java
similarity index 97%
rename from modulevoice/src/main/java/com/example/modulevoice/presenter/VoiceCategoryPresenter.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/VoiceCategoryPresenter.java
index 64fb04ac..03c84b34 100644
--- a/modulevoice/src/main/java/com/example/modulevoice/presenter/VoiceCategoryPresenter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/VoiceCategoryPresenter.java
@@ -1,9 +1,9 @@
-package com.example.modulevoice.presenter;
+package com.xscm.modulemain.activity.room.presenter;
 
 import android.content.Context;
 
-import com.example.modulevoice.contacts.VoiceCategoryContacts;
 import com.google.gson.reflect.TypeToken;
+import com.xscm.modulemain.activity.room.contacts.VoiceCategoryContacts;
 import com.xscm.moduleutil.bean.BannerModel;
 import com.xscm.moduleutil.bean.RoomTypeModel;
 import com.xscm.moduleutil.bean.TopRoom;
diff --git a/modulevoice/src/main/java/com/example/modulevoice/presenter/VoicePresenter.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/VoicePresenter.java
similarity index 97%
rename from modulevoice/src/main/java/com/example/modulevoice/presenter/VoicePresenter.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/VoicePresenter.java
index 7ef0726f..a12f2387 100644
--- a/modulevoice/src/main/java/com/example/modulevoice/presenter/VoicePresenter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/VoicePresenter.java
@@ -1,16 +1,18 @@
-package com.example.modulevoice.presenter;
+package com.xscm.modulemain.activity.room.presenter;
 
 import android.content.Context;
 
-import com.example.modulevoice.contacts.VoiceContacts;
+import com.xscm.modulemain.activity.room.contacts.VoiceContacts;
 import com.xscm.moduleutil.bean.ActivitiesPermission;
 import com.xscm.moduleutil.http.BaseObserver;
 import com.xscm.moduleutil.presenter.BasePresenter;
-import io.reactivex.disposables.Disposable;
+
 import org.jetbrains.annotations.NotNull;
 
 import java.lang.ref.WeakReference;
 
+import io.reactivex.disposables.Disposable;
+
 public class VoicePresenter extends BasePresenter<VoiceContacts.View> implements VoiceContacts.IIndexPre {
     private VoiceContacts.View mView;
     public VoicePresenter(VoiceContacts.View view, Context context) {
diff --git a/moduleroom/src/main/java/com/example/moduleroom/presenter/WheatPresenter.java b/modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/WheatPresenter.java
similarity index 97%
rename from moduleroom/src/main/java/com/example/moduleroom/presenter/WheatPresenter.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/WheatPresenter.java
index c63f0dcf..7867860f 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/presenter/WheatPresenter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/room/presenter/WheatPresenter.java
@@ -1,8 +1,8 @@
-package com.example.moduleroom.presenter;
+package com.xscm.modulemain.activity.room.presenter;
 
 import android.content.Context;
 
-import com.example.moduleroom.contacts.WheatContacts;
+import com.xscm.modulemain.activity.room.contacts.WheatContacts;
 import com.xscm.moduleutil.bean.room.RoomApplyListBean;
 import com.xscm.moduleutil.http.BaseObserver;
 import com.xscm.moduleutil.presenter.BasePresenter;
diff --git a/modulevocal/src/main/java/com/example/modulevocal/activity/AboutUsActivity.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/AboutUsActivity.java
similarity index 88%
rename from modulevocal/src/main/java/com/example/modulevocal/activity/AboutUsActivity.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/AboutUsActivity.java
index fba1fc7f..7acb9924 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/activity/AboutUsActivity.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/AboutUsActivity.java
@@ -1,15 +1,13 @@
-package com.example.modulevocal.activity;
+package com.xscm.modulemain.activity.user.activity;
 
 
 import android.content.Intent;
 
-import com.alibaba.android.arouter.launcher.ARouter;
-import com.example.modulevocal.R;
-import com.example.modulevocal.databinding.ActivityAboutUsBinding;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.databinding.ActivityAboutUsBinding;
 import com.xscm.moduleutil.activity.BaseAppCompatActivity;
 import com.xscm.moduleutil.activity.WebViewActivity;
 import com.xscm.moduleutil.base.CommonAppContext;
-import com.xscm.moduleutil.utils.ARouteConstants;
 import com.xscm.moduleutil.widget.CommonAppConfig;
 
 public class AboutUsActivity extends BaseAppCompatActivity<ActivityAboutUsBinding> {
diff --git a/modulevocal/src/main/java/com/example/modulevocal/activity/AlbumDetailActivity.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/AlbumDetailActivity.java
similarity index 97%
rename from modulevocal/src/main/java/com/example/modulevocal/activity/AlbumDetailActivity.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/AlbumDetailActivity.java
index a3f1b8de..00047a88 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/activity/AlbumDetailActivity.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/AlbumDetailActivity.java
@@ -1,4 +1,4 @@
-package com.example.modulevocal.activity;
+package com.xscm.modulemain.activity.user.activity;
 
 
 import static android.view.View.VISIBLE;
@@ -7,7 +7,6 @@ import android.content.Intent;
 import android.graphics.Color;
 import android.text.TextUtils;
 import android.view.View;
-import android.widget.Button;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
@@ -19,16 +18,18 @@ import com.alibaba.android.arouter.facade.annotation.Autowired;
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.blankj.utilcode.util.ToastUtils;
-import com.example.modulevocal.R;
-import com.example.modulevocal.adapter.AlbumPhotoAdapter;
-import com.example.modulevocal.adapter.SingleChoiceAdapter;
-import com.example.modulevocal.conacts.AlbumDetailConacts;
-import com.example.modulevocal.databinding.ActivityAlbumDetailBinding;
-import com.example.modulevocal.presenter.AlbumDetailPresenter;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.adapter.AlbumPhotoAdapter;
+import com.xscm.modulemain.adapter.SingleChoiceAdapter;
+import com.xscm.modulemain.databinding.ActivityAlbumDetailBinding;
 import com.google.android.material.bottomsheet.BottomSheetDialog;
 import com.luck.picture.lib.basic.PictureSelector;
 import com.luck.picture.lib.config.PictureConfig;
 import com.luck.picture.lib.entity.LocalMedia;
+import com.scwang.smartrefresh.layout.api.RefreshLayout;
+import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener;
+import com.xscm.modulemain.activity.user.conacts.AlbumDetailConacts;
+import com.xscm.modulemain.activity.user.presenter.AlbumDetailPresenter;
 import com.xscm.moduleutil.activity.BaseMvpActivity;
 import com.xscm.moduleutil.bean.AlbumBean;
 import com.xscm.moduleutil.utils.ARouteConstants;
@@ -37,8 +38,6 @@ import com.xscm.moduleutil.utils.ImageUtils;
 import com.xscm.moduleutil.utils.SpUtil;
 import com.xscm.moduleutil.widget.Constants;
 import com.xscm.moduleutil.widget.dialog.ShareDialog;
-import com.scwang.smartrefresh.layout.api.RefreshLayout;
-import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener;
 
 import java.io.File;
 import java.text.SimpleDateFormat;
diff --git a/modulevocal/src/main/java/com/example/modulevocal/activity/BindCardActivity.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/BindCardActivity.java
similarity index 90%
rename from modulevocal/src/main/java/com/example/modulevocal/activity/BindCardActivity.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/BindCardActivity.java
index 2d47c955..e88c1fc9 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/activity/BindCardActivity.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/BindCardActivity.java
@@ -1,14 +1,14 @@
-package com.example.modulevocal.activity;
+package com.xscm.modulemain.activity.user.activity;
 
 import android.content.Intent;
 
 import androidx.recyclerview.widget.LinearLayoutManager;
 
-import com.example.modulevocal.R;
-import com.example.modulevocal.adapter.BindCardAdapter;
-import com.example.modulevocal.conacts.WithdrawalConacts;
-import com.example.modulevocal.databinding.ActivityBindCardBinding;
-import com.example.modulevocal.presenter.WithdrawalPresenter;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.adapter.BindCardAdapter;
+import com.xscm.modulemain.databinding.ActivityBindCardBinding;
+import com.xscm.modulemain.activity.user.conacts.WithdrawalConacts;
+import com.xscm.modulemain.activity.user.presenter.WithdrawalPresenter;
 import com.xscm.moduleutil.activity.BaseMvpActivity;
 import com.xscm.moduleutil.bean.BindDetail;
 import com.xscm.moduleutil.bean.BindType;
diff --git a/modulevocal/src/main/java/com/example/modulevocal/activity/BindCardDetailsActivity.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/BindCardDetailsActivity.java
similarity index 95%
rename from modulevocal/src/main/java/com/example/modulevocal/activity/BindCardDetailsActivity.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/BindCardDetailsActivity.java
index 968c3fab..3cb141b2 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/activity/BindCardDetailsActivity.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/BindCardDetailsActivity.java
@@ -1,15 +1,15 @@
-package com.example.modulevocal.activity;
+package com.xscm.modulemain.activity.user.activity;
 
 import static android.view.View.GONE;
 import static android.view.View.VISIBLE;
 
 import android.view.View;
 
-import com.example.modulevocal.R;
-import com.example.modulevocal.conacts.WithdrawalConacts;
-import com.example.modulevocal.databinding.ActivityBindCardDetailsBinding;
-import com.example.modulevocal.presenter.WithdrawalPresenter;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.databinding.ActivityBindCardDetailsBinding;
 import com.hjq.toast.ToastUtils;
+import com.xscm.modulemain.activity.user.conacts.WithdrawalConacts;
+import com.xscm.modulemain.activity.user.presenter.WithdrawalPresenter;
 import com.xscm.moduleutil.activity.BaseMvpActivity;
 import com.xscm.moduleutil.bean.BindDetail;
 import com.xscm.moduleutil.bean.BindType;
diff --git a/modulevocal/src/main/java/com/example/modulevocal/activity/BlacklistActivity.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/BlacklistActivity.java
similarity index 93%
rename from modulevocal/src/main/java/com/example/modulevocal/activity/BlacklistActivity.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/BlacklistActivity.java
index 60e1a688..7c0928c8 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/activity/BlacklistActivity.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/BlacklistActivity.java
@@ -1,12 +1,12 @@
-package com.example.modulevocal.activity;
+package com.xscm.modulemain.activity.user.activity;
 
 import androidx.recyclerview.widget.LinearLayoutManager;
 
-import com.example.modulevocal.R;
-import com.example.modulevocal.adapter.BlackAdapter;
-import com.example.modulevocal.conacts.BlacklistConacts;
-import com.example.modulevocal.databinding.ActivityBlacklistBinding;
-import com.example.modulevocal.presenter.BlacklistPresenter;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.adapter.BlackAdapter;
+import com.xscm.modulemain.databinding.ActivityBlacklistBinding;
+import com.xscm.modulemain.activity.user.conacts.BlacklistConacts;
+import com.xscm.modulemain.activity.user.presenter.BlacklistPresenter;
 import com.xscm.moduleutil.activity.BaseMvpActivity;
 import com.xscm.moduleutil.bean.BlackUserBean;
 
diff --git a/modulevocal/src/main/java/com/example/modulevocal/activity/BriefIntroductionActivity.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/BriefIntroductionActivity.java
similarity index 91%
rename from modulevocal/src/main/java/com/example/modulevocal/activity/BriefIntroductionActivity.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/BriefIntroductionActivity.java
index c53df4fe..98d89b20 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/activity/BriefIntroductionActivity.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/BriefIntroductionActivity.java
@@ -1,4 +1,4 @@
-package com.example.modulevocal.activity;
+package com.xscm.modulemain.activity.user.activity;
 
 import android.graphics.Color;
 import android.text.TextUtils;
@@ -8,10 +8,10 @@ import androidx.recyclerview.widget.GridLayoutManager;
 import com.blankj.utilcode.util.ToastUtils;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.example.modulevocal.R;
-import com.example.modulevocal.conacts.BriefIntroductionConacts;
-import com.example.modulevocal.databinding.ActivityBriefIntroductionBinding;
-import com.example.modulevocal.presenter.BriefIntroductionPresenter;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.databinding.ActivityBriefIntroductionBinding;
+import com.xscm.modulemain.activity.user.conacts.BriefIntroductionConacts;
+import com.xscm.modulemain.activity.user.presenter.BriefIntroductionPresenter;
 import com.xscm.moduleutil.activity.BaseMvpActivity;
 import com.xscm.moduleutil.bean.UserTagBean;
 
diff --git a/modulevocal/src/main/java/com/example/modulevocal/activity/ChangPassActivity.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/ChangPassActivity.java
similarity index 93%
rename from modulevocal/src/main/java/com/example/modulevocal/activity/ChangPassActivity.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/ChangPassActivity.java
index af0c5839..368cce5c 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/activity/ChangPassActivity.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/ChangPassActivity.java
@@ -1,12 +1,12 @@
-package com.example.modulevocal.activity;
+package com.xscm.modulemain.activity.user.activity;
 
 import android.os.CountDownTimer;
 import android.view.View;
 
-import com.example.modulevocal.R;
-import com.example.modulevocal.conacts.ChangePasswordConactos;
-import com.example.modulevocal.databinding.ActivityChangePasswordBinding;
-import com.example.modulevocal.presenter.ChangePasswordPresenter;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.databinding.ActivityChangePasswordBinding;
+import com.xscm.modulemain.activity.user.conacts.ChangePasswordConactos;
+import com.xscm.modulemain.activity.user.presenter.ChangePasswordPresenter;
 import com.xscm.moduleutil.activity.BaseMvpActivity;
 import com.xscm.moduleutil.bean.UserBean;
 import com.xscm.moduleutil.color.ThemeableDrawableUtils;
diff --git a/modulevocal/src/main/java/com/example/modulevocal/activity/ChangeNicknameActivity.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/ChangeNicknameActivity.java
similarity index 86%
rename from modulevocal/src/main/java/com/example/modulevocal/activity/ChangeNicknameActivity.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/ChangeNicknameActivity.java
index bb43fc3c..6d9b2746 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/activity/ChangeNicknameActivity.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/ChangeNicknameActivity.java
@@ -1,13 +1,13 @@
-package com.example.modulevocal.activity;
+package com.xscm.modulemain.activity.user.activity;
 
 import android.graphics.Color;
 import android.text.TextUtils;
 
 import com.blankj.utilcode.util.ToastUtils;
-import com.example.modulevocal.R;
-import com.example.modulevocal.conacts.ChangeNicknameConacts;
-import com.example.modulevocal.databinding.ActivityChangeNicknameBinding;
-import com.example.modulevocal.presenter.ChangeNicknamePresenter;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.databinding.ActivityChangeNicknameBinding;
+import com.xscm.modulemain.activity.user.conacts.ChangeNicknameConacts;
+import com.xscm.modulemain.activity.user.presenter.ChangeNicknamePresenter;
 import com.xscm.moduleutil.activity.BaseMvpActivity;
 import com.xscm.moduleutil.bean.UserBean;
 import com.xscm.moduleutil.bean.UserInfo;
diff --git a/modulevocal/src/main/java/com/example/modulevocal/activity/CreateAlbumActivity.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/CreateAlbumActivity.java
similarity index 96%
rename from modulevocal/src/main/java/com/example/modulevocal/activity/CreateAlbumActivity.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/CreateAlbumActivity.java
index 5e7aca22..de2bc5d8 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/activity/CreateAlbumActivity.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/CreateAlbumActivity.java
@@ -1,23 +1,21 @@
-package com.example.modulevocal.activity;
+package com.xscm.modulemain.activity.user.activity;
 
 import android.content.Intent;
-import android.graphics.Color;
 import android.view.View;
 
 import androidx.annotation.Nullable;
-import androidx.core.content.ContextCompat;
 
 import com.alibaba.android.arouter.facade.annotation.Autowired;
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.blankj.utilcode.util.ToastUtils;
-import com.example.modulevocal.R;
-import com.example.modulevocal.conacts.MyAlbumConacts;
-import com.example.modulevocal.databinding.ActivityCreateAlbumBinding;
-import com.example.modulevocal.presenter.MyAlbumPresenter;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.databinding.ActivityCreateAlbumBinding;
 import com.luck.picture.lib.basic.PictureSelector;
 import com.luck.picture.lib.config.PictureConfig;
 import com.luck.picture.lib.entity.LocalMedia;
+import com.xscm.modulemain.activity.user.conacts.MyAlbumConacts;
+import com.xscm.modulemain.activity.user.presenter.MyAlbumPresenter;
 import com.xscm.moduleutil.activity.BaseMvpActivity;
 import com.xscm.moduleutil.bean.AlbumBean;
 import com.xscm.moduleutil.color.ThemeableDrawableUtils;
diff --git a/modulevocal/src/main/java/com/example/modulevocal/activity/CreatedRoomActivity.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/CreatedRoomActivity.java
similarity index 97%
rename from modulevocal/src/main/java/com/example/modulevocal/activity/CreatedRoomActivity.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/CreatedRoomActivity.java
index 1e3c4c3b..c0dfa005 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/activity/CreatedRoomActivity.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/CreatedRoomActivity.java
@@ -1,4 +1,4 @@
-package com.example.modulevocal.activity;
+package com.xscm.modulemain.activity.user.activity;
 
 import android.content.Intent;
 import android.os.Handler;
@@ -14,15 +14,15 @@ import androidx.annotation.Nullable;
 import com.alibaba.android.arouter.facade.annotation.Autowired;
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.launcher.ARouter;
-import com.example.modulevocal.R;
-import com.example.modulevocal.conacts.CreatedRoomConactos;
-import com.example.modulevocal.databinding.ActivityCreatedRoomBinding;
-import com.example.modulevocal.presenter.CreatedRoomPresenter;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.databinding.ActivityCreatedRoomBinding;
 import com.example.zhouwei.library.CustomPopWindow;
 import com.hjq.toast.ToastUtils;
 import com.luck.picture.lib.basic.PictureSelector;
 import com.luck.picture.lib.config.PictureConfig;
 import com.luck.picture.lib.entity.LocalMedia;
+import com.xscm.modulemain.activity.user.conacts.CreatedRoomConactos;
+import com.xscm.modulemain.activity.user.presenter.CreatedRoomPresenter;
 import com.xscm.moduleutil.activity.BaseMvpActivity;
 import com.xscm.moduleutil.bean.room.RoomInfoResp;
 import com.xscm.moduleutil.color.ThemeableDrawableUtils;
diff --git a/modulevocal/src/main/java/com/example/modulevocal/activity/CurrencyExchangeActivity.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/CurrencyExchangeActivity.java
similarity index 85%
rename from modulevocal/src/main/java/com/example/modulevocal/activity/CurrencyExchangeActivity.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/CurrencyExchangeActivity.java
index bc9b12a9..62859caf 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/activity/CurrencyExchangeActivity.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/CurrencyExchangeActivity.java
@@ -1,19 +1,13 @@
-package com.example.modulevocal.activity;
+package com.xscm.modulemain.activity.user.activity;
 
-import android.text.Editable;
-import android.text.InputFilter;
-import android.text.TextUtils;
-import android.text.TextWatcher;
-import android.text.method.DigitsKeyListener;
 import android.view.View;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.blankj.utilcode.util.ToastUtils;
-import com.example.modulevocal.R;
-import com.example.modulevocal.conacts.CurrencyExchangeConacts;
-import com.example.modulevocal.databinding.ActivityCurrencyExchangeBinding;
-import com.example.modulevocal.presenter.CurrencyExchangePresenter;
-import com.google.android.material.textfield.TextInputEditText;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.databinding.ActivityCurrencyExchangeBinding;
+import com.xscm.modulemain.activity.user.conacts.CurrencyExchangeConacts;
+import com.xscm.modulemain.activity.user.presenter.CurrencyExchangePresenter;
 import com.xscm.moduleutil.activity.BaseMvpActivity;
 import com.xscm.moduleutil.bean.WalletBean;
 import com.xscm.moduleutil.bean.WalletConfig;
diff --git a/modulevocal/src/main/java/com/example/modulevocal/activity/DailyTasksActivity.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/DailyTasksActivity.java
similarity index 93%
rename from modulevocal/src/main/java/com/example/modulevocal/activity/DailyTasksActivity.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/DailyTasksActivity.java
index 394b7a3a..2a0c33c1 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/activity/DailyTasksActivity.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/DailyTasksActivity.java
@@ -1,23 +1,21 @@
-package com.example.modulevocal.activity;
+package com.xscm.modulemain.activity.user.activity;
 
 
 import android.content.Intent;
-import android.graphics.Color;
-
 import android.view.View;
+
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
-import com.alibaba.android.arouter.launcher.ARouter;
-import com.example.modulevocal.R;
-import com.example.modulevocal.adapter.TaskBoxAdapter;
-import com.example.modulevocal.adapter.TaskDataAdapter;
-import com.example.modulevocal.adapter.TaskSectionAdapter;
-import com.example.modulevocal.conacts.DailyTasksConacts;
-import com.example.modulevocal.databinding.ActivityDailyTasksBinding;
-import com.example.modulevocal.presenter.DailyTasksPresenter;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.adapter.TaskBoxAdapter;
+import com.xscm.modulemain.adapter.TaskDataAdapter;
+import com.xscm.modulemain.adapter.TaskSectionAdapter;
+import com.xscm.modulemain.databinding.ActivityDailyTasksBinding;
 import com.hjq.toast.ToastUtils;
+import com.xscm.modulemain.activity.user.conacts.DailyTasksConacts;
+import com.xscm.modulemain.activity.user.presenter.DailyTasksPresenter;
 import com.xscm.moduleutil.activity.BaseMvpActivity;
 import com.xscm.moduleutil.activity.WebViewActivity;
 import com.xscm.moduleutil.base.CommonAppContext;
diff --git a/modulevocal/src/main/java/com/example/modulevocal/activity/EditUserInfoActivity.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/EditUserInfoActivity.java
similarity index 97%
rename from modulevocal/src/main/java/com/example/modulevocal/activity/EditUserInfoActivity.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/EditUserInfoActivity.java
index 9a89a338..cf559b1b 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/activity/EditUserInfoActivity.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/EditUserInfoActivity.java
@@ -1,4 +1,4 @@
-package com.example.modulevocal.activity;
+package com.xscm.modulemain.activity.user.activity;
 
 import android.content.Context;
 import android.content.Intent;
@@ -21,15 +21,16 @@ import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.target.CustomTarget;
 import com.bumptech.glide.request.transition.Transition;
 import com.chad.library.adapter.base.BaseQuickAdapter;
-import com.example.modulevocal.R;
-import com.example.modulevocal.adapter.UserPhotoWallAdapter;
-import com.example.modulevocal.conacts.EditUserConactos;
-import com.example.modulevocal.databinding.ActivityEditUserBinding;
-import com.example.modulevocal.presenter.EditUserPresenter;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.adapter.UserPhotoWallAdapter;
+import com.xscm.modulemain.databinding.ActivityEditUserBinding;
 import com.luck.picture.lib.basic.PictureSelector;
 import com.luck.picture.lib.config.PictureConfig;
 import com.luck.picture.lib.engine.CropFileEngine;
 import com.luck.picture.lib.entity.LocalMedia;
+import com.stx.xhb.xbanner.XBanner;
+import com.xscm.modulemain.activity.user.conacts.EditUserConactos;
+import com.xscm.modulemain.activity.user.presenter.EditUserPresenter;
 import com.xscm.moduleutil.activity.BaseMvpActivity;
 import com.xscm.moduleutil.bean.HeatedBean;
 import com.xscm.moduleutil.bean.UserBean;
@@ -42,10 +43,6 @@ import com.xscm.moduleutil.utils.SpUtil;
 import com.xscm.moduleutil.widget.Constants;
 import com.xscm.moduleutil.widget.img.FullScreenUtil;
 import com.xscm.moduleutil.widget.picker.PictureSelectorUtil;
-import com.stx.xhb.xbanner.XBanner;
-import com.tencent.imsdk.v2.V2TIMCallback;
-import com.tencent.imsdk.v2.V2TIMManager;
-import com.tencent.imsdk.v2.V2TIMUserFullInfo;
 import com.yalantis.ucrop.UCrop;
 import com.yalantis.ucrop.UCropImageEngine;
 
diff --git a/modulevocal/src/main/java/com/example/modulevocal/activity/GiftBoxRecordActivity.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/GiftBoxRecordActivity.java
similarity index 78%
rename from modulevocal/src/main/java/com/example/modulevocal/activity/GiftBoxRecordActivity.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/GiftBoxRecordActivity.java
index a9579a64..0226ee03 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/activity/GiftBoxRecordActivity.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/GiftBoxRecordActivity.java
@@ -1,13 +1,13 @@
-package com.example.modulevocal.activity;
+package com.xscm.modulemain.activity.user.activity;
 
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.example.modulevocal.R;
-import com.example.modulevocal.adapter.GiftBoxAdapter;
-import com.example.modulevocal.conacts.GiftBoxRecordConacts;
-import com.example.modulevocal.databinding.ActivityGiftBoxRecordBinding;
-import com.example.modulevocal.presenter.GiftBoxRecordPresenter;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.adapter.GiftBoxAdapter;
+import com.xscm.modulemain.databinding.ActivityGiftBoxRecordBinding;
+import com.xscm.modulemain.activity.user.conacts.GiftBoxRecordConacts;
+import com.xscm.modulemain.activity.user.presenter.GiftBoxRecordPresenter;
 import com.xscm.moduleutil.activity.BaseMvpActivity;
 import com.xscm.moduleutil.bean.GiftBoxRecordBean;
 
diff --git a/modulevocal/src/main/java/com/example/modulevocal/activity/MessageReminderActivity.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/MessageReminderActivity.java
similarity index 89%
rename from modulevocal/src/main/java/com/example/modulevocal/activity/MessageReminderActivity.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/MessageReminderActivity.java
index 34ef87da..9718794d 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/activity/MessageReminderActivity.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/MessageReminderActivity.java
@@ -1,11 +1,11 @@
-package com.example.modulevocal.activity;
+package com.xscm.modulemain.activity.user.activity;
 
 import android.graphics.drawable.Drawable;
 
 import androidx.core.content.ContextCompat;
 
-import com.example.modulevocal.R;
-import com.example.modulevocal.databinding.ActivityMessageReminderBinding;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.databinding.ActivityMessageReminderBinding;
 import com.xscm.moduleutil.activity.BaseAppCompatActivity;
 
 public class MessageReminderActivity extends BaseAppCompatActivity<ActivityMessageReminderBinding> {
diff --git a/modulevocal/src/main/java/com/example/modulevocal/activity/MyBagActivity.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/MyBagActivity.java
similarity index 86%
rename from modulevocal/src/main/java/com/example/modulevocal/activity/MyBagActivity.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/MyBagActivity.java
index df8267a7..563e8dba 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/activity/MyBagActivity.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/MyBagActivity.java
@@ -1,16 +1,16 @@
-package com.example.modulevocal.activity;
+package com.xscm.modulemain.activity.user.activity;
 
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentStatePagerAdapter;
 
-import com.example.modulevocal.R;
-import com.example.modulevocal.conacts.MyBagConacts;
-import com.example.modulevocal.databinding.ActivityMyBagBinding;
-import com.example.modulevocal.fragment.mybag.MyBagFragment;
-import com.example.modulevocal.fragment.mybag.MyBagListFragment;
-import com.example.modulevocal.presenter.MyBagPresenter;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.databinding.ActivityMyBagBinding;
+import com.xscm.modulemain.activity.user.conacts.MyBagConacts;
+import com.xscm.modulemain.activity.user.fragment.mybag.MyBagFragment;
+import com.xscm.modulemain.activity.user.fragment.mybag.MyBagListFragment;
+import com.xscm.modulemain.activity.user.presenter.MyBagPresenter;
 import com.xscm.moduleutil.activity.BaseMvpActivity;
 import com.xscm.moduleutil.bean.GiftPackBean;
 import com.xscm.moduleutil.bean.MyBagBean;
diff --git a/modulevocal/src/main/java/com/example/modulevocal/activity/MyMoneyActivity.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/MyMoneyActivity.java
similarity index 94%
rename from modulevocal/src/main/java/com/example/modulevocal/activity/MyMoneyActivity.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/MyMoneyActivity.java
index 766417e8..2e89f4ec 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/activity/MyMoneyActivity.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/MyMoneyActivity.java
@@ -1,14 +1,14 @@
-package com.example.modulevocal.activity;
+package com.xscm.modulemain.activity.user.activity;
 
 import android.content.Intent;
 import android.view.View;
 
 import com.alibaba.android.arouter.launcher.ARouter;
-import com.example.modulevocal.R;
-import com.example.modulevocal.conacts.MyMoneyConactos;
-import com.example.modulevocal.databinding.ActivityMyMoneyBinding;
-import com.example.modulevocal.presenter.MyMoneyPresenter;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.databinding.ActivityMyMoneyBinding;
 import com.hjq.toast.ToastUtils;
+import com.xscm.modulemain.activity.user.conacts.MyMoneyConactos;
+import com.xscm.modulemain.activity.user.presenter.MyMoneyPresenter;
 import com.xscm.moduleutil.activity.BaseMvpActivity;
 import com.xscm.moduleutil.bean.BindType;
 import com.xscm.moduleutil.bean.UserInfo;
diff --git a/modulevocal/src/main/java/com/example/modulevocal/activity/MyRoomActivity.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/MyRoomActivity.java
similarity index 96%
rename from modulevocal/src/main/java/com/example/modulevocal/activity/MyRoomActivity.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/MyRoomActivity.java
index 0c587330..f06141bb 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/activity/MyRoomActivity.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/MyRoomActivity.java
@@ -1,4 +1,4 @@
-package com.example.modulevocal.activity;
+package com.xscm.modulemain.activity.user.activity;
 
 import android.content.Intent;
 import android.graphics.Typeface;
@@ -15,15 +15,15 @@ import androidx.viewpager.widget.ViewPager;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.launcher.ARouter;
-import com.example.modulevocal.R;
-import com.example.modulevocal.conacts.MyRoomListContacts;
-import com.example.modulevocal.databinding.RoomActivityMyRoomBinding;
-import com.example.modulevocal.fragment.MyCreateFragment;
-import com.example.modulevocal.fragment.MyFollowFragment;
-import com.example.modulevocal.fragment.MyManageFragment;
-import com.example.modulevocal.fragment.MyRoomListFragment;
-import com.example.modulevocal.presenter.MyRoomPresenter;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.databinding.RoomActivityMyRoomBinding;
 import com.hjq.toast.ToastUtils;
+import com.xscm.modulemain.activity.user.conacts.MyRoomListContacts;
+import com.xscm.modulemain.activity.user.fragment.MyCreateFragment;
+import com.xscm.modulemain.activity.user.fragment.MyFollowFragment;
+import com.xscm.modulemain.activity.user.fragment.MyManageFragment;
+import com.xscm.modulemain.activity.user.fragment.MyRoomListFragment;
+import com.xscm.modulemain.activity.user.presenter.MyRoomPresenter;
 import com.xscm.moduleutil.activity.BaseMvpActivity;
 import com.xscm.moduleutil.base.CommonAppContext;
 import com.xscm.moduleutil.base.RoomManager;
diff --git a/modulevocal/src/main/java/com/example/modulevocal/activity/NotificationActivity.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/NotificationActivity.java
similarity index 85%
rename from modulevocal/src/main/java/com/example/modulevocal/activity/NotificationActivity.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/NotificationActivity.java
index a6316159..e2200913 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/activity/NotificationActivity.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/NotificationActivity.java
@@ -1,10 +1,10 @@
-package com.example.modulevocal.activity;
+package com.xscm.modulemain.activity.user.activity;
 
 import android.content.Intent;
 import android.view.View;
 
-import com.example.modulevocal.R;
-import com.example.modulevocal.databinding.ActivityNotificationBinding;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.databinding.ActivityNotificationBinding;
 import com.xscm.moduleutil.activity.BaseAppCompatActivity;
 
 public class NotificationActivity extends BaseAppCompatActivity<ActivityNotificationBinding> {
diff --git a/modulevocal/src/main/java/com/example/modulevocal/activity/PersonalityActivity.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/PersonalityActivity.java
similarity index 94%
rename from modulevocal/src/main/java/com/example/modulevocal/activity/PersonalityActivity.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/PersonalityActivity.java
index e6946687..93cb2a07 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/activity/PersonalityActivity.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/PersonalityActivity.java
@@ -1,7 +1,6 @@
-package com.example.modulevocal.activity;
+package com.xscm.modulemain.activity.user.activity;
 
 import android.content.Intent;
-import android.graphics.Color;
 import android.view.View;
 
 import androidx.annotation.Nullable;
@@ -10,20 +9,18 @@ import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentStatePagerAdapter;
 import androidx.viewpager.widget.ViewPager;
 
-import com.example.modulevocal.R;
-import com.example.modulevocal.conacts.PersonalityConacts;
-import com.example.modulevocal.databinding.ActivityPersonalityBinding;
-import com.example.modulevocal.fragment.zhuangb.ZhuangBanShangChengFragment;
-import com.example.modulevocal.presenter.PersonalityPresenter;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.databinding.ActivityPersonalityBinding;
+import com.xscm.modulemain.activity.user.conacts.PersonalityConacts;
+import com.xscm.modulemain.activity.user.fragment.zhuangb.ZhuangBanShangChengFragment;
+import com.xscm.modulemain.activity.user.presenter.PersonalityPresenter;
 import com.xscm.moduleutil.activity.BaseMvpActivity;
 import com.xscm.moduleutil.activity.WebViewActivity;
-import com.xscm.moduleutil.adapter.GiftTwoDetailsFragment;
 import com.xscm.moduleutil.adapter.MyPagerAdapter;
 import com.xscm.moduleutil.base.CommonAppContext;
 import com.xscm.moduleutil.bean.PersonaltyBean;
 import com.xscm.moduleutil.utils.ColorManager;
 import com.xscm.moduleutil.utils.SpUtil;
-import com.xscm.moduleutil.widget.dialog.RewardGiftDialogFragment;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/modulevocal/src/main/java/com/example/modulevocal/activity/PhoneReplacementActivity.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/PhoneReplacementActivity.java
similarity index 91%
rename from modulevocal/src/main/java/com/example/modulevocal/activity/PhoneReplacementActivity.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/PhoneReplacementActivity.java
index fdfd814d..b67c240b 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/activity/PhoneReplacementActivity.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/PhoneReplacementActivity.java
@@ -1,17 +1,14 @@
-package com.example.modulevocal.activity;
+package com.xscm.modulemain.activity.user.activity;
 
 import android.os.CountDownTimer;
 import android.view.View;
 
-import com.example.modulevocal.R;
-import com.example.modulevocal.conacts.PhoneReplacementConacts;
-import com.example.modulevocal.databinding.ActivityPhoneReplacementBinding;
-import com.example.modulevocal.presenter.PhoneReplacementPresenter;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.databinding.ActivityPhoneReplacementBinding;
 import com.hjq.toast.ToastUtils;
-import com.xscm.moduleutil.activity.BaseAppCompatActivity;
+import com.xscm.modulemain.activity.user.conacts.PhoneReplacementConacts;
+import com.xscm.modulemain.activity.user.presenter.PhoneReplacementPresenter;
 import com.xscm.moduleutil.activity.BaseMvpActivity;
-import com.xscm.moduleutil.bean.UserBean;
-import com.xscm.moduleutil.bean.UserInfo;
 import com.xscm.moduleutil.color.ThemeableDrawableUtils;
 import com.xscm.moduleutil.utils.ColorManager;
 import com.xscm.moduleutil.utils.SpUtil;
diff --git a/modulevocal/src/main/java/com/example/modulevocal/activity/RealDetailActivity.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/RealDetailActivity.java
similarity index 85%
rename from modulevocal/src/main/java/com/example/modulevocal/activity/RealDetailActivity.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/RealDetailActivity.java
index 7dc0f7b9..b58d7b3f 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/activity/RealDetailActivity.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/RealDetailActivity.java
@@ -1,12 +1,12 @@
-package com.example.modulevocal.activity;
+package com.xscm.modulemain.activity.user.activity;
 
 import android.view.View;
 
 import com.alibaba.android.arouter.launcher.ARouter;
-import com.example.modulevocal.R;
-import com.example.modulevocal.conacts.RealDetailConacts;
-import com.example.modulevocal.databinding.ActivityRealDeatilBinding;
-import com.example.modulevocal.presenter.RealDetailPresenter;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.databinding.ActivityRealDeatilBinding;
+import com.xscm.modulemain.activity.user.conacts.RealDetailConacts;
+import com.xscm.modulemain.activity.user.presenter.RealDetailPresenter;
 import com.xscm.moduleutil.activity.BaseMvpActivity;
 import com.xscm.moduleutil.bean.RealNameBean;
 import com.xscm.moduleutil.utils.ARouteConstants;
diff --git a/modulevocal/src/main/java/com/example/modulevocal/activity/RealNameActivity.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/RealNameActivity.java
similarity index 96%
rename from modulevocal/src/main/java/com/example/modulevocal/activity/RealNameActivity.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/RealNameActivity.java
index 5f181074..b9a94921 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/activity/RealNameActivity.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/RealNameActivity.java
@@ -1,4 +1,4 @@
-package com.example.modulevocal.activity;
+package com.xscm.modulemain.activity.user.activity;
 
 import android.graphics.Color;
 import android.os.Bundle;
@@ -11,10 +11,8 @@ import android.view.View;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.blankj.utilcode.util.RegexUtils;
-import com.example.modulevocal.R;
-import com.example.modulevocal.conacts.RealNameConacts;
-import com.example.modulevocal.databinding.ActivityRealNameBinding;
-import com.example.modulevocal.presenter.RealNamePresenter;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.databinding.ActivityRealNameBinding;
 import com.tencent.cloud.huiyansdkface.facelight.api.WbCloudFaceContant;
 import com.tencent.cloud.huiyansdkface.facelight.api.WbCloudFaceVerifySdk;
 import com.tencent.cloud.huiyansdkface.facelight.api.listeners.WbCloudFaceVerifyLoginListener;
@@ -22,6 +20,8 @@ import com.tencent.cloud.huiyansdkface.facelight.api.listeners.WbCloudFaceVerify
 import com.tencent.cloud.huiyansdkface.facelight.api.result.WbFaceError;
 import com.tencent.cloud.huiyansdkface.facelight.api.result.WbFaceVerifyResult;
 import com.tencent.cloud.huiyansdkface.facelight.process.FaceVerifyStatus;
+import com.xscm.modulemain.activity.user.conacts.RealNameConacts;
+import com.xscm.modulemain.activity.user.presenter.RealNamePresenter;
 import com.xscm.moduleutil.activity.BaseMvpActivity;
 import com.xscm.moduleutil.bean.RealNameBean;
 import com.xscm.moduleutil.color.ThemeableDrawableUtils;
diff --git a/modulevocal/src/main/java/com/example/modulevocal/activity/RechargeActivity.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/RechargeActivity.java
similarity index 96%
rename from modulevocal/src/main/java/com/example/modulevocal/activity/RechargeActivity.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/RechargeActivity.java
index b555faac..fc826b89 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/activity/RechargeActivity.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/RechargeActivity.java
@@ -1,4 +1,4 @@
-package com.example.modulevocal.activity;
+package com.xscm.modulemain.activity.user.activity;
 
 import static com.xscm.moduleutil.utils.permission.PermissionUtils.TAG;
 
@@ -17,14 +17,18 @@ import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.fastjson.JSON;
 import com.blankj.utilcode.util.LogUtils;
 import com.blankj.utilcode.util.ToastUtils;
-import com.chad.library.adapter.base.BaseQuickAdapter;
-import com.example.modulevocal.R;
-import com.xscm.moduleutil.adapter.PayMethodAdapter;
-import com.xscm.moduleutil.adapter.BalanceRechargeAdapter;
-import com.example.modulevocal.conacts.RechargeConactos;
-import com.example.modulevocal.databinding.ActivityRechargeBinding;
-import com.example.modulevocal.presenter.RechargePresenter;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.databinding.ActivityRechargeBinding;
+import com.tencent.liteav.base.Log;
+import com.tencent.mm.opensdk.constants.ConstantsAPI;
+import com.tencent.mm.opensdk.modelbase.BaseResp;
+import com.tencent.mm.opensdk.openapi.IWXAPI;
+import com.tencent.mm.opensdk.openapi.WXAPIFactory;
+import com.xscm.modulemain.activity.user.conacts.RechargeConactos;
+import com.xscm.modulemain.activity.user.presenter.RechargePresenter;
 import com.xscm.moduleutil.activity.BaseMvpActivity;
+import com.xscm.moduleutil.adapter.BalanceRechargeAdapter;
+import com.xscm.moduleutil.adapter.PayMethodAdapter;
 import com.xscm.moduleutil.base.CommonAppContext;
 import com.xscm.moduleutil.bean.AppPay;
 import com.xscm.moduleutil.bean.BindType;
@@ -36,13 +40,7 @@ import com.xscm.moduleutil.utils.ARouteConstants;
 import com.xscm.moduleutil.utils.ColorManager;
 import com.xscm.moduleutil.utils.SpUtil;
 import com.xscm.moduleutil.utils.SystemUtils;
-import com.xscm.moduleutil.widget.EqualSpaceItemDecoration;
 import com.xscm.moduleutil.widget.PaymentUtil;
-import com.tencent.liteav.base.Log;
-import com.tencent.mm.opensdk.constants.ConstantsAPI;
-import com.tencent.mm.opensdk.modelbase.BaseResp;
-import com.tencent.mm.opensdk.openapi.IWXAPI;
-import com.tencent.mm.opensdk.openapi.WXAPIFactory;
 
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
diff --git a/modulevocal/src/main/java/com/example/modulevocal/activity/RevenueActivity.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/RevenueActivity.java
similarity index 94%
rename from modulevocal/src/main/java/com/example/modulevocal/activity/RevenueActivity.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/RevenueActivity.java
index f612ca59..be9bde01 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/activity/RevenueActivity.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/RevenueActivity.java
@@ -1,4 +1,4 @@
-package com.example.modulevocal.activity;
+package com.xscm.modulemain.activity.user.activity;
 
 import android.util.SparseArray;
 import android.view.ViewGroup;
@@ -9,11 +9,11 @@ import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentStatePagerAdapter;
 import androidx.viewpager.widget.ViewPager;
 
-import com.example.modulevocal.R;
-import com.example.modulevocal.conacts.RevenueConacts;
-import com.example.modulevocal.databinding.ActivityRevenueBinding;
-import com.example.modulevocal.fragment.RevenueFragment;
-import com.example.modulevocal.presenter.RevenuePresenter;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.databinding.ActivityRevenueBinding;
+import com.xscm.modulemain.activity.user.conacts.RevenueConacts;
+import com.xscm.modulemain.activity.user.fragment.RevenueFragment;
+import com.xscm.modulemain.activity.user.presenter.RevenuePresenter;
 import com.xscm.moduleutil.activity.BaseMvpActivity;
 import com.xscm.moduleutil.bean.MyBagBean;
 import com.xscm.moduleutil.bean.RevenueBean;
diff --git a/modulevocal/src/main/java/com/example/modulevocal/activity/RoomAllowanceActivity.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/RoomAllowanceActivity.java
similarity index 93%
rename from modulevocal/src/main/java/com/example/modulevocal/activity/RoomAllowanceActivity.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/RoomAllowanceActivity.java
index c5145190..d99d3d30 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/activity/RoomAllowanceActivity.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/RoomAllowanceActivity.java
@@ -1,4 +1,4 @@
-package com.example.modulevocal.activity;
+package com.xscm.modulemain.activity.user.activity;
 
 import static android.view.View.GONE;
 
@@ -7,10 +7,10 @@ import android.graphics.Color;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.launcher.ARouter;
-import com.example.modulevocal.R;
-import com.example.modulevocal.conacts.RoomAllowanceContacts;
-import com.example.modulevocal.databinding.ActivityRoomAllowanceBinding;
-import com.example.modulevocal.presenter.RoomAllowancePresenter;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.databinding.ActivityRoomAllowanceBinding;
+import com.xscm.modulemain.activity.user.conacts.RoomAllowanceContacts;
+import com.xscm.modulemain.activity.user.presenter.RoomAllowancePresenter;
 import com.xscm.moduleutil.activity.BaseMvpActivity;
 import com.xscm.moduleutil.bean.RoomSubsidy;
 import com.xscm.moduleutil.bean.RoomSubsidyDetails;
diff --git a/modulevocal/src/main/java/com/example/modulevocal/activity/RoomAllowanceDetailActivity.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/RoomAllowanceDetailActivity.java
similarity index 89%
rename from modulevocal/src/main/java/com/example/modulevocal/activity/RoomAllowanceDetailActivity.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/RoomAllowanceDetailActivity.java
index 415232ec..c3d9dea8 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/activity/RoomAllowanceDetailActivity.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/RoomAllowanceDetailActivity.java
@@ -1,4 +1,4 @@
-package com.example.modulevocal.activity;
+package com.xscm.modulemain.activity.user.activity;
 
 import android.annotation.SuppressLint;
 
@@ -7,18 +7,18 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.chad.library.adapter.base.BaseQuickAdapter;
-import com.example.modulevocal.R;
-import com.example.modulevocal.adapter.RoomAllowanceDetailAdapter;
-import com.example.modulevocal.conacts.RoomAllowanceContacts;
-import com.example.modulevocal.databinding.ActivityRoomAllowanceDetailBinding;
-import com.example.modulevocal.presenter.RoomAllowancePresenter;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.adapter.RoomAllowanceDetailAdapter;
+import com.xscm.modulemain.databinding.ActivityRoomAllowanceDetailBinding;
+import com.scwang.smartrefresh.layout.api.RefreshLayout;
+import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener;
+import com.xscm.modulemain.activity.user.conacts.RoomAllowanceContacts;
+import com.xscm.modulemain.activity.user.presenter.RoomAllowancePresenter;
 import com.xscm.moduleutil.activity.BaseMvpActivity;
 import com.xscm.moduleutil.bean.RoomSubsidy;
 import com.xscm.moduleutil.bean.RoomSubsidyDetails;
 import com.xscm.moduleutil.utils.ARouteConstants;
 import com.xscm.moduleutil.widget.CustomTopBar;
-import com.scwang.smartrefresh.layout.api.RefreshLayout;
-import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener;
 
 import java.util.List;
 /**
diff --git a/modulevocal/src/main/java/com/example/modulevocal/activity/RoomDetailsActivity.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/RoomDetailsActivity.java
similarity index 95%
rename from modulevocal/src/main/java/com/example/modulevocal/activity/RoomDetailsActivity.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/RoomDetailsActivity.java
index 707bf563..60bd0650 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/activity/RoomDetailsActivity.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/RoomDetailsActivity.java
@@ -1,4 +1,4 @@
-package com.example.modulevocal.activity;
+package com.xscm.modulemain.activity.user.activity;
 
 import android.util.Log;
 
@@ -9,11 +9,13 @@ import com.alibaba.android.arouter.facade.annotation.Autowired;
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.example.modulevocal.R;
-import com.example.modulevocal.adapter.RoomDetailsAdapter;
-import com.example.modulevocal.conacts.MyRoomListContacts;
-import com.example.modulevocal.databinding.ActivityRoomDetailsBinding;
-import com.example.modulevocal.presenter.RoomDetailsPresenter;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.adapter.RoomDetailsAdapter;
+import com.xscm.modulemain.databinding.ActivityRoomDetailsBinding;
+import com.scwang.smartrefresh.layout.api.RefreshLayout;
+import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener;
+import com.xscm.modulemain.activity.user.conacts.MyRoomListContacts;
+import com.xscm.modulemain.activity.user.presenter.RoomDetailsPresenter;
 import com.xscm.moduleutil.activity.BaseMvpActivity;
 import com.xscm.moduleutil.bean.RoomDetails;
 import com.xscm.moduleutil.bean.details.BaseMultiItemEntity;
@@ -22,8 +24,6 @@ import com.xscm.moduleutil.bean.details.RoomDeatil;
 import com.xscm.moduleutil.utils.ARouteConstants;
 import com.xscm.moduleutil.widget.CustomTopBar;
 import com.xscm.moduleutil.widget.DoubleTimePickerBottomSheet;
-import com.scwang.smartrefresh.layout.api.RefreshLayout;
-import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
diff --git a/modulevocal/src/main/java/com/example/modulevocal/activity/SettingActivity.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/SettingActivity.java
similarity index 94%
rename from modulevocal/src/main/java/com/example/modulevocal/activity/SettingActivity.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/SettingActivity.java
index fbb6eec3..20d27680 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/activity/SettingActivity.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/SettingActivity.java
@@ -1,6 +1,4 @@
-package com.example.modulevocal.activity;
-
-import static com.blankj.utilcode.util.ActivityUtils.startActivity;
+package com.xscm.modulemain.activity.user.activity;
 
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -11,15 +9,12 @@ import androidx.appcompat.app.AlertDialog;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.blankj.utilcode.util.FileUtils;
 import com.blankj.utilcode.util.ToastUtils;
-import com.example.modulevocal.R;
-import com.example.modulevocal.conacts.SettingConacts;
-import com.example.modulevocal.databinding.ActivitySettingBinding;
-import com.example.modulevocal.presenter.SettingPresenter;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.databinding.ActivitySettingBinding;
+import com.xscm.modulemain.activity.user.conacts.SettingConacts;
+import com.xscm.modulemain.activity.user.presenter.SettingPresenter;
 import com.xscm.moduleutil.activity.BaseMvpActivity;
-import com.xscm.moduleutil.activity.WebViewActivity;
 import com.xscm.moduleutil.base.CommonAppContext;
-import com.xscm.moduleutil.bean.FirstChargeGiftBean;
-import com.xscm.moduleutil.dialog.FirstChargeDialog;
 import com.xscm.moduleutil.dialog.RealNameDialog;
 import com.xscm.moduleutil.utils.ARouteConstants;
 import com.xscm.moduleutil.utils.SpUtil;
diff --git a/modulevocal/src/main/java/com/example/modulevocal/activity/UnderageActivity.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/UnderageActivity.java
similarity index 96%
rename from modulevocal/src/main/java/com/example/modulevocal/activity/UnderageActivity.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/UnderageActivity.java
index 768ff09a..97891a87 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/activity/UnderageActivity.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/UnderageActivity.java
@@ -1,4 +1,4 @@
-package com.example.modulevocal.activity;
+package com.xscm.modulemain.activity.user.activity;
 
 
 import android.content.Intent;
@@ -8,9 +8,9 @@ import com.alibaba.android.arouter.facade.annotation.Autowired;
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.blankj.utilcode.util.ToastUtils;
-import com.example.modulevocal.R;
-import com.example.modulevocal.databinding.ActivityUnderageBinding;
-import com.example.modulevocal.presenter.UnderagePresenter;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.databinding.ActivityUnderageBinding;
+import com.xscm.modulemain.activity.user.presenter.UnderagePresenter;
 import com.xscm.moduleutil.activity.BaseMvpActivity;
 import com.xscm.moduleutil.activity.WebViewActivity;
 import com.xscm.moduleutil.base.CommonAppContext;
@@ -52,7 +52,7 @@ public class UnderageActivity extends BaseMvpActivity<UnderagePresenter, Activit
         } else {
             // 设置密码模式
             mBinding.meMim.setText("请输入监护密码");
-            mBinding.text.setVisibility(android.view.View.GONE);
+            mBinding.text.setVisibility(View.GONE);
         }
 
         mBinding.verificationcodeview.setOnInputListener(new SplitEditText.OnInputListener() {
diff --git a/modulevocal/src/main/java/com/example/modulevocal/activity/UserHomepageActivity.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/UserHomepageActivity.java
similarity index 92%
rename from modulevocal/src/main/java/com/example/modulevocal/activity/UserHomepageActivity.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/UserHomepageActivity.java
index 1670ddf7..4978275b 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/activity/UserHomepageActivity.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/UserHomepageActivity.java
@@ -1,4 +1,4 @@
-package com.example.modulevocal.activity;
+package com.xscm.modulemain.activity.user.activity;
 
 import android.os.Bundle;
 import android.text.TextUtils;
@@ -11,16 +11,14 @@ import androidx.fragment.app.Fragment;
 
 import com.alibaba.android.arouter.facade.annotation.Autowired;
 import com.alibaba.android.arouter.facade.annotation.Route;
-import com.blankj.utilcode.util.ToastUtils;
 import com.example.moduletablayout.listener.CustomTabEntity;
-import com.example.modulevocal.R;
-import com.example.modulevocal.conacts.UserHomepageConacts;
-import com.example.modulevocal.databinding.ActivityUserHomepageBinding;
-import com.example.modulevocal.fragment.UserHomepageFragment;
-import com.example.modulevocal.presenter.UserHomepagePresenter;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.databinding.ActivityUserHomepageBinding;
+import com.xscm.modulemain.activity.user.conacts.UserHomepageConacts;
+import com.xscm.modulemain.activity.user.fragment.UserHomepageFragment;
+import com.xscm.modulemain.activity.user.presenter.UserHomepagePresenter;
 import com.xscm.moduleutil.activity.BaseMvpActivity;
 import com.xscm.moduleutil.adapter.MyFragmentPagerAdapter;
-import com.xscm.moduleutil.base.CommonAppContext;
 import com.xscm.moduleutil.bean.CircleListBean;
 import com.xscm.moduleutil.bean.UserInfo;
 import com.xscm.moduleutil.bean.XBannerData;
diff --git a/modulevocal/src/main/java/com/example/modulevocal/activity/WithdrawalActivity.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/WithdrawalActivity.java
similarity index 97%
rename from modulevocal/src/main/java/com/example/modulevocal/activity/WithdrawalActivity.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/WithdrawalActivity.java
index 90244968..72d6f2f8 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/activity/WithdrawalActivity.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/WithdrawalActivity.java
@@ -1,10 +1,8 @@
-package com.example.modulevocal.activity;
+package com.xscm.modulemain.activity.user.activity;
 
 import android.content.Intent;
-import android.graphics.Color;
 import android.os.CountDownTimer;
 import android.text.Editable;
-import android.text.InputFilter;
 import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.text.method.DigitsKeyListener;
@@ -17,13 +15,12 @@ import androidx.appcompat.app.AlertDialog;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
-import com.alibaba.android.arouter.launcher.ARouter;
-import com.example.modulevocal.R;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.activity.user.conacts.WithdrawalConacts;
+import com.xscm.modulemain.activity.user.presenter.WithdrawalPresenter;
 import com.xscm.moduleutil.activity.WebViewActivity;
 import com.xscm.moduleutil.adapter.PayMethodAdapter;
-import com.example.modulevocal.conacts.WithdrawalConacts;
-import com.example.modulevocal.databinding.ActivityWithdrawalBinding;
-import com.example.modulevocal.presenter.WithdrawalPresenter;
+import com.xscm.modulemain.databinding.ActivityWithdrawalBinding;
 import com.google.android.material.textfield.TextInputEditText;
 import com.hjq.toast.ToastUtils;
 import com.xscm.moduleutil.activity.BaseMvpActivity;
diff --git a/modulevocal/src/main/java/com/example/modulevocal/activity/WithdrawalListActivity.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/WithdrawalListActivity.java
similarity index 93%
rename from modulevocal/src/main/java/com/example/modulevocal/activity/WithdrawalListActivity.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/WithdrawalListActivity.java
index d70faa19..a03ccbdc 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/activity/WithdrawalListActivity.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/activity/WithdrawalListActivity.java
@@ -1,4 +1,4 @@
-package com.example.modulevocal.activity;
+package com.xscm.modulemain.activity.user.activity;
 
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -7,15 +7,14 @@ import android.view.View;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
-import com.example.modulevocal.R;
-import com.example.modulevocal.adapter.WithdrawalAdapter;
-import com.example.modulevocal.conacts.WithdrawalConacts;
-import com.example.modulevocal.databinding.ActivityWithdrawalListBinding;
-import com.example.modulevocal.presenter.WithdrawalPresenter;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.adapter.WithdrawalAdapter;
+import com.xscm.modulemain.databinding.ActivityWithdrawalListBinding;
 import com.scwang.smartrefresh.layout.api.RefreshLayout;
 import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener;
+import com.xscm.modulemain.activity.user.conacts.WithdrawalConacts;
+import com.xscm.modulemain.activity.user.presenter.WithdrawalPresenter;
 import com.xscm.moduleutil.activity.BaseMvpActivity;
-import com.xscm.moduleutil.base.CommonAppContext;
 import com.xscm.moduleutil.bean.BindDetail;
 import com.xscm.moduleutil.bean.BindType;
 import com.xscm.moduleutil.bean.WalletBean;
@@ -24,7 +23,6 @@ import com.xscm.moduleutil.bean.WithdrawalBean;
 import com.xscm.moduleutil.widget.DoubleTimePickerBottomSheet;
 
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
diff --git a/modulevocal/src/main/java/com/example/modulevocal/conacts/AlbumDetailConacts.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/AlbumDetailConacts.java
similarity index 95%
rename from modulevocal/src/main/java/com/example/modulevocal/conacts/AlbumDetailConacts.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/AlbumDetailConacts.java
index 9f662bd8..eef958f5 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/conacts/AlbumDetailConacts.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/AlbumDetailConacts.java
@@ -1,4 +1,4 @@
-package com.example.modulevocal.conacts;
+package com.xscm.modulemain.activity.user.conacts;
 
 import android.app.Activity;
 
diff --git a/modulevocal/src/main/java/com/example/modulevocal/conacts/BlacklistConacts.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/BlacklistConacts.java
similarity index 92%
rename from modulevocal/src/main/java/com/example/modulevocal/conacts/BlacklistConacts.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/BlacklistConacts.java
index 9d81a57e..efc454b7 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/conacts/BlacklistConacts.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/BlacklistConacts.java
@@ -1,4 +1,4 @@
-package com.example.modulevocal.conacts;
+package com.xscm.modulemain.activity.user.conacts;
 
 import android.app.Activity;
 
diff --git a/modulevocal/src/main/java/com/example/modulevocal/conacts/BriefIntroductionConacts.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/BriefIntroductionConacts.java
similarity index 92%
rename from modulevocal/src/main/java/com/example/modulevocal/conacts/BriefIntroductionConacts.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/BriefIntroductionConacts.java
index 929f1e8f..a363ebbc 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/conacts/BriefIntroductionConacts.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/BriefIntroductionConacts.java
@@ -1,4 +1,4 @@
-package com.example.modulevocal.conacts;
+package com.xscm.modulemain.activity.user.conacts;
 
 import android.app.Activity;
 
diff --git a/modulevocal/src/main/java/com/example/modulevocal/conacts/ChangeNicknameConacts.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/ChangeNicknameConacts.java
similarity index 89%
rename from modulevocal/src/main/java/com/example/modulevocal/conacts/ChangeNicknameConacts.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/ChangeNicknameConacts.java
index 740712d3..6544b125 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/conacts/ChangeNicknameConacts.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/ChangeNicknameConacts.java
@@ -1,4 +1,4 @@
-package com.example.modulevocal.conacts;
+package com.xscm.modulemain.activity.user.conacts;
 
 import android.app.Activity;
 
diff --git a/modulevocal/src/main/java/com/example/modulevocal/conacts/ChangePasswordConactos.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/ChangePasswordConactos.java
similarity index 91%
rename from modulevocal/src/main/java/com/example/modulevocal/conacts/ChangePasswordConactos.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/ChangePasswordConactos.java
index d3906c22..b17a2e48 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/conacts/ChangePasswordConactos.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/ChangePasswordConactos.java
@@ -1,4 +1,4 @@
-package com.example.modulevocal.conacts;
+package com.xscm.modulemain.activity.user.conacts;
 
 import android.app.Activity;
 
diff --git a/modulevocal/src/main/java/com/example/modulevocal/conacts/CreatedRoomConactos.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/CreatedRoomConactos.java
similarity index 94%
rename from modulevocal/src/main/java/com/example/modulevocal/conacts/CreatedRoomConactos.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/CreatedRoomConactos.java
index 5bafe7b8..2cda484e 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/conacts/CreatedRoomConactos.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/CreatedRoomConactos.java
@@ -1,8 +1,7 @@
-package com.example.modulevocal.conacts;
+package com.xscm.modulemain.activity.user.conacts;
 
 import android.app.Activity;
 
-
 import com.xscm.moduleutil.activity.IPresenter;
 import com.xscm.moduleutil.activity.IView;
 
diff --git a/modulevocal/src/main/java/com/example/modulevocal/conacts/CurrencyExchangeConacts.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/CurrencyExchangeConacts.java
similarity index 92%
rename from modulevocal/src/main/java/com/example/modulevocal/conacts/CurrencyExchangeConacts.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/CurrencyExchangeConacts.java
index c7be4932..01be4443 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/conacts/CurrencyExchangeConacts.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/CurrencyExchangeConacts.java
@@ -1,4 +1,4 @@
-package com.example.modulevocal.conacts;
+package com.xscm.modulemain.activity.user.conacts;
 
 import android.app.Activity;
 
diff --git a/modulevocal/src/main/java/com/example/modulevocal/conacts/DailyTasksConacts.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/DailyTasksConacts.java
similarity index 92%
rename from modulevocal/src/main/java/com/example/modulevocal/conacts/DailyTasksConacts.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/DailyTasksConacts.java
index bb78ccd3..5463e03a 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/conacts/DailyTasksConacts.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/DailyTasksConacts.java
@@ -1,4 +1,4 @@
-package com.example.modulevocal.conacts;
+package com.xscm.modulemain.activity.user.conacts;
 
 import android.app.Activity;
 
diff --git a/modulevocal/src/main/java/com/example/modulevocal/conacts/EditUserConactos.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/EditUserConactos.java
similarity index 94%
rename from modulevocal/src/main/java/com/example/modulevocal/conacts/EditUserConactos.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/EditUserConactos.java
index 73ea3dae..156ed977 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/conacts/EditUserConactos.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/EditUserConactos.java
@@ -1,4 +1,4 @@
-package com.example.modulevocal.conacts;
+package com.xscm.modulemain.activity.user.conacts;
 
 import android.app.Activity;
 
diff --git a/modulevocal/src/main/java/com/example/modulevocal/conacts/GiftBoxRecordConacts.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/GiftBoxRecordConacts.java
similarity index 90%
rename from modulevocal/src/main/java/com/example/modulevocal/conacts/GiftBoxRecordConacts.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/GiftBoxRecordConacts.java
index 06b12677..318fccbe 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/conacts/GiftBoxRecordConacts.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/GiftBoxRecordConacts.java
@@ -1,4 +1,4 @@
-package com.example.modulevocal.conacts;
+package com.xscm.modulemain.activity.user.conacts;
 
 import android.app.Activity;
 
diff --git a/modulevocal/src/main/java/com/example/modulevocal/conacts/MeConacts.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/MeConacts.java
similarity index 94%
rename from modulevocal/src/main/java/com/example/modulevocal/conacts/MeConacts.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/MeConacts.java
index 6b931008..394e5cf2 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/conacts/MeConacts.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/MeConacts.java
@@ -1,4 +1,4 @@
-package com.example.modulevocal.conacts;
+package com.xscm.modulemain.activity.user.conacts;
 
 import android.app.Activity;
 
diff --git a/modulevocal/src/main/java/com/example/modulevocal/conacts/MyAlbumConacts.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/MyAlbumConacts.java
similarity index 94%
rename from modulevocal/src/main/java/com/example/modulevocal/conacts/MyAlbumConacts.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/MyAlbumConacts.java
index f065b6c4..8f4e19e2 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/conacts/MyAlbumConacts.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/MyAlbumConacts.java
@@ -1,4 +1,4 @@
-package com.example.modulevocal.conacts;
+package com.xscm.modulemain.activity.user.conacts;
 
 import android.app.Activity;
 
diff --git a/modulevocal/src/main/java/com/example/modulevocal/conacts/MyBagConacts.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/MyBagConacts.java
similarity index 93%
rename from modulevocal/src/main/java/com/example/modulevocal/conacts/MyBagConacts.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/MyBagConacts.java
index 3b4db0ec..42527cb4 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/conacts/MyBagConacts.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/MyBagConacts.java
@@ -1,4 +1,4 @@
-package com.example.modulevocal.conacts;
+package com.xscm.modulemain.activity.user.conacts;
 
 import android.app.Activity;
 
diff --git a/modulevocal/src/main/java/com/example/modulevocal/conacts/MyMoneyConactos.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/MyMoneyConactos.java
similarity index 92%
rename from modulevocal/src/main/java/com/example/modulevocal/conacts/MyMoneyConactos.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/MyMoneyConactos.java
index 86bc91a8..d85d7d94 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/conacts/MyMoneyConactos.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/MyMoneyConactos.java
@@ -1,4 +1,4 @@
-package com.example.modulevocal.conacts;
+package com.xscm.modulemain.activity.user.conacts;
 
 import android.app.Activity;
 
diff --git a/modulevocal/src/main/java/com/example/modulevocal/conacts/MyRoomListContacts.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/MyRoomListContacts.java
similarity index 96%
rename from modulevocal/src/main/java/com/example/modulevocal/conacts/MyRoomListContacts.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/MyRoomListContacts.java
index ae1cdd36..e4db645d 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/conacts/MyRoomListContacts.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/MyRoomListContacts.java
@@ -1,8 +1,7 @@
-package com.example.modulevocal.conacts;
+package com.xscm.modulemain.activity.user.conacts;
 
 import android.app.Activity;
 
-
 import com.xscm.moduleutil.activity.IPresenter;
 import com.xscm.moduleutil.activity.IView;
 import com.xscm.moduleutil.bean.AttentionResp;
diff --git a/modulevocal/src/main/java/com/example/modulevocal/conacts/PersonalityConacts.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/PersonalityConacts.java
similarity index 89%
rename from modulevocal/src/main/java/com/example/modulevocal/conacts/PersonalityConacts.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/PersonalityConacts.java
index b511a693..0b0e8fea 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/conacts/PersonalityConacts.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/PersonalityConacts.java
@@ -1,4 +1,4 @@
-package com.example.modulevocal.conacts;
+package com.xscm.modulemain.activity.user.conacts;
 
 import android.app.Activity;
 
diff --git a/modulevocal/src/main/java/com/example/modulevocal/conacts/PhoneReplacementConacts.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/PhoneReplacementConacts.java
similarity index 91%
rename from modulevocal/src/main/java/com/example/modulevocal/conacts/PhoneReplacementConacts.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/PhoneReplacementConacts.java
index 2375c687..d8d2d377 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/conacts/PhoneReplacementConacts.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/PhoneReplacementConacts.java
@@ -1,4 +1,4 @@
-package com.example.modulevocal.conacts;
+package com.xscm.modulemain.activity.user.conacts;
 
 import android.app.Activity;
 
diff --git a/modulevocal/src/main/java/com/example/modulevocal/conacts/RealDetailConacts.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/RealDetailConacts.java
similarity index 88%
rename from modulevocal/src/main/java/com/example/modulevocal/conacts/RealDetailConacts.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/RealDetailConacts.java
index 54cd30ba..7fa1a265 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/conacts/RealDetailConacts.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/RealDetailConacts.java
@@ -1,4 +1,4 @@
-package com.example.modulevocal.conacts;
+package com.xscm.modulemain.activity.user.conacts;
 
 import android.app.Activity;
 
diff --git a/modulevocal/src/main/java/com/example/modulevocal/conacts/RealNameConacts.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/RealNameConacts.java
similarity index 90%
rename from modulevocal/src/main/java/com/example/modulevocal/conacts/RealNameConacts.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/RealNameConacts.java
index 6cd721b8..a90d3ae2 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/conacts/RealNameConacts.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/RealNameConacts.java
@@ -1,4 +1,4 @@
-package com.example.modulevocal.conacts;
+package com.xscm.modulemain.activity.user.conacts;
 
 import android.app.Activity;
 
diff --git a/modulevocal/src/main/java/com/example/modulevocal/conacts/RechargeConactos.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/RechargeConactos.java
similarity index 94%
rename from modulevocal/src/main/java/com/example/modulevocal/conacts/RechargeConactos.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/RechargeConactos.java
index 1f940619..48e4e79e 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/conacts/RechargeConactos.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/RechargeConactos.java
@@ -1,4 +1,4 @@
-package com.example.modulevocal.conacts;
+package com.xscm.modulemain.activity.user.conacts;
 
 import android.app.Activity;
 
diff --git a/modulevocal/src/main/java/com/example/modulevocal/conacts/RevenueConacts.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/RevenueConacts.java
similarity index 91%
rename from modulevocal/src/main/java/com/example/modulevocal/conacts/RevenueConacts.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/RevenueConacts.java
index b81bf9b2..f165d28f 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/conacts/RevenueConacts.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/RevenueConacts.java
@@ -1,4 +1,4 @@
-package com.example.modulevocal.conacts;
+package com.xscm.modulemain.activity.user.conacts;
 
 import android.app.Activity;
 
diff --git a/modulevocal/src/main/java/com/example/modulevocal/conacts/RoomAllowanceContacts.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/RoomAllowanceContacts.java
similarity index 92%
rename from modulevocal/src/main/java/com/example/modulevocal/conacts/RoomAllowanceContacts.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/RoomAllowanceContacts.java
index d57f5e21..67175acb 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/conacts/RoomAllowanceContacts.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/RoomAllowanceContacts.java
@@ -1,4 +1,4 @@
-package com.example.modulevocal.conacts;
+package com.xscm.modulemain.activity.user.conacts;
 
 import android.app.Activity;
 
diff --git a/modulevocal/src/main/java/com/example/modulevocal/conacts/SettingConacts.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/SettingConacts.java
similarity index 88%
rename from modulevocal/src/main/java/com/example/modulevocal/conacts/SettingConacts.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/SettingConacts.java
index aedc0996..7d69ecae 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/conacts/SettingConacts.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/SettingConacts.java
@@ -1,4 +1,4 @@
-package com.example.modulevocal.conacts;
+package com.xscm.modulemain.activity.user.conacts;
 
 import android.app.Activity;
 
diff --git a/modulevocal/src/main/java/com/example/modulevocal/conacts/UnderageConacts.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/UnderageConacts.java
similarity index 84%
rename from modulevocal/src/main/java/com/example/modulevocal/conacts/UnderageConacts.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/UnderageConacts.java
index 755bd1c0..8ac85e88 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/conacts/UnderageConacts.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/UnderageConacts.java
@@ -1,4 +1,4 @@
-package com.example.modulevocal.conacts;
+package com.xscm.modulemain.activity.user.conacts;
 
 import android.app.Activity;
 
diff --git a/modulevocal/src/main/java/com/example/modulevocal/conacts/UserGiftWallConacts.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/UserGiftWallConacts.java
similarity index 89%
rename from modulevocal/src/main/java/com/example/modulevocal/conacts/UserGiftWallConacts.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/UserGiftWallConacts.java
index 80f2bb53..c0ea2917 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/conacts/UserGiftWallConacts.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/UserGiftWallConacts.java
@@ -1,8 +1,7 @@
-package com.example.modulevocal.conacts;
+package com.xscm.modulemain.activity.user.conacts;
 
 import android.app.Activity;
 
-
 import com.xscm.moduleutil.activity.IPresenter;
 import com.xscm.moduleutil.activity.IView;
 import com.xscm.moduleutil.bean.GiftUserWallBean;
diff --git a/modulevocal/src/main/java/com/example/modulevocal/conacts/UserHomepageConacts.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/UserHomepageConacts.java
similarity index 93%
rename from modulevocal/src/main/java/com/example/modulevocal/conacts/UserHomepageConacts.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/UserHomepageConacts.java
index f250399d..2e9fa926 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/conacts/UserHomepageConacts.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/UserHomepageConacts.java
@@ -1,4 +1,4 @@
-package com.example.modulevocal.conacts;
+package com.xscm.modulemain.activity.user.conacts;
 
 import android.app.Activity;
 
diff --git a/modulevocal/src/main/java/com/example/modulevocal/conacts/WithdrawalConacts.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/WithdrawalConacts.java
similarity index 96%
rename from modulevocal/src/main/java/com/example/modulevocal/conacts/WithdrawalConacts.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/WithdrawalConacts.java
index 60ff8a41..cfeac82e 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/conacts/WithdrawalConacts.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/conacts/WithdrawalConacts.java
@@ -1,4 +1,4 @@
-package com.example.modulevocal.conacts;
+package com.xscm.modulemain.activity.user.conacts;
 
 import android.app.Activity;
 
diff --git a/modulevocal/src/main/java/com/example/modulevocal/fragment/CirleListFragment.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/fragment/CirleListFragment.java
similarity index 95%
rename from modulevocal/src/main/java/com/example/modulevocal/fragment/CirleListFragment.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/fragment/CirleListFragment.java
index ce1770ff..041deb99 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/fragment/CirleListFragment.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/fragment/CirleListFragment.java
@@ -1,4 +1,4 @@
-package com.example.modulevocal.fragment;
+package com.xscm.modulemain.activity.user.fragment;
 
 import android.os.Bundle;
 
@@ -6,10 +6,12 @@ import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
 import com.alibaba.android.arouter.launcher.ARouter;
-import com.example.modulevocal.R;
-import com.example.modulevocal.conacts.UserHomepageConacts;
-import com.example.modulevocal.databinding.FragmentCirleListBinding;
-import com.example.modulevocal.presenter.UserHomepagePresenter;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.databinding.FragmentCirleListBinding;
+import com.scwang.smartrefresh.layout.api.RefreshLayout;
+import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener;
+import com.xscm.modulemain.activity.user.conacts.UserHomepageConacts;
+import com.xscm.modulemain.activity.user.presenter.UserHomepagePresenter;
 import com.xscm.moduleutil.adapter.CirleListAdapter;
 import com.xscm.moduleutil.base.BaseMvpFragment;
 import com.xscm.moduleutil.base.RoomManager;
@@ -18,8 +20,6 @@ import com.xscm.moduleutil.bean.UserInfo;
 import com.xscm.moduleutil.utils.ARouteConstants;
 import com.xscm.moduleutil.widget.dialog.RewardGiftDialogFragment;
 import com.xscm.moduleutil.widget.dialog.ShareDialog;
-import com.scwang.smartrefresh.layout.api.RefreshLayout;
-import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener;
 
 import java.util.List;
 
diff --git a/modulevocal/src/main/java/com/example/modulevocal/fragment/MyAlbumFragment.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/fragment/MyAlbumFragment.java
similarity index 93%
rename from modulevocal/src/main/java/com/example/modulevocal/fragment/MyAlbumFragment.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/fragment/MyAlbumFragment.java
index 9870cd46..a6eb3cc4 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/fragment/MyAlbumFragment.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/fragment/MyAlbumFragment.java
@@ -1,14 +1,10 @@
-package com.example.modulevocal.fragment;
+package com.xscm.modulemain.activity.user.fragment;
 
 import android.annotation.SuppressLint;
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.GridLayoutManager;
-
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -16,14 +12,17 @@ import android.widget.EditText;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.GridLayoutManager;
+
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.chad.library.adapter.base.BaseQuickAdapter;
-import com.example.modulevocal.R;
-import com.example.modulevocal.activity.CreateAlbumActivity;
-import com.example.modulevocal.adapter.MyAlbumListAdapter;
-import com.example.modulevocal.conacts.MyAlbumConacts;
-import com.example.modulevocal.databinding.FragmentMyAlbumBinding;
-import com.example.modulevocal.presenter.MyAlbumPresenter;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.adapter.MyAlbumListAdapter;
+import com.xscm.modulemain.databinding.FragmentMyAlbumBinding;
+import com.xscm.modulemain.activity.user.activity.CreateAlbumActivity;
+import com.xscm.modulemain.activity.user.conacts.MyAlbumConacts;
+import com.xscm.modulemain.activity.user.presenter.MyAlbumPresenter;
 import com.xscm.moduleutil.base.BaseMvpFragment;
 import com.xscm.moduleutil.bean.AlbumBean;
 import com.xscm.moduleutil.utils.ARouteConstants;
diff --git a/modulevocal/src/main/java/com/example/modulevocal/fragment/MyCreateFragment.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/fragment/MyCreateFragment.java
similarity index 94%
rename from modulevocal/src/main/java/com/example/modulevocal/fragment/MyCreateFragment.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/fragment/MyCreateFragment.java
index 180a1596..f9b4a929 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/fragment/MyCreateFragment.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/fragment/MyCreateFragment.java
@@ -1,4 +1,4 @@
-package com.example.modulevocal.fragment;
+package com.xscm.modulemain.activity.user.fragment;
 
 import android.os.Bundle;
 import android.view.View;
@@ -7,14 +7,14 @@ import androidx.recyclerview.widget.GridLayoutManager;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.example.modulevocal.R;
-import com.example.modulevocal.activity.MyRoomActivity;
-import com.example.modulevocal.adapter.ChatRoomMyFootAdapter;
-import com.example.modulevocal.adapter.MyCreateAdapter;
-import com.example.modulevocal.conacts.MyRoomListContacts;
-import com.example.modulevocal.databinding.RoomFragmentMyCreateBinding;
-import com.example.modulevocal.presenter.MyRoomPresenter;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.adapter.ChatRoomMyFootAdapter;
+import com.xscm.modulemain.adapter.MyCreateAdapter;
+import com.xscm.modulemain.databinding.RoomFragmentMyCreateBinding;
 import com.hjq.toast.ToastUtils;
+import com.xscm.modulemain.activity.user.activity.MyRoomActivity;
+import com.xscm.modulemain.activity.user.conacts.MyRoomListContacts;
+import com.xscm.modulemain.activity.user.presenter.MyRoomPresenter;
 import com.xscm.moduleutil.base.BaseMvpFragment;
 import com.xscm.moduleutil.bean.AttentionResp;
 import com.xscm.moduleutil.bean.ManageRoomResp;
diff --git a/modulevocal/src/main/java/com/example/modulevocal/fragment/MyFollowFragment.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/fragment/MyFollowFragment.java
similarity index 90%
rename from modulevocal/src/main/java/com/example/modulevocal/fragment/MyFollowFragment.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/fragment/MyFollowFragment.java
index c4a03ca8..236e4996 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/fragment/MyFollowFragment.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/fragment/MyFollowFragment.java
@@ -1,4 +1,4 @@
-package com.example.modulevocal.fragment;
+package com.xscm.modulemain.activity.user.fragment;
 
 
 import android.os.Bundle;
@@ -7,14 +7,15 @@ import android.view.View;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.GridLayoutManager;
 
-import com.alibaba.android.arouter.launcher.ARouter;
 import com.chad.library.adapter.base.BaseQuickAdapter;
-import com.example.modulevocal.R;
-import com.example.modulevocal.activity.MyRoomActivity;
-import com.example.modulevocal.adapter.ChatRoomMyFollowAdapter;
-import com.example.modulevocal.conacts.MyRoomListContacts;
-import com.example.modulevocal.databinding.RoomFragmentMyFollowBinding;
-import com.example.modulevocal.presenter.MyRoomPresenter;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.adapter.ChatRoomMyFollowAdapter;
+import com.xscm.modulemain.databinding.RoomFragmentMyFollowBinding;
+import com.scwang.smartrefresh.layout.api.RefreshLayout;
+import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener;
+import com.xscm.modulemain.activity.user.activity.MyRoomActivity;
+import com.xscm.modulemain.activity.user.conacts.MyRoomListContacts;
+import com.xscm.modulemain.activity.user.presenter.MyRoomPresenter;
 import com.xscm.moduleutil.base.BaseMvpFragment;
 import com.xscm.moduleutil.base.RoomManager;
 import com.xscm.moduleutil.bean.AttentionResp;
@@ -22,10 +23,7 @@ import com.xscm.moduleutil.bean.ManageRoomResp;
 import com.xscm.moduleutil.bean.MyCpRoom;
 import com.xscm.moduleutil.bean.MyFootResp;
 import com.xscm.moduleutil.bean.MyRoomBean;
-import com.xscm.moduleutil.utils.ARouteConstants;
 import com.xscm.moduleutil.widget.CommonEmptyView;
-import com.scwang.smartrefresh.layout.api.RefreshLayout;
-import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener;
 
 import java.util.List;
 
diff --git a/modulevocal/src/main/java/com/example/modulevocal/fragment/MyManageFragment.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/fragment/MyManageFragment.java
similarity index 90%
rename from modulevocal/src/main/java/com/example/modulevocal/fragment/MyManageFragment.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/fragment/MyManageFragment.java
index 8dbec3e2..36c44b75 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/fragment/MyManageFragment.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/fragment/MyManageFragment.java
@@ -1,4 +1,4 @@
-package com.example.modulevocal.fragment;
+package com.xscm.modulemain.activity.user.fragment;
 
 import android.os.Bundle;
 import android.view.View;
@@ -6,14 +6,15 @@ import android.view.View;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.GridLayoutManager;
 
-import com.alibaba.android.arouter.launcher.ARouter;
 import com.chad.library.adapter.base.BaseQuickAdapter;
-import com.example.modulevocal.R;
-import com.example.modulevocal.activity.MyRoomActivity;
-import com.example.modulevocal.adapter.ChatRoomMyManageAdapter;
-import com.example.modulevocal.conacts.MyRoomListContacts;
-import com.example.modulevocal.databinding.RoomFragmentMyManageBinding;
-import com.example.modulevocal.presenter.MyRoomPresenter;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.adapter.ChatRoomMyManageAdapter;
+import com.xscm.modulemain.databinding.RoomFragmentMyManageBinding;
+import com.scwang.smartrefresh.layout.api.RefreshLayout;
+import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener;
+import com.xscm.modulemain.activity.user.activity.MyRoomActivity;
+import com.xscm.modulemain.activity.user.conacts.MyRoomListContacts;
+import com.xscm.modulemain.activity.user.presenter.MyRoomPresenter;
 import com.xscm.moduleutil.base.BaseMvpFragment;
 import com.xscm.moduleutil.base.RoomManager;
 import com.xscm.moduleutil.bean.AttentionResp;
@@ -21,10 +22,7 @@ import com.xscm.moduleutil.bean.ManageRoomResp;
 import com.xscm.moduleutil.bean.MyCpRoom;
 import com.xscm.moduleutil.bean.MyFootResp;
 import com.xscm.moduleutil.bean.MyRoomBean;
-import com.xscm.moduleutil.utils.ARouteConstants;
 import com.xscm.moduleutil.widget.CommonEmptyView;
-import com.scwang.smartrefresh.layout.api.RefreshLayout;
-import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener;
 
 import java.util.List;
 
diff --git a/modulevocal/src/main/java/com/example/modulevocal/fragment/MyRoomListFragment.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/fragment/MyRoomListFragment.java
similarity index 96%
rename from modulevocal/src/main/java/com/example/modulevocal/fragment/MyRoomListFragment.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/fragment/MyRoomListFragment.java
index 626c1c08..b0b97b2f 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/fragment/MyRoomListFragment.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/fragment/MyRoomListFragment.java
@@ -1,4 +1,4 @@
-package com.example.modulevocal.fragment;
+package com.xscm.modulemain.activity.user.fragment;
 
 import android.os.Bundle;
 import android.text.SpannableString;
@@ -15,11 +15,13 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.example.modulevocal.R;
-import com.example.modulevocal.activity.MyRoomActivity;
-import com.example.modulevocal.conacts.MyRoomListContacts;
-import com.example.modulevocal.databinding.RoomFragmentMyRoomListListBinding;
-import com.example.modulevocal.presenter.MyRoomPresenter;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.databinding.RoomFragmentMyRoomListListBinding;
+import com.scwang.smartrefresh.layout.api.RefreshLayout;
+import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener;
+import com.xscm.modulemain.activity.user.activity.MyRoomActivity;
+import com.xscm.modulemain.activity.user.conacts.MyRoomListContacts;
+import com.xscm.modulemain.activity.user.presenter.MyRoomPresenter;
 import com.xscm.moduleutil.base.BaseMvpFragment;
 import com.xscm.moduleutil.base.RoomManager;
 import com.xscm.moduleutil.bean.AttentionResp;
@@ -31,8 +33,6 @@ import com.xscm.moduleutil.color.ThemeableDrawableUtils;
 import com.xscm.moduleutil.utils.ARouteConstants;
 import com.xscm.moduleutil.utils.ColorManager;
 import com.xscm.moduleutil.utils.ImageUtils;
-import com.scwang.smartrefresh.layout.api.RefreshLayout;
-import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener;
 
 import java.util.List;
 
diff --git a/modulevocal/src/main/java/com/example/modulevocal/fragment/RevenueFragment.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/fragment/RevenueFragment.java
similarity index 94%
rename from modulevocal/src/main/java/com/example/modulevocal/fragment/RevenueFragment.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/fragment/RevenueFragment.java
index a7fa5ee6..09ceaee3 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/fragment/RevenueFragment.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/fragment/RevenueFragment.java
@@ -1,22 +1,21 @@
-package com.example.modulevocal.fragment;
+package com.xscm.modulemain.activity.user.fragment;
 
 import android.os.Bundle;
+import android.util.Log;
 
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
-import android.util.Log;
-
-import com.example.modulevocal.R;
-import com.example.modulevocal.adapter.RevenueAdapter;
-import com.example.modulevocal.conacts.RevenueConacts;
-import com.example.modulevocal.databinding.FragmentRevenueBinding;
-import com.example.modulevocal.presenter.RevenuePresenter;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.adapter.RevenueAdapter;
+import com.xscm.modulemain.databinding.FragmentRevenueBinding;
+import com.scwang.smartrefresh.layout.api.RefreshLayout;
+import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener;
+import com.xscm.modulemain.activity.user.conacts.RevenueConacts;
+import com.xscm.modulemain.activity.user.presenter.RevenuePresenter;
 import com.xscm.moduleutil.base.BaseMvpFragment;
 import com.xscm.moduleutil.bean.RevenueBean;
 import com.xscm.moduleutil.widget.DoubleTimePickerBottomSheet;
-import com.scwang.smartrefresh.layout.api.RefreshLayout;
-import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
diff --git a/modulevocal/src/main/java/com/example/modulevocal/fragment/UserGiftWallFragment.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/fragment/UserGiftWallFragment.java
similarity index 89%
rename from modulevocal/src/main/java/com/example/modulevocal/fragment/UserGiftWallFragment.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/fragment/UserGiftWallFragment.java
index ffcd94b3..f8097d42 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/fragment/UserGiftWallFragment.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/fragment/UserGiftWallFragment.java
@@ -1,21 +1,19 @@
-package com.example.modulevocal.fragment;
+package com.xscm.modulemain.activity.user.fragment;
 
 import android.os.Bundle;
 
-
 import androidx.recyclerview.widget.GridLayoutManager;
 
-import com.example.modulevocal.R;
-import com.example.modulevocal.activity.UserHomepageActivity;
-import com.example.modulevocal.adapter.UserGiftWallAdapter;
-import com.example.modulevocal.conacts.UserGiftWallConacts;
-import com.example.modulevocal.databinding.MeFagmentUserGiftWallBinding;
-import com.example.modulevocal.presenter.UserGiftWallPresenter;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.adapter.UserGiftWallAdapter;
+import com.xscm.modulemain.databinding.MeFagmentUserGiftWallBinding;
+import com.xscm.modulemain.activity.user.activity.UserHomepageActivity;
+import com.xscm.modulemain.activity.user.conacts.UserGiftWallConacts;
+import com.xscm.modulemain.activity.user.presenter.UserGiftWallPresenter;
 import com.xscm.moduleutil.base.BaseMvpFragment;
 import com.xscm.moduleutil.bean.CombinedGiftBean;
 import com.xscm.moduleutil.bean.GiftUserWallBean;
 import com.xscm.moduleutil.widget.pagerecyclerview.PagerGridLayoutManager;
-import com.xscm.moduleutil.widget.pagerecyclerview.PagerGridSnapHelper;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/modulevocal/src/main/java/com/example/modulevocal/fragment/UserHomepageFragment.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/fragment/UserHomepageFragment.java
similarity index 96%
rename from modulevocal/src/main/java/com/example/modulevocal/fragment/UserHomepageFragment.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/fragment/UserHomepageFragment.java
index 8a3e3d48..1879c1ae 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/fragment/UserHomepageFragment.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/fragment/UserHomepageFragment.java
@@ -1,4 +1,4 @@
-package com.example.modulevocal.fragment;
+package com.xscm.modulemain.activity.user.fragment;
 
 import android.content.Intent;
 import android.graphics.Color;
@@ -14,13 +14,15 @@ import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentStatePagerAdapter;
 import androidx.recyclerview.widget.GridLayoutManager;
 
-import com.alibaba.android.arouter.launcher.ARouter;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.example.modulevocal.R;
-import com.example.modulevocal.conacts.UserHomepageConacts;
-import com.example.modulevocal.databinding.FragmentUserHompageBinding;
-import com.example.modulevocal.presenter.UserHomepagePresenter;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.databinding.FragmentUserHompageBinding;
+import com.tencent.imsdk.v2.V2TIMConversation;
+import com.tencent.qcloud.tuicore.TUIConstants;
+import com.tencent.qcloud.tuikit.tuichat.classicui.page.TUIC2CChatActivity;
+import com.xscm.modulemain.activity.user.conacts.UserHomepageConacts;
+import com.xscm.modulemain.activity.user.presenter.UserHomepagePresenter;
 import com.xscm.moduleutil.base.BaseMvpFragment;
 import com.xscm.moduleutil.base.RoomManager;
 import com.xscm.moduleutil.bean.CircleListBean;
@@ -28,13 +30,9 @@ import com.xscm.moduleutil.bean.MyBagBean;
 import com.xscm.moduleutil.bean.UserInfo;
 import com.xscm.moduleutil.bean.UserTagBean;
 import com.xscm.moduleutil.color.ThemeableDrawableUtils;
-import com.xscm.moduleutil.utils.ARouteConstants;
 import com.xscm.moduleutil.utils.ColorManager;
 import com.xscm.moduleutil.utils.ImageUtils;
 import com.xscm.moduleutil.utils.SpUtil;
-import com.tencent.imsdk.v2.V2TIMConversation;
-import com.tencent.qcloud.tuicore.TUIConstants;
-import com.tencent.qcloud.tuikit.tuichat.classicui.page.TUIC2CChatActivity;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/modulevocal/src/main/java/com/example/modulevocal/fragment/VocalRangeFragment.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/fragment/VocalRangeFragment.java
similarity index 94%
rename from modulevocal/src/main/java/com/example/modulevocal/fragment/VocalRangeFragment.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/fragment/VocalRangeFragment.java
index b6e16b1e..013ac770 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/fragment/VocalRangeFragment.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/fragment/VocalRangeFragment.java
@@ -1,4 +1,4 @@
-package com.example.modulevocal.fragment;
+package com.xscm.modulemain.activity.user.fragment;
 
 import static android.content.Context.CLIPBOARD_SERVICE;
 
@@ -8,30 +8,26 @@ import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import android.util.Log;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.Toast;
-
-import com.blankj.utilcode.util.ToastUtils;
-import com.example.modulevocal.R;
-import com.example.modulevocal.activity.BlacklistActivity;
-import com.example.modulevocal.activity.DailyTasksActivity;
-import com.example.modulevocal.activity.EditUserInfoActivity;
-import com.example.modulevocal.activity.MyBagActivity;
-import com.example.modulevocal.activity.MyMoneyActivity;
-import com.example.modulevocal.activity.MyRoomActivity;
-import com.example.modulevocal.activity.PersonalityActivity;
-import com.example.modulevocal.activity.SettingActivity;
-import com.example.modulevocal.activity.UserHomepageActivity;
-import com.example.modulevocal.conacts.MeConacts;
-import com.example.modulevocal.databinding.FragmentVocalRangeBinding;
-import com.example.modulevocal.presenter.MePresenter;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.databinding.FragmentVocalRangeBinding;
+import com.xscm.modulemain.activity.user.activity.BlacklistActivity;
+import com.xscm.modulemain.activity.user.activity.DailyTasksActivity;
+import com.xscm.modulemain.activity.user.activity.EditUserInfoActivity;
+import com.xscm.modulemain.activity.user.activity.MyBagActivity;
+import com.xscm.modulemain.activity.user.activity.MyMoneyActivity;
+import com.xscm.modulemain.activity.user.activity.MyRoomActivity;
+import com.xscm.modulemain.activity.user.activity.PersonalityActivity;
+import com.xscm.modulemain.activity.user.activity.SettingActivity;
+import com.xscm.modulemain.activity.user.activity.UserHomepageActivity;
+import com.xscm.modulemain.activity.user.conacts.MeConacts;
+import com.xscm.modulemain.activity.user.presenter.MePresenter;
 import com.xscm.moduleutil.activity.WebViewActivity;
 import com.xscm.moduleutil.base.BaseMvpFragment;
 import com.xscm.moduleutil.base.CommonAppContext;
diff --git a/modulevocal/src/main/java/com/example/modulevocal/fragment/mybag/MyBagAdapter.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/fragment/mybag/MyBagAdapter.java
similarity index 92%
rename from modulevocal/src/main/java/com/example/modulevocal/fragment/mybag/MyBagAdapter.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/fragment/mybag/MyBagAdapter.java
index 1be18cc1..b23ccb83 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/fragment/mybag/MyBagAdapter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/fragment/mybag/MyBagAdapter.java
@@ -1,10 +1,10 @@
-package com.example.modulevocal.fragment.mybag;
+package com.xscm.modulemain.activity.user.fragment.mybag;
 
 import android.widget.TextView;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.example.modulevocal.R;
+import com.xscm.modulemain.R;
 import com.xscm.moduleutil.bean.GiftPackBean;
 import com.xscm.moduleutil.color.ThemeableDrawableUtils;
 import com.xscm.moduleutil.utils.ColorManager;
diff --git a/modulevocal/src/main/java/com/example/modulevocal/fragment/mybag/MyBagFragment.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/fragment/mybag/MyBagFragment.java
similarity index 89%
rename from modulevocal/src/main/java/com/example/modulevocal/fragment/mybag/MyBagFragment.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/fragment/mybag/MyBagFragment.java
index 7410d6fe..222f2694 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/fragment/mybag/MyBagFragment.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/fragment/mybag/MyBagFragment.java
@@ -1,13 +1,13 @@
-package com.example.modulevocal.fragment.mybag;
+package com.xscm.modulemain.activity.user.fragment.mybag;
 
 import android.os.Bundle;
 
 import androidx.recyclerview.widget.GridLayoutManager;
 
-import com.example.modulevocal.R;
-import com.example.modulevocal.conacts.MyBagConacts;
-import com.example.modulevocal.databinding.FragmentMyBagBinding;
-import com.example.modulevocal.presenter.MyBagPresenter;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.databinding.FragmentMyBagBinding;
+import com.xscm.modulemain.activity.user.conacts.MyBagConacts;
+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;
diff --git a/modulevocal/src/main/java/com/example/modulevocal/fragment/mybag/MyBagListAdapter.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/fragment/mybag/MyBagListAdapter.java
similarity index 87%
rename from modulevocal/src/main/java/com/example/modulevocal/fragment/mybag/MyBagListAdapter.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/fragment/mybag/MyBagListAdapter.java
index a7c0bcc6..ecb05d31 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/fragment/mybag/MyBagListAdapter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/fragment/mybag/MyBagListAdapter.java
@@ -1,8 +1,8 @@
-package com.example.modulevocal.fragment.mybag;
+package com.xscm.modulemain.activity.user.fragment.mybag;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.example.modulevocal.R;
+import com.xscm.modulemain.R;
 import com.xscm.moduleutil.bean.MyBagDataBean;
 
 public class MyBagListAdapter extends BaseQuickAdapter<MyBagDataBean, BaseViewHolder> {
diff --git a/modulevocal/src/main/java/com/example/modulevocal/fragment/mybag/MyBagListFragment.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/fragment/mybag/MyBagListFragment.java
similarity index 92%
rename from modulevocal/src/main/java/com/example/modulevocal/fragment/mybag/MyBagListFragment.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/fragment/mybag/MyBagListFragment.java
index 3f02db36..9093b0ae 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/fragment/mybag/MyBagListFragment.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/fragment/mybag/MyBagListFragment.java
@@ -1,21 +1,20 @@
-package com.example.modulevocal.fragment.mybag;
+package com.xscm.modulemain.activity.user.fragment.mybag;
 
 import android.os.Bundle;
 
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
-import com.example.modulevocal.R;
-import com.example.modulevocal.conacts.MyBagConacts;
-import com.example.modulevocal.databinding.FragmentMyBagListBinding;
-import com.example.modulevocal.presenter.MyBagPresenter;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.databinding.FragmentMyBagListBinding;
 import com.scwang.smartrefresh.layout.api.RefreshLayout;
 import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener;
+import com.xscm.modulemain.activity.user.conacts.MyBagConacts;
+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 java.util.ArrayList;
 import java.util.List;
 
 public class MyBagListFragment extends BaseMvpFragment<MyBagPresenter, FragmentMyBagListBinding> implements MyBagConacts.View{
diff --git a/modulevocal/src/main/java/com/example/modulevocal/fragment/zhuangb/ZhuangBanShangChengAdapter.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/fragment/zhuangb/ZhuangBanShangChengAdapter.java
similarity index 96%
rename from modulevocal/src/main/java/com/example/modulevocal/fragment/zhuangb/ZhuangBanShangChengAdapter.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/fragment/zhuangb/ZhuangBanShangChengAdapter.java
index dff834cc..656ed1f2 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/fragment/zhuangb/ZhuangBanShangChengAdapter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/fragment/zhuangb/ZhuangBanShangChengAdapter.java
@@ -1,11 +1,11 @@
-package com.example.modulevocal.fragment.zhuangb;
+package com.xscm.modulemain.activity.user.fragment.zhuangb;
 
 import android.view.View;
 import android.widget.TextView;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.example.modulevocal.R;
+import com.xscm.modulemain.R;
 import com.xscm.moduleutil.bean.zhuangb.ZhuangBanShangChengBean;
 import com.xscm.moduleutil.color.ThemeableDrawableUtils;
 import com.xscm.moduleutil.utils.ColorManager;
diff --git a/modulevocal/src/main/java/com/example/modulevocal/fragment/zhuangb/ZhuangBanShangChengConactos.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/fragment/zhuangb/ZhuangBanShangChengConactos.java
similarity index 92%
rename from modulevocal/src/main/java/com/example/modulevocal/fragment/zhuangb/ZhuangBanShangChengConactos.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/fragment/zhuangb/ZhuangBanShangChengConactos.java
index d6382845..adf692df 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/fragment/zhuangb/ZhuangBanShangChengConactos.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/fragment/zhuangb/ZhuangBanShangChengConactos.java
@@ -1,4 +1,4 @@
-package com.example.modulevocal.fragment.zhuangb;
+package com.xscm.modulemain.activity.user.fragment.zhuangb;
 
 import android.app.Activity;
 
diff --git a/modulevocal/src/main/java/com/example/modulevocal/fragment/zhuangb/ZhuangBanShangChengFragment.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/fragment/zhuangb/ZhuangBanShangChengFragment.java
similarity index 97%
rename from modulevocal/src/main/java/com/example/modulevocal/fragment/zhuangb/ZhuangBanShangChengFragment.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/fragment/zhuangb/ZhuangBanShangChengFragment.java
index dda7f7d6..dc44e246 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/fragment/zhuangb/ZhuangBanShangChengFragment.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/fragment/zhuangb/ZhuangBanShangChengFragment.java
@@ -1,7 +1,6 @@
-package com.example.modulevocal.fragment.zhuangb;
+package com.xscm.modulemain.activity.user.fragment.zhuangb;
 
 import static android.view.View.GONE;
-import static com.xscm.moduleutil.utils.ImageLoader.loadImage;
 
 import android.os.Bundle;
 import android.view.View;
@@ -10,11 +9,12 @@ import android.widget.Toast;
 
 import androidx.recyclerview.widget.GridLayoutManager;
 
-import com.example.modulevocal.R;
-import com.example.modulevocal.databinding.ZhuangbanRecyclerviewNorefBinding;
-import com.example.modulevocal.fragment.MyRoomListFragment;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.databinding.ZhuangbanRecyclerviewNorefBinding;
 import com.hjq.toast.ToastUtils;
 import com.makeramen.roundedimageview.RoundedImageView;
+import com.tencent.qgame.animplayer.AnimView;
+import com.xscm.modulemain.activity.user.fragment.MyRoomListFragment;
 import com.xscm.moduleutil.base.BaseMvpFragment;
 import com.xscm.moduleutil.bean.zhuangb.ZhuangBanShangChengBean;
 import com.xscm.moduleutil.color.ThemeableDrawableUtils;
@@ -22,7 +22,6 @@ import com.xscm.moduleutil.utils.ColorManager;
 import com.xscm.moduleutil.utils.ImageUtils;
 import com.xscm.moduleutil.utils.SpUtil;
 import com.xscm.moduleutil.widget.AvatarFrameView;
-import com.tencent.qgame.animplayer.AnimView;
 import com.xscm.moduleutil.widget.GiftAnimView;
 
 import java.util.ArrayList;
diff --git a/modulevocal/src/main/java/com/example/modulevocal/fragment/zhuangb/ZhuangBanShangChengPresenter.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/fragment/zhuangb/ZhuangBanShangChengPresenter.java
similarity index 97%
rename from modulevocal/src/main/java/com/example/modulevocal/fragment/zhuangb/ZhuangBanShangChengPresenter.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/fragment/zhuangb/ZhuangBanShangChengPresenter.java
index e950f2ec..1bc70238 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/fragment/zhuangb/ZhuangBanShangChengPresenter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/fragment/zhuangb/ZhuangBanShangChengPresenter.java
@@ -1,4 +1,4 @@
-package com.example.modulevocal.fragment.zhuangb;
+package com.xscm.modulemain.activity.user.fragment.zhuangb;
 
 import android.content.Context;
 
diff --git a/modulevocal/src/main/java/com/example/modulevocal/presenter/AlbumDetailPresenter.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/AlbumDetailPresenter.java
similarity index 97%
rename from modulevocal/src/main/java/com/example/modulevocal/presenter/AlbumDetailPresenter.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/AlbumDetailPresenter.java
index f26de98f..806685d0 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/presenter/AlbumDetailPresenter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/AlbumDetailPresenter.java
@@ -1,9 +1,9 @@
-package com.example.modulevocal.presenter;
+package com.xscm.modulemain.activity.user.presenter;
 
 import android.content.Context;
 
-import com.example.modulevocal.conacts.AlbumDetailConacts;
 import com.hjq.toast.ToastUtils;
+import com.xscm.modulemain.activity.user.conacts.AlbumDetailConacts;
 import com.xscm.moduleutil.base.CommonAppContext;
 import com.xscm.moduleutil.bean.AlbumBean;
 import com.xscm.moduleutil.http.BaseObserver;
diff --git a/modulevocal/src/main/java/com/example/modulevocal/presenter/BlacklistPresenter.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/BlacklistPresenter.java
similarity index 96%
rename from modulevocal/src/main/java/com/example/modulevocal/presenter/BlacklistPresenter.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/BlacklistPresenter.java
index 03bc8ed4..ae805f2d 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/presenter/BlacklistPresenter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/BlacklistPresenter.java
@@ -1,8 +1,8 @@
-package com.example.modulevocal.presenter;
+package com.xscm.modulemain.activity.user.presenter;
 
 import android.content.Context;
 
-import com.example.modulevocal.conacts.BlacklistConacts;
+import com.xscm.modulemain.activity.user.conacts.BlacklistConacts;
 import com.xscm.moduleutil.bean.BlackUserBean;
 import com.xscm.moduleutil.http.BaseObserver;
 import com.xscm.moduleutil.presenter.BasePresenter;
diff --git a/modulevocal/src/main/java/com/example/modulevocal/presenter/BriefIntroductionPresenter.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/BriefIntroductionPresenter.java
similarity index 92%
rename from modulevocal/src/main/java/com/example/modulevocal/presenter/BriefIntroductionPresenter.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/BriefIntroductionPresenter.java
index de2c0127..3307408b 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/presenter/BriefIntroductionPresenter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/BriefIntroductionPresenter.java
@@ -1,8 +1,8 @@
-package com.example.modulevocal.presenter;
+package com.xscm.modulemain.activity.user.presenter;
 
 import android.content.Context;
 
-import com.example.modulevocal.conacts.BriefIntroductionConacts;
+import com.xscm.modulemain.activity.user.conacts.BriefIntroductionConacts;
 import com.xscm.moduleutil.bean.UserTagBean;
 import com.xscm.moduleutil.http.BaseObserver;
 import com.xscm.moduleutil.presenter.BasePresenter;
diff --git a/modulevocal/src/main/java/com/example/modulevocal/presenter/ChangeNicknamePresenter.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/ChangeNicknamePresenter.java
similarity index 88%
rename from modulevocal/src/main/java/com/example/modulevocal/presenter/ChangeNicknamePresenter.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/ChangeNicknamePresenter.java
index 2a2f2c89..dd4d3665 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/presenter/ChangeNicknamePresenter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/ChangeNicknamePresenter.java
@@ -1,8 +1,8 @@
-package com.example.modulevocal.presenter;
+package com.xscm.modulemain.activity.user.presenter;
 
 import android.content.Context;
 
-import com.example.modulevocal.conacts.ChangeNicknameConacts;
+import com.xscm.modulemain.activity.user.conacts.ChangeNicknameConacts;
 import com.xscm.moduleutil.http.BaseObserver;
 import com.xscm.moduleutil.presenter.BasePresenter;
 
diff --git a/modulevocal/src/main/java/com/example/modulevocal/presenter/ChangePasswordPresenter.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/ChangePasswordPresenter.java
similarity index 91%
rename from modulevocal/src/main/java/com/example/modulevocal/presenter/ChangePasswordPresenter.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/ChangePasswordPresenter.java
index 810a4749..bffcef8b 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/presenter/ChangePasswordPresenter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/ChangePasswordPresenter.java
@@ -1,10 +1,11 @@
-package com.example.modulevocal.presenter;
+package com.xscm.modulemain.activity.user.presenter;
 
 import android.content.Context;
 
-import com.example.modulevocal.conacts.ChangePasswordConactos;
+import com.xscm.modulemain.activity.user.conacts.ChangePasswordConactos;
 import com.xscm.moduleutil.http.BaseObserver;
 import com.xscm.moduleutil.presenter.BasePresenter;
+
 import io.reactivex.disposables.Disposable;
 
 public class ChangePasswordPresenter extends BasePresenter<ChangePasswordConactos.View> implements ChangePasswordConactos.ICreatedPre{
diff --git a/modulevocal/src/main/java/com/example/modulevocal/presenter/CreatedRoomPresenter.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/CreatedRoomPresenter.java
similarity index 97%
rename from modulevocal/src/main/java/com/example/modulevocal/presenter/CreatedRoomPresenter.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/CreatedRoomPresenter.java
index 433d49e1..6086f5a0 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/presenter/CreatedRoomPresenter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/CreatedRoomPresenter.java
@@ -1,9 +1,9 @@
-package com.example.modulevocal.presenter;
+package com.xscm.modulemain.activity.user.presenter;
 
 import android.content.Context;
 
-import com.example.modulevocal.conacts.CreatedRoomConactos;
 import com.hjq.toast.ToastUtils;
+import com.xscm.modulemain.activity.user.conacts.CreatedRoomConactos;
 import com.xscm.moduleutil.base.CommonAppContext;
 import com.xscm.moduleutil.http.BaseObserver;
 import com.xscm.moduleutil.presenter.BasePresenter;
diff --git a/modulevocal/src/main/java/com/example/modulevocal/presenter/CurrencyExchangePresenter.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/CurrencyExchangePresenter.java
similarity index 93%
rename from modulevocal/src/main/java/com/example/modulevocal/presenter/CurrencyExchangePresenter.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/CurrencyExchangePresenter.java
index a2a403cc..baee47ed 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/presenter/CurrencyExchangePresenter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/CurrencyExchangePresenter.java
@@ -1,8 +1,8 @@
-package com.example.modulevocal.presenter;
+package com.xscm.modulemain.activity.user.presenter;
 
 import android.content.Context;
 
-import com.example.modulevocal.conacts.CurrencyExchangeConacts;
+import com.xscm.modulemain.activity.user.conacts.CurrencyExchangeConacts;
 import com.xscm.moduleutil.bean.WalletBean;
 import com.xscm.moduleutil.bean.WalletConfig;
 import com.xscm.moduleutil.http.BaseObserver;
diff --git a/modulevocal/src/main/java/com/example/modulevocal/presenter/DailyTasksPresenter.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/DailyTasksPresenter.java
similarity index 93%
rename from modulevocal/src/main/java/com/example/modulevocal/presenter/DailyTasksPresenter.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/DailyTasksPresenter.java
index 76ae7e17..50b8c44e 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/presenter/DailyTasksPresenter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/DailyTasksPresenter.java
@@ -1,8 +1,8 @@
-package com.example.modulevocal.presenter;
+package com.xscm.modulemain.activity.user.presenter;
 
 import android.content.Context;
 
-import com.example.modulevocal.conacts.DailyTasksConacts;
+import com.xscm.modulemain.activity.user.conacts.DailyTasksConacts;
 import com.xscm.moduleutil.bean.GiftBoxBean;
 import com.xscm.moduleutil.bean.GiftName;
 import com.xscm.moduleutil.http.BaseObserver;
diff --git a/modulevocal/src/main/java/com/example/modulevocal/presenter/EditUserPresenter.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/EditUserPresenter.java
similarity index 97%
rename from modulevocal/src/main/java/com/example/modulevocal/presenter/EditUserPresenter.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/EditUserPresenter.java
index f204b041..b9e2f78d 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/presenter/EditUserPresenter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/EditUserPresenter.java
@@ -1,9 +1,9 @@
-package com.example.modulevocal.presenter;
+package com.xscm.modulemain.activity.user.presenter;
 
 import android.content.Context;
 
-import com.example.modulevocal.conacts.EditUserConactos;
 import com.hjq.toast.ToastUtils;
+import com.xscm.modulemain.activity.user.conacts.EditUserConactos;
 import com.xscm.moduleutil.base.CommonAppContext;
 import com.xscm.moduleutil.bean.UserInfo;
 import com.xscm.moduleutil.http.BaseObserver;
diff --git a/modulevocal/src/main/java/com/example/modulevocal/presenter/GiftBoxRecordPresenter.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/GiftBoxRecordPresenter.java
similarity index 88%
rename from modulevocal/src/main/java/com/example/modulevocal/presenter/GiftBoxRecordPresenter.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/GiftBoxRecordPresenter.java
index 213c7b2b..30c3cee5 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/presenter/GiftBoxRecordPresenter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/GiftBoxRecordPresenter.java
@@ -1,8 +1,8 @@
-package com.example.modulevocal.presenter;
+package com.xscm.modulemain.activity.user.presenter;
 
 import android.content.Context;
 
-import com.example.modulevocal.conacts.GiftBoxRecordConacts;
+import com.xscm.modulemain.activity.user.conacts.GiftBoxRecordConacts;
 import com.xscm.moduleutil.bean.GiftBoxRecordBean;
 import com.xscm.moduleutil.http.BaseObserver;
 import com.xscm.moduleutil.presenter.BasePresenter;
diff --git a/modulevocal/src/main/java/com/example/modulevocal/presenter/MePresenter.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/MePresenter.java
similarity index 98%
rename from modulevocal/src/main/java/com/example/modulevocal/presenter/MePresenter.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/MePresenter.java
index f5a5a95f..9356e1ac 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/presenter/MePresenter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/MePresenter.java
@@ -1,8 +1,8 @@
-package com.example.modulevocal.presenter;
+package com.xscm.modulemain.activity.user.presenter;
 
 import android.content.Context;
 
-import com.example.modulevocal.conacts.MeConacts;
+import com.xscm.modulemain.activity.user.conacts.MeConacts;
 import com.xscm.moduleutil.bean.UserInfo;
 import com.xscm.moduleutil.http.BaseObserver;
 import com.xscm.moduleutil.presenter.BasePresenter;
diff --git a/modulevocal/src/main/java/com/example/modulevocal/presenter/MyAlbumPresenter.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/MyAlbumPresenter.java
similarity index 97%
rename from modulevocal/src/main/java/com/example/modulevocal/presenter/MyAlbumPresenter.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/MyAlbumPresenter.java
index 3af59501..a3a0c216 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/presenter/MyAlbumPresenter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/MyAlbumPresenter.java
@@ -1,9 +1,9 @@
-package com.example.modulevocal.presenter;
+package com.xscm.modulemain.activity.user.presenter;
 
 import android.content.Context;
 
-import com.example.modulevocal.conacts.MyAlbumConacts;
 import com.hjq.toast.ToastUtils;
+import com.xscm.modulemain.activity.user.conacts.MyAlbumConacts;
 import com.xscm.moduleutil.base.CommonAppContext;
 import com.xscm.moduleutil.bean.AlbumBean;
 import com.xscm.moduleutil.http.BaseObserver;
diff --git a/modulevocal/src/main/java/com/example/modulevocal/presenter/MyBagPresenter.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/MyBagPresenter.java
similarity index 95%
rename from modulevocal/src/main/java/com/example/modulevocal/presenter/MyBagPresenter.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/MyBagPresenter.java
index e3ef0b3a..f73dc35a 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/presenter/MyBagPresenter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/MyBagPresenter.java
@@ -1,8 +1,8 @@
-package com.example.modulevocal.presenter;
+package com.xscm.modulemain.activity.user.presenter;
 
 import android.content.Context;
 
-import com.example.modulevocal.conacts.MyBagConacts;
+import com.xscm.modulemain.activity.user.conacts.MyBagConacts;
 import com.xscm.moduleutil.bean.GiftPackBean;
 import com.xscm.moduleutil.bean.MyBagDataBean;
 import com.xscm.moduleutil.http.BaseObserver;
diff --git a/modulevocal/src/main/java/com/example/modulevocal/presenter/MyMoneyPresenter.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/MyMoneyPresenter.java
similarity index 93%
rename from modulevocal/src/main/java/com/example/modulevocal/presenter/MyMoneyPresenter.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/MyMoneyPresenter.java
index 30391732..e6f48c41 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/presenter/MyMoneyPresenter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/MyMoneyPresenter.java
@@ -1,8 +1,8 @@
-package com.example.modulevocal.presenter;
+package com.xscm.modulemain.activity.user.presenter;
 
 import android.content.Context;
 
-import com.example.modulevocal.conacts.MyMoneyConactos;
+import com.xscm.modulemain.activity.user.conacts.MyMoneyConactos;
 import com.xscm.moduleutil.bean.BindType;
 import com.xscm.moduleutil.bean.UserInfo;
 import com.xscm.moduleutil.bean.WalletBean;
diff --git a/modulevocal/src/main/java/com/example/modulevocal/presenter/MyRoomPresenter.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/MyRoomPresenter.java
similarity index 98%
rename from modulevocal/src/main/java/com/example/modulevocal/presenter/MyRoomPresenter.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/MyRoomPresenter.java
index 603e2e02..53316552 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/presenter/MyRoomPresenter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/MyRoomPresenter.java
@@ -1,9 +1,8 @@
-package com.example.modulevocal.presenter;
+package com.xscm.modulemain.activity.user.presenter;
 
 import android.content.Context;
 
-
-import com.example.modulevocal.conacts.MyRoomListContacts;
+import com.xscm.modulemain.activity.user.conacts.MyRoomListContacts;
 import com.xscm.moduleutil.bean.MyCpRoom;
 import com.xscm.moduleutil.bean.MyFootResp;
 import com.xscm.moduleutil.bean.MyRoomBean;
diff --git a/modulevocal/src/main/java/com/example/modulevocal/presenter/PersonalityPresenter.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/PersonalityPresenter.java
similarity index 88%
rename from modulevocal/src/main/java/com/example/modulevocal/presenter/PersonalityPresenter.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/PersonalityPresenter.java
index 8df36bd9..40dfe168 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/presenter/PersonalityPresenter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/PersonalityPresenter.java
@@ -1,8 +1,8 @@
-package com.example.modulevocal.presenter;
+package com.xscm.modulemain.activity.user.presenter;
 
 import android.content.Context;
 
-import com.example.modulevocal.conacts.PersonalityConacts;
+import com.xscm.modulemain.activity.user.conacts.PersonalityConacts;
 import com.xscm.moduleutil.bean.PersonaltyBean;
 import com.xscm.moduleutil.http.BaseObserver;
 import com.xscm.moduleutil.presenter.BasePresenter;
diff --git a/modulevocal/src/main/java/com/example/modulevocal/presenter/PhoneReplacementPresenter.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/PhoneReplacementPresenter.java
similarity index 95%
rename from modulevocal/src/main/java/com/example/modulevocal/presenter/PhoneReplacementPresenter.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/PhoneReplacementPresenter.java
index 38ba8f1c..3796d28a 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/presenter/PhoneReplacementPresenter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/PhoneReplacementPresenter.java
@@ -1,8 +1,8 @@
-package com.example.modulevocal.presenter;
+package com.xscm.modulemain.activity.user.presenter;
 
 import android.content.Context;
 
-import com.example.modulevocal.conacts.PhoneReplacementConacts;
+import com.xscm.modulemain.activity.user.conacts.PhoneReplacementConacts;
 import com.xscm.moduleutil.bean.UserBean;
 import com.xscm.moduleutil.http.BaseObserver;
 import com.xscm.moduleutil.presenter.BasePresenter;
diff --git a/modulevocal/src/main/java/com/example/modulevocal/presenter/RealDetailPresenter.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/RealDetailPresenter.java
similarity index 87%
rename from modulevocal/src/main/java/com/example/modulevocal/presenter/RealDetailPresenter.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/RealDetailPresenter.java
index de361780..4374cbc9 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/presenter/RealDetailPresenter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/RealDetailPresenter.java
@@ -1,8 +1,8 @@
-package com.example.modulevocal.presenter;
+package com.xscm.modulemain.activity.user.presenter;
 
 import android.content.Context;
 
-import com.example.modulevocal.conacts.RealDetailConacts;
+import com.xscm.modulemain.activity.user.conacts.RealDetailConacts;
 import com.xscm.moduleutil.bean.RealNameBean;
 import com.xscm.moduleutil.http.BaseObserver;
 import com.xscm.moduleutil.presenter.BasePresenter;
diff --git a/modulevocal/src/main/java/com/example/modulevocal/presenter/RealNamePresenter.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/RealNamePresenter.java
similarity index 93%
rename from modulevocal/src/main/java/com/example/modulevocal/presenter/RealNamePresenter.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/RealNamePresenter.java
index ec1a187f..1f283b35 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/presenter/RealNamePresenter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/RealNamePresenter.java
@@ -1,8 +1,8 @@
-package com.example.modulevocal.presenter;
+package com.xscm.modulemain.activity.user.presenter;
 
 import android.content.Context;
 
-import com.example.modulevocal.conacts.RealNameConacts;
+import com.xscm.modulemain.activity.user.conacts.RealNameConacts;
 import com.xscm.moduleutil.bean.RealNameBean;
 import com.xscm.moduleutil.http.BaseObserver;
 import com.xscm.moduleutil.presenter.BasePresenter;
diff --git a/modulevocal/src/main/java/com/example/modulevocal/presenter/RechargePresenter.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/RechargePresenter.java
similarity index 95%
rename from modulevocal/src/main/java/com/example/modulevocal/presenter/RechargePresenter.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/RechargePresenter.java
index 5cd2978a..57770b68 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/presenter/RechargePresenter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/RechargePresenter.java
@@ -1,8 +1,8 @@
-package com.example.modulevocal.presenter;
+package com.xscm.modulemain.activity.user.presenter;
 
 import android.content.Context;
 
-import com.example.modulevocal.conacts.RechargeConactos;
+import com.xscm.modulemain.activity.user.conacts.RechargeConactos;
 import com.xscm.moduleutil.bean.AppPay;
 import com.xscm.moduleutil.bean.BindType;
 import com.xscm.moduleutil.bean.RechargeBean;
diff --git a/modulevocal/src/main/java/com/example/modulevocal/presenter/RevenuePresenter.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/RevenuePresenter.java
similarity index 91%
rename from modulevocal/src/main/java/com/example/modulevocal/presenter/RevenuePresenter.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/RevenuePresenter.java
index 5a9f8585..453cf74c 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/presenter/RevenuePresenter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/RevenuePresenter.java
@@ -1,8 +1,8 @@
-package com.example.modulevocal.presenter;
+package com.xscm.modulemain.activity.user.presenter;
 
 import android.content.Context;
 
-import com.example.modulevocal.conacts.RevenueConacts;
+import com.xscm.modulemain.activity.user.conacts.RevenueConacts;
 import com.xscm.moduleutil.bean.RevenueBean;
 import com.xscm.moduleutil.http.BaseObserver;
 import com.xscm.moduleutil.presenter.BasePresenter;
diff --git a/modulevocal/src/main/java/com/example/modulevocal/presenter/RoomAllowancePresenter.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/RoomAllowancePresenter.java
similarity index 92%
rename from modulevocal/src/main/java/com/example/modulevocal/presenter/RoomAllowancePresenter.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/RoomAllowancePresenter.java
index e898c016..954f2fd0 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/presenter/RoomAllowancePresenter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/RoomAllowancePresenter.java
@@ -1,9 +1,8 @@
-package com.example.modulevocal.presenter;
+package com.xscm.modulemain.activity.user.presenter;
 
 import android.content.Context;
 
-
-import com.example.modulevocal.conacts.RoomAllowanceContacts;
+import com.xscm.modulemain.activity.user.conacts.RoomAllowanceContacts;
 import com.xscm.moduleutil.bean.RoomSubsidy;
 import com.xscm.moduleutil.http.BaseObserver;
 import com.xscm.moduleutil.presenter.BasePresenter;
diff --git a/modulevocal/src/main/java/com/example/modulevocal/presenter/RoomDetailsPresenter.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/RoomDetailsPresenter.java
similarity index 95%
rename from modulevocal/src/main/java/com/example/modulevocal/presenter/RoomDetailsPresenter.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/RoomDetailsPresenter.java
index ddb48ad9..817ed772 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/presenter/RoomDetailsPresenter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/RoomDetailsPresenter.java
@@ -1,9 +1,8 @@
-package com.example.modulevocal.presenter;
+package com.xscm.modulemain.activity.user.presenter;
 
 import android.content.Context;
 
-
-import com.example.modulevocal.conacts.MyRoomListContacts;
+import com.xscm.modulemain.activity.user.conacts.MyRoomListContacts;
 import com.xscm.moduleutil.bean.RoomDetails;
 import com.xscm.moduleutil.http.BaseObserver;
 import com.xscm.moduleutil.presenter.BasePresenter;
diff --git a/modulevocal/src/main/java/com/example/modulevocal/presenter/SettingPresenter.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/SettingPresenter.java
similarity index 90%
rename from modulevocal/src/main/java/com/example/modulevocal/presenter/SettingPresenter.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/SettingPresenter.java
index cf564d8d..11475f6e 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/presenter/SettingPresenter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/SettingPresenter.java
@@ -1,8 +1,8 @@
-package com.example.modulevocal.presenter;
+package com.xscm.modulemain.activity.user.presenter;
 
 import android.content.Context;
 
-import com.example.modulevocal.conacts.SettingConacts;
+import com.xscm.modulemain.activity.user.conacts.SettingConacts;
 import com.xscm.moduleutil.http.BaseObserver;
 import com.xscm.moduleutil.presenter.BasePresenter;
 
diff --git a/modulevocal/src/main/java/com/example/modulevocal/presenter/UnderagePresenter.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/UnderagePresenter.java
similarity index 72%
rename from modulevocal/src/main/java/com/example/modulevocal/presenter/UnderagePresenter.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/UnderagePresenter.java
index 43102a4e..dd3eef25 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/presenter/UnderagePresenter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/UnderagePresenter.java
@@ -1,8 +1,8 @@
-package com.example.modulevocal.presenter;
+package com.xscm.modulemain.activity.user.presenter;
 
 import android.content.Context;
 
-import com.example.modulevocal.conacts.UnderageConacts;
+import com.xscm.modulemain.activity.user.conacts.UnderageConacts;
 import com.xscm.moduleutil.presenter.BasePresenter;
 
 public class UnderagePresenter extends BasePresenter<UnderageConacts.View> implements UnderageConacts.IMePre{
diff --git a/modulevocal/src/main/java/com/example/modulevocal/presenter/UserGiftWallPresenter.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/UserGiftWallPresenter.java
similarity index 88%
rename from modulevocal/src/main/java/com/example/modulevocal/presenter/UserGiftWallPresenter.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/UserGiftWallPresenter.java
index 6c7856d0..1bb7049c 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/presenter/UserGiftWallPresenter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/UserGiftWallPresenter.java
@@ -1,9 +1,8 @@
-package com.example.modulevocal.presenter;
+package com.xscm.modulemain.activity.user.presenter;
 
 import android.content.Context;
 
-
-import com.example.modulevocal.conacts.UserGiftWallConacts;
+import com.xscm.modulemain.activity.user.conacts.UserGiftWallConacts;
 import com.xscm.moduleutil.bean.GiftUserWallBean;
 import com.xscm.moduleutil.http.BaseObserver;
 import com.xscm.moduleutil.presenter.BasePresenter;
diff --git a/modulevocal/src/main/java/com/example/modulevocal/presenter/UserHomepagePresenter.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/UserHomepagePresenter.java
similarity index 95%
rename from modulevocal/src/main/java/com/example/modulevocal/presenter/UserHomepagePresenter.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/UserHomepagePresenter.java
index 90deee2c..06807dba 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/presenter/UserHomepagePresenter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/UserHomepagePresenter.java
@@ -1,8 +1,8 @@
-package com.example.modulevocal.presenter;
+package com.xscm.modulemain.activity.user.presenter;
 
 import android.content.Context;
 
-import com.example.modulevocal.conacts.UserHomepageConacts;
+import com.xscm.modulemain.activity.user.conacts.UserHomepageConacts;
 import com.xscm.moduleutil.bean.CircleListBean;
 import com.xscm.moduleutil.bean.UserInfo;
 import com.xscm.moduleutil.http.BaseObserver;
diff --git a/modulevocal/src/main/java/com/example/modulevocal/presenter/WithdrawalPresenter.java b/modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/WithdrawalPresenter.java
similarity index 97%
rename from modulevocal/src/main/java/com/example/modulevocal/presenter/WithdrawalPresenter.java
rename to modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/WithdrawalPresenter.java
index fc1a7b04..a4962bca 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/presenter/WithdrawalPresenter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/activity/user/presenter/WithdrawalPresenter.java
@@ -1,8 +1,8 @@
-package com.example.modulevocal.presenter;
+package com.xscm.modulemain.activity.user.presenter;
 
 import android.content.Context;
 
-import com.example.modulevocal.conacts.WithdrawalConacts;
+import com.xscm.modulemain.activity.user.conacts.WithdrawalConacts;
 import com.xscm.moduleutil.bean.BindDetail;
 import com.xscm.moduleutil.bean.BindType;
 import com.xscm.moduleutil.bean.WalletBean;
diff --git a/modulevocal/src/main/java/com/example/modulevocal/adapter/AlbumPhotoAdapter.java b/modulemain/src/main/java/com/xscm/modulemain/adapter/AlbumPhotoAdapter.java
similarity index 98%
rename from modulevocal/src/main/java/com/example/modulevocal/adapter/AlbumPhotoAdapter.java
rename to modulemain/src/main/java/com/xscm/modulemain/adapter/AlbumPhotoAdapter.java
index d0d809ba..48e94415 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/adapter/AlbumPhotoAdapter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/adapter/AlbumPhotoAdapter.java
@@ -1,4 +1,4 @@
-package com.example.modulevocal.adapter;
+package com.xscm.modulemain.adapter;
 
 import android.text.TextUtils;
 import android.view.View;
@@ -8,7 +8,7 @@ import androidx.annotation.NonNull;
 
 import com.chad.library.adapter.base.BaseMultiItemQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.example.modulevocal.R;
+import com.xscm.modulemain.R;
 import com.xscm.moduleutil.bean.AlbumBean;
 import com.xscm.moduleutil.utils.ImageUtils;
 import com.xscm.moduleutil.widget.img.FullScreenUtil;
diff --git a/modulevocal/src/main/java/com/example/modulevocal/adapter/BindCardAdapter.java b/modulemain/src/main/java/com/xscm/modulemain/adapter/BindCardAdapter.java
similarity index 94%
rename from modulevocal/src/main/java/com/example/modulevocal/adapter/BindCardAdapter.java
rename to modulemain/src/main/java/com/xscm/modulemain/adapter/BindCardAdapter.java
index cde99982..b3f899d1 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/adapter/BindCardAdapter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/adapter/BindCardAdapter.java
@@ -1,10 +1,10 @@
-package com.example.modulevocal.adapter;
+package com.xscm.modulemain.adapter;
 
 import static com.xscm.moduleutil.utils.UtilConfig.getContext;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.example.modulevocal.R;
+import com.xscm.modulemain.R;
 import com.xscm.moduleutil.bean.BindType;
 
 public class BindCardAdapter extends BaseQuickAdapter<BindType.AllData, BaseViewHolder> {
diff --git a/modulevocal/src/main/java/com/example/modulevocal/adapter/BlackAdapter.java b/modulemain/src/main/java/com/xscm/modulemain/adapter/BlackAdapter.java
similarity index 98%
rename from modulevocal/src/main/java/com/example/modulevocal/adapter/BlackAdapter.java
rename to modulemain/src/main/java/com/xscm/modulemain/adapter/BlackAdapter.java
index a7d7a0f3..cdb35a77 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/adapter/BlackAdapter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/adapter/BlackAdapter.java
@@ -1,4 +1,4 @@
-package com.example.modulevocal.adapter;
+package com.xscm.modulemain.adapter;
 
 import static com.xscm.moduleutil.utils.UtilConfig.getContext;
 
@@ -11,7 +11,7 @@ import android.widget.TextView;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.example.modulevocal.R;
+import com.xscm.modulemain.R;
 import com.xscm.moduleutil.bean.BlackUserBean;
 import com.xscm.moduleutil.color.ThemeableDrawableUtils;
 import com.xscm.moduleutil.utils.ARouteConstants;
diff --git a/moduleroom/src/main/java/com/example/moduleroom/adapter/CardRelationAdapter.java b/modulemain/src/main/java/com/xscm/modulemain/adapter/CardRelationAdapter.java
similarity index 99%
rename from moduleroom/src/main/java/com/example/moduleroom/adapter/CardRelationAdapter.java
rename to modulemain/src/main/java/com/xscm/modulemain/adapter/CardRelationAdapter.java
index e4fd4516..417a937c 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/adapter/CardRelationAdapter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/adapter/CardRelationAdapter.java
@@ -1,4 +1,4 @@
-package com.example.moduleroom.adapter;
+package com.xscm.modulemain.adapter;
 
 import android.annotation.SuppressLint;
 import android.text.SpannableStringBuilder;
@@ -12,7 +12,7 @@ import androidx.annotation.NonNull;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.example.moduleroom.R;
+import com.xscm.modulemain.R;
 import com.xscm.moduleutil.RoomAutionTimeBean;
 import com.xscm.moduleutil.bean.RoomRelationBean;
 import com.xscm.moduleutil.bean.RoonGiftModel;
diff --git a/modulevoice/src/main/java/com/example/modulevoice/adapter/CarouselBannerAdapter.java b/modulemain/src/main/java/com/xscm/modulemain/adapter/CarouselBannerAdapter.java
similarity index 90%
rename from modulevoice/src/main/java/com/example/modulevoice/adapter/CarouselBannerAdapter.java
rename to modulemain/src/main/java/com/xscm/modulemain/adapter/CarouselBannerAdapter.java
index 3493d92f..1ea23728 100644
--- a/modulevoice/src/main/java/com/example/modulevoice/adapter/CarouselBannerAdapter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/adapter/CarouselBannerAdapter.java
@@ -1,24 +1,15 @@
-package com.example.modulevoice.adapter;
+package com.xscm.modulemain.adapter;
 
-import android.content.Context;
-import android.graphics.Rect;
-import android.util.TypedValue;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
-import com.example.modulevoice.R;
+import com.xscm.modulemain.R;
 import com.xscm.moduleutil.bean.TopRoom;
 import com.xscm.moduleutil.utils.ImageUtils;
 import com.zhpan.bannerview.BaseBannerAdapter;
 import com.zhpan.bannerview.BaseViewHolder;
 
-import java.util.List;
-
 public class CarouselBannerAdapter extends BaseBannerAdapter<TopRoom> {
 
     private OnItemClickListener onItemClickListener;
diff --git a/modulevoice/src/main/java/com/example/modulevoice/adapter/CarouselImgAdapter.java b/modulemain/src/main/java/com/xscm/modulemain/adapter/CarouselImgAdapter.java
similarity index 88%
rename from modulevoice/src/main/java/com/example/modulevoice/adapter/CarouselImgAdapter.java
rename to modulemain/src/main/java/com/xscm/modulemain/adapter/CarouselImgAdapter.java
index 68e02b26..9f6da0ac 100644
--- a/modulevoice/src/main/java/com/example/modulevoice/adapter/CarouselImgAdapter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/adapter/CarouselImgAdapter.java
@@ -1,8 +1,8 @@
-package com.example.modulevoice.adapter;
+package com.xscm.modulemain.adapter;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.example.modulevoice.R;
+import com.xscm.modulemain.R;
 import com.xscm.moduleutil.bean.TopRoom;
 import com.xscm.moduleutil.utils.ImageUtils;
 
diff --git a/modulevocal/src/main/java/com/example/modulevocal/adapter/ChatRoomMyFollowAdapter.java b/modulemain/src/main/java/com/xscm/modulemain/adapter/ChatRoomMyFollowAdapter.java
similarity index 94%
rename from modulevocal/src/main/java/com/example/modulevocal/adapter/ChatRoomMyFollowAdapter.java
rename to modulemain/src/main/java/com/xscm/modulemain/adapter/ChatRoomMyFollowAdapter.java
index b60e614b..8e66380a 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/adapter/ChatRoomMyFollowAdapter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/adapter/ChatRoomMyFollowAdapter.java
@@ -1,10 +1,10 @@
-package com.example.modulevocal.adapter;
+package com.xscm.modulemain.adapter;
 
 import androidx.annotation.Nullable;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.example.modulevocal.R;
+import com.xscm.modulemain.R;
 import com.xscm.moduleutil.bean.MyRoomBean;
 import com.xscm.moduleutil.utils.ImageUtils;
 
diff --git a/modulevocal/src/main/java/com/example/modulevocal/adapter/ChatRoomMyFootAdapter.java b/modulemain/src/main/java/com/xscm/modulemain/adapter/ChatRoomMyFootAdapter.java
similarity index 96%
rename from modulevocal/src/main/java/com/example/modulevocal/adapter/ChatRoomMyFootAdapter.java
rename to modulemain/src/main/java/com/xscm/modulemain/adapter/ChatRoomMyFootAdapter.java
index cc65e5ad..4704babd 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/adapter/ChatRoomMyFootAdapter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/adapter/ChatRoomMyFootAdapter.java
@@ -1,10 +1,10 @@
-package com.example.modulevocal.adapter;
+package com.xscm.modulemain.adapter;
 
 import android.widget.ImageView;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.example.modulevocal.R;
+import com.xscm.modulemain.R;
 import com.xscm.moduleutil.bean.MyFootResp;
 import com.xscm.moduleutil.utils.ImageUtils;
 
diff --git a/modulevocal/src/main/java/com/example/modulevocal/adapter/ChatRoomMyManageAdapter.java b/modulemain/src/main/java/com/xscm/modulemain/adapter/ChatRoomMyManageAdapter.java
similarity index 94%
rename from modulevocal/src/main/java/com/example/modulevocal/adapter/ChatRoomMyManageAdapter.java
rename to modulemain/src/main/java/com/xscm/modulemain/adapter/ChatRoomMyManageAdapter.java
index 58f9f222..f90e775f 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/adapter/ChatRoomMyManageAdapter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/adapter/ChatRoomMyManageAdapter.java
@@ -1,10 +1,10 @@
-package com.example.modulevocal.adapter;
+package com.xscm.modulemain.adapter;
 
 import androidx.annotation.Nullable;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.example.modulevocal.R;
+import com.xscm.modulemain.R;
 import com.xscm.moduleutil.bean.MyRoomBean;
 import com.xscm.moduleutil.utils.ImageUtils;
 
diff --git a/modulecircle/src/main/java/com/example/modulecircle/adapter/CircleCategoryAdapter.java b/modulemain/src/main/java/com/xscm/modulemain/adapter/CircleCategoryAdapter.java
similarity index 96%
rename from modulecircle/src/main/java/com/example/modulecircle/adapter/CircleCategoryAdapter.java
rename to modulemain/src/main/java/com/xscm/modulemain/adapter/CircleCategoryAdapter.java
index 176bce06..c253b60f 100644
--- a/modulecircle/src/main/java/com/example/modulecircle/adapter/CircleCategoryAdapter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/adapter/CircleCategoryAdapter.java
@@ -1,4 +1,4 @@
-package com.example.modulecircle.adapter;
+package com.xscm.modulemain.adapter;
 
 import android.view.LayoutInflater;
 import android.view.View;
@@ -9,7 +9,7 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.example.modulecircle.R;
+import com.xscm.modulemain.R;
 import com.xscm.moduleutil.bean.HeatedBean;
 import com.xscm.moduleutil.utils.ImageUtils;
 
diff --git a/modulecircle/src/main/java/com/example/modulecircle/adapter/CirleCategoryBannerAdapter.java b/modulemain/src/main/java/com/xscm/modulemain/adapter/CirleCategoryBannerAdapter.java
similarity index 95%
rename from modulecircle/src/main/java/com/example/modulecircle/adapter/CirleCategoryBannerAdapter.java
rename to modulemain/src/main/java/com/xscm/modulemain/adapter/CirleCategoryBannerAdapter.java
index 0b345b6e..f9951f26 100644
--- a/modulecircle/src/main/java/com/example/modulecircle/adapter/CirleCategoryBannerAdapter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/adapter/CirleCategoryBannerAdapter.java
@@ -1,11 +1,11 @@
-package com.example.modulecircle.adapter;
+package com.xscm.modulemain.adapter;
 
 import android.view.View;
 
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.example.modulecircle.R;
+import com.xscm.modulemain.R;
 import com.xscm.moduleutil.bean.BaseListData;
 import com.xscm.moduleutil.bean.HeatedBean;
 import com.zhpan.bannerview.BaseBannerAdapter;
diff --git a/moduleroom/src/main/java/com/example/moduleroom/adapter/EaseChatAdapter.java b/modulemain/src/main/java/com/xscm/modulemain/adapter/EaseChatAdapter.java
similarity index 99%
rename from moduleroom/src/main/java/com/example/moduleroom/adapter/EaseChatAdapter.java
rename to modulemain/src/main/java/com/xscm/modulemain/adapter/EaseChatAdapter.java
index e947f94c..8027e87b 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/adapter/EaseChatAdapter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/adapter/EaseChatAdapter.java
@@ -1,13 +1,11 @@
-package com.example.moduleroom.adapter;
+package com.xscm.modulemain.adapter;
 
 import android.app.Activity;
 import android.content.Context;
 import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
 import android.graphics.Color;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
-import android.graphics.drawable.NinePatchDrawable;
 import android.os.Build;
 import android.os.Handler;
 import android.text.Spannable;
@@ -15,32 +13,28 @@ import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
 import android.text.style.ForegroundColorSpan;
 import android.view.View;
-import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
-import android.widget.TextView;
 
 import androidx.annotation.NonNull;
-
 import androidx.annotation.Nullable;
 import androidx.constraintlayout.widget.ConstraintLayout;
+
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.DataSource;
 import com.bumptech.glide.load.engine.GlideException;
 import com.bumptech.glide.request.RequestListener;
-import com.bumptech.glide.request.target.CustomTarget;
 import com.bumptech.glide.request.target.SimpleTarget;
 import com.bumptech.glide.request.target.Target;
 import com.bumptech.glide.request.transition.Transition;
 import com.chad.library.adapter.base.BaseMultiItemQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.example.moduleroom.R;
+import com.xscm.modulemain.R;
 import com.xscm.modulemain.FakeNinePatchDrawable;
 import com.xscm.moduleutil.bean.GiftBean;
 import com.xscm.moduleutil.bean.RoomMessageEvent;
 import com.xscm.moduleutil.bean.UserInfo;
 import com.xscm.moduleutil.bean.room.EMMessageInfo;
-import com.xscm.moduleutil.utils.ColorManager;
 import com.xscm.moduleutil.utils.ImageUtils;
 import com.xscm.moduleutil.utils.logger.Logger;
 import com.xscm.moduleutil.widget.AdaptiveImageView;
diff --git a/moduleroom/src/main/java/com/example/moduleroom/adapter/EmotionAdapter.java b/modulemain/src/main/java/com/xscm/modulemain/adapter/EmotionAdapter.java
similarity index 94%
rename from moduleroom/src/main/java/com/example/moduleroom/adapter/EmotionAdapter.java
rename to modulemain/src/main/java/com/xscm/modulemain/adapter/EmotionAdapter.java
index 95afa21d..40c87681 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/adapter/EmotionAdapter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/adapter/EmotionAdapter.java
@@ -1,8 +1,8 @@
-package com.example.moduleroom.adapter;
+package com.xscm.modulemain.adapter;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.example.moduleroom.R;
+import com.xscm.modulemain.R;
 import com.xscm.moduleutil.bean.room.EmotionDeatils;
 import com.xscm.moduleutil.utils.ImageUtils;
 
diff --git a/modulecircle/src/main/java/com/example/modulecircle/adapter/ExpandColumnAdapter.java b/modulemain/src/main/java/com/xscm/modulemain/adapter/ExpandColumnAdapter.java
similarity index 98%
rename from modulecircle/src/main/java/com/example/modulecircle/adapter/ExpandColumnAdapter.java
rename to modulemain/src/main/java/com/xscm/modulemain/adapter/ExpandColumnAdapter.java
index 5c2d95a3..5258e8bc 100644
--- a/modulecircle/src/main/java/com/example/modulecircle/adapter/ExpandColumnAdapter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/adapter/ExpandColumnAdapter.java
@@ -1,4 +1,4 @@
-package com.example.modulecircle.adapter;
+package com.xscm.modulemain.adapter;
 
 import android.view.View;
 import android.widget.ImageView;
@@ -6,7 +6,7 @@ import android.widget.LinearLayout;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.example.modulecircle.R;
+import com.xscm.modulemain.R;
 import com.xscm.moduleutil.adapter.OneImageYuanJiaoAdapter;
 import com.xscm.moduleutil.bean.ExpandColumnBean;
 import com.xscm.moduleutil.utils.ImageUtils;
diff --git a/modulenews/src/main/java/com/example/modulenews/adapter/FragmentAdapter.java b/modulemain/src/main/java/com/xscm/modulemain/adapter/FragmentAdapter.java
similarity index 96%
rename from modulenews/src/main/java/com/example/modulenews/adapter/FragmentAdapter.java
rename to modulemain/src/main/java/com/xscm/modulemain/adapter/FragmentAdapter.java
index bcaa6968..3f98dd23 100644
--- a/modulenews/src/main/java/com/example/modulenews/adapter/FragmentAdapter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/adapter/FragmentAdapter.java
@@ -1,4 +1,4 @@
-package com.example.modulenews.adapter;
+package com.xscm.modulemain.adapter;
 
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
diff --git a/modulevocal/src/main/java/com/example/modulevocal/adapter/GiftBoxAdapter.java b/modulemain/src/main/java/com/xscm/modulemain/adapter/GiftBoxAdapter.java
similarity index 98%
rename from modulevocal/src/main/java/com/example/modulevocal/adapter/GiftBoxAdapter.java
rename to modulemain/src/main/java/com/xscm/modulemain/adapter/GiftBoxAdapter.java
index 11998c47..0a2b7450 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/adapter/GiftBoxAdapter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/adapter/GiftBoxAdapter.java
@@ -1,4 +1,4 @@
-package com.example.modulevocal.adapter;
+package com.xscm.modulemain.adapter;
 
 import android.view.LayoutInflater;
 import android.view.View;
@@ -8,7 +8,7 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.example.modulevocal.R;
+import com.xscm.modulemain.R;
 import com.xscm.moduleutil.bean.GiftBoxRecordBean;
 
 import java.util.List;
diff --git a/moduleroom/src/main/java/com/example/moduleroom/adapter/GiftUserAdapter.java b/modulemain/src/main/java/com/xscm/modulemain/adapter/GiftUserAdapter.java
similarity index 98%
rename from moduleroom/src/main/java/com/example/moduleroom/adapter/GiftUserAdapter.java
rename to modulemain/src/main/java/com/xscm/modulemain/adapter/GiftUserAdapter.java
index 0f5245de..79f522bb 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/adapter/GiftUserAdapter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/adapter/GiftUserAdapter.java
@@ -1,4 +1,4 @@
-package com.example.moduleroom.adapter;
+package com.xscm.modulemain.adapter;
 
 import android.graphics.Color;
 import android.text.TextUtils;
@@ -8,7 +8,7 @@ import android.widget.TextView;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.example.moduleroom.R;
+import com.xscm.modulemain.R;
 import com.xscm.moduleutil.bean.RewardUserBean;
 import com.xscm.moduleutil.utils.ImageUtils;
 import com.xscm.moduleutil.utils.SpUtil;
diff --git a/modulevoice/src/main/java/com/example/modulevoice/adapter/HotAdapter.java b/modulemain/src/main/java/com/xscm/modulemain/adapter/HotAdapter.java
similarity index 94%
rename from modulevoice/src/main/java/com/example/modulevoice/adapter/HotAdapter.java
rename to modulemain/src/main/java/com/xscm/modulemain/adapter/HotAdapter.java
index 76ebe496..52b244cc 100644
--- a/modulevoice/src/main/java/com/example/modulevoice/adapter/HotAdapter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/adapter/HotAdapter.java
@@ -1,4 +1,4 @@
-package com.example.modulevoice.adapter;
+package com.xscm.modulemain.adapter;
 
 import static android.view.View.GONE;
 
@@ -8,12 +8,10 @@ import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 
-import com.alibaba.android.arouter.launcher.ARouter;
 import com.chad.library.adapter.base.BaseMultiItemQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.example.modulevoice.R;
+import com.xscm.modulemain.R;
 import com.xscm.moduleutil.bean.TopRoom;
-import com.xscm.moduleutil.utils.ARouteConstants;
 import com.xscm.moduleutil.utils.ImageUtils;
 import com.xscm.moduleutil.utils.logger.Logger;
 
diff --git a/modulecircle/src/main/java/com/example/modulecircle/adapter/MultiSelectAdapter.java b/modulemain/src/main/java/com/xscm/modulemain/adapter/MultiSelectAdapter.java
similarity index 97%
rename from modulecircle/src/main/java/com/example/modulecircle/adapter/MultiSelectAdapter.java
rename to modulemain/src/main/java/com/xscm/modulemain/adapter/MultiSelectAdapter.java
index 24e3819a..39565559 100644
--- a/modulecircle/src/main/java/com/example/modulecircle/adapter/MultiSelectAdapter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/adapter/MultiSelectAdapter.java
@@ -1,4 +1,4 @@
-package com.example.modulecircle.adapter;
+package com.xscm.modulemain.adapter;
 
 import android.util.SparseBooleanArray;
 import android.view.LayoutInflater;
@@ -9,7 +9,7 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.example.modulecircle.R;
+import com.xscm.modulemain.R;
 import com.xscm.moduleutil.bean.HeatedBean;
 
 import java.util.ArrayList;
diff --git a/modulevocal/src/main/java/com/example/modulevocal/adapter/MyAlbumListAdapter.java b/modulemain/src/main/java/com/xscm/modulemain/adapter/MyAlbumListAdapter.java
similarity index 96%
rename from modulevocal/src/main/java/com/example/modulevocal/adapter/MyAlbumListAdapter.java
rename to modulemain/src/main/java/com/xscm/modulemain/adapter/MyAlbumListAdapter.java
index 4aa199c7..caea5cee 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/adapter/MyAlbumListAdapter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/adapter/MyAlbumListAdapter.java
@@ -1,8 +1,8 @@
-package com.example.modulevocal.adapter;
+package com.xscm.modulemain.adapter;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.example.modulevocal.R;
+import com.xscm.modulemain.R;
 import com.xscm.moduleutil.bean.AlbumBean;
 import com.xscm.moduleutil.utils.ImageUtils;
 
diff --git a/modulevocal/src/main/java/com/example/modulevocal/adapter/MyCreateAdapter.java b/modulemain/src/main/java/com/xscm/modulemain/adapter/MyCreateAdapter.java
similarity index 98%
rename from modulevocal/src/main/java/com/example/modulevocal/adapter/MyCreateAdapter.java
rename to modulemain/src/main/java/com/xscm/modulemain/adapter/MyCreateAdapter.java
index 16a64076..a1cf3ff1 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/adapter/MyCreateAdapter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/adapter/MyCreateAdapter.java
@@ -1,7 +1,4 @@
-package com.example.modulevocal.adapter;
-
-import static com.blankj.utilcode.util.ActivityUtils.getLauncherActivity;
-import static com.blankj.utilcode.util.ActivityUtils.startActivity;
+package com.xscm.modulemain.adapter;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -21,11 +18,10 @@ import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.alibaba.android.arouter.launcher.ARouter;
-import com.example.modulevocal.R;
-import com.example.modulevocal.activity.MyRoomActivity;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.activity.user.activity.MyRoomActivity;
 import com.makeramen.roundedimageview.RoundedImageView;
 import com.xscm.moduleutil.RoomAutionTimeBean;
-import com.xscm.moduleutil.base.CommonAppContext;
 import com.xscm.moduleutil.base.RoomManager;
 import com.xscm.moduleutil.bean.MyCpRoom;
 import com.xscm.moduleutil.bean.MyFootResp;
@@ -34,7 +30,6 @@ import com.xscm.moduleutil.bean.RoomData;
 import com.xscm.moduleutil.bean.RoomRelationBean;
 import com.xscm.moduleutil.bean.RoonGiftModel;
 import com.xscm.moduleutil.bean.ViewItem;
-import com.xscm.moduleutil.bean.room.PkRoomInfo;
 import com.xscm.moduleutil.color.ThemeableDrawableUtils;
 import com.xscm.moduleutil.dialog.ConfirmDialog;
 import com.xscm.moduleutil.utils.ARouteConstants;
diff --git a/moduleroom/src/main/java/com/example/moduleroom/adapter/PkTimeAdapter.java b/modulemain/src/main/java/com/xscm/modulemain/adapter/PkTimeAdapter.java
similarity index 96%
rename from moduleroom/src/main/java/com/example/moduleroom/adapter/PkTimeAdapter.java
rename to modulemain/src/main/java/com/xscm/modulemain/adapter/PkTimeAdapter.java
index 2fe75420..a2177427 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/adapter/PkTimeAdapter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/adapter/PkTimeAdapter.java
@@ -1,10 +1,10 @@
-package com.example.moduleroom.adapter;
+package com.xscm.modulemain.adapter;
 
 import android.widget.TextView;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.example.moduleroom.R;
+import com.xscm.modulemain.R;
 import com.xscm.moduleutil.RoomAutionTimeBean;
 
 import java.util.ArrayList;
diff --git a/modulevoice/src/main/java/com/example/modulevoice/activity/ui/main/PlaceholderFragment.java b/modulemain/src/main/java/com/xscm/modulemain/adapter/PlaceholderFragment.java
similarity index 98%
rename from modulevoice/src/main/java/com/example/modulevoice/activity/ui/main/PlaceholderFragment.java
rename to modulemain/src/main/java/com/xscm/modulemain/adapter/PlaceholderFragment.java
index b477bbe5..e81453f0 100644
--- a/modulevoice/src/main/java/com/example/modulevoice/activity/ui/main/PlaceholderFragment.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/adapter/PlaceholderFragment.java
@@ -1,10 +1,9 @@
-package com.example.modulevoice.activity.ui.main;
+package com.xscm.modulemain.adapter;
 
 import android.content.Context;
 import android.graphics.Color;
 import android.os.Bundle;
 import android.view.View;
-import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
@@ -18,19 +17,15 @@ import com.alibaba.android.arouter.launcher.ARouter;
 import com.blankj.utilcode.util.SpanUtils;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.example.modulevoice.R;
-import com.example.modulevoice.contacts.PlaceholderContacts;
-import com.example.modulevoice.databinding.FragmentRankingListBinding;
-import com.example.modulevoice.presenter.PlaceholderPresenter;
-import com.lihang.ShadowLayout;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.activity.room.contacts.PlaceholderContacts;
+import com.xscm.modulemain.activity.room.presenter.PlaceholderPresenter;
+import com.xscm.modulemain.databinding.FragmentRankingListBinding;
 import com.xscm.moduleutil.base.BaseMvpFragment;
 import com.xscm.moduleutil.bean.PlaceholderBean;
-import com.xscm.moduleutil.color.ThemeableDrawableUtils;
 import com.xscm.moduleutil.utils.ARouteConstants;
-import com.xscm.moduleutil.utils.ColorManager;
 import com.xscm.moduleutil.utils.ImageUtils;
 import com.xscm.moduleutil.utils.StringUtil;
-import com.xscm.moduleutil.widget.BeautifulNameView;
 import com.xscm.moduleutil.widget.CommonEmptyView;
 import com.xscm.moduleutil.widget.GifAvatarOvalView;
 
@@ -41,7 +36,8 @@ import java.util.List;
  * @data 2025/7/11
  * @description: 榜单
  */
-public class PlaceholderFragment extends BaseMvpFragment<PlaceholderPresenter, FragmentRankingListBinding> implements PlaceholderContacts.View {
+public class PlaceholderFragment extends BaseMvpFragment<PlaceholderPresenter,
+        FragmentRankingListBinding> implements PlaceholderContacts.View {
     private int index;
     private static final String ARG_SECTION_NUMBER = "section_number";
     private TextView tvDay, tvWeek, tvMonth;
diff --git a/modulevoice/src/main/java/com/example/modulevoice/adapter/PopularRoomAdapter.java b/modulemain/src/main/java/com/xscm/modulemain/adapter/PopularRoomAdapter.java
similarity index 84%
rename from modulevoice/src/main/java/com/example/modulevoice/adapter/PopularRoomAdapter.java
rename to modulemain/src/main/java/com/xscm/modulemain/adapter/PopularRoomAdapter.java
index e2b3a496..9766fa93 100644
--- a/modulevoice/src/main/java/com/example/modulevoice/adapter/PopularRoomAdapter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/adapter/PopularRoomAdapter.java
@@ -1,18 +1,20 @@
-package com.example.modulevoice.adapter;
+package com.xscm.modulemain.adapter;
+
+import static android.view.View.GONE;
 
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
+
 import androidx.annotation.NonNull;
+
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.example.modulevoice.R;
+import com.xscm.modulemain.R;
 import com.xscm.moduleutil.bean.TopRoom;
 import com.xscm.moduleutil.utils.ImageUtils;
 import com.xscm.moduleutil.utils.logger.Logger;
 
-import static android.view.View.GONE;
-
 /**
  * com.xscm.modulemain.activity
  * qx
@@ -33,20 +35,20 @@ public class PopularRoomAdapter extends BaseQuickAdapter<TopRoom, BaseViewHolder
 
     @Override
     protected void convert(BaseViewHolder helper, TopRoom item) {
-        ImageUtils.loadHeadCC(item.getRoom_cover(), helper.getView(com.example.modulevoice.R.id.iv_follow_bg));
+        ImageUtils.loadHeadCC(item.getRoom_cover(), helper.getView(R.id.iv_follow_bg));
 
-        TextView tv_name = helper.getView(com.example.modulevoice.R.id.tv_name);
+        TextView tv_name = helper.getView(R.id.tv_name);
         tv_name.setText(item.getRoom_name());
         tv_name.setSelected(true);
 
-        ImageView iv = helper.getView(com.example.modulevoice.R.id.iv_play);
+        ImageView iv = helper.getView(R.id.iv_play);
         if (item.getUser_list()!=null && item.getUser_list().size() > 0) {
             iv.setVisibility(View.VISIBLE);
         }else {
             iv.setVisibility(GONE);
         }
-        helper.setText(com.example.modulevoice.R.id.tv_num, formatHotValue(Integer.parseInt(item.getHot_value())));
-        ImageUtils.loadHeadCC(item.getLabel_icon(), helper.getView(com.example.modulevoice.R.id.iv_type));
+        helper.setText(R.id.tv_num, formatHotValue(Integer.parseInt(item.getHot_value())));
+        ImageUtils.loadHeadCC(item.getLabel_icon(), helper.getView(R.id.iv_type));
 
         helper.itemView.setOnClickListener(new View.OnClickListener() {
             @Override
diff --git a/moduleroom/src/main/java/com/example/moduleroom/adapter/RankingAutcionAdapter.java b/modulemain/src/main/java/com/xscm/modulemain/adapter/RankingAutcionAdapter.java
similarity index 97%
rename from moduleroom/src/main/java/com/example/moduleroom/adapter/RankingAutcionAdapter.java
rename to modulemain/src/main/java/com/xscm/modulemain/adapter/RankingAutcionAdapter.java
index d146152c..d9acac1d 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/adapter/RankingAutcionAdapter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/adapter/RankingAutcionAdapter.java
@@ -1,4 +1,4 @@
-package com.example.moduleroom.adapter;
+package com.xscm.modulemain.adapter;
 
 import static com.xscm.moduleutil.utils.UtilConfig.getContext;
 
@@ -10,7 +10,7 @@ import androidx.annotation.NonNull;
 import com.bumptech.glide.Glide;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.example.moduleroom.R;
+import com.xscm.modulemain.R;
 import com.xscm.moduleutil.bean.room.RoomAuction;
 import com.xscm.moduleutil.utils.ImageUtils;
 import com.xscm.moduleutil.utils.logger.Logger;
diff --git a/moduleroom/src/main/java/com/example/moduleroom/adapter/RankingCharmListAdapter.java b/modulemain/src/main/java/com/xscm/modulemain/adapter/RankingCharmListAdapter.java
similarity index 98%
rename from moduleroom/src/main/java/com/example/moduleroom/adapter/RankingCharmListAdapter.java
rename to modulemain/src/main/java/com/xscm/modulemain/adapter/RankingCharmListAdapter.java
index d5a400a8..c1fb9a97 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/adapter/RankingCharmListAdapter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/adapter/RankingCharmListAdapter.java
@@ -1,4 +1,4 @@
-package com.example.moduleroom.adapter;
+package com.xscm.modulemain.adapter;
 
 import static com.xscm.moduleutil.utils.UtilConfig.getContext;
 
@@ -10,7 +10,7 @@ import androidx.annotation.NonNull;
 import com.bumptech.glide.Glide;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.example.moduleroom.R;
+import com.xscm.modulemain.R;
 import com.xscm.moduleutil.bean.CharmRankingResp;
 import com.xscm.moduleutil.utils.ImageUtils;
 import com.xscm.moduleutil.utils.StringUtil;
diff --git a/moduleroom/src/main/java/com/example/moduleroom/adapter/RankingWealthListAdapter.java b/modulemain/src/main/java/com/xscm/modulemain/adapter/RankingWealthListAdapter.java
similarity index 98%
rename from moduleroom/src/main/java/com/example/moduleroom/adapter/RankingWealthListAdapter.java
rename to modulemain/src/main/java/com/xscm/modulemain/adapter/RankingWealthListAdapter.java
index 19cff208..f560ab54 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/adapter/RankingWealthListAdapter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/adapter/RankingWealthListAdapter.java
@@ -1,4 +1,4 @@
-package com.example.moduleroom.adapter;
+package com.xscm.modulemain.adapter;
 
 import android.text.TextUtils;
 import android.view.View;
@@ -9,7 +9,7 @@ import androidx.annotation.NonNull;
 import com.bumptech.glide.Glide;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.example.moduleroom.R;
+import com.xscm.modulemain.R;
 import com.xscm.moduleutil.bean.WealthRankingResp;
 import com.xscm.moduleutil.utils.ImageUtils;
 import com.xscm.moduleutil.utils.logger.Logger;
diff --git a/moduleroom/src/main/java/com/example/moduleroom/adapter/RedAdapter.java b/modulemain/src/main/java/com/xscm/modulemain/adapter/RedAdapter.java
similarity index 83%
rename from moduleroom/src/main/java/com/example/moduleroom/adapter/RedAdapter.java
rename to modulemain/src/main/java/com/xscm/modulemain/adapter/RedAdapter.java
index ae3776c2..8fc2babb 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/adapter/RedAdapter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/adapter/RedAdapter.java
@@ -1,12 +1,9 @@
-package com.example.moduleroom.adapter;
+package com.xscm.modulemain.adapter;
 
-import android.view.View;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.example.moduleroom.R;
+import com.xscm.modulemain.R;
 import com.xscm.moduleutil.bean.RedpacketDetail;
-import com.xscm.moduleutil.bean.room.RedResultBean;
-import com.xscm.moduleutil.bean.room.RoomHourBean;
 import com.xscm.moduleutil.utils.ImageUtils;
 
 import java.text.SimpleDateFormat;
diff --git a/moduleroom/src/main/java/com/example/moduleroom/adapter/RedBagAdapter.java b/modulemain/src/main/java/com/xscm/modulemain/adapter/RedBagAdapter.java
similarity index 98%
rename from moduleroom/src/main/java/com/example/moduleroom/adapter/RedBagAdapter.java
rename to modulemain/src/main/java/com/xscm/modulemain/adapter/RedBagAdapter.java
index 461e9647..bb7bfaa6 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/adapter/RedBagAdapter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/adapter/RedBagAdapter.java
@@ -1,13 +1,15 @@
-package com.example.moduleroom.adapter;
+package com.xscm.modulemain.adapter;
 
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
+
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
+
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.example.moduleroom.R;
+import com.xscm.modulemain.R;
 import com.xscm.moduleutil.bean.RedPacketInfo;
 
 import java.util.Map;
diff --git a/moduleroom/src/main/java/com/example/moduleroom/adapter/RelationshipAdapter.java b/modulemain/src/main/java/com/xscm/modulemain/adapter/RelationshipAdapter.java
similarity index 97%
rename from moduleroom/src/main/java/com/example/moduleroom/adapter/RelationshipAdapter.java
rename to modulemain/src/main/java/com/xscm/modulemain/adapter/RelationshipAdapter.java
index 37b06dd3..1c0c794c 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/adapter/RelationshipAdapter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/adapter/RelationshipAdapter.java
@@ -1,10 +1,10 @@
-package com.example.moduleroom.adapter;
+package com.xscm.modulemain.adapter;
 
 import android.view.View;
 
 import com.blankj.utilcode.util.LogUtils;
 import com.chad.library.adapter.base.BaseQuickAdapter;
-import com.example.moduleroom.R;
+import com.xscm.modulemain.R;
 import com.xscm.moduleutil.bean.RelationshipBean;
 import com.xscm.moduleutil.utils.ImageUtils;
 import com.xscm.moduleutil.utils.SpUtil;
diff --git a/modulevocal/src/main/java/com/example/modulevocal/adapter/RevenueAdapter.java b/modulemain/src/main/java/com/xscm/modulemain/adapter/RevenueAdapter.java
similarity index 94%
rename from modulevocal/src/main/java/com/example/modulevocal/adapter/RevenueAdapter.java
rename to modulemain/src/main/java/com/xscm/modulemain/adapter/RevenueAdapter.java
index d667e8f9..f1342944 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/adapter/RevenueAdapter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/adapter/RevenueAdapter.java
@@ -1,10 +1,10 @@
-package com.example.modulevocal.adapter;
+package com.xscm.modulemain.adapter;
 
 import android.widget.TextView;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.example.modulevocal.R;
+import com.xscm.modulemain.R;
 import com.xscm.moduleutil.bean.RevenueBean;
 import com.xscm.moduleutil.utils.TimeUtils;
 
diff --git a/modulevocal/src/main/java/com/example/modulevocal/adapter/RoomAllowanceDetailAdapter.java b/modulemain/src/main/java/com/xscm/modulemain/adapter/RoomAllowanceDetailAdapter.java
similarity index 94%
rename from modulevocal/src/main/java/com/example/modulevocal/adapter/RoomAllowanceDetailAdapter.java
rename to modulemain/src/main/java/com/xscm/modulemain/adapter/RoomAllowanceDetailAdapter.java
index 1f9893b5..fe11da61 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/adapter/RoomAllowanceDetailAdapter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/adapter/RoomAllowanceDetailAdapter.java
@@ -1,4 +1,4 @@
-package com.example.modulevocal.adapter;
+package com.xscm.modulemain.adapter;
 
 
 import static com.xscm.moduleutil.utils.UtilConfig.getContext;
@@ -9,7 +9,7 @@ import androidx.annotation.Nullable;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.example.modulevocal.R;
+import com.xscm.modulemain.R;
 import com.xscm.moduleutil.bean.RoomSubsidyDetails;
 
 import java.util.List;
diff --git a/moduleroom/src/main/java/com/example/moduleroom/adapter/RoomCharmAdapter.java b/modulemain/src/main/java/com/xscm/modulemain/adapter/RoomCharmAdapter.java
similarity index 96%
rename from moduleroom/src/main/java/com/example/moduleroom/adapter/RoomCharmAdapter.java
rename to modulemain/src/main/java/com/xscm/modulemain/adapter/RoomCharmAdapter.java
index 7c9d2b85..bacaf628 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/adapter/RoomCharmAdapter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/adapter/RoomCharmAdapter.java
@@ -1,4 +1,4 @@
-package com.example.moduleroom.adapter;
+package com.xscm.modulemain.adapter;
 
 import static com.xscm.moduleutil.utils.UtilConfig.getContext;
 
@@ -7,7 +7,7 @@ import android.widget.LinearLayout;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.example.moduleroom.R;
+import com.xscm.modulemain.R;
 import com.xscm.moduleutil.bean.RoomUserCharmListBean;
 import com.xscm.moduleutil.utils.ImageUtils;
 import com.xscm.moduleutil.utils.MeHeadView;
diff --git a/modulevocal/src/main/java/com/example/modulevocal/adapter/RoomDetailsAdapter.java b/modulemain/src/main/java/com/xscm/modulemain/adapter/RoomDetailsAdapter.java
similarity index 97%
rename from modulevocal/src/main/java/com/example/modulevocal/adapter/RoomDetailsAdapter.java
rename to modulemain/src/main/java/com/xscm/modulemain/adapter/RoomDetailsAdapter.java
index 8170b9f8..b80ca490 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/adapter/RoomDetailsAdapter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/adapter/RoomDetailsAdapter.java
@@ -1,10 +1,10 @@
-package com.example.modulevocal.adapter;
+package com.xscm.modulemain.adapter;
 
 import android.widget.TextView;
 
 import com.chad.library.adapter.base.BaseMultiItemQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.example.modulevocal.R;
+import com.xscm.modulemain.R;
 import com.xscm.moduleutil.bean.details.BaseMultiItemEntity;
 import com.xscm.moduleutil.bean.details.RoomDeatailList;
 import com.xscm.moduleutil.bean.details.RoomDeatil;
diff --git a/moduleroom/src/main/java/com/example/moduleroom/adapter/RoomHourlyAdapter.java b/modulemain/src/main/java/com/xscm/modulemain/adapter/RoomHourlyAdapter.java
similarity index 97%
rename from moduleroom/src/main/java/com/example/moduleroom/adapter/RoomHourlyAdapter.java
rename to modulemain/src/main/java/com/xscm/modulemain/adapter/RoomHourlyAdapter.java
index e715633f..ffbc1a3b 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/adapter/RoomHourlyAdapter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/adapter/RoomHourlyAdapter.java
@@ -1,9 +1,10 @@
-package com.example.moduleroom.adapter;
+package com.xscm.modulemain.adapter;
 
 import android.view.View;
+
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.example.moduleroom.R;
+import com.xscm.modulemain.R;
 import com.xscm.moduleutil.bean.room.RoomHourBean;
 import com.xscm.moduleutil.utils.ImageUtils;
 
diff --git a/moduleroom/src/main/java/com/example/moduleroom/adapter/RoomOnlineAdapter.java b/modulemain/src/main/java/com/xscm/modulemain/adapter/RoomOnlineAdapter.java
similarity index 98%
rename from moduleroom/src/main/java/com/example/moduleroom/adapter/RoomOnlineAdapter.java
rename to modulemain/src/main/java/com/xscm/modulemain/adapter/RoomOnlineAdapter.java
index fe8b6db8..826ff3b8 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/adapter/RoomOnlineAdapter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/adapter/RoomOnlineAdapter.java
@@ -1,4 +1,4 @@
-package com.example.moduleroom.adapter;
+package com.xscm.modulemain.adapter;
 
 import static android.view.View.GONE;
 import static android.view.View.VISIBLE;
@@ -9,7 +9,7 @@ import android.widget.TextView;
 
 import com.chad.library.adapter.base.BaseMultiItemQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.example.moduleroom.R;
+import com.xscm.modulemain.R;
 import com.xscm.moduleutil.bean.room.RoomOnlineBean;
 import com.xscm.moduleutil.utils.ColorManager;
 import com.xscm.moduleutil.utils.ImageUtils;
diff --git a/moduleroom/src/main/java/com/example/moduleroom/adapter/RoomSettingAdapter.java b/modulemain/src/main/java/com/xscm/modulemain/adapter/RoomSettingAdapter.java
similarity index 98%
rename from moduleroom/src/main/java/com/example/moduleroom/adapter/RoomSettingAdapter.java
rename to modulemain/src/main/java/com/xscm/modulemain/adapter/RoomSettingAdapter.java
index 16b476da..389ae9f0 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/adapter/RoomSettingAdapter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/adapter/RoomSettingAdapter.java
@@ -1,8 +1,8 @@
-package com.example.moduleroom.adapter;
+package com.xscm.modulemain.adapter;
 
 import com.chad.library.adapter.base.BaseMultiItemQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.example.moduleroom.R;
+import com.xscm.modulemain.R;
 import com.xscm.moduleutil.bean.room.RoomSettingBean;
 
 import java.util.List;
diff --git a/modulevoice/src/main/java/com/example/modulevoice/adapter/SearchHistoryAdapter.java b/modulemain/src/main/java/com/xscm/modulemain/adapter/SearchHistoryAdapter.java
similarity index 85%
rename from modulevoice/src/main/java/com/example/modulevoice/adapter/SearchHistoryAdapter.java
rename to modulemain/src/main/java/com/xscm/modulemain/adapter/SearchHistoryAdapter.java
index 4c4e417c..457bf872 100644
--- a/modulevoice/src/main/java/com/example/modulevoice/adapter/SearchHistoryAdapter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/adapter/SearchHistoryAdapter.java
@@ -1,8 +1,8 @@
-package com.example.modulevoice.adapter;
+package com.xscm.modulemain.adapter;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.example.modulevoice.R;
+import com.xscm.modulemain.R;
 
 /**
  * 历史记录
diff --git a/modulevoice/src/main/java/com/example/modulevoice/adapter/SearchRecordAdapter.java b/modulemain/src/main/java/com/xscm/modulemain/adapter/SearchRecordAdapter.java
similarity index 93%
rename from modulevoice/src/main/java/com/example/modulevoice/adapter/SearchRecordAdapter.java
rename to modulemain/src/main/java/com/xscm/modulemain/adapter/SearchRecordAdapter.java
index 29a3b583..b3ce2436 100644
--- a/modulevoice/src/main/java/com/example/modulevoice/adapter/SearchRecordAdapter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/adapter/SearchRecordAdapter.java
@@ -1,10 +1,10 @@
-package com.example.modulevoice.adapter;
+package com.xscm.modulemain.adapter;
 
 import android.graphics.Color;
 
 import com.chad.library.adapter.base.BaseSectionQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.example.modulevoice.R;
+import com.xscm.modulemain.R;
 import com.xscm.moduleutil.bean.RecordSection;
 import com.xscm.moduleutil.utils.KeyWordUtil;
 
diff --git a/modulevoice/src/main/java/com/example/modulevoice/adapter/SearchRoomResultAdapter.java b/modulemain/src/main/java/com/xscm/modulemain/adapter/SearchRoomResultAdapter.java
similarity index 87%
rename from modulevoice/src/main/java/com/example/modulevoice/adapter/SearchRoomResultAdapter.java
rename to modulemain/src/main/java/com/xscm/modulemain/adapter/SearchRoomResultAdapter.java
index 3abcaf25..4febf2d8 100644
--- a/modulevoice/src/main/java/com/example/modulevoice/adapter/SearchRoomResultAdapter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/adapter/SearchRoomResultAdapter.java
@@ -1,18 +1,13 @@
-package com.example.modulevoice.adapter;
+package com.xscm.modulemain.adapter;
 
-import static android.app.PendingIntent.getActivity;
 import static android.view.View.GONE;
 
-import android.view.View;
 import android.widget.ImageView;
 
-import com.alibaba.android.arouter.launcher.ARouter;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.example.modulevoice.R;
-import com.xscm.moduleutil.base.RoomManager;
+import com.xscm.modulemain.R;
 import com.xscm.moduleutil.bean.RoomSearchResp;
-import com.xscm.moduleutil.utils.ARouteConstants;
 import com.xscm.moduleutil.utils.ImageUtils;
 
 /**
diff --git a/modulevoice/src/main/java/com/example/modulevoice/adapter/SearchUserResultAdapter.java b/modulemain/src/main/java/com/xscm/modulemain/adapter/SearchUserResultAdapter.java
similarity index 85%
rename from modulevoice/src/main/java/com/example/modulevoice/adapter/SearchUserResultAdapter.java
rename to modulemain/src/main/java/com/xscm/modulemain/adapter/SearchUserResultAdapter.java
index 38ce7892..e7b0294b 100644
--- a/modulevoice/src/main/java/com/example/modulevoice/adapter/SearchUserResultAdapter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/adapter/SearchUserResultAdapter.java
@@ -1,22 +1,14 @@
-package com.example.modulevoice.adapter;
+package com.xscm.modulemain.adapter;
 
 import android.graphics.Color;
-import android.graphics.drawable.Drawable;
-import android.text.TextUtils;
 import android.view.View;
-import android.widget.TextView;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.example.modulevoice.R;
-import com.xscm.moduleutil.bean.CircleListBean;
-import com.xscm.moduleutil.bean.ExpandColumnBean;
+import com.xscm.modulemain.R;
 import com.xscm.moduleutil.bean.UserResultResp;
-import com.xscm.moduleutil.utils.ImageUtils;
 import com.xscm.moduleutil.utils.KeyWordUtil;
 import com.xscm.moduleutil.utils.MeHeadView;
-import com.xscm.moduleutil.utils.SpUtil;
-import com.xscm.moduleutil.widget.BeautifulNameView;
 
 /**
  * 搜索用户的结果
diff --git a/modulevoice/src/main/java/com/example/modulevoice/activity/ui/main/SectionsPagerAdapter.java b/modulemain/src/main/java/com/xscm/modulemain/adapter/SectionsPagerAdapter.java
similarity index 96%
rename from modulevoice/src/main/java/com/example/modulevoice/activity/ui/main/SectionsPagerAdapter.java
rename to modulemain/src/main/java/com/xscm/modulemain/adapter/SectionsPagerAdapter.java
index ef548551..d0f3feee 100644
--- a/modulevoice/src/main/java/com/example/modulevoice/activity/ui/main/SectionsPagerAdapter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/adapter/SectionsPagerAdapter.java
@@ -1,4 +1,4 @@
-package com.example.modulevoice.activity.ui.main;
+package com.xscm.modulemain.adapter;
 
 import android.content.Context;
 
diff --git a/modulevocal/src/main/java/com/example/modulevocal/adapter/SingleChoiceAdapter.java b/modulemain/src/main/java/com/xscm/modulemain/adapter/SingleChoiceAdapter.java
similarity index 96%
rename from modulevocal/src/main/java/com/example/modulevocal/adapter/SingleChoiceAdapter.java
rename to modulemain/src/main/java/com/xscm/modulemain/adapter/SingleChoiceAdapter.java
index 7c143010..e7412b36 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/adapter/SingleChoiceAdapter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/adapter/SingleChoiceAdapter.java
@@ -1,4 +1,4 @@
-package com.example.modulevocal.adapter;
+package com.xscm.modulemain.adapter;
 
 import android.widget.TextView;
 
@@ -6,7 +6,7 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.example.modulevocal.R;
+import com.xscm.modulemain.R;
 import com.xscm.moduleutil.bean.AlbumBean;
 import com.xscm.moduleutil.utils.ImageUtils;
 
diff --git a/moduleLogin/src/main/java/com/xscm/modulelogin/adapter/SwitchAccountsAdapter.java b/modulemain/src/main/java/com/xscm/modulemain/adapter/SwitchAccountsAdapter.java
similarity index 93%
rename from moduleLogin/src/main/java/com/xscm/modulelogin/adapter/SwitchAccountsAdapter.java
rename to modulemain/src/main/java/com/xscm/modulemain/adapter/SwitchAccountsAdapter.java
index 7a608692..570e2bed 100644
--- a/moduleLogin/src/main/java/com/xscm/modulelogin/adapter/SwitchAccountsAdapter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/adapter/SwitchAccountsAdapter.java
@@ -1,11 +1,10 @@
-package com.xscm.modulelogin.adapter;
+package com.xscm.modulemain.adapter;
 
-import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.xscm.modulelogin.R;
+import com.xscm.modulemain.R;
 import com.xscm.moduleutil.bean.UserBean;
 import com.xscm.moduleutil.utils.ImageUtils;
 
@@ -44,7 +43,5 @@ public class SwitchAccountsAdapter extends BaseQuickAdapter<UserBean, BaseViewHo
                 onItemClickListener.onItemClick(item);
             }
         });
-
-
     }
 }
diff --git a/modulevocal/src/main/java/com/example/modulevocal/adapter/TaskBoxAdapter.java b/modulemain/src/main/java/com/xscm/modulemain/adapter/TaskBoxAdapter.java
similarity index 98%
rename from modulevocal/src/main/java/com/example/modulevocal/adapter/TaskBoxAdapter.java
rename to modulemain/src/main/java/com/xscm/modulemain/adapter/TaskBoxAdapter.java
index 059d5944..72b3f550 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/adapter/TaskBoxAdapter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/adapter/TaskBoxAdapter.java
@@ -1,4 +1,4 @@
-package com.example.modulevocal.adapter;
+package com.xscm.modulemain.adapter;
 
 import android.annotation.SuppressLint;
 import android.text.Spannable;
@@ -11,7 +11,7 @@ import androidx.core.content.ContextCompat;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.example.modulevocal.R;
+import com.xscm.modulemain.R;
 import com.google.android.material.progressindicator.LinearProgressIndicator;
 import com.xscm.moduleutil.bean.GiftBoxBean;
 import com.xscm.moduleutil.utils.ImageUtils;
diff --git a/modulevocal/src/main/java/com/example/modulevocal/adapter/TaskDataAdapter.java b/modulemain/src/main/java/com/xscm/modulemain/adapter/TaskDataAdapter.java
similarity index 97%
rename from modulevocal/src/main/java/com/example/modulevocal/adapter/TaskDataAdapter.java
rename to modulemain/src/main/java/com/xscm/modulemain/adapter/TaskDataAdapter.java
index 048a7280..d8e7ef37 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/adapter/TaskDataAdapter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/adapter/TaskDataAdapter.java
@@ -1,11 +1,11 @@
-package com.example.modulevocal.adapter;
+package com.xscm.modulemain.adapter;
 
 import android.view.View;
 import android.widget.TextView;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.example.modulevocal.R;
+import com.xscm.modulemain.R;
 import com.xscm.moduleutil.bean.GiftBoxBean;
 import com.xscm.moduleutil.utils.ImageUtils;
 
diff --git a/modulevocal/src/main/java/com/example/modulevocal/adapter/TaskSectionAdapter.java b/modulemain/src/main/java/com/xscm/modulemain/adapter/TaskSectionAdapter.java
similarity index 97%
rename from modulevocal/src/main/java/com/example/modulevocal/adapter/TaskSectionAdapter.java
rename to modulemain/src/main/java/com/xscm/modulemain/adapter/TaskSectionAdapter.java
index 361bfd6a..3e9574b7 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/adapter/TaskSectionAdapter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/adapter/TaskSectionAdapter.java
@@ -1,4 +1,4 @@
-package com.example.modulevocal.adapter;
+package com.xscm.modulemain.adapter;
 
 import android.view.LayoutInflater;
 import android.view.View;
@@ -9,7 +9,7 @@ import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.example.modulevocal.R;
+import com.xscm.modulemain.R;
 import com.xscm.moduleutil.bean.GiftBoxBean;
 import com.xscm.moduleutil.bean.TaskItem;
 
diff --git a/modulevocal/src/main/java/com/example/modulevocal/adapter/TopUsersAdapter.java b/modulemain/src/main/java/com/xscm/modulemain/adapter/TopUsersAdapter.java
similarity index 91%
rename from modulevocal/src/main/java/com/example/modulevocal/adapter/TopUsersAdapter.java
rename to modulemain/src/main/java/com/xscm/modulemain/adapter/TopUsersAdapter.java
index b567c0de..11c5138b 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/adapter/TopUsersAdapter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/adapter/TopUsersAdapter.java
@@ -1,8 +1,8 @@
-package com.example.modulevocal.adapter;
+package com.xscm.modulemain.adapter;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.example.modulevocal.R;
+import com.xscm.modulemain.R;
 import com.xscm.moduleutil.bean.CombinedGiftBean;
 import com.xscm.moduleutil.utils.ImageLoader;
 
diff --git a/moduleroom/src/main/java/com/example/moduleroom/adapter/TunerListAdapter.java b/modulemain/src/main/java/com/xscm/modulemain/adapter/TunerListAdapter.java
similarity index 96%
rename from moduleroom/src/main/java/com/example/moduleroom/adapter/TunerListAdapter.java
rename to modulemain/src/main/java/com/xscm/modulemain/adapter/TunerListAdapter.java
index a1077c4e..b6e77334 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/adapter/TunerListAdapter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/adapter/TunerListAdapter.java
@@ -1,4 +1,4 @@
-package com.example.moduleroom.adapter;
+package com.xscm.modulemain.adapter;
 
 import android.util.SparseBooleanArray;
 import android.view.View;
@@ -6,7 +6,7 @@ import android.widget.TextView;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.example.moduleroom.R;
+import com.xscm.modulemain.R;
 import com.makeramen.roundedimageview.RoundedImageView;
 import com.xscm.moduleutil.bean.MixerResp;
 
diff --git a/modulevocal/src/main/java/com/example/modulevocal/adapter/UserGiftWallAdapter.java b/modulemain/src/main/java/com/xscm/modulemain/adapter/UserGiftWallAdapter.java
similarity index 95%
rename from modulevocal/src/main/java/com/example/modulevocal/adapter/UserGiftWallAdapter.java
rename to modulemain/src/main/java/com/xscm/modulemain/adapter/UserGiftWallAdapter.java
index a8333d2f..160c20fa 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/adapter/UserGiftWallAdapter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/adapter/UserGiftWallAdapter.java
@@ -1,15 +1,13 @@
-package com.example.modulevocal.adapter;
+package com.xscm.modulemain.adapter;
 
-import android.graphics.Color;
 import android.widget.TextView;
 
-import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.example.modulevocal.R;
+import com.xscm.modulemain.R;
 import com.xscm.moduleutil.bean.CombinedGiftBean;
 import com.xscm.moduleutil.color.ThemeableDrawableUtils;
 import com.xscm.moduleutil.utils.ColorManager;
diff --git a/modulevocal/src/main/java/com/example/modulevocal/adapter/UserPhotoWallAdapter.java b/modulemain/src/main/java/com/xscm/modulemain/adapter/UserPhotoWallAdapter.java
similarity index 96%
rename from modulevocal/src/main/java/com/example/modulevocal/adapter/UserPhotoWallAdapter.java
rename to modulemain/src/main/java/com/xscm/modulemain/adapter/UserPhotoWallAdapter.java
index 08ba91eb..1f97adc1 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/adapter/UserPhotoWallAdapter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/adapter/UserPhotoWallAdapter.java
@@ -1,8 +1,8 @@
-package com.example.modulevocal.adapter;
+package com.xscm.modulemain.adapter;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.example.modulevocal.R;
+import com.xscm.modulemain.R;
 import com.xscm.moduleutil.utils.ImageUtils;
 
 public class UserPhotoWallAdapter extends BaseQuickAdapter<String, BaseViewHolder> {
diff --git a/moduleroom/src/main/java/com/example/moduleroom/adapter/WheatFeedingSelectAdapter.java b/modulemain/src/main/java/com/xscm/modulemain/adapter/WheatFeedingSelectAdapter.java
similarity index 98%
rename from moduleroom/src/main/java/com/example/moduleroom/adapter/WheatFeedingSelectAdapter.java
rename to modulemain/src/main/java/com/xscm/modulemain/adapter/WheatFeedingSelectAdapter.java
index 269c0ec4..a4ec9e5b 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/adapter/WheatFeedingSelectAdapter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/adapter/WheatFeedingSelectAdapter.java
@@ -1,4 +1,4 @@
-package com.example.moduleroom.adapter;
+package com.xscm.modulemain.adapter;
 
 import android.util.SparseBooleanArray;
 import android.view.LayoutInflater;
@@ -9,7 +9,7 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.example.moduleroom.R;
+import com.xscm.modulemain.R;
 import com.makeramen.roundedimageview.RoundedImageView;
 import com.xscm.moduleutil.bean.room.RoomApplyListBean;
 import com.xscm.moduleutil.color.ThemeableDrawableUtils;
diff --git a/modulevocal/src/main/java/com/example/modulevocal/adapter/WithdrawalAdapter.java b/modulemain/src/main/java/com/xscm/modulemain/adapter/WithdrawalAdapter.java
similarity index 97%
rename from modulevocal/src/main/java/com/example/modulevocal/adapter/WithdrawalAdapter.java
rename to modulemain/src/main/java/com/xscm/modulemain/adapter/WithdrawalAdapter.java
index 4bf505cf..c74c87c7 100644
--- a/modulevocal/src/main/java/com/example/modulevocal/adapter/WithdrawalAdapter.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/adapter/WithdrawalAdapter.java
@@ -1,17 +1,14 @@
-package com.example.modulevocal.adapter;
-
-import static com.xscm.moduleutil.utils.UtilConfig.getContext;
+package com.xscm.modulemain.adapter;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
-import android.widget.ImageView;
 import android.widget.TextView;
 
 import androidx.core.content.ContextCompat;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.example.modulevocal.R;
+import com.xscm.modulemain.R;
 import com.xscm.moduleutil.bean.WithdrawalBean;
 
 public class WithdrawalAdapter extends BaseQuickAdapter<WithdrawalBean, BaseViewHolder> {
diff --git a/moduleLogin/src/main/java/com/xscm/modulelogin/bean/UserFillResp.java b/modulemain/src/main/java/com/xscm/modulemain/bean/UserFillResp.java
similarity index 94%
rename from moduleLogin/src/main/java/com/xscm/modulelogin/bean/UserFillResp.java
rename to modulemain/src/main/java/com/xscm/modulemain/bean/UserFillResp.java
index 66dd0db4..8f79f3f7 100644
--- a/moduleLogin/src/main/java/com/xscm/modulelogin/bean/UserFillResp.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/bean/UserFillResp.java
@@ -1,4 +1,4 @@
-package com.xscm.modulelogin.bean;
+package com.xscm.modulemain.bean;
 
 /**
  * 项目名称 qipao-android
diff --git a/moduleroom/src/main/java/com/example/moduleroom/dialog/BidListDialogFragment.java b/modulemain/src/main/java/com/xscm/modulemain/dialog/BidListDialogFragment.java
similarity index 95%
rename from moduleroom/src/main/java/com/example/moduleroom/dialog/BidListDialogFragment.java
rename to modulemain/src/main/java/com/xscm/modulemain/dialog/BidListDialogFragment.java
index a844711c..6346037a 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/dialog/BidListDialogFragment.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/dialog/BidListDialogFragment.java
@@ -1,4 +1,4 @@
-package com.example.moduleroom.dialog;
+package com.xscm.modulemain.dialog;
 
 import android.os.Bundle;
 import android.view.Gravity;
@@ -9,11 +9,11 @@ import android.widget.LinearLayout;
 
 import androidx.recyclerview.widget.LinearLayoutManager;
 
-import com.example.moduleroom.R;
-import com.example.moduleroom.adapter.RankingAutcionAdapter;
-import com.example.moduleroom.contacts.BidListContacts;
-import com.example.moduleroom.databinding.DialogRoomBidListBinding;
-import com.example.moduleroom.presenter.BidListPresenter;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.adapter.RankingAutcionAdapter;
+import com.xscm.modulemain.activity.room.contacts.BidListContacts;
+import com.xscm.modulemain.databinding.DialogRoomBidListBinding;
+import com.xscm.modulemain.activity.room.presenter.BidListPresenter;
 import com.xscm.moduleutil.base.BaseMvpDialogFragment;
 import com.xscm.moduleutil.bean.room.RoomAuction;
 import com.xscm.moduleutil.utils.ImageUtils;
diff --git a/moduleroom/src/main/java/com/example/moduleroom/dialog/CardRelationshipFragment.java b/modulemain/src/main/java/com/xscm/modulemain/dialog/CardRelationshipFragment.java
similarity index 96%
rename from moduleroom/src/main/java/com/example/moduleroom/dialog/CardRelationshipFragment.java
rename to modulemain/src/main/java/com/xscm/modulemain/dialog/CardRelationshipFragment.java
index 7b61db4e..389770c9 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/dialog/CardRelationshipFragment.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/dialog/CardRelationshipFragment.java
@@ -1,4 +1,4 @@
-package com.example.moduleroom.dialog;
+package com.xscm.modulemain.dialog;
 
 import android.content.Context;
 import android.os.Bundle;
@@ -13,11 +13,11 @@ import androidx.fragment.app.FragmentManager;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.example.moduleroom.R;
-import com.example.moduleroom.adapter.CardRelationAdapter;
-import com.example.moduleroom.contacts.CardRelationshipContacts;
-import com.example.moduleroom.databinding.DialogCardRelationBinding;
-import com.example.moduleroom.presenter.CardRelationshipPresenter;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.adapter.CardRelationAdapter;
+import com.xscm.modulemain.activity.room.contacts.CardRelationshipContacts;
+import com.xscm.modulemain.databinding.DialogCardRelationBinding;
+import com.xscm.modulemain.activity.room.presenter.CardRelationshipPresenter;
 import com.hjq.toast.ToastUtils;
 import com.xscm.moduleutil.RoomAutionTimeBean;
 import com.xscm.moduleutil.base.BaseMvpDialogFragment;
diff --git a/moduleroom/src/main/java/com/example/moduleroom/dialog/CustomCenterDialogFragment.java b/modulemain/src/main/java/com/xscm/modulemain/dialog/CustomCenterDialogFragment.java
similarity index 99%
rename from moduleroom/src/main/java/com/example/moduleroom/dialog/CustomCenterDialogFragment.java
rename to modulemain/src/main/java/com/xscm/modulemain/dialog/CustomCenterDialogFragment.java
index 47d5f5f3..616a1463 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/dialog/CustomCenterDialogFragment.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/dialog/CustomCenterDialogFragment.java
@@ -1,4 +1,4 @@
-package com.example.moduleroom.dialog;
+package com.xscm.modulemain.dialog;
 
 import android.app.Dialog;
 import android.content.Context;
@@ -24,7 +24,7 @@ import androidx.core.content.ContextCompat;
 import androidx.fragment.app.DialogFragment;
 import androidx.fragment.app.FragmentManager;
 
-import com.example.moduleroom.R;
+import com.xscm.modulemain.R;
 import com.xscm.moduleutil.bean.room.RoomAuction;
 import com.xscm.moduleutil.utils.ImageUtils;
 import com.xscm.moduleutil.widget.GifAvatarOvalView;
diff --git a/moduleroom/src/main/java/com/example/moduleroom/dialog/EmotionPickerDialog.kt b/modulemain/src/main/java/com/xscm/modulemain/dialog/EmotionPickerDialog.kt
similarity index 97%
rename from moduleroom/src/main/java/com/example/moduleroom/dialog/EmotionPickerDialog.kt
rename to modulemain/src/main/java/com/xscm/modulemain/dialog/EmotionPickerDialog.kt
index b5273c78..fdde6c6a 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/dialog/EmotionPickerDialog.kt
+++ b/modulemain/src/main/java/com/xscm/modulemain/dialog/EmotionPickerDialog.kt
@@ -1,4 +1,4 @@
-package com.example.moduleroom.dialog
+package com.xscm.modulemain.dialog
 
 import android.R
 import android.app.Dialog
@@ -11,8 +11,8 @@ import android.widget.TextView
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import com.example.moduleroom.adapter.EmotionAdapter
-import com.example.moduleroom.databinding.DialogEmotionPickerBinding
+import com.xscm.modulemain.adapter.EmotionAdapter
+import com.xscm.modulemain.databinding.DialogEmotionPickerBinding
 import com.google.android.material.tabs.TabLayout
 import com.tencent.qcloud.tuikit.timcommon.util.ThreadUtils
 import com.xscm.moduleutil.bean.room.Emotion
diff --git a/moduleroom/src/main/java/com/example/moduleroom/dialog/ExitRoomBottomSheet.java b/modulemain/src/main/java/com/xscm/modulemain/dialog/ExitRoomBottomSheet.java
similarity index 98%
rename from moduleroom/src/main/java/com/example/moduleroom/dialog/ExitRoomBottomSheet.java
rename to modulemain/src/main/java/com/xscm/modulemain/dialog/ExitRoomBottomSheet.java
index 1596aef7..2fb5e1c9 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/dialog/ExitRoomBottomSheet.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/dialog/ExitRoomBottomSheet.java
@@ -1,4 +1,4 @@
-package com.example.moduleroom.dialog;
+package com.xscm.modulemain.dialog;
 
 import android.annotation.SuppressLint;
 import android.os.Bundle;
@@ -10,8 +10,8 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import com.example.moduleroom.R;
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
+import com.xscm.modulemain.R;
 
 /**
  * @author qx
diff --git a/moduleroom/src/main/java/com/example/moduleroom/dialog/FriendsDialogFragment.java b/modulemain/src/main/java/com/xscm/modulemain/dialog/FriendsDialogFragment.java
similarity index 97%
rename from moduleroom/src/main/java/com/example/moduleroom/dialog/FriendsDialogFragment.java
rename to modulemain/src/main/java/com/xscm/modulemain/dialog/FriendsDialogFragment.java
index 37308c06..4d56a707 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/dialog/FriendsDialogFragment.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/dialog/FriendsDialogFragment.java
@@ -1,4 +1,4 @@
-package com.example.moduleroom.dialog;
+package com.xscm.modulemain.dialog;
 
 import android.app.Dialog;
 import android.content.Context;
@@ -24,9 +24,8 @@ import androidx.core.content.ContextCompat;
 import androidx.fragment.app.DialogFragment;
 import androidx.fragment.app.FragmentManager;
 
-import com.example.moduleroom.R;
+import com.xscm.modulemain.R;
 import com.xscm.moduleutil.bean.room.FriendUserBean;
-import com.xscm.moduleutil.bean.room.RoomAuction;
 import com.xscm.moduleutil.utils.ImageUtils;
 import com.xscm.moduleutil.widget.GifAvatarOvalView;
 /**
diff --git a/moduleroom/src/main/java/com/example/moduleroom/dialog/HourlyChartDialog.java b/modulemain/src/main/java/com/xscm/modulemain/dialog/HourlyChartDialog.java
similarity index 94%
rename from moduleroom/src/main/java/com/example/moduleroom/dialog/HourlyChartDialog.java
rename to modulemain/src/main/java/com/xscm/modulemain/dialog/HourlyChartDialog.java
index 29996445..b8d6de80 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/dialog/HourlyChartDialog.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/dialog/HourlyChartDialog.java
@@ -1,4 +1,4 @@
-package com.example.moduleroom.dialog;
+package com.xscm.modulemain.dialog;
 
 import android.app.Dialog;
 import android.graphics.Color;
@@ -8,15 +8,13 @@ import android.view.*;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.LinearLayoutManager;
-import com.example.moduleroom.R;
-import com.example.moduleroom.adapter.RoomHourlyAdapter;
-import com.example.moduleroom.contacts.HourlyChartContacts;
-import com.example.moduleroom.databinding.DialogHourlyChartFragmentBinding;
-import com.example.moduleroom.presenter.HourlyChartPresenter;
 import com.scwang.smartrefresh.layout.api.RefreshLayout;
 import com.scwang.smartrefresh.layout.listener.OnRefreshLoadMoreListener;
-import com.xscm.moduleutil.activity.IPresenter;
-import com.xscm.moduleutil.adapter.CirleListAdapter;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.activity.room.contacts.HourlyChartContacts;
+import com.xscm.modulemain.activity.room.presenter.HourlyChartPresenter;
+import com.xscm.modulemain.adapter.RoomHourlyAdapter;
+import com.xscm.modulemain.databinding.DialogHourlyChartFragmentBinding;
 import com.xscm.moduleutil.base.BaseMvpDialogFragment;
 import com.xscm.moduleutil.base.CommonAppContext;
 import com.xscm.moduleutil.base.RoomManager;
diff --git a/moduleroom/src/main/java/com/example/moduleroom/dialog/LiveBattleSettingsDialog.java b/modulemain/src/main/java/com/xscm/modulemain/dialog/LiveBattleSettingsDialog.java
similarity index 97%
rename from moduleroom/src/main/java/com/example/moduleroom/dialog/LiveBattleSettingsDialog.java
rename to modulemain/src/main/java/com/xscm/modulemain/dialog/LiveBattleSettingsDialog.java
index 8e31a9cf..25c82a6d 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/dialog/LiveBattleSettingsDialog.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/dialog/LiveBattleSettingsDialog.java
@@ -1,4 +1,4 @@
-package com.example.moduleroom.dialog;
+package com.xscm.modulemain.dialog;
 
 import android.app.Dialog;
 import android.content.Context;
@@ -10,7 +10,7 @@ import android.widget.Switch;
 
 import androidx.annotation.NonNull;
 
-import com.example.moduleroom.R;
+import com.xscm.modulemain.R;
 
 /**
  *@author qx
diff --git a/moduleroom/src/main/java/com/example/moduleroom/dialog/PkResultDialogFragment.java b/modulemain/src/main/java/com/xscm/modulemain/dialog/PkResultDialogFragment.java
similarity index 95%
rename from moduleroom/src/main/java/com/example/moduleroom/dialog/PkResultDialogFragment.java
rename to modulemain/src/main/java/com/xscm/modulemain/dialog/PkResultDialogFragment.java
index ae2bb9ab..1e2186ec 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/dialog/PkResultDialogFragment.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/dialog/PkResultDialogFragment.java
@@ -1,12 +1,12 @@
-package com.example.moduleroom.dialog;
+package com.xscm.modulemain.dialog;
 
 import android.content.Context;
 import android.view.View;
 
 import androidx.annotation.NonNull;
 
-import com.example.moduleroom.R;
-import com.example.moduleroom.databinding.FragmentPkResultDialogBinding;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.databinding.FragmentPkResultDialogBinding;
 import com.xscm.moduleutil.bean.RoomMessageEvent;
 import com.xscm.moduleutil.utils.ImageUtils;
 import com.xscm.moduleutil.widget.dialog.BaseDialog;
diff --git a/moduleroom/src/main/java/com/example/moduleroom/dialog/PkTimeDialogFragment.java b/modulemain/src/main/java/com/xscm/modulemain/dialog/PkTimeDialogFragment.java
similarity index 93%
rename from moduleroom/src/main/java/com/example/moduleroom/dialog/PkTimeDialogFragment.java
rename to modulemain/src/main/java/com/xscm/modulemain/dialog/PkTimeDialogFragment.java
index 068cb6db..ee6b52b2 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/dialog/PkTimeDialogFragment.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/dialog/PkTimeDialogFragment.java
@@ -1,4 +1,4 @@
-package com.example.moduleroom.dialog;
+package com.xscm.modulemain.dialog;
 
 import android.content.Context;
 import android.os.Bundle;
@@ -13,11 +13,11 @@ import androidx.fragment.app.FragmentManager;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.example.moduleroom.R;
-import com.example.moduleroom.adapter.PkTimeAdapter;
-import com.example.moduleroom.contacts.PkTimeContract;
-import com.example.moduleroom.databinding.FragmentPkTimeFragmentBinding;
-import com.example.moduleroom.presenter.PkTimePresenter;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.adapter.PkTimeAdapter;
+import com.xscm.modulemain.activity.room.contacts.PkTimeContract;
+import com.xscm.modulemain.databinding.FragmentPkTimeFragmentBinding;
+import com.xscm.modulemain.activity.room.presenter.PkTimePresenter;
 import com.hjq.toast.ToastUtils;
 import com.xscm.moduleutil.RoomAutionTimeBean;
 import com.xscm.moduleutil.base.BaseMvpDialogFragment;
diff --git a/moduleroom/src/main/java/com/example/moduleroom/dialog/PublishCommentDialogFragment.java b/modulemain/src/main/java/com/xscm/modulemain/dialog/PublishCommentDialogFragment.java
similarity index 93%
rename from moduleroom/src/main/java/com/example/moduleroom/dialog/PublishCommentDialogFragment.java
rename to modulemain/src/main/java/com/xscm/modulemain/dialog/PublishCommentDialogFragment.java
index d70f3f5a..cdf4cc5c 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/dialog/PublishCommentDialogFragment.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/dialog/PublishCommentDialogFragment.java
@@ -1,4 +1,4 @@
-package com.example.moduleroom.dialog;
+package com.xscm.modulemain.dialog;
 
 import static android.view.View.GONE;
 import static android.view.View.VISIBLE;
@@ -13,10 +13,10 @@ import android.view.WindowManager;
 import androidx.fragment.app.FragmentManager;
 
 import com.blankj.utilcode.util.ToastUtils;
-import com.example.moduleroom.R;
-import com.example.moduleroom.contacts.PublishCommentContacts;
-import com.example.moduleroom.databinding.DialogPublishCommentBinding;
-import com.example.moduleroom.presenter.PublishCommentPresenter;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.activity.room.contacts.PublishCommentContacts;
+import com.xscm.modulemain.activity.room.presenter.PublishCommentPresenter;
+import com.xscm.modulemain.databinding.DialogPublishCommentBinding;
 import com.xscm.moduleutil.base.BaseMvpDialogFragment;
 import com.xscm.moduleutil.bean.HeadlineBean;
 import com.xscm.moduleutil.color.ThemeableDrawableUtils;
diff --git a/moduleroom/src/main/java/com/example/moduleroom/dialog/RedBagSendDialog.java b/modulemain/src/main/java/com/xscm/modulemain/dialog/RedBagSendDialog.java
similarity index 98%
rename from moduleroom/src/main/java/com/example/moduleroom/dialog/RedBagSendDialog.java
rename to modulemain/src/main/java/com/xscm/modulemain/dialog/RedBagSendDialog.java
index 3277fa64..80e89ebd 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/dialog/RedBagSendDialog.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/dialog/RedBagSendDialog.java
@@ -1,4 +1,7 @@
-package com.example.moduleroom.dialog;
+package com.xscm.modulemain.dialog;
+
+import static android.view.View.GONE;
+import static android.view.View.VISIBLE;
 
 import android.content.Context;
 import android.graphics.Color;
@@ -9,25 +12,25 @@ import android.view.Window;
 import android.view.WindowManager;
 import android.widget.Button;
 import android.widget.RadioGroup;
+
 import androidx.annotation.NonNull;
+
 import com.blankj.utilcode.util.ScreenUtils;
-import com.example.moduleroom.R;
-import com.example.moduleroom.databinding.DialogRedBagSendBinding;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.databinding.DialogRedBagSendBinding;
 import com.hjq.toast.ToastUtils;
 import com.xscm.moduleutil.base.CommonAppContext;
 import com.xscm.moduleutil.bean.WalletBean;
 import com.xscm.moduleutil.http.BaseObserver;
 import com.xscm.moduleutil.http.RetrofitClient;
 import com.xscm.moduleutil.widget.dialog.BaseDialog;
-import io.reactivex.disposables.Disposable;
+
 import org.jetbrains.annotations.NotNull;
 
-import java.lang.ref.WeakReference;
 import java.util.ArrayList;
 import java.util.List;
 
-import static android.view.View.GONE;
-import static android.view.View.VISIBLE;
+import io.reactivex.disposables.Disposable;
 
 public class RedBagSendDialog extends BaseDialog<DialogRedBagSendBinding> {
     private static final String TAG = "RedBagSendDialog";
diff --git a/moduleroom/src/main/java/com/example/moduleroom/dialog/RedListDialog.java b/modulemain/src/main/java/com/xscm/modulemain/dialog/RedListDialog.java
similarity index 96%
rename from moduleroom/src/main/java/com/example/moduleroom/dialog/RedListDialog.java
rename to modulemain/src/main/java/com/xscm/modulemain/dialog/RedListDialog.java
index 4cec1dc6..351e5086 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/dialog/RedListDialog.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/dialog/RedListDialog.java
@@ -1,4 +1,4 @@
-package com.example.moduleroom.dialog;
+package com.xscm.modulemain.dialog;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -11,9 +11,9 @@ import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import com.blankj.utilcode.util.ScreenUtils;
-import com.example.moduleroom.R;
-import com.example.moduleroom.adapter.RedBagAdapter;
-import com.example.moduleroom.databinding.DialogRedListBinding;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.adapter.RedBagAdapter;
+import com.xscm.modulemain.databinding.DialogRedListBinding;
 import com.xscm.moduleutil.bean.RedPacketInfo;
 import com.xscm.moduleutil.utils.QXRedPacketManager;
 import com.xscm.moduleutil.widget.dialog.BaseDialog;
diff --git a/moduleroom/src/main/java/com/example/moduleroom/dialog/RequestDialogFragment.java b/modulemain/src/main/java/com/xscm/modulemain/dialog/RequestDialogFragment.java
similarity index 93%
rename from moduleroom/src/main/java/com/example/moduleroom/dialog/RequestDialogFragment.java
rename to modulemain/src/main/java/com/xscm/modulemain/dialog/RequestDialogFragment.java
index f9a325aa..cc6ed20c 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/dialog/RequestDialogFragment.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/dialog/RequestDialogFragment.java
@@ -1,4 +1,4 @@
-package com.example.moduleroom.dialog;
+package com.xscm.modulemain.dialog;
 
 import android.content.Context;
 import android.os.Bundle;
@@ -14,13 +14,13 @@ import android.view.Gravity;
 import android.view.Window;
 import android.view.WindowManager;
 
-import com.example.moduleroom.R;
-import com.example.moduleroom.contacts.RequestContacts;
-import com.example.moduleroom.databinding.FragmentRequestDialogBinding;
-import com.example.moduleroom.fragment.MusicSongListFragment;
-import com.example.moduleroom.fragment.RequestFragment;
-import com.example.moduleroom.presenter.RequestPresenter;
 import com.google.android.material.tabs.TabLayoutMediator;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.activity.room.contacts.RequestContacts;
+import com.xscm.modulemain.activity.room.fragment.MusicSongListFragment;
+import com.xscm.modulemain.activity.room.fragment.RequestFragment;
+import com.xscm.modulemain.activity.room.presenter.RequestPresenter;
+import com.xscm.modulemain.databinding.FragmentRequestDialogBinding;
 import com.xscm.moduleutil.base.BaseMvpDialogFragment;
 import com.xscm.moduleutil.bean.MusicSongBean;
 import com.xscm.moduleutil.bean.SongMusicBean;
diff --git a/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomCharmDialog.java b/modulemain/src/main/java/com/xscm/modulemain/dialog/RoomCharmDialog.java
similarity index 88%
rename from moduleroom/src/main/java/com/example/moduleroom/dialog/RoomCharmDialog.java
rename to modulemain/src/main/java/com/xscm/modulemain/dialog/RoomCharmDialog.java
index 628580c0..45cc1372 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomCharmDialog.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/dialog/RoomCharmDialog.java
@@ -1,4 +1,4 @@
-package com.example.moduleroom.dialog;
+package com.xscm.modulemain.dialog;
 
 import android.os.Bundle;
 import android.view.Gravity;
@@ -7,11 +7,11 @@ import android.view.WindowManager;
 
 import androidx.recyclerview.widget.LinearLayoutManager;
 
-import com.example.moduleroom.R;
-import com.example.moduleroom.adapter.RoomCharmAdapter;
-import com.example.moduleroom.contacts.RoomCharmDialogContacts;
-import com.example.moduleroom.databinding.DialogCharmFragmentBinding;
-import com.example.moduleroom.presenter.RoomCharmDialogPresenter;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.adapter.RoomCharmAdapter;
+import com.xscm.modulemain.activity.room.contacts.RoomCharmDialogContacts;
+import com.xscm.modulemain.databinding.DialogCharmFragmentBinding;
+import com.xscm.modulemain.activity.room.presenter.RoomCharmDialogPresenter;
 import com.hjq.toast.ToastUtils;
 import com.xscm.moduleutil.base.BaseMvpDialogFragment;
 import com.xscm.moduleutil.bean.RoomUserCharmListBean;
diff --git a/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomConcernDialogFragment.java b/modulemain/src/main/java/com/xscm/modulemain/dialog/RoomConcernDialogFragment.java
similarity index 94%
rename from moduleroom/src/main/java/com/example/moduleroom/dialog/RoomConcernDialogFragment.java
rename to modulemain/src/main/java/com/xscm/modulemain/dialog/RoomConcernDialogFragment.java
index cf7d779c..efdf3d14 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomConcernDialogFragment.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/dialog/RoomConcernDialogFragment.java
@@ -1,4 +1,4 @@
-package com.example.moduleroom.dialog;
+package com.xscm.modulemain.dialog;
 
 import android.app.Dialog;
 import android.os.Bundle;
@@ -6,28 +6,24 @@ import android.view.Gravity;
 import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
-import android.widget.RadioGroup;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.GridLayoutManager;
 
-import com.blankj.utilcode.util.ScreenUtils;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.example.moduleroom.R;
-import com.example.moduleroom.contacts.RoomCloseContacts;
-import com.example.moduleroom.databinding.RoomConcernDialogBinding;
-import com.example.moduleroom.presenter.RoomClosePresenter;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.activity.room.contacts.RoomCloseContacts;
+import com.xscm.modulemain.databinding.RoomConcernDialogBinding;
+import com.xscm.modulemain.activity.room.presenter.RoomClosePresenter;
 import com.hjq.toast.ToastUtils;
 import com.xscm.moduleutil.base.BaseMvpDialogFragment;
 import com.xscm.moduleutil.bean.RoomRelationBean;
 import com.xscm.moduleutil.bean.room.FriendUserBean;
-import com.xscm.moduleutil.bean.room.RoomConcernDean;
 import com.xscm.moduleutil.utils.ImageUtils;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import lombok.Setter;
diff --git a/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomGiftDialogFragment.java b/modulemain/src/main/java/com/xscm/modulemain/dialog/RoomGiftDialogFragment.java
similarity index 97%
rename from moduleroom/src/main/java/com/example/moduleroom/dialog/RoomGiftDialogFragment.java
rename to modulemain/src/main/java/com/xscm/modulemain/dialog/RoomGiftDialogFragment.java
index 3b7a85e6..708a4708 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomGiftDialogFragment.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/dialog/RoomGiftDialogFragment.java
@@ -1,44 +1,32 @@
-package com.example.moduleroom.dialog;
+package com.xscm.modulemain.dialog;
 
 import android.app.Dialog;
 import android.content.Context;
 import android.content.Intent;
-import android.graphics.Color;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.DisplayMetrics;
 import android.util.Log;
-import android.util.TypedValue;
 import android.view.Gravity;
-import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.Window;
 import android.view.WindowManager;
-import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentActivity;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentStatePagerAdapter;
-import androidx.fragment.app.FragmentTransaction;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.viewpager.widget.ViewPager;
-import androidx.viewpager2.adapter.FragmentStateAdapter;
 
-import com.alibaba.android.arouter.launcher.ARouter;
-import com.example.moduleroom.R;
-import com.example.moduleroom.adapter.GiftUserAdapter;
-import com.example.moduleroom.databinding.RoomGiftDialogBinding;
-import com.example.moduletablayout.listener.OnTabSelectListener;
-import com.google.android.material.tabs.TabLayout;
-import com.google.android.material.tabs.TabLayoutMediator;
 import com.hjq.toast.ToastUtils;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.adapter.GiftUserAdapter;
+import com.xscm.modulemain.databinding.RoomGiftDialogBinding;
 import com.xscm.moduleutil.activity.WebViewActivity;
 import com.xscm.moduleutil.adapter.GiftTwoDetailsFragment;
-import com.xscm.moduleutil.adapter.MyFragmentPagerAdapter;
 import com.xscm.moduleutil.base.BaseMvpDialogFragment;
 import com.xscm.moduleutil.bean.GiftLabelBean;
 import com.xscm.moduleutil.bean.GiftNumBean;
@@ -46,7 +34,6 @@ import com.xscm.moduleutil.bean.GiftPackBean;
 import com.xscm.moduleutil.bean.GiftPackEvent;
 import com.xscm.moduleutil.bean.GiftPackListCount;
 import com.xscm.moduleutil.bean.RewardUserBean;
-import com.xscm.moduleutil.bean.RoomTypeModel;
 import com.xscm.moduleutil.bean.RoonGiftModel;
 import com.xscm.moduleutil.bean.UserInfo;
 import com.xscm.moduleutil.bean.WalletBean;
@@ -56,14 +43,12 @@ import com.xscm.moduleutil.bean.room.RoomPitBean;
 import com.xscm.moduleutil.color.ThemeableDrawableUtils;
 import com.xscm.moduleutil.dialog.ConfirmDialog;
 import com.xscm.moduleutil.dialog.RechargeDialogFragment;
-import com.xscm.moduleutil.dialog.WebViewDialog;
 import com.xscm.moduleutil.dialog.giftLottery.GiftLotteryDialog;
 import com.xscm.moduleutil.event.GiftDoubleClickEvent;
 import com.xscm.moduleutil.event.GiftUserRefreshEvent;
 import com.xscm.moduleutil.event.RoomGiftGiveEvent;
 import com.xscm.moduleutil.presenter.RewardGiftContacts;
 import com.xscm.moduleutil.presenter.RewardGiftPresenter;
-import com.xscm.moduleutil.utils.ARouteConstants;
 import com.xscm.moduleutil.utils.ColorManager;
 import com.xscm.moduleutil.utils.SpUtil;
 import com.xscm.moduleutil.utils.SystemUtils;
@@ -872,10 +857,10 @@ public class RoomGiftDialogFragment extends BaseMvpDialogFragment<RewardGiftPres
     @Override
     public void getGiftPack(String s) {
         if (s != null) {
-            com.hjq.toast.ToastUtils.show(s);
+            ToastUtils.show(s);
             dismiss();
         } else {
-            com.hjq.toast.ToastUtils.show("一键全清背包礼物失败");
+            ToastUtils.show("一键全清背包礼物失败");
         }
     }
 
diff --git a/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomHostAddFragment.java b/modulemain/src/main/java/com/xscm/modulemain/dialog/RoomHostAddFragment.java
similarity index 96%
rename from moduleroom/src/main/java/com/example/moduleroom/dialog/RoomHostAddFragment.java
rename to modulemain/src/main/java/com/xscm/modulemain/dialog/RoomHostAddFragment.java
index 71dd8f86..cbe8f851 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomHostAddFragment.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/dialog/RoomHostAddFragment.java
@@ -1,4 +1,4 @@
-package com.example.moduleroom.dialog;
+package com.xscm.modulemain.dialog;
 
 import android.content.DialogInterface;
 import android.os.Bundle;
@@ -18,10 +18,10 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import com.blankj.utilcode.util.StringUtils;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.example.moduleroom.R;
-import com.example.moduleroom.contacts.RoomHostContacts;
-import com.example.moduleroom.databinding.RoomHostAddFragmentBinding;
-import com.example.moduleroom.presenter.RoomHostPresenter;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.activity.room.contacts.RoomHostContacts;
+import com.xscm.modulemain.databinding.RoomHostAddFragmentBinding;
+import com.xscm.modulemain.activity.room.presenter.RoomHostPresenter;
 import com.hjq.toast.ToastUtils;
 import com.lihang.ShadowLayout;
 import com.xscm.moduleutil.base.BaseMvpDialogFragment;
diff --git a/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomHostFragment.java b/modulemain/src/main/java/com/xscm/modulemain/dialog/RoomHostFragment.java
similarity index 96%
rename from moduleroom/src/main/java/com/example/moduleroom/dialog/RoomHostFragment.java
rename to modulemain/src/main/java/com/xscm/modulemain/dialog/RoomHostFragment.java
index 6a68d903..c8e4d7a4 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomHostFragment.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/dialog/RoomHostFragment.java
@@ -1,4 +1,4 @@
-package com.example.moduleroom.dialog;
+package com.xscm.modulemain.dialog;
 
 import android.os.Bundle;
 import android.view.Gravity;
@@ -12,10 +12,10 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import com.blankj.utilcode.util.ToastUtils;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.example.moduleroom.R;
-import com.example.moduleroom.contacts.RoomHostContacts;
-import com.example.moduleroom.databinding.RoomFragmentItemListBinding;
-import com.example.moduleroom.presenter.RoomHostPresenter;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.activity.room.contacts.RoomHostContacts;
+import com.xscm.modulemain.databinding.RoomFragmentItemListBinding;
+import com.xscm.modulemain.activity.room.presenter.RoomHostPresenter;
 import com.lihang.ShadowLayout;
 import com.xscm.moduleutil.base.BaseMvpDialogFragment;
 import com.xscm.moduleutil.bean.HostBean;
diff --git a/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomHostIncomeDialog.java b/modulemain/src/main/java/com/xscm/modulemain/dialog/RoomHostIncomeDialog.java
similarity index 93%
rename from moduleroom/src/main/java/com/example/moduleroom/dialog/RoomHostIncomeDialog.java
rename to modulemain/src/main/java/com/xscm/modulemain/dialog/RoomHostIncomeDialog.java
index c3d634a5..7f99ded0 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomHostIncomeDialog.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/dialog/RoomHostIncomeDialog.java
@@ -1,4 +1,4 @@
-package com.example.moduleroom.dialog;
+package com.xscm.modulemain.dialog;
 
 import android.content.Context;
 import android.view.View;
@@ -8,8 +8,8 @@ import androidx.annotation.NonNull;
 
 import com.blankj.utilcode.util.ScreenUtils;
 import com.blankj.utilcode.util.ToastUtils;
-import com.example.moduleroom.R;
-import com.example.moduleroom.databinding.RoomHostIncomeDialogBinding;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.databinding.RoomHostIncomeDialogBinding;
 import com.xscm.moduleutil.color.ThemeableDrawableUtils;
 import com.xscm.moduleutil.utils.ColorManager;
 import com.xscm.moduleutil.widget.dialog.BaseDialog;
diff --git a/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomHostZBDialog.java b/modulemain/src/main/java/com/xscm/modulemain/dialog/RoomHostZBDialog.java
similarity index 91%
rename from moduleroom/src/main/java/com/example/moduleroom/dialog/RoomHostZBDialog.java
rename to modulemain/src/main/java/com/xscm/modulemain/dialog/RoomHostZBDialog.java
index 2896cd8f..014ec749 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomHostZBDialog.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/dialog/RoomHostZBDialog.java
@@ -1,4 +1,4 @@
-package com.example.moduleroom.dialog;
+package com.xscm.modulemain.dialog;
 
 import android.content.Context;
 import android.view.View;
@@ -8,8 +8,8 @@ import androidx.annotation.NonNull;
 
 import com.blankj.utilcode.util.ScreenUtils;
 import com.blankj.utilcode.util.ToastUtils;
-import com.example.moduleroom.R;
-import com.example.moduleroom.databinding.RoomHostZbDialogBinding;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.databinding.RoomHostZbDialogBinding;
 import com.xscm.moduleutil.widget.dialog.BaseDialog;
 
 /**
diff --git a/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomMessageDialogFragment.java b/modulemain/src/main/java/com/xscm/modulemain/dialog/RoomMessageDialogFragment.java
similarity index 95%
rename from moduleroom/src/main/java/com/example/moduleroom/dialog/RoomMessageDialogFragment.java
rename to modulemain/src/main/java/com/xscm/modulemain/dialog/RoomMessageDialogFragment.java
index 251591b0..13011bf9 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomMessageDialogFragment.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/dialog/RoomMessageDialogFragment.java
@@ -1,4 +1,4 @@
-package com.example.moduleroom.dialog;
+package com.xscm.modulemain.dialog;
 
 import android.os.Bundle;
 import android.util.Log;
@@ -12,8 +12,8 @@ import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 
-import com.example.moduleroom.R;
-import com.example.moduleroom.databinding.RoomDialogMessageListBinding;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.databinding.RoomDialogMessageListBinding;
 import com.xscm.moduleutil.activity.news.NewsPresenter;
 import com.xscm.moduleutil.adapter.MyFragmentPagerAdapter;
 import com.xscm.moduleutil.base.BaseMvpDialogFragment;
diff --git a/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomOnlineDialogFragment.java b/modulemain/src/main/java/com/xscm/modulemain/dialog/RoomOnlineDialogFragment.java
similarity index 97%
rename from moduleroom/src/main/java/com/example/moduleroom/dialog/RoomOnlineDialogFragment.java
rename to modulemain/src/main/java/com/xscm/modulemain/dialog/RoomOnlineDialogFragment.java
index f1ce0da1..31c1eb6f 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomOnlineDialogFragment.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/dialog/RoomOnlineDialogFragment.java
@@ -1,4 +1,4 @@
-package com.example.moduleroom.dialog;
+package com.xscm.modulemain.dialog;
 
 import android.content.Context;
 import android.os.Bundle;
@@ -12,12 +12,12 @@ import android.view.Window;
 import android.view.WindowManager;
 
 import com.blankj.utilcode.util.ToastUtils;
-import com.example.moduleroom.R;
-import com.example.moduleroom.activity.RoomActivity;
-import com.example.moduleroom.adapter.RoomOnlineAdapter;
-import com.example.moduleroom.contacts.RoomContacts;
-import com.example.moduleroom.databinding.FragmentRoomOnlineDialogBinding;
-import com.example.moduleroom.presenter.RoomPresenter;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.activity.room.activity.RoomActivity;
+import com.xscm.modulemain.activity.room.contacts.RoomContacts;
+import com.xscm.modulemain.activity.room.presenter.RoomPresenter;
+import com.xscm.modulemain.adapter.RoomOnlineAdapter;
+import com.xscm.modulemain.databinding.FragmentRoomOnlineDialogBinding;
 import com.xscm.moduleutil.base.BaseMvpDialogFragment;
 import com.xscm.moduleutil.bean.RedPacketInfo;
 import com.xscm.moduleutil.bean.RoomCharmRankBean;
diff --git a/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomPkDialogFragment.java b/modulemain/src/main/java/com/xscm/modulemain/dialog/RoomPkDialogFragment.java
similarity index 96%
rename from moduleroom/src/main/java/com/example/moduleroom/dialog/RoomPkDialogFragment.java
rename to modulemain/src/main/java/com/xscm/modulemain/dialog/RoomPkDialogFragment.java
index 2b7bdd52..4125e11f 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomPkDialogFragment.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/dialog/RoomPkDialogFragment.java
@@ -1,4 +1,4 @@
-package com.example.moduleroom.dialog;
+package com.xscm.modulemain.dialog;
 
 import android.content.Context;
 import android.os.Bundle;
@@ -18,11 +18,11 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import com.blankj.utilcode.util.StringUtils;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.example.moduleroom.R;
-import com.example.moduleroom.contacts.RoomPkContacts;
-import com.example.moduleroom.databinding.FragmentRoomPkBinding;
-import com.example.moduleroom.presenter.RoomPkPresenter;
 import com.lihang.ShadowLayout;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.activity.room.contacts.RoomPkContacts;
+import com.xscm.modulemain.activity.room.presenter.RoomPkPresenter;
+import com.xscm.modulemain.databinding.FragmentRoomPkBinding;
 import com.xscm.moduleutil.base.BaseMvpDialogFragment;
 import com.xscm.moduleutil.bean.room.RoomBean;
 import com.xscm.moduleutil.utils.ImageUtils;
diff --git a/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomSettingFragment.java b/modulemain/src/main/java/com/xscm/modulemain/dialog/RoomSettingFragment.java
similarity index 97%
rename from moduleroom/src/main/java/com/example/moduleroom/dialog/RoomSettingFragment.java
rename to modulemain/src/main/java/com/xscm/modulemain/dialog/RoomSettingFragment.java
index 465ef88e..4ce1f961 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomSettingFragment.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/dialog/RoomSettingFragment.java
@@ -1,9 +1,8 @@
-package com.example.moduleroom.dialog;
+package com.xscm.modulemain.dialog;
 
 import static com.xscm.moduleutil.bean.room.RoomSettingBean.QXRoomSettingTypeRoomOrderMic;
 
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.*;
@@ -16,22 +15,21 @@ import com.alibaba.android.arouter.launcher.ARouter;
 import com.blankj.utilcode.util.GsonUtils;
 import com.blankj.utilcode.util.LogUtils;
 import com.chad.library.adapter.base.BaseQuickAdapter;
-import com.example.moduleroom.R;
-import com.example.moduleroom.activity.RoomActivity;
-import com.example.moduleroom.adapter.RoomSettingAdapter;
-import com.example.moduleroom.contacts.RoomSettingContacts;
-import com.example.moduleroom.databinding.DialogRoomSettingFragmentBinding;
-import com.example.moduleroom.fragment.RoomBackgroundDialogFragment;
 import com.hjq.toast.ToastUtils;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.activity.room.activity.RoomActivity;
+import com.xscm.modulemain.activity.room.contacts.RoomSettingContacts;
+import com.xscm.modulemain.activity.room.fragment.RoomBackgroundDialogFragment;
+import com.xscm.modulemain.activity.room.presenter.RoomSettingPresenter;
+import com.xscm.modulemain.adapter.RoomSettingAdapter;
+import com.xscm.modulemain.databinding.DialogRoomSettingFragmentBinding;
 import com.xscm.moduleutil.activity.WebViewActivity;
 import com.xscm.moduleutil.base.CommonAppContext;
 import com.xscm.moduleutil.dialog.ConfirmDialog;
 import com.xscm.moduleutil.event.EffectEvent;
 import com.xscm.moduleutil.event.FloatingScreenEvent;
 import com.xscm.moduleutil.event.MusicEvent;
-import com.xscm.moduleutil.event.RoomOutEvent;
 import com.xscm.moduleutil.listener.MessageListenerSingleton;
-import com.example.moduleroom.presenter.RoomSettingPresenter;
 import com.xscm.moduleutil.base.BaseMvpDialogFragment;
 import com.xscm.moduleutil.bean.RoomMessageEvent;
 import com.xscm.moduleutil.bean.RoomSettingEvent;
@@ -40,7 +38,6 @@ import com.xscm.moduleutil.bean.room.RoomSettingBean;
 import com.xscm.moduleutil.utils.ARouteConstants;
 import com.xscm.moduleutil.utils.SpUtil;
 
-import com.xscm.moduleutil.view.QXRedBagSendView;
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
diff --git a/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomUserInfoFragment.java b/modulemain/src/main/java/com/xscm/modulemain/dialog/RoomUserInfoFragment.java
similarity index 98%
rename from moduleroom/src/main/java/com/example/moduleroom/dialog/RoomUserInfoFragment.java
rename to modulemain/src/main/java/com/xscm/modulemain/dialog/RoomUserInfoFragment.java
index b33329b9..ff3730da 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomUserInfoFragment.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/dialog/RoomUserInfoFragment.java
@@ -1,4 +1,4 @@
-package com.example.moduleroom.dialog;
+package com.xscm.modulemain.dialog;
 
 import static android.view.View.GONE;
 import static android.view.View.VISIBLE;
@@ -18,11 +18,11 @@ import android.view.Window;
 import android.widget.TextView;
 
 import com.alibaba.android.arouter.launcher.ARouter;
-import com.example.moduleroom.R;
-import com.example.moduleroom.contacts.RoomUserContacts;
-import com.example.moduleroom.databinding.FragmentRoomUserInfoBinding;
-import com.example.moduleroom.fragment.RelationshipFragment;
-import com.example.moduleroom.presenter.RoomUserPresenter;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.activity.room.contacts.RoomUserContacts;
+import com.xscm.modulemain.databinding.FragmentRoomUserInfoBinding;
+import com.xscm.modulemain.activity.room.fragment.RelationshipFragment;
+import com.xscm.modulemain.activity.room.presenter.RoomUserPresenter;
 import com.example.zhouwei.library.CustomPopWindow;
 import com.hjq.toast.ToastUtils;
 import com.xscm.moduleutil.activity.WebViewActivity;
diff --git a/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomWheatGiftSettingFragment.java b/modulemain/src/main/java/com/xscm/modulemain/dialog/RoomWheatGiftSettingFragment.java
similarity index 98%
rename from moduleroom/src/main/java/com/example/moduleroom/dialog/RoomWheatGiftSettingFragment.java
rename to modulemain/src/main/java/com/xscm/modulemain/dialog/RoomWheatGiftSettingFragment.java
index 2685d5fb..7b5f5407 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/dialog/RoomWheatGiftSettingFragment.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/dialog/RoomWheatGiftSettingFragment.java
@@ -1,4 +1,4 @@
-package com.example.moduleroom.dialog;
+package com.xscm.modulemain.dialog;
 
 import android.content.Context;
 import android.os.Bundle;
@@ -13,8 +13,8 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentStatePagerAdapter;
 
-import com.example.moduleroom.R;
-import com.example.moduleroom.databinding.DialogRoomWheatGiftBinding;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.databinding.DialogRoomWheatGiftBinding;
 import com.hjq.toast.ToastUtils;
 import com.xscm.moduleutil.adapter.GiftTwoDetailsFragment;
 import com.xscm.moduleutil.base.BaseMvpDialogFragment;
diff --git a/moduleroom/src/main/java/com/example/moduleroom/dialog/SoundEffectsDialogFragment.java b/modulemain/src/main/java/com/xscm/modulemain/dialog/SoundEffectsDialogFragment.java
similarity index 96%
rename from moduleroom/src/main/java/com/example/moduleroom/dialog/SoundEffectsDialogFragment.java
rename to modulemain/src/main/java/com/xscm/modulemain/dialog/SoundEffectsDialogFragment.java
index d5739e6d..f818bcc7 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/dialog/SoundEffectsDialogFragment.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/dialog/SoundEffectsDialogFragment.java
@@ -1,4 +1,4 @@
-package com.example.moduleroom.dialog;
+package com.xscm.modulemain.dialog;
 
 import static com.xscm.moduleutil.utils.ImageUtils.copyAssetToFile;
 
@@ -15,11 +15,11 @@ import android.widget.TextView;
 import androidx.core.content.ContextCompat;
 import androidx.fragment.app.FragmentManager;
 
-import com.example.moduleroom.R;
-import com.example.moduleroom.adapter.RoomOnlineAdapter;
-import com.example.moduleroom.contacts.WheatContacts;
-import com.example.moduleroom.databinding.FragmentSoundDialogBinding;
-import com.example.moduleroom.presenter.WheatPresenter;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.activity.room.contacts.WheatContacts;
+import com.xscm.modulemain.activity.room.presenter.WheatPresenter;
+import com.xscm.modulemain.adapter.RoomOnlineAdapter;
+import com.xscm.modulemain.databinding.FragmentSoundDialogBinding;
 import com.xscm.moduleutil.base.BaseMvpDialogFragment;
 import com.xscm.moduleutil.bean.room.RoomApplyListBean;
 import com.xscm.moduleutil.color.ThemeableDrawableUtils;
diff --git a/moduleroom/src/main/java/com/example/moduleroom/dialog/TunerDialogFragment.java b/modulemain/src/main/java/com/xscm/modulemain/dialog/TunerDialogFragment.java
similarity index 97%
rename from moduleroom/src/main/java/com/example/moduleroom/dialog/TunerDialogFragment.java
rename to modulemain/src/main/java/com/xscm/modulemain/dialog/TunerDialogFragment.java
index fd649cc4..637e8948 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/dialog/TunerDialogFragment.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/dialog/TunerDialogFragment.java
@@ -1,4 +1,4 @@
-package com.example.moduleroom.dialog;
+package com.xscm.modulemain.dialog;
 
 
 import android.content.Context;
@@ -14,11 +14,11 @@ import androidx.fragment.app.FragmentManager;
 import androidx.recyclerview.widget.GridLayoutManager;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
-import com.example.moduleroom.R;
-import com.example.moduleroom.adapter.TunerListAdapter;
-import com.example.moduleroom.contacts.WheatContacts;
-import com.example.moduleroom.databinding.RoomDialogTunerBinding;
-import com.example.moduleroom.presenter.WheatPresenter;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.adapter.TunerListAdapter;
+import com.xscm.modulemain.activity.room.contacts.WheatContacts;
+import com.xscm.modulemain.databinding.RoomDialogTunerBinding;
+import com.xscm.modulemain.activity.room.presenter.WheatPresenter;
 import com.luck.picture.lib.decoration.GridSpacingItemDecoration;
 import com.xscm.moduleutil.base.BaseMvpDialogFragment;
 import com.xscm.moduleutil.bean.MixerResp;
diff --git a/moduleroom/src/main/java/com/example/moduleroom/dialog/UserGiftWallRoomFragment.java b/modulemain/src/main/java/com/xscm/modulemain/dialog/UserGiftWallRoomFragment.java
similarity index 94%
rename from moduleroom/src/main/java/com/example/moduleroom/dialog/UserGiftWallRoomFragment.java
rename to modulemain/src/main/java/com/xscm/modulemain/dialog/UserGiftWallRoomFragment.java
index 69869f45..ac86b46b 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/dialog/UserGiftWallRoomFragment.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/dialog/UserGiftWallRoomFragment.java
@@ -1,4 +1,4 @@
-package com.example.moduleroom.dialog;
+package com.xscm.modulemain.dialog;
 
 import android.os.Bundle;
 import android.view.Gravity;
@@ -10,10 +10,10 @@ import androidx.recyclerview.widget.GridLayoutManager;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
-import com.example.moduleroom.R;
-import com.example.moduleroom.contacts.UserGiftWallConacts;
-import com.example.moduleroom.databinding.MeFagmentUserGiftWallBinding;
-import com.example.moduleroom.presenter.UserGiftWallPresenter;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.activity.room.contacts.UserGiftWallConacts;
+import com.xscm.modulemain.databinding.MeFagmentUserGiftWallBinding;
+import com.xscm.modulemain.activity.room.presenter.UserGiftWallPresenter;
 import com.xscm.moduleutil.base.BaseMvpDialogFragment;
 import com.xscm.moduleutil.bean.GiftUserWallBean;
 import com.xscm.moduleutil.utils.ImageUtils;
diff --git a/moduleroom/src/main/java/com/example/moduleroom/dialog/WheatFeedingDialogFragment.java b/modulemain/src/main/java/com/xscm/modulemain/dialog/WheatFeedingDialogFragment.java
similarity index 97%
rename from moduleroom/src/main/java/com/example/moduleroom/dialog/WheatFeedingDialogFragment.java
rename to modulemain/src/main/java/com/xscm/modulemain/dialog/WheatFeedingDialogFragment.java
index 307ff472..543f5fd0 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/dialog/WheatFeedingDialogFragment.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/dialog/WheatFeedingDialogFragment.java
@@ -1,4 +1,4 @@
-package com.example.moduleroom.dialog;
+package com.xscm.modulemain.dialog;
 
 import static android.view.View.GONE;
 import static android.view.View.VISIBLE;
@@ -15,11 +15,11 @@ import androidx.fragment.app.FragmentManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
 import com.blankj.utilcode.util.ToastUtils;
-import com.example.moduleroom.R;
-import com.example.moduleroom.adapter.WheatFeedingSelectAdapter;
-import com.example.moduleroom.contacts.WheatContacts;
-import com.example.moduleroom.databinding.FragmentWheatFeedingDialogBinding;
-import com.example.moduleroom.presenter.WheatPresenter;
+import com.xscm.modulemain.R;
+import com.xscm.modulemain.activity.room.contacts.WheatContacts;
+import com.xscm.modulemain.activity.room.presenter.WheatPresenter;
+import com.xscm.modulemain.adapter.WheatFeedingSelectAdapter;
+import com.xscm.modulemain.databinding.FragmentWheatFeedingDialogBinding;
 import com.xscm.moduleutil.base.BaseMvpDialogFragment;
 import com.xscm.moduleutil.bean.RoomWheatEvent;
 import com.xscm.moduleutil.bean.room.RoomApplyListBean;
diff --git a/moduleroom/src/main/java/com/example/moduleroom/service/CancelNoticeService.kt b/modulemain/src/main/java/com/xscm/modulemain/service/CancelNoticeService.kt
similarity index 97%
rename from moduleroom/src/main/java/com/example/moduleroom/service/CancelNoticeService.kt
rename to modulemain/src/main/java/com/xscm/modulemain/service/CancelNoticeService.kt
index 48f5c7dc..fd123289 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/service/CancelNoticeService.kt
+++ b/modulemain/src/main/java/com/xscm/modulemain/service/CancelNoticeService.kt
@@ -1,4 +1,4 @@
-package com.example.moduleroom.service
+package com.xscm.modulemain.service
 
 import android.app.Service
 import android.content.Intent
diff --git a/moduleroom/src/main/java/com/example/moduleroom/service/Extensions.kt b/modulemain/src/main/java/com/xscm/modulemain/service/Extensions.kt
similarity index 98%
rename from moduleroom/src/main/java/com/example/moduleroom/service/Extensions.kt
rename to modulemain/src/main/java/com/xscm/modulemain/service/Extensions.kt
index 7acfcb1b..d704961a 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/service/Extensions.kt
+++ b/modulemain/src/main/java/com/xscm/modulemain/service/Extensions.kt
@@ -1,4 +1,4 @@
-package com.example.moduleroom.service
+package com.xscm.modulemain.service
 
 import android.app.Activity
 import android.app.ActivityManager
diff --git a/moduleroom/src/main/java/com/example/moduleroom/service/ForegroundNotification.kt b/modulemain/src/main/java/com/xscm/modulemain/service/ForegroundNotification.kt
similarity index 96%
rename from moduleroom/src/main/java/com/example/moduleroom/service/ForegroundNotification.kt
rename to modulemain/src/main/java/com/xscm/modulemain/service/ForegroundNotification.kt
index bba6d976..a43995c3 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/service/ForegroundNotification.kt
+++ b/modulemain/src/main/java/com/xscm/modulemain/service/ForegroundNotification.kt
@@ -1,4 +1,4 @@
-package com.example.moduleroom.service
+package com.xscm.modulemain.service
 
 
 import android.annotation.SuppressLint
@@ -8,7 +8,7 @@ import android.content.Intent
 import android.os.Build
 import androidx.core.app.NotificationCompat
 import androidx.core.content.getSystemService
-import com.example.moduleroom.activity.RoomActivity
+import com.xscm.modulemain.activity.room.activity.RoomActivity
 
 @SuppressLint("StaticFieldLeak")
 object ForegroundNotification {
diff --git a/moduleroom/src/main/java/com/example/moduleroom/service/ForegroundService.kt b/modulemain/src/main/java/com/xscm/modulemain/service/ForegroundService.kt
similarity index 97%
rename from moduleroom/src/main/java/com/example/moduleroom/service/ForegroundService.kt
rename to modulemain/src/main/java/com/xscm/modulemain/service/ForegroundService.kt
index ee37b734..e4506f39 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/service/ForegroundService.kt
+++ b/modulemain/src/main/java/com/xscm/modulemain/service/ForegroundService.kt
@@ -1,4 +1,4 @@
-package com.example.moduleroom.service
+package com.xscm.modulemain.service
 
 import android.app.Service
 import android.content.Intent
diff --git a/moduleroom/src/main/java/com/example/moduleroom/service/MediaProjectionService.java b/modulemain/src/main/java/com/xscm/modulemain/service/MediaProjectionService.java
similarity index 97%
rename from moduleroom/src/main/java/com/example/moduleroom/service/MediaProjectionService.java
rename to modulemain/src/main/java/com/xscm/modulemain/service/MediaProjectionService.java
index 61cdb70f..905f05bd 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/service/MediaProjectionService.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/service/MediaProjectionService.java
@@ -1,4 +1,4 @@
-package com.example.moduleroom.service;// MediaProjectionService.java
+package com.xscm.modulemain.service;
 
 import android.app.Notification;
 import android.app.NotificationChannel;
@@ -18,7 +18,7 @@ import android.util.Log;
 
 import androidx.annotation.Nullable;
 
-import com.example.moduleroom.activity.RoomActivity;
+import com.xscm.modulemain.activity.room.activity.RoomActivity;
 
 
 public class MediaProjectionService extends Service {
diff --git a/moduleroom/src/main/java/com/example/moduleroom/service/RoomPlayService.java b/modulemain/src/main/java/com/xscm/modulemain/service/RoomPlayService.java
similarity index 98%
rename from moduleroom/src/main/java/com/example/moduleroom/service/RoomPlayService.java
rename to modulemain/src/main/java/com/xscm/modulemain/service/RoomPlayService.java
index b6a9697b..1b65505b 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/service/RoomPlayService.java
+++ b/modulemain/src/main/java/com/xscm/modulemain/service/RoomPlayService.java
@@ -1,4 +1,4 @@
-package com.example.moduleroom.service;
+package com.xscm.modulemain.service;
 
 import android.app.Notification;
 import android.app.NotificationChannel;
diff --git a/moduleroom/src/main/java/com/example/moduleroom/service/ServiceHelper.kt b/modulemain/src/main/java/com/xscm/modulemain/service/ServiceHelper.kt
similarity index 58%
rename from moduleroom/src/main/java/com/example/moduleroom/service/ServiceHelper.kt
rename to modulemain/src/main/java/com/xscm/modulemain/service/ServiceHelper.kt
index 1cee9f2e..3afc9c6f 100644
--- a/moduleroom/src/main/java/com/example/moduleroom/service/ServiceHelper.kt
+++ b/modulemain/src/main/java/com/xscm/modulemain/service/ServiceHelper.kt
@@ -1,4 +1,4 @@
-package com.example.moduleroom.service
+package com.xscm.modulemain.service;
 
 object ServiceHelper {
 
diff --git a/modulevoice/src/main/res/drawable/index_bg_search_avatar.xml b/modulemain/src/main/res/drawable/index_bg_search_avatar.xml
similarity index 100%
rename from modulevoice/src/main/res/drawable/index_bg_search_avatar.xml
rename to modulemain/src/main/res/drawable/index_bg_search_avatar.xml
diff --git a/modulevoice/src/main/res/drawable/index_bg_search_item.xml b/modulemain/src/main/res/drawable/index_bg_search_item.xml
similarity index 100%
rename from modulevoice/src/main/res/drawable/index_bg_search_item.xml
rename to modulemain/src/main/res/drawable/index_bg_search_item.xml
diff --git a/modulecircle/src/main/res/drawable/selector_custom_checkbox.xml b/modulemain/src/main/res/drawable/selector_custom_checkbox.xml
similarity index 100%
rename from modulecircle/src/main/res/drawable/selector_custom_checkbox.xml
rename to modulemain/src/main/res/drawable/selector_custom_checkbox.xml
diff --git a/modulevoice/src/main/res/drawable/shape_search_in.xml b/modulemain/src/main/res/drawable/shape_search_in.xml
similarity index 100%
rename from modulevoice/src/main/res/drawable/shape_search_in.xml
rename to modulemain/src/main/res/drawable/shape_search_in.xml
diff --git a/modulevocal/src/main/res/layout/activity_about_us.xml b/modulemain/src/main/res/layout/activity_about_us.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/activity_about_us.xml
rename to modulemain/src/main/res/layout/activity_about_us.xml
diff --git a/modulevocal/src/main/res/layout/activity_album_detail.xml b/modulemain/src/main/res/layout/activity_album_detail.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/activity_album_detail.xml
rename to modulemain/src/main/res/layout/activity_album_detail.xml
diff --git a/modulevocal/src/main/res/layout/activity_bind_card.xml b/modulemain/src/main/res/layout/activity_bind_card.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/activity_bind_card.xml
rename to modulemain/src/main/res/layout/activity_bind_card.xml
diff --git a/modulevocal/src/main/res/layout/activity_bind_card_details.xml b/modulemain/src/main/res/layout/activity_bind_card_details.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/activity_bind_card_details.xml
rename to modulemain/src/main/res/layout/activity_bind_card_details.xml
diff --git a/modulevocal/src/main/res/layout/activity_blacklist.xml b/modulemain/src/main/res/layout/activity_blacklist.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/activity_blacklist.xml
rename to modulemain/src/main/res/layout/activity_blacklist.xml
diff --git a/modulevocal/src/main/res/layout/activity_brief_introduction.xml b/modulemain/src/main/res/layout/activity_brief_introduction.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/activity_brief_introduction.xml
rename to modulemain/src/main/res/layout/activity_brief_introduction.xml
diff --git a/modulevocal/src/main/res/layout/activity_change_nickname.xml b/modulemain/src/main/res/layout/activity_change_nickname.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/activity_change_nickname.xml
rename to modulemain/src/main/res/layout/activity_change_nickname.xml
diff --git a/modulevocal/src/main/res/layout/activity_change_password.xml b/modulemain/src/main/res/layout/activity_change_password.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/activity_change_password.xml
rename to modulemain/src/main/res/layout/activity_change_password.xml
diff --git a/modulevocal/src/main/res/layout/activity_create_album.xml b/modulemain/src/main/res/layout/activity_create_album.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/activity_create_album.xml
rename to modulemain/src/main/res/layout/activity_create_album.xml
diff --git a/modulevocal/src/main/res/layout/activity_created_room.xml b/modulemain/src/main/res/layout/activity_created_room.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/activity_created_room.xml
rename to modulemain/src/main/res/layout/activity_created_room.xml
diff --git a/modulevocal/src/main/res/layout/activity_currency_exchange.xml b/modulemain/src/main/res/layout/activity_currency_exchange.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/activity_currency_exchange.xml
rename to modulemain/src/main/res/layout/activity_currency_exchange.xml
diff --git a/modulevocal/src/main/res/layout/activity_daily_tasks.xml b/modulemain/src/main/res/layout/activity_daily_tasks.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/activity_daily_tasks.xml
rename to modulemain/src/main/res/layout/activity_daily_tasks.xml
diff --git a/modulecircle/src/main/res/layout/activity_dynamic_detail.xml b/modulemain/src/main/res/layout/activity_dynamic_detail.xml
similarity index 100%
rename from modulecircle/src/main/res/layout/activity_dynamic_detail.xml
rename to modulemain/src/main/res/layout/activity_dynamic_detail.xml
diff --git a/modulecircle/src/main/res/layout/activity_dynamic_list.xml b/modulemain/src/main/res/layout/activity_dynamic_list.xml
similarity index 100%
rename from modulecircle/src/main/res/layout/activity_dynamic_list.xml
rename to modulemain/src/main/res/layout/activity_dynamic_list.xml
diff --git a/modulevocal/src/main/res/layout/activity_edit_user.xml b/modulemain/src/main/res/layout/activity_edit_user.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/activity_edit_user.xml
rename to modulemain/src/main/res/layout/activity_edit_user.xml
diff --git a/moduleLogin/src/main/res/layout/activity_forget_password.xml b/modulemain/src/main/res/layout/activity_forget_password.xml
similarity index 100%
rename from moduleLogin/src/main/res/layout/activity_forget_password.xml
rename to modulemain/src/main/res/layout/activity_forget_password.xml
diff --git a/modulevocal/src/main/res/layout/activity_gift_box_record.xml b/modulemain/src/main/res/layout/activity_gift_box_record.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/activity_gift_box_record.xml
rename to modulemain/src/main/res/layout/activity_gift_box_record.xml
diff --git a/moduleLogin/src/main/res/layout/activity_improve_info.xml b/modulemain/src/main/res/layout/activity_improve_info.xml
similarity index 100%
rename from moduleLogin/src/main/res/layout/activity_improve_info.xml
rename to modulemain/src/main/res/layout/activity_improve_info.xml
diff --git a/moduleLogin/src/main/res/layout/activity_login.xml b/modulemain/src/main/res/layout/activity_login.xml
similarity index 100%
rename from moduleLogin/src/main/res/layout/activity_login.xml
rename to modulemain/src/main/res/layout/activity_login.xml
diff --git a/modulemain/src/main/res/layout/activity_main.xml b/modulemain/src/main/res/layout/activity_main.xml
index 5bf9f593..2529fc43 100644
--- a/modulemain/src/main/res/layout/activity_main.xml
+++ b/modulemain/src/main/res/layout/activity_main.xml
@@ -2,7 +2,7 @@
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         xmlns:tools="http://schemas.android.com/tools"
-        tools:context=".activity.MainActivity">
+        tools:context=".activity.main.activity.MainActivity">
 
     <data>
 
diff --git a/modulevocal/src/main/res/layout/activity_message_reminder.xml b/modulemain/src/main/res/layout/activity_message_reminder.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/activity_message_reminder.xml
rename to modulemain/src/main/res/layout/activity_message_reminder.xml
diff --git a/modulevocal/src/main/res/layout/activity_my_bag.xml b/modulemain/src/main/res/layout/activity_my_bag.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/activity_my_bag.xml
rename to modulemain/src/main/res/layout/activity_my_bag.xml
diff --git a/modulevocal/src/main/res/layout/activity_my_money.xml b/modulemain/src/main/res/layout/activity_my_money.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/activity_my_money.xml
rename to modulemain/src/main/res/layout/activity_my_money.xml
diff --git a/modulevocal/src/main/res/layout/activity_my_room.xml b/modulemain/src/main/res/layout/activity_my_room.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/activity_my_room.xml
rename to modulemain/src/main/res/layout/activity_my_room.xml
diff --git a/modulevocal/src/main/res/layout/activity_notification.xml b/modulemain/src/main/res/layout/activity_notification.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/activity_notification.xml
rename to modulemain/src/main/res/layout/activity_notification.xml
diff --git a/modulevocal/src/main/res/layout/activity_personality.xml b/modulemain/src/main/res/layout/activity_personality.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/activity_personality.xml
rename to modulemain/src/main/res/layout/activity_personality.xml
diff --git a/modulevocal/src/main/res/layout/activity_phone_replacement.xml b/modulemain/src/main/res/layout/activity_phone_replacement.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/activity_phone_replacement.xml
rename to modulemain/src/main/res/layout/activity_phone_replacement.xml
diff --git a/modulevoice/src/main/res/layout/activity_popular_room.xml b/modulemain/src/main/res/layout/activity_popular_room.xml
similarity index 100%
rename from modulevoice/src/main/res/layout/activity_popular_room.xml
rename to modulemain/src/main/res/layout/activity_popular_room.xml
diff --git a/modulevoice/src/main/res/layout/activity_ranking_list.xml b/modulemain/src/main/res/layout/activity_ranking_list.xml
similarity index 100%
rename from modulevoice/src/main/res/layout/activity_ranking_list.xml
rename to modulemain/src/main/res/layout/activity_ranking_list.xml
diff --git a/modulevocal/src/main/res/layout/activity_real_deatil.xml b/modulemain/src/main/res/layout/activity_real_deatil.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/activity_real_deatil.xml
rename to modulemain/src/main/res/layout/activity_real_deatil.xml
diff --git a/modulevocal/src/main/res/layout/activity_real_name.xml b/modulemain/src/main/res/layout/activity_real_name.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/activity_real_name.xml
rename to modulemain/src/main/res/layout/activity_real_name.xml
diff --git a/modulevocal/src/main/res/layout/activity_recharge.xml b/modulemain/src/main/res/layout/activity_recharge.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/activity_recharge.xml
rename to modulemain/src/main/res/layout/activity_recharge.xml
diff --git a/modulecircle/src/main/res/layout/activity_release.xml b/modulemain/src/main/res/layout/activity_release.xml
similarity index 100%
rename from modulecircle/src/main/res/layout/activity_release.xml
rename to modulemain/src/main/res/layout/activity_release.xml
diff --git a/modulevocal/src/main/res/layout/activity_revenue.xml b/modulemain/src/main/res/layout/activity_revenue.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/activity_revenue.xml
rename to modulemain/src/main/res/layout/activity_revenue.xml
diff --git a/moduleroom/src/main/res/layout/activity_room.xml b/modulemain/src/main/res/layout/activity_room.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/activity_room.xml
rename to modulemain/src/main/res/layout/activity_room.xml
diff --git a/modulevocal/src/main/res/layout/activity_room_allowance.xml b/modulemain/src/main/res/layout/activity_room_allowance.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/activity_room_allowance.xml
rename to modulemain/src/main/res/layout/activity_room_allowance.xml
diff --git a/modulevocal/src/main/res/layout/activity_room_allowance_detail.xml b/modulemain/src/main/res/layout/activity_room_allowance_detail.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/activity_room_allowance_detail.xml
rename to modulemain/src/main/res/layout/activity_room_allowance_detail.xml
diff --git a/modulevocal/src/main/res/layout/activity_room_details.xml b/modulemain/src/main/res/layout/activity_room_details.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/activity_room_details.xml
rename to modulemain/src/main/res/layout/activity_room_details.xml
diff --git a/modulevoice/src/main/res/layout/activity_search.xml b/modulemain/src/main/res/layout/activity_search.xml
similarity index 100%
rename from modulevoice/src/main/res/layout/activity_search.xml
rename to modulemain/src/main/res/layout/activity_search.xml
diff --git a/modulevocal/src/main/res/layout/activity_setting.xml b/modulemain/src/main/res/layout/activity_setting.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/activity_setting.xml
rename to modulemain/src/main/res/layout/activity_setting.xml
diff --git a/modulevocal/src/main/res/layout/activity_setting1.xml b/modulemain/src/main/res/layout/activity_setting1.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/activity_setting1.xml
rename to modulemain/src/main/res/layout/activity_setting1.xml
diff --git a/moduleLogin/src/main/res/layout/activity_switch_accounts.xml b/modulemain/src/main/res/layout/activity_switch_accounts.xml
similarity index 100%
rename from moduleLogin/src/main/res/layout/activity_switch_accounts.xml
rename to modulemain/src/main/res/layout/activity_switch_accounts.xml
diff --git a/modulevocal/src/main/res/layout/activity_underage.xml b/modulemain/src/main/res/layout/activity_underage.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/activity_underage.xml
rename to modulemain/src/main/res/layout/activity_underage.xml
diff --git a/modulevocal/src/main/res/layout/activity_user_homepage.xml b/modulemain/src/main/res/layout/activity_user_homepage.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/activity_user_homepage.xml
rename to modulemain/src/main/res/layout/activity_user_homepage.xml
diff --git a/modulevocal/src/main/res/layout/activity_withdrawal.xml b/modulemain/src/main/res/layout/activity_withdrawal.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/activity_withdrawal.xml
rename to modulemain/src/main/res/layout/activity_withdrawal.xml
diff --git a/modulevocal/src/main/res/layout/activity_withdrawal_list.xml b/modulemain/src/main/res/layout/activity_withdrawal_list.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/activity_withdrawal_list.xml
rename to modulemain/src/main/res/layout/activity_withdrawal_list.xml
diff --git a/modulecircle/src/main/res/layout/bottom_sheet_recyclerview.xml b/modulemain/src/main/res/layout/bottom_sheet_recyclerview.xml
similarity index 100%
rename from modulecircle/src/main/res/layout/bottom_sheet_recyclerview.xml
rename to modulemain/src/main/res/layout/bottom_sheet_recyclerview.xml
diff --git a/moduleroom/src/main/res/layout/custom_tab_layou_giftt.xml b/modulemain/src/main/res/layout/custom_tab_layou_giftt.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/custom_tab_layou_giftt.xml
rename to modulemain/src/main/res/layout/custom_tab_layou_giftt.xml
diff --git a/modulevoice/src/main/res/layout/custom_tab_layout.xml b/modulemain/src/main/res/layout/custom_tab_layout.xml
similarity index 100%
rename from modulevoice/src/main/res/layout/custom_tab_layout.xml
rename to modulemain/src/main/res/layout/custom_tab_layout.xml
diff --git a/moduleroom/src/main/res/layout/dialog_card_relation.xml b/modulemain/src/main/res/layout/dialog_card_relation.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/dialog_card_relation.xml
rename to modulemain/src/main/res/layout/dialog_card_relation.xml
diff --git a/moduleroom/src/main/res/layout/dialog_charm_fragment.xml b/modulemain/src/main/res/layout/dialog_charm_fragment.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/dialog_charm_fragment.xml
rename to modulemain/src/main/res/layout/dialog_charm_fragment.xml
diff --git a/moduleroom/src/main/res/layout/dialog_emotion_picker.xml b/modulemain/src/main/res/layout/dialog_emotion_picker.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/dialog_emotion_picker.xml
rename to modulemain/src/main/res/layout/dialog_emotion_picker.xml
diff --git a/moduleroom/src/main/res/layout/dialog_exit_room_bottom_sheet.xml b/modulemain/src/main/res/layout/dialog_exit_room_bottom_sheet.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/dialog_exit_room_bottom_sheet.xml
rename to modulemain/src/main/res/layout/dialog_exit_room_bottom_sheet.xml
diff --git a/moduleroom/src/main/res/layout/dialog_friends_room.xml b/modulemain/src/main/res/layout/dialog_friends_room.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/dialog_friends_room.xml
rename to modulemain/src/main/res/layout/dialog_friends_room.xml
diff --git a/moduleroom/src/main/res/layout/dialog_hourly_chart_fragment.xml b/modulemain/src/main/res/layout/dialog_hourly_chart_fragment.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/dialog_hourly_chart_fragment.xml
rename to modulemain/src/main/res/layout/dialog_hourly_chart_fragment.xml
diff --git a/moduleroom/src/main/res/layout/dialog_live_battle_settings.xml b/modulemain/src/main/res/layout/dialog_live_battle_settings.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/dialog_live_battle_settings.xml
rename to modulemain/src/main/res/layout/dialog_live_battle_settings.xml
diff --git a/moduleroom/src/main/res/layout/dialog_publish_comment.xml b/modulemain/src/main/res/layout/dialog_publish_comment.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/dialog_publish_comment.xml
rename to modulemain/src/main/res/layout/dialog_publish_comment.xml
diff --git a/moduleroom/src/main/res/layout/dialog_red_bag_send.xml b/modulemain/src/main/res/layout/dialog_red_bag_send.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/dialog_red_bag_send.xml
rename to modulemain/src/main/res/layout/dialog_red_bag_send.xml
diff --git a/moduleroom/src/main/res/layout/dialog_red_list.xml b/modulemain/src/main/res/layout/dialog_red_list.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/dialog_red_list.xml
rename to modulemain/src/main/res/layout/dialog_red_list.xml
diff --git a/moduleroom/src/main/res/layout/dialog_room_auction.xml b/modulemain/src/main/res/layout/dialog_room_auction.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/dialog_room_auction.xml
rename to modulemain/src/main/res/layout/dialog_room_auction.xml
diff --git a/moduleroom/src/main/res/layout/dialog_room_bid_list.xml b/modulemain/src/main/res/layout/dialog_room_bid_list.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/dialog_room_bid_list.xml
rename to modulemain/src/main/res/layout/dialog_room_bid_list.xml
diff --git a/moduleroom/src/main/res/layout/dialog_room_setting_fragment.xml b/modulemain/src/main/res/layout/dialog_room_setting_fragment.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/dialog_room_setting_fragment.xml
rename to modulemain/src/main/res/layout/dialog_room_setting_fragment.xml
diff --git a/moduleroom/src/main/res/layout/dialog_room_wheat_gift.xml b/modulemain/src/main/res/layout/dialog_room_wheat_gift.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/dialog_room_wheat_gift.xml
rename to modulemain/src/main/res/layout/dialog_room_wheat_gift.xml
diff --git a/modulevocal/src/main/res/layout/dialog_secondary_verification.xml b/modulemain/src/main/res/layout/dialog_secondary_verification.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/dialog_secondary_verification.xml
rename to modulemain/src/main/res/layout/dialog_secondary_verification.xml
diff --git a/moduleroom/src/main/res/layout/dialog_with_countdown.xml b/modulemain/src/main/res/layout/dialog_with_countdown.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/dialog_with_countdown.xml
rename to modulemain/src/main/res/layout/dialog_with_countdown.xml
diff --git a/modulecircle/src/main/res/layout/fragment_circle.xml b/modulemain/src/main/res/layout/fragment_circle.xml
similarity index 100%
rename from modulecircle/src/main/res/layout/fragment_circle.xml
rename to modulemain/src/main/res/layout/fragment_circle.xml
diff --git a/modulecircle/src/main/res/layout/fragment_circle_category.xml b/modulemain/src/main/res/layout/fragment_circle_category.xml
similarity index 100%
rename from modulecircle/src/main/res/layout/fragment_circle_category.xml
rename to modulemain/src/main/res/layout/fragment_circle_category.xml
diff --git a/modulevocal/src/main/res/layout/fragment_cirle_list.xml b/modulemain/src/main/res/layout/fragment_cirle_list.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/fragment_cirle_list.xml
rename to modulemain/src/main/res/layout/fragment_cirle_list.xml
diff --git a/modulecircle/src/main/res/layout/fragment_expand_column.xml b/modulemain/src/main/res/layout/fragment_expand_column.xml
similarity index 100%
rename from modulecircle/src/main/res/layout/fragment_expand_column.xml
rename to modulemain/src/main/res/layout/fragment_expand_column.xml
diff --git a/moduleroom/src/main/res/layout/fragment_friendship_room.xml b/modulemain/src/main/res/layout/fragment_friendship_room.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/fragment_friendship_room.xml
rename to modulemain/src/main/res/layout/fragment_friendship_room.xml
diff --git a/modulevoice/src/main/res/layout/fragment_hot_list.xml b/modulemain/src/main/res/layout/fragment_hot_list.xml
similarity index 100%
rename from modulevoice/src/main/res/layout/fragment_hot_list.xml
rename to modulemain/src/main/res/layout/fragment_hot_list.xml
diff --git a/moduleroom/src/main/res/layout/fragment_muisc_song.xml b/modulemain/src/main/res/layout/fragment_muisc_song.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/fragment_muisc_song.xml
rename to modulemain/src/main/res/layout/fragment_muisc_song.xml
diff --git a/modulevocal/src/main/res/layout/fragment_my_album.xml b/modulemain/src/main/res/layout/fragment_my_album.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/fragment_my_album.xml
rename to modulemain/src/main/res/layout/fragment_my_album.xml
diff --git a/modulevocal/src/main/res/layout/fragment_my_bag.xml b/modulemain/src/main/res/layout/fragment_my_bag.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/fragment_my_bag.xml
rename to modulemain/src/main/res/layout/fragment_my_bag.xml
diff --git a/modulevocal/src/main/res/layout/fragment_my_bag_list.xml b/modulemain/src/main/res/layout/fragment_my_bag_list.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/fragment_my_bag_list.xml
rename to modulemain/src/main/res/layout/fragment_my_bag_list.xml
diff --git a/modulenews/src/main/res/layout/fragment_news.xml b/modulemain/src/main/res/layout/fragment_news.xml
similarity index 100%
rename from modulenews/src/main/res/layout/fragment_news.xml
rename to modulemain/src/main/res/layout/fragment_news.xml
diff --git a/moduleroom/src/main/res/layout/fragment_pk_result_dialog.xml b/modulemain/src/main/res/layout/fragment_pk_result_dialog.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/fragment_pk_result_dialog.xml
rename to modulemain/src/main/res/layout/fragment_pk_result_dialog.xml
diff --git a/moduleroom/src/main/res/layout/fragment_pk_time_fragment.xml b/modulemain/src/main/res/layout/fragment_pk_time_fragment.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/fragment_pk_time_fragment.xml
rename to modulemain/src/main/res/layout/fragment_pk_time_fragment.xml
diff --git a/modulevoice/src/main/res/layout/fragment_ranking_list.xml b/modulemain/src/main/res/layout/fragment_ranking_list.xml
similarity index 100%
rename from modulevoice/src/main/res/layout/fragment_ranking_list.xml
rename to modulemain/src/main/res/layout/fragment_ranking_list.xml
diff --git a/moduleroom/src/main/res/layout/fragment_red.xml b/modulemain/src/main/res/layout/fragment_red.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/fragment_red.xml
rename to modulemain/src/main/res/layout/fragment_red.xml
diff --git a/moduleroom/src/main/res/layout/fragment_red_envelopes.xml b/modulemain/src/main/res/layout/fragment_red_envelopes.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/fragment_red_envelopes.xml
rename to modulemain/src/main/res/layout/fragment_red_envelopes.xml
diff --git a/moduleroom/src/main/res/layout/fragment_relationship.xml b/modulemain/src/main/res/layout/fragment_relationship.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/fragment_relationship.xml
rename to modulemain/src/main/res/layout/fragment_relationship.xml
diff --git a/moduleroom/src/main/res/layout/fragment_request.xml b/modulemain/src/main/res/layout/fragment_request.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/fragment_request.xml
rename to modulemain/src/main/res/layout/fragment_request.xml
diff --git a/moduleroom/src/main/res/layout/fragment_request_dialog.xml b/modulemain/src/main/res/layout/fragment_request_dialog.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/fragment_request_dialog.xml
rename to modulemain/src/main/res/layout/fragment_request_dialog.xml
diff --git a/modulevocal/src/main/res/layout/fragment_revenue.xml b/modulemain/src/main/res/layout/fragment_revenue.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/fragment_revenue.xml
rename to modulemain/src/main/res/layout/fragment_revenue.xml
diff --git a/moduleroom/src/main/res/layout/fragment_room.xml b/modulemain/src/main/res/layout/fragment_room.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/fragment_room.xml
rename to modulemain/src/main/res/layout/fragment_room.xml
diff --git a/moduleroom/src/main/res/layout/fragment_room_auction.xml b/modulemain/src/main/res/layout/fragment_room_auction.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/fragment_room_auction.xml
rename to modulemain/src/main/res/layout/fragment_room_auction.xml
diff --git a/moduleroom/src/main/res/layout/fragment_room_charts.xml b/modulemain/src/main/res/layout/fragment_room_charts.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/fragment_room_charts.xml
rename to modulemain/src/main/res/layout/fragment_room_charts.xml
diff --git a/moduleroom/src/main/res/layout/fragment_room_ktv.xml b/modulemain/src/main/res/layout/fragment_room_ktv.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/fragment_room_ktv.xml
rename to modulemain/src/main/res/layout/fragment_room_ktv.xml
diff --git a/moduleroom/src/main/res/layout/fragment_room_notice_dialog.xml b/modulemain/src/main/res/layout/fragment_room_notice_dialog.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/fragment_room_notice_dialog.xml
rename to modulemain/src/main/res/layout/fragment_room_notice_dialog.xml
diff --git a/moduleroom/src/main/res/layout/fragment_room_online_dialog.xml b/modulemain/src/main/res/layout/fragment_room_online_dialog.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/fragment_room_online_dialog.xml
rename to modulemain/src/main/res/layout/fragment_room_online_dialog.xml
diff --git a/moduleroom/src/main/res/layout/fragment_room_pk.xml b/modulemain/src/main/res/layout/fragment_room_pk.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/fragment_room_pk.xml
rename to modulemain/src/main/res/layout/fragment_room_pk.xml
diff --git a/moduleroom/src/main/res/layout/fragment_room_user_info.xml b/modulemain/src/main/res/layout/fragment_room_user_info.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/fragment_room_user_info.xml
rename to modulemain/src/main/res/layout/fragment_room_user_info.xml
diff --git a/moduleroom/src/main/res/layout/fragment_sing_song.xml b/modulemain/src/main/res/layout/fragment_sing_song.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/fragment_sing_song.xml
rename to modulemain/src/main/res/layout/fragment_sing_song.xml
diff --git a/moduleroom/src/main/res/layout/fragment_sound_dialog.xml b/modulemain/src/main/res/layout/fragment_sound_dialog.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/fragment_sound_dialog.xml
rename to modulemain/src/main/res/layout/fragment_sound_dialog.xml
diff --git a/modulevocal/src/main/res/layout/fragment_user_hompage.xml b/modulemain/src/main/res/layout/fragment_user_hompage.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/fragment_user_hompage.xml
rename to modulemain/src/main/res/layout/fragment_user_hompage.xml
diff --git a/modulevocal/src/main/res/layout/fragment_vocal_range.xml b/modulemain/src/main/res/layout/fragment_vocal_range.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/fragment_vocal_range.xml
rename to modulemain/src/main/res/layout/fragment_vocal_range.xml
diff --git a/modulevoice/src/main/res/layout/fragment_voice.xml b/modulemain/src/main/res/layout/fragment_voice.xml
similarity index 100%
rename from modulevoice/src/main/res/layout/fragment_voice.xml
rename to modulemain/src/main/res/layout/fragment_voice.xml
diff --git a/modulevoice/src/main/res/layout/fragment_voice_category.xml b/modulemain/src/main/res/layout/fragment_voice_category.xml
similarity index 100%
rename from modulevoice/src/main/res/layout/fragment_voice_category.xml
rename to modulemain/src/main/res/layout/fragment_voice_category.xml
diff --git a/moduleroom/src/main/res/layout/fragment_wheat_feeding_dialog.xml b/modulemain/src/main/res/layout/fragment_wheat_feeding_dialog.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/fragment_wheat_feeding_dialog.xml
rename to modulemain/src/main/res/layout/fragment_wheat_feeding_dialog.xml
diff --git a/modulevoice/src/main/res/layout/index_image_banner.xml b/modulemain/src/main/res/layout/index_image_banner.xml
similarity index 100%
rename from modulevoice/src/main/res/layout/index_image_banner.xml
rename to modulemain/src/main/res/layout/index_image_banner.xml
diff --git a/modulevoice/src/main/res/layout/index_item_carousel.xml b/modulemain/src/main/res/layout/index_item_carousel.xml
similarity index 100%
rename from modulevoice/src/main/res/layout/index_item_carousel.xml
rename to modulemain/src/main/res/layout/index_item_carousel.xml
diff --git a/modulevoice/src/main/res/layout/index_item_history.xml b/modulemain/src/main/res/layout/index_item_history.xml
similarity index 100%
rename from modulevoice/src/main/res/layout/index_item_history.xml
rename to modulemain/src/main/res/layout/index_item_history.xml
diff --git a/modulevoice/src/main/res/layout/index_item_image.xml b/modulemain/src/main/res/layout/index_item_image.xml
similarity index 100%
rename from modulevoice/src/main/res/layout/index_item_image.xml
rename to modulemain/src/main/res/layout/index_item_image.xml
diff --git a/modulevoice/src/main/res/layout/index_item_record.xml b/modulemain/src/main/res/layout/index_item_record.xml
similarity index 100%
rename from modulevoice/src/main/res/layout/index_item_record.xml
rename to modulemain/src/main/res/layout/index_item_record.xml
diff --git a/modulevoice/src/main/res/layout/index_item_search_room_result.xml b/modulemain/src/main/res/layout/index_item_search_room_result.xml
similarity index 100%
rename from modulevoice/src/main/res/layout/index_item_search_room_result.xml
rename to modulemain/src/main/res/layout/index_item_search_room_result.xml
diff --git a/modulevoice/src/main/res/layout/index_item_search_user_result.xml b/modulemain/src/main/res/layout/index_item_search_user_result.xml
similarity index 100%
rename from modulevoice/src/main/res/layout/index_item_search_user_result.xml
rename to modulemain/src/main/res/layout/index_item_search_user_result.xml
diff --git a/modulevoice/src/main/res/layout/index_item_tecord_head.xml b/modulemain/src/main/res/layout/index_item_tecord_head.xml
similarity index 100%
rename from modulevoice/src/main/res/layout/index_item_tecord_head.xml
rename to modulemain/src/main/res/layout/index_item_tecord_head.xml
diff --git a/modulevoice/src/main/res/layout/index_rv_item_ranking_list.xml b/modulemain/src/main/res/layout/index_rv_item_ranking_list.xml
similarity index 100%
rename from modulevoice/src/main/res/layout/index_rv_item_ranking_list.xml
rename to modulemain/src/main/res/layout/index_rv_item_ranking_list.xml
diff --git a/modulevoice/src/main/res/layout/index_rv_item_room_hot0.xml b/modulemain/src/main/res/layout/index_rv_item_room_hot0.xml
similarity index 100%
rename from modulevoice/src/main/res/layout/index_rv_item_room_hot0.xml
rename to modulemain/src/main/res/layout/index_rv_item_room_hot0.xml
diff --git a/modulevoice/src/main/res/layout/index_view_empty.xml b/modulemain/src/main/res/layout/index_view_empty.xml
similarity index 100%
rename from modulevoice/src/main/res/layout/index_view_empty.xml
rename to modulemain/src/main/res/layout/index_view_empty.xml
diff --git a/modulevocal/src/main/res/layout/item_album_list.xml b/modulemain/src/main/res/layout/item_album_list.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/item_album_list.xml
rename to modulemain/src/main/res/layout/item_album_list.xml
diff --git a/modulevocal/src/main/res/layout/item_bind_card.xml b/modulemain/src/main/res/layout/item_bind_card.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/item_bind_card.xml
rename to modulemain/src/main/res/layout/item_bind_card.xml
diff --git a/modulevocal/src/main/res/layout/item_black.xml b/modulemain/src/main/res/layout/item_black.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/item_black.xml
rename to modulemain/src/main/res/layout/item_black.xml
diff --git a/modulevocal/src/main/res/layout/item_brief_introduction.xml b/modulemain/src/main/res/layout/item_brief_introduction.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/item_brief_introduction.xml
rename to modulemain/src/main/res/layout/item_brief_introduction.xml
diff --git a/moduleroom/src/main/res/layout/item_charm_dialog.xml b/modulemain/src/main/res/layout/item_charm_dialog.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/item_charm_dialog.xml
rename to modulemain/src/main/res/layout/item_charm_dialog.xml
diff --git a/modulecircle/src/main/res/layout/item_circle_category.xml b/modulemain/src/main/res/layout/item_circle_category.xml
similarity index 100%
rename from modulecircle/src/main/res/layout/item_circle_category.xml
rename to modulemain/src/main/res/layout/item_circle_category.xml
diff --git a/modulecircle/src/main/res/layout/item_cirle_category_grid.xml b/modulemain/src/main/res/layout/item_cirle_category_grid.xml
similarity index 100%
rename from modulecircle/src/main/res/layout/item_cirle_category_grid.xml
rename to modulemain/src/main/res/layout/item_cirle_category_grid.xml
diff --git a/modulevocal/src/main/res/layout/item_date_header.xml b/modulemain/src/main/res/layout/item_date_header.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/item_date_header.xml
rename to modulemain/src/main/res/layout/item_date_header.xml
diff --git a/moduleroom/src/main/res/layout/item_emotion.xml b/modulemain/src/main/res/layout/item_emotion.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/item_emotion.xml
rename to modulemain/src/main/res/layout/item_emotion.xml
diff --git a/modulecircle/src/main/res/layout/item_expand_column.xml b/modulemain/src/main/res/layout/item_expand_column.xml
similarity index 100%
rename from modulecircle/src/main/res/layout/item_expand_column.xml
rename to modulemain/src/main/res/layout/item_expand_column.xml
diff --git a/modulevocal/src/main/res/layout/item_gift_box.xml b/modulemain/src/main/res/layout/item_gift_box.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/item_gift_box.xml
rename to modulemain/src/main/res/layout/item_gift_box.xml
diff --git a/moduleroom/src/main/res/layout/item_gift_card.xml b/modulemain/src/main/res/layout/item_gift_card.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/item_gift_card.xml
rename to modulemain/src/main/res/layout/item_gift_card.xml
diff --git a/modulevocal/src/main/res/layout/item_group.xml b/modulemain/src/main/res/layout/item_group.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/item_group.xml
rename to modulemain/src/main/res/layout/item_group.xml
diff --git a/moduleroom/src/main/res/layout/item_hourly.xml b/modulemain/src/main/res/layout/item_hourly.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/item_hourly.xml
rename to modulemain/src/main/res/layout/item_hourly.xml
diff --git a/modulecircle/src/main/res/layout/item_multi_select.xml b/modulemain/src/main/res/layout/item_multi_select.xml
similarity index 100%
rename from modulecircle/src/main/res/layout/item_multi_select.xml
rename to modulemain/src/main/res/layout/item_multi_select.xml
diff --git a/modulevocal/src/main/res/layout/item_multi_select_t.xml b/modulemain/src/main/res/layout/item_multi_select_t.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/item_multi_select_t.xml
rename to modulemain/src/main/res/layout/item_multi_select_t.xml
diff --git a/modulevocal/src/main/res/layout/item_my_bag.xml b/modulemain/src/main/res/layout/item_my_bag.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/item_my_bag.xml
rename to modulemain/src/main/res/layout/item_my_bag.xml
diff --git a/modulevocal/src/main/res/layout/item_my_bag_data.xml b/modulemain/src/main/res/layout/item_my_bag_data.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/item_my_bag_data.xml
rename to modulemain/src/main/res/layout/item_my_bag_data.xml
diff --git a/moduleroom/src/main/res/layout/item_onlie_room.xml b/modulemain/src/main/res/layout/item_onlie_room.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/item_onlie_room.xml
rename to modulemain/src/main/res/layout/item_onlie_room.xml
diff --git a/modulevocal/src/main/res/layout/item_photo.xml b/modulemain/src/main/res/layout/item_photo.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/item_photo.xml
rename to modulemain/src/main/res/layout/item_photo.xml
diff --git a/modulevoice/src/main/res/layout/item_popular_room.xml b/modulemain/src/main/res/layout/item_popular_room.xml
similarity index 100%
rename from modulevoice/src/main/res/layout/item_popular_room.xml
rename to modulemain/src/main/res/layout/item_popular_room.xml
diff --git a/moduleroom/src/main/res/layout/item_ranking_auction.xml b/modulemain/src/main/res/layout/item_ranking_auction.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/item_ranking_auction.xml
rename to modulemain/src/main/res/layout/item_ranking_auction.xml
diff --git a/moduleroom/src/main/res/layout/item_red.xml b/modulemain/src/main/res/layout/item_red.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/item_red.xml
rename to modulemain/src/main/res/layout/item_red.xml
diff --git a/moduleroom/src/main/res/layout/item_red_bag.xml b/modulemain/src/main/res/layout/item_red_bag.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/item_red_bag.xml
rename to modulemain/src/main/res/layout/item_red_bag.xml
diff --git a/moduleroom/src/main/res/layout/item_relation.xml b/modulemain/src/main/res/layout/item_relation.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/item_relation.xml
rename to modulemain/src/main/res/layout/item_relation.xml
diff --git a/moduleroom/src/main/res/layout/item_relationship.xml b/modulemain/src/main/res/layout/item_relationship.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/item_relationship.xml
rename to modulemain/src/main/res/layout/item_relationship.xml
diff --git a/modulevocal/src/main/res/layout/item_revenue.xml b/modulemain/src/main/res/layout/item_revenue.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/item_revenue.xml
rename to modulemain/src/main/res/layout/item_revenue.xml
diff --git a/moduleroom/src/main/res/layout/item_reward.xml b/modulemain/src/main/res/layout/item_reward.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/item_reward.xml
rename to modulemain/src/main/res/layout/item_reward.xml
diff --git a/moduleroom/src/main/res/layout/item_room_charm_rank.xml b/modulemain/src/main/res/layout/item_room_charm_rank.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/item_room_charm_rank.xml
rename to modulemain/src/main/res/layout/item_room_charm_rank.xml
diff --git a/moduleroom/src/main/res/layout/item_room_gift.xml b/modulemain/src/main/res/layout/item_room_gift.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/item_room_gift.xml
rename to modulemain/src/main/res/layout/item_room_gift.xml
diff --git a/moduleroom/src/main/res/layout/item_room_online_text.xml b/modulemain/src/main/res/layout/item_room_online_text.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/item_room_online_text.xml
rename to modulemain/src/main/res/layout/item_room_online_text.xml
diff --git a/moduleroom/src/main/res/layout/item_setting.xml b/modulemain/src/main/res/layout/item_setting.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/item_setting.xml
rename to modulemain/src/main/res/layout/item_setting.xml
diff --git a/moduleroom/src/main/res/layout/item_song_list.xml b/modulemain/src/main/res/layout/item_song_list.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/item_song_list.xml
rename to modulemain/src/main/res/layout/item_song_list.xml
diff --git a/moduleLogin/src/main/res/layout/item_switch_accounts.xml b/modulemain/src/main/res/layout/item_switch_accounts.xml
similarity index 100%
rename from moduleLogin/src/main/res/layout/item_switch_accounts.xml
rename to modulemain/src/main/res/layout/item_switch_accounts.xml
diff --git a/modulevocal/src/main/res/layout/item_tablayout_headerzb.xml b/modulemain/src/main/res/layout/item_tablayout_headerzb.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/item_tablayout_headerzb.xml
rename to modulemain/src/main/res/layout/item_tablayout_headerzb.xml
diff --git a/modulevocal/src/main/res/layout/item_tag.xml b/modulemain/src/main/res/layout/item_tag.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/item_tag.xml
rename to modulemain/src/main/res/layout/item_tag.xml
diff --git a/modulevocal/src/main/res/layout/item_task_box.xml b/modulemain/src/main/res/layout/item_task_box.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/item_task_box.xml
rename to modulemain/src/main/res/layout/item_task_box.xml
diff --git a/modulevocal/src/main/res/layout/item_task_data.xml b/modulemain/src/main/res/layout/item_task_data.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/item_task_data.xml
rename to modulemain/src/main/res/layout/item_task_data.xml
diff --git a/modulevocal/src/main/res/layout/item_task_header.xml b/modulemain/src/main/res/layout/item_task_header.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/item_task_header.xml
rename to modulemain/src/main/res/layout/item_task_header.xml
diff --git a/moduleroom/src/main/res/layout/item_text_view.xml b/modulemain/src/main/res/layout/item_text_view.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/item_text_view.xml
rename to modulemain/src/main/res/layout/item_text_view.xml
diff --git a/moduleroom/src/main/res/layout/item_title.xml b/modulemain/src/main/res/layout/item_title.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/item_title.xml
rename to modulemain/src/main/res/layout/item_title.xml
diff --git a/modulevocal/src/main/res/layout/item_top_user.xml b/modulemain/src/main/res/layout/item_top_user.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/item_top_user.xml
rename to modulemain/src/main/res/layout/item_top_user.xml
diff --git a/moduleroom/src/main/res/layout/item_wheat_feeding_select.xml b/modulemain/src/main/res/layout/item_wheat_feeding_select.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/item_wheat_feeding_select.xml
rename to modulemain/src/main/res/layout/item_wheat_feeding_select.xml
diff --git a/modulevocal/src/main/res/layout/item_withdrawal.xml b/modulemain/src/main/res/layout/item_withdrawal.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/item_withdrawal.xml
rename to modulemain/src/main/res/layout/item_withdrawal.xml
diff --git a/modulevocal/src/main/res/layout/item_zhuangbanschangcheng_list.xml b/modulemain/src/main/res/layout/item_zhuangbanschangcheng_list.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/item_zhuangbanschangcheng_list.xml
rename to modulemain/src/main/res/layout/item_zhuangbanschangcheng_list.xml
diff --git a/modulevocal/src/main/res/layout/layout_empty_no.xml b/modulemain/src/main/res/layout/layout_empty_no.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/layout_empty_no.xml
rename to modulemain/src/main/res/layout/layout_empty_no.xml
diff --git a/moduleroom/src/main/res/layout/me_fagment_user_gift_wall.xml b/modulemain/src/main/res/layout/me_fagment_user_gift_wall.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/me_fagment_user_gift_wall.xml
rename to modulemain/src/main/res/layout/me_fagment_user_gift_wall.xml
diff --git a/modulevocal/src/main/res/layout/me_fagment_user_gift_wall.xml b/modulemain/src/main/res/layout/me_fagment_user_gift_wall_2.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/me_fagment_user_gift_wall.xml
rename to modulemain/src/main/res/layout/me_fagment_user_gift_wall_2.xml
diff --git a/moduleroom/src/main/res/layout/me_item_user_gift_wall.xml b/modulemain/src/main/res/layout/me_item_user_gift_wall.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/me_item_user_gift_wall.xml
rename to modulemain/src/main/res/layout/me_item_user_gift_wall.xml
diff --git a/modulevocal/src/main/res/layout/me_item_user_gift_wall.xml b/modulemain/src/main/res/layout/me_item_user_gift_wall_2.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/me_item_user_gift_wall.xml
rename to modulemain/src/main/res/layout/me_item_user_gift_wall_2.xml
diff --git a/modulevocal/src/main/res/layout/me_item_user_photo_wall.xml b/modulemain/src/main/res/layout/me_item_user_photo_wall.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/me_item_user_photo_wall.xml
rename to modulemain/src/main/res/layout/me_item_user_photo_wall.xml
diff --git a/modulevocal/src/main/res/layout/pop_layout1.xml b/modulemain/src/main/res/layout/pop_layout1.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/pop_layout1.xml
rename to modulemain/src/main/res/layout/pop_layout1.xml
diff --git a/moduleroom/src/main/res/layout/pop_menu.xml b/modulemain/src/main/res/layout/pop_menu.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/pop_menu.xml
rename to modulemain/src/main/res/layout/pop_menu.xml
diff --git a/moduleroom/src/main/res/layout/popup_menu.xml b/modulemain/src/main/res/layout/popup_menu.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/popup_menu.xml
rename to modulemain/src/main/res/layout/popup_menu.xml
diff --git a/modulevoice/src/main/res/layout/ranking_list.xml b/modulemain/src/main/res/layout/ranking_list.xml
similarity index 100%
rename from modulevoice/src/main/res/layout/ranking_list.xml
rename to modulemain/src/main/res/layout/ranking_list.xml
diff --git a/modulevocal/src/main/res/layout/room_activity_my_room.xml b/modulemain/src/main/res/layout/room_activity_my_room.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/room_activity_my_room.xml
rename to modulemain/src/main/res/layout/room_activity_my_room.xml
diff --git a/moduleroom/src/main/res/layout/room_cabin_fragment.xml b/modulemain/src/main/res/layout/room_cabin_fragment.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/room_cabin_fragment.xml
rename to modulemain/src/main/res/layout/room_cabin_fragment.xml
diff --git a/moduleroom/src/main/res/layout/room_concern_dialog.xml b/modulemain/src/main/res/layout/room_concern_dialog.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/room_concern_dialog.xml
rename to modulemain/src/main/res/layout/room_concern_dialog.xml
diff --git a/moduleroom/src/main/res/layout/room_concern_item.xml b/modulemain/src/main/res/layout/room_concern_item.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/room_concern_item.xml
rename to modulemain/src/main/res/layout/room_concern_item.xml
diff --git a/modulevocal/src/main/res/layout/room_details_list.xml b/modulemain/src/main/res/layout/room_details_list.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/room_details_list.xml
rename to modulemain/src/main/res/layout/room_details_list.xml
diff --git a/moduleroom/src/main/res/layout/room_dialog_message_list.xml b/modulemain/src/main/res/layout/room_dialog_message_list.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/room_dialog_message_list.xml
rename to modulemain/src/main/res/layout/room_dialog_message_list.xml
diff --git a/moduleroom/src/main/res/layout/room_dialog_room_pw_setting.xml b/modulemain/src/main/res/layout/room_dialog_room_pw_setting.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/room_dialog_room_pw_setting.xml
rename to modulemain/src/main/res/layout/room_dialog_room_pw_setting.xml
diff --git a/moduleroom/src/main/res/layout/room_dialog_tuner.xml b/modulemain/src/main/res/layout/room_dialog_tuner.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/room_dialog_tuner.xml
rename to modulemain/src/main/res/layout/room_dialog_tuner.xml
diff --git a/moduleroom/src/main/res/layout/room_fragement_dialog_room_background.xml b/modulemain/src/main/res/layout/room_fragement_dialog_room_background.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/room_fragement_dialog_room_background.xml
rename to modulemain/src/main/res/layout/room_fragement_dialog_room_background.xml
diff --git a/moduleroom/src/main/res/layout/room_fragement_trans_ease_chat.xml b/modulemain/src/main/res/layout/room_fragement_trans_ease_chat.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/room_fragement_trans_ease_chat.xml
rename to modulemain/src/main/res/layout/room_fragement_trans_ease_chat.xml
diff --git a/moduleroom/src/main/res/layout/room_fragment_item.xml b/modulemain/src/main/res/layout/room_fragment_item.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/room_fragment_item.xml
rename to modulemain/src/main/res/layout/room_fragment_item.xml
diff --git a/moduleroom/src/main/res/layout/room_fragment_item_list.xml b/modulemain/src/main/res/layout/room_fragment_item_list.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/room_fragment_item_list.xml
rename to modulemain/src/main/res/layout/room_fragment_item_list.xml
diff --git a/modulevocal/src/main/res/layout/room_fragment_my_create.xml b/modulemain/src/main/res/layout/room_fragment_my_create.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/room_fragment_my_create.xml
rename to modulemain/src/main/res/layout/room_fragment_my_create.xml
diff --git a/modulevocal/src/main/res/layout/room_fragment_my_follow.xml b/modulemain/src/main/res/layout/room_fragment_my_follow.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/room_fragment_my_follow.xml
rename to modulemain/src/main/res/layout/room_fragment_my_follow.xml
diff --git a/modulevocal/src/main/res/layout/room_fragment_my_manage.xml b/modulemain/src/main/res/layout/room_fragment_my_manage.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/room_fragment_my_manage.xml
rename to modulemain/src/main/res/layout/room_fragment_my_manage.xml
diff --git a/modulevocal/src/main/res/layout/room_fragment_my_room_cp_list.xml b/modulemain/src/main/res/layout/room_fragment_my_room_cp_list.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/room_fragment_my_room_cp_list.xml
rename to modulemain/src/main/res/layout/room_fragment_my_room_cp_list.xml
diff --git a/modulevocal/src/main/res/layout/room_fragment_my_room_list.xml b/modulemain/src/main/res/layout/room_fragment_my_room_list.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/room_fragment_my_room_list.xml
rename to modulemain/src/main/res/layout/room_fragment_my_room_list.xml
diff --git a/modulevocal/src/main/res/layout/room_fragment_my_room_list_list.xml b/modulemain/src/main/res/layout/room_fragment_my_room_list_list.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/room_fragment_my_room_list_list.xml
rename to modulemain/src/main/res/layout/room_fragment_my_room_list_list.xml
diff --git a/moduleroom/src/main/res/layout/room_gift_dialog.xml b/modulemain/src/main/res/layout/room_gift_dialog.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/room_gift_dialog.xml
rename to modulemain/src/main/res/layout/room_gift_dialog.xml
diff --git a/moduleroom/src/main/res/layout/room_host_add_fragment.xml b/modulemain/src/main/res/layout/room_host_add_fragment.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/room_host_add_fragment.xml
rename to modulemain/src/main/res/layout/room_host_add_fragment.xml
diff --git a/moduleroom/src/main/res/layout/room_host_add_item.xml b/modulemain/src/main/res/layout/room_host_add_item.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/room_host_add_item.xml
rename to modulemain/src/main/res/layout/room_host_add_item.xml
diff --git a/moduleroom/src/main/res/layout/room_host_income_dialog.xml b/modulemain/src/main/res/layout/room_host_income_dialog.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/room_host_income_dialog.xml
rename to modulemain/src/main/res/layout/room_host_income_dialog.xml
diff --git a/moduleroom/src/main/res/layout/room_host_zb_dialog.xml b/modulemain/src/main/res/layout/room_host_zb_dialog.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/room_host_zb_dialog.xml
rename to modulemain/src/main/res/layout/room_host_zb_dialog.xml
diff --git a/modulevocal/src/main/res/layout/room_index_item_chatroom_my_foot.xml b/modulemain/src/main/res/layout/room_index_item_chatroom_my_foot.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/room_index_item_chatroom_my_foot.xml
rename to modulemain/src/main/res/layout/room_index_item_chatroom_my_foot.xml
diff --git a/modulevocal/src/main/res/layout/room_index_item_subsidy.xml b/modulemain/src/main/res/layout/room_index_item_subsidy.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/room_index_item_subsidy.xml
rename to modulemain/src/main/res/layout/room_index_item_subsidy.xml
diff --git a/modulevocal/src/main/res/layout/room_li_bu.xml b/modulemain/src/main/res/layout/room_li_bu.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/room_li_bu.xml
rename to modulemain/src/main/res/layout/room_li_bu.xml
diff --git a/moduleroom/src/main/res/layout/room_ranking_child.xml b/modulemain/src/main/res/layout/room_ranking_child.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/room_ranking_child.xml
rename to modulemain/src/main/res/layout/room_ranking_child.xml
diff --git a/moduleroom/src/main/res/layout/room_ranking_parent.xml b/modulemain/src/main/res/layout/room_ranking_parent.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/room_ranking_parent.xml
rename to modulemain/src/main/res/layout/room_ranking_parent.xml
diff --git a/moduleroom/src/main/res/layout/room_rv_item_gift_wheat.xml b/modulemain/src/main/res/layout/room_rv_item_gift_wheat.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/room_rv_item_gift_wheat.xml
rename to modulemain/src/main/res/layout/room_rv_item_gift_wheat.xml
diff --git a/moduleroom/src/main/res/layout/room_rv_item_ranking.xml b/modulemain/src/main/res/layout/room_rv_item_ranking.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/room_rv_item_ranking.xml
rename to modulemain/src/main/res/layout/room_rv_item_ranking.xml
diff --git a/moduleroom/src/main/res/layout/room_rv_item_ranking_rich.xml b/modulemain/src/main/res/layout/room_rv_item_ranking_rich.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/room_rv_item_ranking_rich.xml
rename to modulemain/src/main/res/layout/room_rv_item_ranking_rich.xml
diff --git a/moduleroom/src/main/res/layout/room_rv_item_room_bg.xml b/modulemain/src/main/res/layout/room_rv_item_room_bg.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/room_rv_item_room_bg.xml
rename to modulemain/src/main/res/layout/room_rv_item_room_bg.xml
diff --git a/moduleroom/src/main/res/layout/room_rv_item_tuner.xml b/modulemain/src/main/res/layout/room_rv_item_tuner.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/room_rv_item_tuner.xml
rename to modulemain/src/main/res/layout/room_rv_item_tuner.xml
diff --git a/moduleroom/src/main/res/layout/room_top.xml b/modulemain/src/main/res/layout/room_top.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/room_top.xml
rename to modulemain/src/main/res/layout/room_top.xml
diff --git a/moduleroom/src/main/res/layout/top_overlay_buttons.xml b/modulemain/src/main/res/layout/top_overlay_buttons.xml
similarity index 100%
rename from moduleroom/src/main/res/layout/top_overlay_buttons.xml
rename to modulemain/src/main/res/layout/top_overlay_buttons.xml
diff --git a/modulevocal/src/main/res/layout/user_home.xml b/modulemain/src/main/res/layout/user_home.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/user_home.xml
rename to modulemain/src/main/res/layout/user_home.xml
diff --git a/modulevocal/src/main/res/layout/user_top.xml b/modulemain/src/main/res/layout/user_top.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/user_top.xml
rename to modulemain/src/main/res/layout/user_top.xml
diff --git a/modulevocal/src/main/res/layout/zhuangban_recyclerview_noref.xml b/modulemain/src/main/res/layout/zhuangban_recyclerview_noref.xml
similarity index 100%
rename from modulevocal/src/main/res/layout/zhuangban_recyclerview_noref.xml
rename to modulemain/src/main/res/layout/zhuangban_recyclerview_noref.xml
diff --git a/modulevoice/src/main/res/mipmap-xxhdpi/jiaoyou.webp b/modulemain/src/main/res/mipmap-xxhdpi/jiaoyou.webp
similarity index 100%
rename from modulevoice/src/main/res/mipmap-xxhdpi/jiaoyou.webp
rename to modulemain/src/main/res/mipmap-xxhdpi/jiaoyou.webp
diff --git a/modulevoice/src/main/res/mipmap-xxxhdpi/me_head_bg.png b/modulemain/src/main/res/mipmap-xxxhdpi/me_head_bg.png
similarity index 100%
rename from modulevoice/src/main/res/mipmap-xxxhdpi/me_head_bg.png
rename to modulemain/src/main/res/mipmap-xxxhdpi/me_head_bg.png
diff --git a/modulevoice/src/main/res/mipmap-xxxhdpi/xing.webp b/modulemain/src/main/res/mipmap-xxxhdpi/xing.webp
similarity index 100%
rename from modulevoice/src/main/res/mipmap-xxxhdpi/xing.webp
rename to modulemain/src/main/res/mipmap-xxxhdpi/xing.webp
diff --git a/modulenews/.gitignore b/modulenews/.gitignore
deleted file mode 100644
index 42afabfd..00000000
--- a/modulenews/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
\ No newline at end of file
diff --git a/modulenews/build.gradle b/modulenews/build.gradle
deleted file mode 100644
index a9ece88b..00000000
--- a/modulenews/build.gradle
+++ /dev/null
@@ -1,45 +0,0 @@
-plugins {
-    alias(libs.plugins.android.library)
-}
-
-android {
-    namespace 'com.example.modulenews'
-    compileSdk 35
-
-    defaultConfig {
-        minSdk 24
-        targetSdk 35
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
-    }
-
-    dataBinding {
-        enabled = true
-    }
-}
-
-dependencies {
-
-    implementation libs.appcompat
-    implementation libs.material
-    implementation libs.activity
-    implementation libs.constraintlayout
-    testImplementation libs.junit
-    androidTestImplementation libs.ext.junit
-    androidTestImplementation libs.espresso.core
-
-    implementation project(':moduleUtil')
-    api project(':tuiconversation')
-    api project(':tuichat')
-}
\ No newline at end of file
diff --git a/modulenews/proguard-rules.pro b/modulenews/proguard-rules.pro
deleted file mode 100644
index 481bb434..00000000
--- a/modulenews/proguard-rules.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/modulenews/src/main/AndroidManifest.xml b/modulenews/src/main/AndroidManifest.xml
deleted file mode 100644
index 14a54e7b..00000000
--- a/modulenews/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <application
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:roundIcon="@mipmap/ic_launcher_round"
-        android:supportsRtl="true"
-        android:theme="@style/Theme.QxLive">
-
-    </application>
-
-</manifest>
\ No newline at end of file
diff --git a/modulenews/src/main/res/drawable/ic_launcher_background.xml b/modulenews/src/main/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index 07d5da9c..00000000
--- a/modulenews/src/main/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>
diff --git a/modulenews/src/main/res/drawable/ic_launcher_foreground.xml b/modulenews/src/main/res/drawable/ic_launcher_foreground.xml
deleted file mode 100644
index 2b068d11..00000000
--- a/modulenews/src/main/res/drawable/ic_launcher_foreground.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
-        <aapt:attr name="android:fillColor">
-            <gradient
-                android:endX="85.84757"
-                android:endY="92.4963"
-                android:startX="42.9492"
-                android:startY="49.59793"
-                android:type="linear">
-                <item
-                    android:color="#44000000"
-                    android:offset="0.0" />
-                <item
-                    android:color="#00000000"
-                    android:offset="1.0" />
-            </gradient>
-        </aapt:attr>
-    </path>
-    <path
-        android:fillColor="#FFFFFF"
-        android:fillType="nonZero"
-        android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
-        android:strokeWidth="1"
-        android:strokeColor="#00000000" />
-</vector>
\ No newline at end of file
diff --git a/modulenews/src/main/res/values/colors.xml b/modulenews/src/main/res/values/colors.xml
deleted file mode 100644
index f8c6127d..00000000
--- a/modulenews/src/main/res/values/colors.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="purple_200">#FFBB86FC</color>
-    <color name="purple_500">#FF6200EE</color>
-    <color name="purple_700">#FF3700B3</color>
-    <color name="teal_200">#FF03DAC5</color>
-    <color name="teal_700">#FF018786</color>
-    <color name="black">#FF000000</color>
-    <color name="white">#FFFFFFFF</color>
-</resources>
\ No newline at end of file
diff --git a/modulenews/src/main/res/values/strings.xml b/modulenews/src/main/res/values/strings.xml
deleted file mode 100644
index 73862c41..00000000
--- a/modulenews/src/main/res/values/strings.xml
+++ /dev/null
@@ -1 +0,0 @@
-<resources></resources>
\ No newline at end of file
diff --git a/moduleroom/.gitignore b/moduleroom/.gitignore
deleted file mode 100644
index 42afabfd..00000000
--- a/moduleroom/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
\ No newline at end of file
diff --git a/moduleroom/build.gradle b/moduleroom/build.gradle
deleted file mode 100644
index d7f42d0b..00000000
--- a/moduleroom/build.gradle
+++ /dev/null
@@ -1,73 +0,0 @@
-plugins {
-    alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
-}
-apply plugin: 'kotlin-kapt'
-android {
-    namespace 'com.example.moduleroom'
-    compileSdk 35
-
-    defaultConfig {
-        minSdk 24
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles "consumer-rules.pro"
-        javaCompileOptions {
-            annotationProcessorOptions {
-                arguments = [AROUTER_MODULE_NAME: project.getName()]
-            }
-        }
-
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
-    }
-
-    dataBinding {
-        enable = true
-    }
-}
-// 与 dependencies 同级别
-kapt {
-    arguments {
-        arg("AROUTER_MODULE_NAME", project.getName())
-    }
-}
-dependencies {
-
-    implementation libs.appcompat
-    implementation libs.material
-    implementation libs.activity
-    implementation libs.constraintlayout
-    implementation libs.androidx.legacy.support.v4
-    implementation libs.lifecycle.livedata.ktx
-    implementation libs.lifecycle.viewmodel.ktx
-    implementation libs.androidx.fragment.ktx
-    testImplementation libs.junit
-    androidTestImplementation libs.ext.junit
-    androidTestImplementation libs.espresso.core
-
-    implementation project(':moduleUtil')
-    implementation project(':moduletablayout')
-
-//    implementation 'com.alibaba:arouter-api:1.5.2'
-    //annotationProcessor
-//    annotationProcessor 'com.alibaba:arouter-compiler:1.5.2'
-
-    implementation 'com.alibaba:arouter-api:1.5.2'
-    kapt 'com.alibaba:arouter-compiler:1.5.2'
-
-    implementation 'com.github.JessYanCoding:AndroidAutoSize:v1.2.1'
-
-    api project(':tuiconversation')
-    api project(':tuichat')
-}
-apply plugin: 'com.alibaba.arouter' // ⚠️ 添加这一行
\ No newline at end of file
diff --git a/moduleroom/consumer-rules.pro b/moduleroom/consumer-rules.pro
deleted file mode 100644
index e69de29b..00000000
diff --git a/moduleroom/proguard-rules.pro b/moduleroom/proguard-rules.pro
deleted file mode 100644
index 481bb434..00000000
--- a/moduleroom/proguard-rules.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/moduleroom/src/main/AndroidManifest.xml b/moduleroom/src/main/AndroidManifest.xml
deleted file mode 100644
index f22d5030..00000000
--- a/moduleroom/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.example.moduleroom">
-
-    <application>
-
-        <meta-data
-            android:name="design_width_in_dp"
-            android:value="375" />
-
-        <meta-data
-            android:name="design_height_in_dp"
-            android:value="812" />
-
-        <activity
-            android:name=".activity.RoomActivity"
-            android:screenOrientation="portrait"
-            android:launchMode="singleTask"
-            android:excludeFromRecents="false"
-            android:exported="false"
-            android:windowSoftInputMode="adjustPan"
-            android:alwaysRetainTaskState="true"
-            android:enableOnBackInvokedCallback="false"
-            android:theme="@style/TransparentActivityTheme"
-            android:configChanges="orientation|screenSize|keyboardHidden"
-            tools:targetApi="tiramisu" />
-<!--        <activity-->
-<!--            android:name=".activity.RoomActivity"-->
-<!--            android:launchMode="singleInstancePerTask"-->
-<!--            android:windowSoftInputMode="adjustPan"-->
-<!--            android:enableOnBackInvokedCallback="false"-->
-<!--            android:theme="@style/TransparentActivityTheme"-->
-<!--            android:configChanges="orientation|screenSize|keyboardHidden"-->
-<!--            android:screenOrientation="portrait"-->
-<!--            android:exported="true"-->
-<!--           />-->
-
-        <service
-            android:name=".service.MediaProjectionService"
-            android:foregroundServiceType="mediaProjection">
-        </service>
-
-        <service
-            android:name=".service.ForegroundService"
-            android:enabled="true"
-            android:exported="true"
-            android:foregroundServiceType="microphone|camera|mediaPlayback" />
-        <service
-            android:name=".service.CancelNoticeService"
-            android:enabled="true"
-            android:exported="true" />
-
-        <activity android:name=".activity.RedResultActivity"
-                android:exported="true"/>
-
-    </application>
-
-</manifest>
\ No newline at end of file
diff --git a/moduleroom/src/main/res/layout/custom_tab_layout.xml b/moduleroom/src/main/res/layout/custom_tab_layout.xml
deleted file mode 100644
index c2d30a71..00000000
--- a/moduleroom/src/main/res/layout/custom_tab_layout.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal"
-    android:gravity="center_vertical"
-    android:layout_marginTop="@dimen/dp_12"
-    android:layout_marginStart="@dimen/dp_16"
-    android:layout_marginEnd="@dimen/dp_16">
-
-    <com.example.moduletablayout.CustomSlidingTabLayout
-        android:id="@+id/sliding_tab_layout"
-        android:layout_width="0dp"
-        android:layout_height="@dimen/dp_24"
-        android:orientation="horizontal"
-        android:layout_weight="1"
-        app:tl_tab_space_equal="true"
-        app:tl_textBold="BOTH"
-        app:tl_textSelectColor="@color/white"
-        app:tl_textUnselectColor="@color/color_FF999999"
-        app:tl_textsize="14sp" />
-
-    <TextView
-        android:id="@+id/more_button"
-        android:layout_width="wrap_content"
-        android:layout_height="@dimen/dp_24"
-        android:drawableEnd="@mipmap/jt_right"
-        android:background="?attr/selectableItemBackgroundBorderless"
-        android:text="更多"
-        android:gravity="center"
-        android:layout_gravity="center"
-        android:textSize="@dimen/sp_12"
-        android:textColor="#0DFFB9"
-        android:layout_marginStart="@dimen/dp_8" />
-</LinearLayout>
diff --git a/moduleroom/src/main/res/values/strings.xml b/moduleroom/src/main/res/values/strings.xml
deleted file mode 100644
index 6048840e..00000000
--- a/moduleroom/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<resources>
-    <!-- TODO: Remove or change this placeholder text -->
-    <string name="hello_blank_fragment">Hello blank fragment</string>
-</resources>
\ No newline at end of file
diff --git a/modulevocal/.gitignore b/modulevocal/.gitignore
deleted file mode 100644
index 42afabfd..00000000
--- a/modulevocal/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
\ No newline at end of file
diff --git a/modulevocal/build.gradle b/modulevocal/build.gradle
deleted file mode 100644
index 661076e3..00000000
--- a/modulevocal/build.gradle
+++ /dev/null
@@ -1,69 +0,0 @@
-plugins {
-    alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
-}
-//configurations.all {
-//    // 解决注解处理器冲突
-//    resolutionStrategy {
-//        force 'com.alibaba:arouter-compiler:1.5.2'
-//        force 'com.google.auto.service:auto-service:1.0'
-//    }
-//}
-android {
-    namespace 'com.example.modulevocal'
-    compileSdk 35
-
-    defaultConfig {
-        minSdk 24
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        javaCompileOptions {
-            annotationProcessorOptions {
-                arguments += [
-                        AROUTER_GENERATE_DOC: "enable",
-                        // 显式指定模块名
-                        AROUTER_MODULE_NAME: project.name
-                ]
-            }
-        }
-
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
-    }
-    dataBinding {
-        enable = true
-    }
-}
-
-dependencies {
-
-    implementation libs.appcompat
-    implementation libs.material
-    implementation libs.activity
-    implementation libs.constraintlayout
-    testImplementation libs.junit
-    androidTestImplementation libs.ext.junit
-    androidTestImplementation libs.espresso.core
-
-    implementation(project(':moduleUtil'))
-    implementation(project(':moduletablayout'))
-
-    implementation 'com.alibaba:arouter-api:1.5.2'
-    //annotationProcessor
-    annotationProcessor 'com.alibaba:arouter-compiler:1.5.2'
-
-    implementation files('libs/WbCloudFaceLiveSdk-face-v6.6.2-8e4718fc.aar')
-    implementation files('libs/WbCloudNormal-v5.1.10-4e3e198.aar')
-
-
-}
-apply plugin: 'com.alibaba.arouter' // ⚠️ 添加这一行
\ No newline at end of file
diff --git a/modulevocal/proguard-rules.pro b/modulevocal/proguard-rules.pro
deleted file mode 100644
index 481bb434..00000000
--- a/modulevocal/proguard-rules.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/modulevocal/src/main/AndroidManifest.xml b/modulevocal/src/main/AndroidManifest.xml
deleted file mode 100644
index 723426a3..00000000
--- a/modulevocal/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <application
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:roundIcon="@mipmap/ic_launcher_round"
-        android:supportsRtl="true"
-        android:theme="@style/BaseAppTheme">
-        <activity
-            android:name=".activity.AboutUsActivity"
-            android:exported="false" />
-        <activity
-            android:name=".activity.WithdrawalListActivity"
-            android:exported="false"
-             />
-        <activity
-            android:name=".activity.GiftBoxRecordActivity"
-            android:exported="false"
-             />
-        <activity
-            android:name=".activity.BindCardDetailsActivity"
-            android:exported="false"
-             />
-        <activity
-            android:name=".activity.BindCardActivity"
-            android:exported="false"
-             />
-        <activity
-            android:name=".activity.AlbumDetailActivity"
-            android:exported="false"
-             />
-        <activity
-            android:name=".activity.SettingActivity"
-            android:exported="false"
-             />
-        <activity
-            android:name=".activity.CreateAlbumActivity"
-            android:exported="false"
-             />
-        <activity
-            android:name=".activity.RevenueActivity"
-            android:exported="false"
-             />
-        <activity
-            android:name=".activity.DailyTasksActivity"
-            android:exported="false"
-             />
-        <activity
-            android:name=".activity.UserHomepageActivity"
-            android:exported="false"
-             />
-        <activity
-            android:name=".activity.MyBagActivity"
-            android:exported="false"
-             />
-        <activity
-            android:name=".activity.BriefIntroductionActivity"
-            android:exported="false"
-             />
-        <activity
-            android:name=".activity.ChangeNicknameActivity"
-            android:exported="false"
-             />
-        <activity
-            android:name=".activity.CurrencyExchangeActivity"
-            android:exported="false"
-             />
-        <activity
-            android:name=".activity.WithdrawalActivity"
-            android:exported="false"
-             />
-        <activity
-            android:name=".activity.RechargeActivity"
-            android:exported="false"
-             />
-        <activity
-            android:name=".activity.MyMoneyActivity"
-            android:exported="false"
-             />
-        <activity
-            android:name=".activity.EditUserInfoActivity"
-            android:exported="false"
-             />
-        <activity
-            android:name=".activity.EditUserActivity"
-            android:exported="false" />
-        <activity
-            android:name=".activity.ChangPassActivity"
-            android:exported="false"
-             />
-        <activity
-            android:name=".activity.PersonalityActivity"
-            android:exported="false"
-             />
-        <activity
-            android:name=".activity.RealDetailActivity"
-            android:exported="false"
-             />
-        <activity
-            android:name=".activity.RoomAllowanceDetailActivity"
-            android:exported="false"
-             />
-        <activity
-            android:name=".activity.RoomAllowanceActivity"
-            android:exported="false"
-             />
-        <activity
-            android:name=".activity.RoomDetailsActivity"
-            android:exported="false"
-             />
-        <activity
-            android:name=".activity.CreatedRoomActivity"
-            android:exported="false"
-             />
-        <activity
-            android:name=".activity.MyRoomActivity"
-            android:exported="false"
-             />
-        <activity
-            android:name=".activity.PhoneReplacementActivity"
-            android:exported="false"
-             />
-        <activity
-            android:name=".activity.ChangePasswordActivity"
-            android:exported="false" />
-        <activity
-            android:name=".activity.BlacklistActivity"
-            android:exported="false"
-             />
-        <activity
-            android:name=".activity.MessageReminderActivity"
-            android:exported="false"
-             />
-        <activity
-            android:name=".activity.NotificationActivity"
-            android:exported="false"
-             />
-        <activity
-            android:name=".activity.UnderageActivity"
-            android:exported="true"
-             />
-        <activity
-            android:name=".activity.RealNameActivity"
-            android:exported="false" />
-    </application>
-
-</manifest>
\ No newline at end of file
diff --git a/modulevocal/src/main/res/drawable/ic_launcher_background.xml b/modulevocal/src/main/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index 07d5da9c..00000000
--- a/modulevocal/src/main/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>
diff --git a/modulevocal/src/main/res/drawable/ic_launcher_foreground.xml b/modulevocal/src/main/res/drawable/ic_launcher_foreground.xml
deleted file mode 100644
index 2b068d11..00000000
--- a/modulevocal/src/main/res/drawable/ic_launcher_foreground.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
-        <aapt:attr name="android:fillColor">
-            <gradient
-                android:endX="85.84757"
-                android:endY="92.4963"
-                android:startX="42.9492"
-                android:startY="49.59793"
-                android:type="linear">
-                <item
-                    android:color="#44000000"
-                    android:offset="0.0" />
-                <item
-                    android:color="#00000000"
-                    android:offset="1.0" />
-            </gradient>
-        </aapt:attr>
-    </path>
-    <path
-        android:fillColor="#FFFFFF"
-        android:fillType="nonZero"
-        android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
-        android:strokeWidth="1"
-        android:strokeColor="#00000000" />
-</vector>
\ No newline at end of file
diff --git a/modulevocal/src/main/res/values/colors.xml b/modulevocal/src/main/res/values/colors.xml
deleted file mode 100644
index f8c6127d..00000000
--- a/modulevocal/src/main/res/values/colors.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="purple_200">#FFBB86FC</color>
-    <color name="purple_500">#FF6200EE</color>
-    <color name="purple_700">#FF3700B3</color>
-    <color name="teal_200">#FF03DAC5</color>
-    <color name="teal_700">#FF018786</color>
-    <color name="black">#FF000000</color>
-    <color name="white">#FFFFFFFF</color>
-</resources>
\ No newline at end of file
diff --git a/modulevocal/src/main/res/values/strings.xml b/modulevocal/src/main/res/values/strings.xml
deleted file mode 100644
index 6048840e..00000000
--- a/modulevocal/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<resources>
-    <!-- TODO: Remove or change this placeholder text -->
-    <string name="hello_blank_fragment">Hello blank fragment</string>
-</resources>
\ No newline at end of file
diff --git a/modulevocal/src/main/res/values/styles.xml b/modulevocal/src/main/res/values/styles.xml
deleted file mode 100644
index 226e1882..00000000
--- a/modulevocal/src/main/res/values/styles.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <style name="RoundedProgressBar" parent="Widget.Material3.LinearProgressIndicator">
-        <item name="trackCornerRadius">50dp</item>
-    </style>
-
-</resources>
\ No newline at end of file
diff --git a/modulevoice/.gitignore b/modulevoice/.gitignore
deleted file mode 100644
index 42afabfd..00000000
--- a/modulevoice/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
\ No newline at end of file
diff --git a/modulevoice/build.gradle b/modulevoice/build.gradle
deleted file mode 100644
index c76b8d08..00000000
--- a/modulevoice/build.gradle
+++ /dev/null
@@ -1,66 +0,0 @@
-plugins {
-    alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
-}
-
-android {
-    namespace 'com.example.modulevoice'
-    compileSdk 35
-
-    defaultConfig {
-        minSdk 24
-        targetSdk 35
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        javaCompileOptions {
-            annotationProcessorOptions {
-                arguments = [AROUTER_MODULE_NAME: project.getName()]
-            }
-        }
-
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
-    }
-    dataBinding {
-        enabled = true
-    }
-    kotlinOptions {
-        jvmTarget = '11'
-    }
-    buildFeatures {
-        viewBinding true
-    }
-}
-
-dependencies {
-
-    implementation libs.appcompat
-    implementation libs.material
-    implementation project(':moduleUtil')
-    implementation project(':moduletablayout')
-
-    testImplementation libs.junit
-    androidTestImplementation libs.ext.junit
-    androidTestImplementation libs.espresso.core
-    implementation libs.lifecycle.livedata.ktx
-    implementation libs.lifecycle.viewmodel.ktx
-
-    implementation 'com.alibaba:arouter-api:1.5.2'
-    //annotationProcessor
-    annotationProcessor 'com.alibaba:arouter-compiler:1.5.2'
-
-    implementation project(':moduleroom')
-
-
-}
-
-apply plugin: 'com.alibaba.arouter' // ⚠️ 添加这一行
\ No newline at end of file
diff --git a/modulevoice/proguard-rules.pro b/modulevoice/proguard-rules.pro
deleted file mode 100644
index 481bb434..00000000
--- a/modulevoice/proguard-rules.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/modulevoice/src/main/AndroidManifest.xml b/modulevoice/src/main/AndroidManifest.xml
deleted file mode 100644
index ac98997e..00000000
--- a/modulevoice/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-    <application
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:roundIcon="@mipmap/ic_launcher_round"
-        android:supportsRtl="true"
-        android:theme="@style/BaseAppTheme">
-        <activity
-            android:name=".activity.SearchActivity"
-            
-            android:exported="true" />
-
-        <activity
-            android:name=".activity.RankingListActivity"
-            
-            android:exported="false"
-        />
-        <activity
-                android:name=".activity.PopularRoomActivity"
-                android:exported="false"/>
-    </application>
-
-</manifest>
\ No newline at end of file
diff --git a/modulevoice/src/main/java/com/example/modulevoice/activity/ui/main/PageViewModel.java b/modulevoice/src/main/java/com/example/modulevoice/activity/ui/main/PageViewModel.java
deleted file mode 100644
index 1b730aef..00000000
--- a/modulevoice/src/main/java/com/example/modulevoice/activity/ui/main/PageViewModel.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.example.modulevoice.activity.ui.main;
-
-import static androidx.lifecycle.Transformations.map;
-
-import androidx.lifecycle.LiveData;
-import androidx.lifecycle.MutableLiveData;
-import androidx.lifecycle.ViewModel;
-
-public class PageViewModel extends ViewModel {
-
-    private MutableLiveData<Integer> mIndex = new MutableLiveData<>();
-    private LiveData<String> mText = map(mIndex, input -> "Hello world from section: " + input);
-
-    public void setIndex(int index) {
-        mIndex.setValue(index);
-    }
-
-    public LiveData<String> getText() {
-        return mText;
-    }
-}
\ No newline at end of file
diff --git a/modulevoice/src/main/java/com/example/modulevoice/view/MarqueeTextView.java b/modulevoice/src/main/java/com/example/modulevoice/view/MarqueeTextView.java
deleted file mode 100644
index 8ee2c14e..00000000
--- a/modulevoice/src/main/java/com/example/modulevoice/view/MarqueeTextView.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.example.modulevoice.view;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.widget.TextView;
-
-public class MarqueeTextView extends androidx.appcompat.widget.AppCompatTextView {
-    public MarqueeTextView(Context context) {
-        super(context);
-    }
-
-    public MarqueeTextView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public MarqueeTextView(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-    }
-
-    // 始终返回true，确保能获取焦点
-    @Override
-    public boolean isFocused() {
-        return true;
-    }
-}
\ No newline at end of file
diff --git a/modulevoice/src/main/res/drawable/ic_launcher_background.xml b/modulevoice/src/main/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index 07d5da9c..00000000
--- a/modulevoice/src/main/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>
diff --git a/modulevoice/src/main/res/drawable/ic_launcher_foreground.xml b/modulevoice/src/main/res/drawable/ic_launcher_foreground.xml
deleted file mode 100644
index 2b068d11..00000000
--- a/modulevoice/src/main/res/drawable/ic_launcher_foreground.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
-        <aapt:attr name="android:fillColor">
-            <gradient
-                android:endX="85.84757"
-                android:endY="92.4963"
-                android:startX="42.9492"
-                android:startY="49.59793"
-                android:type="linear">
-                <item
-                    android:color="#44000000"
-                    android:offset="0.0" />
-                <item
-                    android:color="#00000000"
-                    android:offset="1.0" />
-            </gradient>
-        </aapt:attr>
-    </path>
-    <path
-        android:fillColor="#FFFFFF"
-        android:fillType="nonZero"
-        android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
-        android:strokeWidth="1"
-        android:strokeColor="#00000000" />
-</vector>
\ No newline at end of file
diff --git a/modulevoice/src/main/res/values-en-rUs/strings.xml b/modulevoice/src/main/res/values-en-rUs/strings.xml
deleted file mode 100644
index d5dac5f6..00000000
--- a/modulevoice/src/main/res/values-en-rUs/strings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
-
-</resources>
\ No newline at end of file
diff --git a/modulevoice/src/main/res/values/colors.xml b/modulevoice/src/main/res/values/colors.xml
deleted file mode 100644
index f8c6127d..00000000
--- a/modulevoice/src/main/res/values/colors.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="purple_200">#FFBB86FC</color>
-    <color name="purple_500">#FF6200EE</color>
-    <color name="purple_700">#FF3700B3</color>
-    <color name="teal_200">#FF03DAC5</color>
-    <color name="teal_700">#FF018786</color>
-    <color name="black">#FF000000</color>
-    <color name="white">#FFFFFFFF</color>
-</resources>
\ No newline at end of file
diff --git a/modulevoice/src/main/res/values/strings.xml b/modulevoice/src/main/res/values/strings.xml
deleted file mode 100644
index 7c3ea2c9..00000000
--- a/modulevoice/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <string name="common_id_formatter" translatable="false" tools:ignore="ResourceName">ID: %s</string>
-</resources>
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index 7999babb..6c6d8446 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -48,18 +48,18 @@ dependencyResolutionManagement {
 rootProject.name = "羽声语音"
 include ':app'
 include ':moduleUtil'  //工具模块
-include ':moduleLogin' //登录模块
+//include ':moduleLogin' //登录模块
 include ':modulemain'  //首页模块
-include ':modulevoice' //声播模块
+//include ':modulevoice' //声播模块
 include ':moduletablayout'
-include ':modulecircle' //语圈模块
-include ':modulevocal'  //个人模块
-include ':modulenews' //音域
+//include ':modulecircle' //语圈模块
+//include ':modulevocal'  //个人模块
+//include ':modulenews' //音域
 
 include ':timcommon'
 include ':tuichat'
 include ':tuiconversation'
 include ':tuicore'
-include ':moduleroom'
+//include ':moduleroom'
 include ':Loadinglibrary'