From 4dba696ee3ac632c0c4036239bac7ddc51ead19a Mon Sep 17 00:00:00 2001 From: Max Date: Wed, 29 Nov 2023 10:35:01 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E8=B0=83=E6=95=B4=E6=B7=B7=E6=B7=86?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=EF=BC=88=E5=88=A0=E5=87=8F=E4=BA=86core?= =?UTF-8?q?=E6=A8=A1=E5=9D=97keep=E8=8C=83=E5=9B=B4=EF=BC=8C=E4=BB=85keep?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=A8=A1=E5=9E=8B=E7=9B=B8=E5=85=B3=E7=B1=BB?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/proguard-rules.pro | 13 +++---------- .../app/application/GlobalHandleManager.java | 2 +- .../app/avroom/activity/AVRoomActivity.java | 4 ++-- .../app/avroom/adapter/CreateRoomGameAdapter.kt | 2 +- .../adapter/CreateRoomGameGuideAdapter.kt | 3 +-- .../app/avroom/adapter/SelectGameAdapter.kt | 2 +- .../app/avroom/dialog/CreateGameRoomDialog.kt | 10 +--------- .../chwl/app/avroom/dialog/CreateRoomDialog.kt | 4 +--- .../avroom/redpackage/RedPackageGoRoomDialog.kt | 2 +- .../app/avroom/redpackage/RedPackageHandler.kt | 2 +- .../app/avroom/redpackage/RedPackageWidget.kt | 2 +- .../redpackage/open/RedPackageOpenDialog.kt | 4 ++++ .../redpackage/open/RedPackageResultAdapter.kt | 3 +-- .../com/chwl/app/avroom/widget/MessageView.java | 7 +++---- .../java/com/chwl/app/base/BaseActivity.java | 6 +++--- .../com/chwl/app/home/adapter/MeGameAdapter.kt | 2 +- .../com/chwl/app/relation/cp/CpDataManager.java | 2 +- .../com/chwl/app/relation/cp/CpDataParser.kt | 4 ++-- .../cp/activity/CpInviteRecordActivity.kt | 4 ++-- .../app/relation/cp/activity/CpTaskActivity.kt | 2 +- .../app/relation/cp/adapter/CpTaskAdapter.kt | 2 +- .../relation/cp/adapter/InviteRecordAdapter.kt | 2 +- .../app/relation/cp/dialog/CpGlobalDialog.kt | 2 +- .../relation/cp/dialog/CpInvitePageDialog.kt | 2 +- .../relation/cp/dialog/CpInviteReplyDialog.kt | 2 +- .../java/com/chwl/app/relation/cp/model/Api.kt | 7 +++++++ .../com/chwl/app/relation/cp/model/CpModel.kt | 8 +++++++- .../app/relation/cp/viewmodel/CpViewModel.kt | 7 +++++++ .../relation/cp/widget/RelationCpCardView.kt | 4 ++-- .../chwl/app/ui/im/chat/MsgViewHolderFairy.java | 5 ----- .../app/ui/im/chat/MsgViewHolderRedPackage.java | 2 +- .../ui/im/friend/FriendFragmentCpDelegate.kt | 2 +- .../ui/widget/dialog/AllPlayEffectDialog.java | 2 +- .../dialog/AllServiceVipLevelUPDialog.java | 2 +- .../java/com/chwl/app/vip/VipMainActivity.kt | 4 ++-- .../main/java/com/chwl/app/vip/VipViewModel.kt | 8 +++----- .../com/chwl/app/vip/adapter/VipAuthAdapter.kt | 4 ++-- .../com/chwl/app/vip/dialog/VipUpgradeDialog.kt | 2 +- .../java/com/chwl/app/vip/util/VipHelper.java | 2 +- app/src/main/res/layout/layout_cp_card.xml | 4 ++-- .../java/com/chwl/core/file/UploadToken.java | 2 ++ .../main/java/com/chwl/core/gift/GiftModel.java | 2 +- .../java/com/chwl/core/home/model/HomeModel.kt | 3 +-- .../core/im/custom/bean/CpInviteAttachment.java | 4 ++-- .../core/im/custom/bean/FairyMsgAttachment.java | 2 +- .../core/im/custom/bean/PlayEffectInfo.java | 2 +- .../im/custom/bean/RedPackageAttachment.java | 2 +- .../bean/RedPackageRoomMsgAttachment.java | 2 +- .../im/custom/bean/VipMessageAttachment.java | 2 +- .../com/chwl/core/manager/IMMessageManager.java | 2 +- .../chwl/core/manager/IMSystemMsgManager.java | 2 +- .../chwl/core/redpackage/RedEnvelopeItemVO.kt | 11 ----------- .../com/chwl/core/redpackage/RedPackageModel.kt | 4 ++++ .../{ => bean}/RedEnvelopeGiftItemVO.kt | 2 +- .../core/redpackage/bean/RedEnvelopeItemVO.kt | 11 +++++++++++ .../redpackage/{ => bean}/RedEnvelopeRoomMsg.kt | 2 +- .../redpackage/{ => bean}/RedEnvelopeState.kt | 2 +- .../core/redpackage/{ => bean}/RedEnvelopeVO.kt | 2 +- .../redpackage/{ => bean}/RedPackageData.kt | 2 +- .../redpackage/{ => bean}/RedPackageInfo.kt | 2 +- .../{ => bean}/RedPackageNotifyInfo.kt | 2 +- .../cp/{ => bean}/CpInviteDetailEntity.kt | 2 +- .../core/relation/cp/{ => bean}/CpInviteInfo.kt | 2 +- .../cp/{ => bean}/CpInvitePageEntity.kt | 2 +- .../cp/{ => bean}/CpMpApplyListEntity.kt | 2 +- .../core/relation/cp/{ => bean}/CpRelation.kt | 2 +- .../core/relation/cp/{ => bean}/CpTaskEntity.kt | 2 +- .../cp/{ => bean}/UserCpLevelMpEntity.kt | 2 +- .../relation/cp/{ => bean}/UserCpListEntity.kt | 2 +- .../chwl/core/room/face/DynamicFaceModel.java | 2 +- .../java/com/chwl/core/room/game/GameModel.kt | 2 ++ .../chwl/core/room/game/{ => bean}/GameCfg.kt | 2 +- .../core/room/game/{ => bean}/GameCodeInfo.kt | 2 +- .../chwl/core/room/game/{ => bean}/GameInfo.kt | 2 +- .../com/chwl/core/room/model/RoomBaseModel.java | 2 +- .../core/treasurefairy/TreasureFairyModel.kt | 17 ++++++++++++++--- .../core/treasurefairy/{ => bean}/Compound.kt | 2 +- .../core/treasurefairy/{ => bean}/DrawInfo.kt | 2 +- .../{ => bean}/ExchangeGiftInfo.kt | 2 +- .../core/treasurefairy/{ => bean}/FairyInfo.kt | 2 +- .../{ => bean}/FairyMsgInfoBean.java | 2 +- .../{ => bean}/FairyResolveParam.kt | 2 +- .../treasurefairy/{ => bean}/FairyTestParam.kt | 2 +- .../core/treasurefairy/{ => bean}/ForestInfo.kt | 2 +- .../treasurefairy/{ => bean}/MyFairyInfo.kt | 2 +- .../core/treasurefairy/{ => bean}/PrizeInfo.kt | 2 +- .../treasurefairy/{ => bean}/PropItemInfo.kt | 2 +- .../treasurefairy/{ => bean}/ResolveInfo.kt | 2 +- .../treasurefairy/{ => bean}/SendFairyInfo.kt | 2 +- .../{ => bean}/TestFairyRecordInfo.kt | 2 +- .../com/chwl/core/user/bean/AttentionInfo.java | 2 +- .../com/chwl/core/user/bean/BaseUserInfo.java | 2 +- .../java/com/chwl/core/user/bean/FansInfo.java | 2 +- .../java/com/chwl/core/user/bean/UserInfo.java | 4 +--- .../src/main/java/com/chwl/core/vip/VipModel.kt | 2 ++ .../java/com/chwl/core/vip/VipUpgradeEvent.kt | 2 ++ .../com/chwl/core/vip/{ => bean}/UserVipInfo.kt | 2 +- .../com/chwl/core/vip/{ => bean}/VipAuthInfo.kt | 2 +- .../core/vip/{ => bean}/VipBroadcastInfo.kt | 2 +- .../com/chwl/core/vip/{ => bean}/VipInfo.kt | 2 +- .../core/vip/{ => bean}/VipMessageInfo.java | 2 +- .../com/chwl/core/vip/{ => bean}/VipPageInfo.kt | 2 +- .../com/chwl/core/community/bean/Comment.java | 2 +- .../chwl/core/community/bean/comment/Reply.java | 2 +- 104 files changed, 169 insertions(+), 152 deletions(-) delete mode 100644 core/src/main/java/com/chwl/core/redpackage/RedEnvelopeItemVO.kt rename core/src/main/java/com/chwl/core/redpackage/{ => bean}/RedEnvelopeGiftItemVO.kt (79%) create mode 100644 core/src/main/java/com/chwl/core/redpackage/bean/RedEnvelopeItemVO.kt rename core/src/main/java/com/chwl/core/redpackage/{ => bean}/RedEnvelopeRoomMsg.kt (94%) rename core/src/main/java/com/chwl/core/redpackage/{ => bean}/RedEnvelopeState.kt (93%) rename core/src/main/java/com/chwl/core/redpackage/{ => bean}/RedEnvelopeVO.kt (96%) rename core/src/main/java/com/chwl/core/redpackage/{ => bean}/RedPackageData.kt (95%) rename core/src/main/java/com/chwl/core/redpackage/{ => bean}/RedPackageInfo.kt (92%) rename core/src/main/java/com/chwl/core/redpackage/{ => bean}/RedPackageNotifyInfo.kt (96%) rename core/src/main/java/com/chwl/core/relation/cp/{ => bean}/CpInviteDetailEntity.kt (93%) rename core/src/main/java/com/chwl/core/relation/cp/{ => bean}/CpInviteInfo.kt (94%) rename core/src/main/java/com/chwl/core/relation/cp/{ => bean}/CpInvitePageEntity.kt (93%) rename core/src/main/java/com/chwl/core/relation/cp/{ => bean}/CpMpApplyListEntity.kt (88%) rename core/src/main/java/com/chwl/core/relation/cp/{ => bean}/CpRelation.kt (94%) rename core/src/main/java/com/chwl/core/relation/cp/{ => bean}/CpTaskEntity.kt (96%) rename core/src/main/java/com/chwl/core/relation/cp/{ => bean}/UserCpLevelMpEntity.kt (89%) rename core/src/main/java/com/chwl/core/relation/cp/{ => bean}/UserCpListEntity.kt (95%) rename core/src/main/java/com/chwl/core/room/game/{ => bean}/GameCfg.kt (98%) rename core/src/main/java/com/chwl/core/room/game/{ => bean}/GameCodeInfo.kt (66%) rename core/src/main/java/com/chwl/core/room/game/{ => bean}/GameInfo.kt (85%) rename core/src/main/java/com/chwl/core/treasurefairy/{ => bean}/Compound.kt (60%) rename core/src/main/java/com/chwl/core/treasurefairy/{ => bean}/DrawInfo.kt (73%) rename core/src/main/java/com/chwl/core/treasurefairy/{ => bean}/ExchangeGiftInfo.kt (95%) rename core/src/main/java/com/chwl/core/treasurefairy/{ => bean}/FairyInfo.kt (93%) rename core/src/main/java/com/chwl/core/treasurefairy/{ => bean}/FairyMsgInfoBean.java (90%) rename core/src/main/java/com/chwl/core/treasurefairy/{ => bean}/FairyResolveParam.kt (68%) rename core/src/main/java/com/chwl/core/treasurefairy/{ => bean}/FairyTestParam.kt (73%) rename core/src/main/java/com/chwl/core/treasurefairy/{ => bean}/ForestInfo.kt (85%) rename core/src/main/java/com/chwl/core/treasurefairy/{ => bean}/MyFairyInfo.kt (85%) rename core/src/main/java/com/chwl/core/treasurefairy/{ => bean}/PrizeInfo.kt (90%) rename core/src/main/java/com/chwl/core/treasurefairy/{ => bean}/PropItemInfo.kt (76%) rename core/src/main/java/com/chwl/core/treasurefairy/{ => bean}/ResolveInfo.kt (75%) rename core/src/main/java/com/chwl/core/treasurefairy/{ => bean}/SendFairyInfo.kt (87%) rename core/src/main/java/com/chwl/core/treasurefairy/{ => bean}/TestFairyRecordInfo.kt (86%) rename core/src/main/java/com/chwl/core/vip/{ => bean}/UserVipInfo.kt (90%) rename core/src/main/java/com/chwl/core/vip/{ => bean}/VipAuthInfo.kt (92%) rename core/src/main/java/com/chwl/core/vip/{ => bean}/VipBroadcastInfo.kt (84%) rename core/src/main/java/com/chwl/core/vip/{ => bean}/VipInfo.kt (96%) rename core/src/main/java/com/chwl/core/vip/{ => bean}/VipMessageInfo.java (91%) rename core/src/main/java/com/chwl/core/vip/{ => bean}/VipPageInfo.kt (88%) diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 8cbe22dd4..5bb4fe709 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -116,11 +116,6 @@ -dontwarn com.netease.** -keep class com.netease.** {*;} -# Presenter 相关 --keep class com.chwl.app.base.** { *; } --keep public class * extends com.chwl.app.base.BaseMvpPresenter --keep public class * extends com.chwl.library.base.factory.AbstractMvpPresenter - # 云信自定义 ViewHolder 配置 -dontwarn com.chwl.app.ui.im.recent.holder.** -keep class com.chwl.app.ui.im.recent.holder.** {*;} @@ -233,11 +228,9 @@ # TODO 网络加载 一些业务bean gson 时候混淆问题 -keep class org.json.** {*;} --dontwarn com.chwl.core.** --keep class com.chwl.core.** {*;} --keep class com.chwl.treasure_box.bean.** {*;} --keep class com.chwl.app.avroom.bean.** {*;} - +-keep class com.chwl.**.bean.** {*;} +-keep class com.chwl.**.result.** {*;} +-keep class com.chwl.**.entity.** {*;} #百度统计 -keep class com.baidu.bottom.** { *; } diff --git a/app/src/main/java/com/chwl/app/application/GlobalHandleManager.java b/app/src/main/java/com/chwl/app/application/GlobalHandleManager.java index a5f9e181a..a0de30f38 100644 --- a/app/src/main/java/com/chwl/app/application/GlobalHandleManager.java +++ b/app/src/main/java/com/chwl/app/application/GlobalHandleManager.java @@ -17,7 +17,7 @@ import com.chwl.core.manager.AvRoomDataManager; import com.chwl.core.pay.event.NewUserChargeEvent; import com.chwl.core.recall.bean.CheckLostUserInfo; import com.chwl.core.recall.event.CheckLostUserEvent; -import com.chwl.core.relation.cp.CpInviteInfo; +import com.chwl.core.relation.cp.bean.CpInviteInfo; import com.chwl.core.upgrade.event.ImPushUpdateAppEvent; import com.chwl.core.user.UserModel; import com.chwl.core.utils.SharedPreferenceUtils; diff --git a/app/src/main/java/com/chwl/app/avroom/activity/AVRoomActivity.java b/app/src/main/java/com/chwl/app/avroom/activity/AVRoomActivity.java index 857c81ddb..16495e736 100644 --- a/app/src/main/java/com/chwl/app/avroom/activity/AVRoomActivity.java +++ b/app/src/main/java/com/chwl/app/avroom/activity/AVRoomActivity.java @@ -126,7 +126,7 @@ import com.chwl.core.patriarch.event.CloseMinRoomEvent; import com.chwl.core.patriarch.event.ImPushMsgPmLimitTimeEvent; import com.chwl.core.patriarch.event.PmDismissAllLimitDialogEvent; import com.chwl.core.patriarch.exception.PmRoomLimitException; -import com.chwl.core.redpackage.RedPackageNotifyInfo; +import com.chwl.core.redpackage.bean.RedPackageNotifyInfo; import com.chwl.core.room.anotherroompk.ShowGiftDialogEvent; import com.chwl.core.room.bean.RoomInfo; import com.chwl.core.room.bean.RoomModeType; @@ -139,7 +139,7 @@ import com.chwl.core.super_admin.util.SAdminOptUtil; import com.chwl.core.super_admin.util.SuperAdminUtil; import com.chwl.core.support.room.RoomContext; import com.chwl.core.support.room.RoomView; -import com.chwl.core.treasurefairy.FairyMsgInfoBean; +import com.chwl.core.treasurefairy.bean.FairyMsgInfoBean; import com.chwl.core.user.UserModel; import com.chwl.core.user.bean.FirstChargeInfo; import com.chwl.core.user.bean.UserInfo; diff --git a/app/src/main/java/com/chwl/app/avroom/adapter/CreateRoomGameAdapter.kt b/app/src/main/java/com/chwl/app/avroom/adapter/CreateRoomGameAdapter.kt index 4d8efbc87..b02a8b1a4 100644 --- a/app/src/main/java/com/chwl/app/avroom/adapter/CreateRoomGameAdapter.kt +++ b/app/src/main/java/com/chwl/app/avroom/adapter/CreateRoomGameAdapter.kt @@ -5,7 +5,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder import com.chwl.app.R import com.chwl.app.ui.utils.load -import com.chwl.core.room.game.GameInfo +import com.chwl.core.room.game.bean.GameInfo class CreateRoomGameAdapter : BaseQuickAdapter(R.layout.item_room_create_game) { diff --git a/app/src/main/java/com/chwl/app/avroom/adapter/CreateRoomGameGuideAdapter.kt b/app/src/main/java/com/chwl/app/avroom/adapter/CreateRoomGameGuideAdapter.kt index e6f7bb4fe..aa564ed45 100644 --- a/app/src/main/java/com/chwl/app/avroom/adapter/CreateRoomGameGuideAdapter.kt +++ b/app/src/main/java/com/chwl/app/avroom/adapter/CreateRoomGameGuideAdapter.kt @@ -4,8 +4,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder import com.chwl.app.R import com.chwl.library.common.glide.GlideUtils -import com.chwl.app.ui.utils.ImageLoadUtilsV2 -import com.chwl.core.room.game.GameInfo +import com.chwl.core.room.game.bean.GameInfo class CreateRoomGameGuideAdapter : BaseQuickAdapter(R.layout.item_room_create_game_guide) { diff --git a/app/src/main/java/com/chwl/app/avroom/adapter/SelectGameAdapter.kt b/app/src/main/java/com/chwl/app/avroom/adapter/SelectGameAdapter.kt index a87872c45..5462bee97 100644 --- a/app/src/main/java/com/chwl/app/avroom/adapter/SelectGameAdapter.kt +++ b/app/src/main/java/com/chwl/app/avroom/adapter/SelectGameAdapter.kt @@ -3,7 +3,7 @@ package com.chwl.app.avroom.adapter import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder import com.chwl.app.R -import com.chwl.core.room.game.GameInfo +import com.chwl.core.room.game.bean.GameInfo class SelectGameAdapter : BaseQuickAdapter(R.layout.item_room_select_game) { diff --git a/app/src/main/java/com/chwl/app/avroom/dialog/CreateGameRoomDialog.kt b/app/src/main/java/com/chwl/app/avroom/dialog/CreateGameRoomDialog.kt index 47ab964c6..978a558ca 100644 --- a/app/src/main/java/com/chwl/app/avroom/dialog/CreateGameRoomDialog.kt +++ b/app/src/main/java/com/chwl/app/avroom/dialog/CreateGameRoomDialog.kt @@ -3,24 +3,16 @@ package com.chwl.app.avroom.dialog import android.annotation.SuppressLint import android.view.Gravity import android.view.WindowManager -import androidx.core.view.isInvisible -import androidx.core.view.isVisible import androidx.recyclerview.widget.GridLayoutManager -import androidx.recyclerview.widget.LinearLayoutManager -import com.chwl.app.R -import com.chwl.app.avroom.adapter.CreateRoomGameAdapter import com.chwl.app.avroom.adapter.CreateRoomGameGuideAdapter import com.chwl.app.base.BaseActivity import com.chwl.app.base.BaseDialog import com.chwl.app.databinding.DialogCreateGameRoomBinding -import com.chwl.app.databinding.DialogCreateRoomBinding import com.chwl.app.home.helper.OpenRoomHelper import com.chwl.app.ui.utils.RVDelegate import com.chwl.core.room.bean.RoomInfo -import com.chwl.core.room.game.GameInfo +import com.chwl.core.room.game.bean.GameInfo import com.chwl.core.room.game.GameModel -import com.chwl.core.utils.toast -import com.chwl.library.utils.ResUtil class CreateGameRoomDialog : BaseDialog() { diff --git a/app/src/main/java/com/chwl/app/avroom/dialog/CreateRoomDialog.kt b/app/src/main/java/com/chwl/app/avroom/dialog/CreateRoomDialog.kt index 6572fcb9f..875844347 100644 --- a/app/src/main/java/com/chwl/app/avroom/dialog/CreateRoomDialog.kt +++ b/app/src/main/java/com/chwl/app/avroom/dialog/CreateRoomDialog.kt @@ -4,8 +4,6 @@ import android.annotation.SuppressLint import android.view.Gravity import android.view.WindowManager import androidx.core.view.isInvisible -import androidx.core.view.isVisible -import androidx.recyclerview.widget.LinearLayoutManager import com.chwl.app.R import com.chwl.app.avroom.adapter.CreateRoomGameAdapter import com.chwl.app.base.BaseActivity @@ -14,7 +12,7 @@ import com.chwl.app.databinding.DialogCreateRoomBinding import com.chwl.app.home.helper.OpenRoomHelper import com.chwl.app.ui.utils.RVDelegate import com.chwl.core.room.bean.RoomInfo -import com.chwl.core.room.game.GameInfo +import com.chwl.core.room.game.bean.GameInfo import com.chwl.core.room.game.GameModel import com.chwl.core.utils.toast import com.chwl.library.utils.ResUtil diff --git a/app/src/main/java/com/chwl/app/avroom/redpackage/RedPackageGoRoomDialog.kt b/app/src/main/java/com/chwl/app/avroom/redpackage/RedPackageGoRoomDialog.kt index 396c65a80..9190a6597 100644 --- a/app/src/main/java/com/chwl/app/avroom/redpackage/RedPackageGoRoomDialog.kt +++ b/app/src/main/java/com/chwl/app/avroom/redpackage/RedPackageGoRoomDialog.kt @@ -10,7 +10,7 @@ import com.chwl.app.common.widget.dialog.DialogManager import com.chwl.app.databinding.DialogRedPackageGoRoomBinding import com.chwl.app.ui.utils.ImageLoadUtils import com.chwl.core.manager.AvRoomDataManager -import com.chwl.core.redpackage.RedPackageNotifyInfo +import com.chwl.core.redpackage.bean.RedPackageNotifyInfo import com.chwl.core.utils.subAndReplaceDot import com.chwl.library.utils.ResUtil import org.greenrobot.eventbus.EventBus diff --git a/app/src/main/java/com/chwl/app/avroom/redpackage/RedPackageHandler.kt b/app/src/main/java/com/chwl/app/avroom/redpackage/RedPackageHandler.kt index 291e840db..a98643e5b 100644 --- a/app/src/main/java/com/chwl/app/avroom/redpackage/RedPackageHandler.kt +++ b/app/src/main/java/com/chwl/app/avroom/redpackage/RedPackageHandler.kt @@ -10,7 +10,7 @@ import com.chwl.core.im.custom.bean.RedPackageAttachment import com.chwl.core.manager.IMNetEaseManager import com.chwl.core.manager.RoomEvent import com.chwl.core.redpackage.RedPackageModel -import com.chwl.core.redpackage.RedPackageNotifyInfo +import com.chwl.core.redpackage.bean.RedPackageNotifyInfo import com.chwl.core.support.room.RoomContext import com.chwl.core.support.room.RoomHandler diff --git a/app/src/main/java/com/chwl/app/avroom/redpackage/RedPackageWidget.kt b/app/src/main/java/com/chwl/app/avroom/redpackage/RedPackageWidget.kt index af4cfeb0a..bb59fca8d 100644 --- a/app/src/main/java/com/chwl/app/avroom/redpackage/RedPackageWidget.kt +++ b/app/src/main/java/com/chwl/app/avroom/redpackage/RedPackageWidget.kt @@ -13,7 +13,7 @@ import com.chwl.app.avroom.redpackage.open.RedPackageOpenDialog import com.chwl.app.common.widget.dialog.DialogManager import com.chwl.app.databinding.RedPackageWidgetBinding import com.chwl.core.redpackage.RedPackageModel -import com.chwl.core.redpackage.RedPackageNotifyInfo +import com.chwl.core.redpackage.bean.RedPackageNotifyInfo import com.chwl.core.support.room.FrameLayoutRoomWidget import com.chwl.core.support.room.RoomContext import com.chwl.core.support.room.RoomView diff --git a/app/src/main/java/com/chwl/app/avroom/redpackage/open/RedPackageOpenDialog.kt b/app/src/main/java/com/chwl/app/avroom/redpackage/open/RedPackageOpenDialog.kt index cb5c9576d..c0bf54482 100644 --- a/app/src/main/java/com/chwl/app/avroom/redpackage/open/RedPackageOpenDialog.kt +++ b/app/src/main/java/com/chwl/app/avroom/redpackage/open/RedPackageOpenDialog.kt @@ -32,6 +32,10 @@ import com.chwl.core.home.model.CollectionRoomModel import com.chwl.core.manager.AvRoomDataManager import com.chwl.core.pay.PayModel import com.chwl.core.redpackage.* +import com.chwl.core.redpackage.bean.RedEnvelopeState +import com.chwl.core.redpackage.bean.RedPackageData +import com.chwl.core.redpackage.bean.RedPackageInfo +import com.chwl.core.redpackage.bean.RedPackageNotifyInfo import com.chwl.core.support.config.Constants import com.chwl.core.support.room.RoomContext import com.chwl.library.annatation.ActLayoutRes diff --git a/app/src/main/java/com/chwl/app/avroom/redpackage/open/RedPackageResultAdapter.kt b/app/src/main/java/com/chwl/app/avroom/redpackage/open/RedPackageResultAdapter.kt index bb7ffc39c..2839b36e7 100644 --- a/app/src/main/java/com/chwl/app/avroom/redpackage/open/RedPackageResultAdapter.kt +++ b/app/src/main/java/com/chwl/app/avroom/redpackage/open/RedPackageResultAdapter.kt @@ -1,7 +1,6 @@ package com.chwl.app.avroom.redpackage.open import android.view.View -import android.view.ViewGroup import android.widget.ImageView import androidx.core.view.isVisible import com.chad.library.adapter.base.BaseQuickAdapter @@ -9,7 +8,7 @@ import com.chad.library.adapter.base.BaseViewHolder import com.chwl.app.R import com.chwl.app.ui.utils.loadAvatar import com.chwl.app.utils.UserUtils -import com.chwl.core.redpackage.RedEnvelopeItemVO +import com.chwl.core.redpackage.bean.RedEnvelopeItemVO import com.chwl.core.utils.subAndReplaceDot import com.chwl.library.utils.ResUtil import java.text.SimpleDateFormat diff --git a/app/src/main/java/com/chwl/app/avroom/widget/MessageView.java b/app/src/main/java/com/chwl/app/avroom/widget/MessageView.java index 1721bef01..15c59b8f8 100644 --- a/app/src/main/java/com/chwl/app/avroom/widget/MessageView.java +++ b/app/src/main/java/com/chwl/app/avroom/widget/MessageView.java @@ -80,7 +80,6 @@ import com.chwl.app.common.widget.OriginalDrawStatusClickSpan; import com.chwl.app.community.photo.BigPhotoActivity; import com.chwl.app.community.photo.PagerOption; import com.chwl.app.community.utils.ObjectTypeHelper; -import com.chwl.app.treasure_box.widget.GoldBoxHelper; import com.chwl.app.ui.utils.ImageLoadUtils; import com.chwl.app.ui.utils.ImageLoadUtilsV2; import com.chwl.app.ui.widget.DividerItemDecoration; @@ -160,7 +159,7 @@ import com.chwl.core.monsterhunting.bean.MonsterProtocol; import com.chwl.core.noble.NobleInfo; import com.chwl.core.noble.NobleUtil; import com.chwl.core.praise.PraiseModel; -import com.chwl.core.redpackage.RedEnvelopeRoomMsg; +import com.chwl.core.redpackage.bean.RedEnvelopeRoomMsg; import com.chwl.core.room.anotherroompk.ShowUserInfoDialogEvent; import com.chwl.core.room.bean.DatingNotifyInfo; import com.chwl.core.room.bean.RoomInfo; @@ -176,14 +175,14 @@ import com.chwl.core.room.pk.bean.RoomPKInvitedUpMicMember; import com.chwl.core.room.pk.bean.RoomPkData; import com.chwl.core.room.queuing_mic.attachment.QueuingMicAttachment; import com.chwl.core.room.queuing_mic.bean.QueuingMicInfo; -import com.chwl.core.treasurefairy.FairyMsgInfoBean; +import com.chwl.core.treasurefairy.bean.FairyMsgInfoBean; import com.chwl.core.user.UserModel; import com.chwl.core.user.bean.UserInfo; import com.chwl.core.utils.ExtensionUtil; import com.chwl.core.utils.StringExtensionKt; import com.chwl.core.utils.net.DontWarnObserver; import com.chwl.core.utils.net.RxHelper; -import com.chwl.core.vip.VipMessageInfo; +import com.chwl.core.vip.bean.VipMessageInfo; import com.chwl.library.rxbus.RxBus; import com.chwl.library.utils.FormatUtils; import com.chwl.library.utils.JavaUtil; diff --git a/app/src/main/java/com/chwl/app/base/BaseActivity.java b/app/src/main/java/com/chwl/app/base/BaseActivity.java index 1dc15fc76..9fbb9417c 100644 --- a/app/src/main/java/com/chwl/app/base/BaseActivity.java +++ b/app/src/main/java/com/chwl/app/base/BaseActivity.java @@ -115,14 +115,14 @@ import com.chwl.core.noble.NobleInfo; import com.chwl.core.noble.NobleProtocol; import com.chwl.core.pay.PayModel; import com.chwl.core.pay.bean.WalletInfo; -import com.chwl.core.redpackage.RedPackageNotifyInfo; +import com.chwl.core.redpackage.bean.RedPackageNotifyInfo; import com.chwl.core.room.bean.RoomInfo; import com.chwl.core.room.model.AvRoomModel; import com.chwl.core.support.room.RoomContext; -import com.chwl.core.treasurefairy.FairyMsgInfoBean; +import com.chwl.core.treasurefairy.bean.FairyMsgInfoBean; import com.chwl.core.user.UserModel; import com.chwl.core.utils.net.RxHelper; -import com.chwl.core.vip.VipMessageInfo; +import com.chwl.core.vip.bean.VipMessageInfo; import com.chwl.library.common.util.DeviceUtil; import com.chwl.library.rxbus.RxBus; import com.chwl.library.utils.AppMetaDataUtil; diff --git a/app/src/main/java/com/chwl/app/home/adapter/MeGameAdapter.kt b/app/src/main/java/com/chwl/app/home/adapter/MeGameAdapter.kt index be52a6fb9..9a7c07a98 100644 --- a/app/src/main/java/com/chwl/app/home/adapter/MeGameAdapter.kt +++ b/app/src/main/java/com/chwl/app/home/adapter/MeGameAdapter.kt @@ -5,7 +5,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder import com.chwl.app.R import com.chwl.app.ui.utils.load -import com.chwl.core.room.game.GameInfo +import com.chwl.core.room.game.bean.GameInfo class MeGameAdapter : diff --git a/app/src/main/java/com/chwl/app/relation/cp/CpDataManager.java b/app/src/main/java/com/chwl/app/relation/cp/CpDataManager.java index 5fe3eca4e..f62603f3d 100644 --- a/app/src/main/java/com/chwl/app/relation/cp/CpDataManager.java +++ b/app/src/main/java/com/chwl/app/relation/cp/CpDataManager.java @@ -1,7 +1,7 @@ package com.chwl.app.relation.cp; -import com.chwl.core.relation.cp.CpInviteInfo; +import com.chwl.core.relation.cp.bean.CpInviteInfo; public class CpDataManager { diff --git a/app/src/main/java/com/chwl/app/relation/cp/CpDataParser.kt b/app/src/main/java/com/chwl/app/relation/cp/CpDataParser.kt index 02f00c135..96e6fbdea 100644 --- a/app/src/main/java/com/chwl/app/relation/cp/CpDataParser.kt +++ b/app/src/main/java/com/chwl/app/relation/cp/CpDataParser.kt @@ -1,7 +1,7 @@ package com.chwl.app.relation.cp -import com.chwl.core.relation.cp.CpInviteDetailEntity -import com.chwl.core.relation.cp.CpInviteInfo +import com.chwl.core.relation.cp.bean.CpInviteDetailEntity +import com.chwl.core.relation.cp.bean.CpInviteInfo object CpDataParser { fun inviteMsg2cpDetailEntity(msgEntity: CpInviteInfo) = CpInviteDetailEntity( diff --git a/app/src/main/java/com/chwl/app/relation/cp/activity/CpInviteRecordActivity.kt b/app/src/main/java/com/chwl/app/relation/cp/activity/CpInviteRecordActivity.kt index 3ae6813a6..574359abf 100644 --- a/app/src/main/java/com/chwl/app/relation/cp/activity/CpInviteRecordActivity.kt +++ b/app/src/main/java/com/chwl/app/relation/cp/activity/CpInviteRecordActivity.kt @@ -18,8 +18,8 @@ import com.chwl.app.relation.cp.dialog.CpInviteReplyDialog import com.chwl.app.relation.cp.viewmodel.CpViewModel import com.chwl.app.ui.widget.dialog.CommonTipDialog import com.chwl.core.relation.cp.CpBindUnbindEvent -import com.chwl.core.relation.cp.CpInviteDetailEntity -import com.chwl.core.relation.cp.UserCpListEntity +import com.chwl.core.relation.cp.bean.CpInviteDetailEntity +import com.chwl.core.relation.cp.bean.UserCpListEntity import com.chwl.library.annatation.ActLayoutRes import com.chwl.library.utils.ResUtil import org.greenrobot.eventbus.EventBus diff --git a/app/src/main/java/com/chwl/app/relation/cp/activity/CpTaskActivity.kt b/app/src/main/java/com/chwl/app/relation/cp/activity/CpTaskActivity.kt index eb93c163c..c95ca32dd 100644 --- a/app/src/main/java/com/chwl/app/relation/cp/activity/CpTaskActivity.kt +++ b/app/src/main/java/com/chwl/app/relation/cp/activity/CpTaskActivity.kt @@ -21,7 +21,7 @@ import com.chwl.app.ui.widget.OnPageSelectedListener import com.chwl.app.ui.widget.magicindicator.ViewPagerHelper import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator import com.chwl.core.auth.AuthModel -import com.chwl.core.relation.cp.CpTaskEntity +import com.chwl.core.relation.cp.bean.CpTaskEntity import com.chwl.library.annatation.ActLayoutRes import com.chwl.library.utils.ResUtil diff --git a/app/src/main/java/com/chwl/app/relation/cp/adapter/CpTaskAdapter.kt b/app/src/main/java/com/chwl/app/relation/cp/adapter/CpTaskAdapter.kt index 1f0e3c8cd..b18ec736e 100644 --- a/app/src/main/java/com/chwl/app/relation/cp/adapter/CpTaskAdapter.kt +++ b/app/src/main/java/com/chwl/app/relation/cp/adapter/CpTaskAdapter.kt @@ -4,7 +4,7 @@ import android.widget.TextView import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder import com.chwl.app.R -import com.chwl.core.relation.cp.Task +import com.chwl.core.relation.cp.bean.Task import com.chwl.library.utils.ResUtil class CpTaskAdapter : BaseQuickAdapter(R.layout.item_cp_task) { diff --git a/app/src/main/java/com/chwl/app/relation/cp/adapter/InviteRecordAdapter.kt b/app/src/main/java/com/chwl/app/relation/cp/adapter/InviteRecordAdapter.kt index 127b585ce..4669bb18e 100644 --- a/app/src/main/java/com/chwl/app/relation/cp/adapter/InviteRecordAdapter.kt +++ b/app/src/main/java/com/chwl/app/relation/cp/adapter/InviteRecordAdapter.kt @@ -7,7 +7,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder import com.chwl.app.R import com.chwl.app.ui.utils.ImageLoadUtilsV2 -import com.chwl.core.relation.cp.UserCpListEntity +import com.chwl.core.relation.cp.bean.UserCpListEntity class InviteRecordAdapter(private val context: Context) : diff --git a/app/src/main/java/com/chwl/app/relation/cp/dialog/CpGlobalDialog.kt b/app/src/main/java/com/chwl/app/relation/cp/dialog/CpGlobalDialog.kt index 10659ee8c..756dbaed7 100644 --- a/app/src/main/java/com/chwl/app/relation/cp/dialog/CpGlobalDialog.kt +++ b/app/src/main/java/com/chwl/app/relation/cp/dialog/CpGlobalDialog.kt @@ -11,7 +11,7 @@ import com.chwl.app.relation.cp.CpDataManager import com.chwl.app.relation.cp.activity.CpInviteRecordActivity import com.chwl.app.treasure_box.widget.dialog.BaseBindingDialog import com.chwl.app.ui.utils.ImageLoadUtilsV2 -import com.chwl.core.relation.cp.CpInviteInfo +import com.chwl.core.relation.cp.bean.CpInviteInfo import com.chwl.library.annatation.ActLayoutRes import io.reactivex.Observable import io.reactivex.Observer diff --git a/app/src/main/java/com/chwl/app/relation/cp/dialog/CpInvitePageDialog.kt b/app/src/main/java/com/chwl/app/relation/cp/dialog/CpInvitePageDialog.kt index f30909cf1..981514e28 100644 --- a/app/src/main/java/com/chwl/app/relation/cp/dialog/CpInvitePageDialog.kt +++ b/app/src/main/java/com/chwl/app/relation/cp/dialog/CpInvitePageDialog.kt @@ -12,7 +12,7 @@ import com.chwl.app.relation.cp.adapter.DeclarationRecommendAdapter import com.chwl.app.treasure_box.widget.dialog.BaseBindingDialog import com.chwl.app.ui.utils.ImageLoadUtilsV2 import com.chwl.app.ui.widget.LinearLayoutManagerWrapper -import com.chwl.core.relation.cp.CpInvitePageEntity +import com.chwl.core.relation.cp.bean.CpInvitePageEntity import com.chwl.library.annatation.ActLayoutRes import com.chwl.library.utils.ScreenUtils diff --git a/app/src/main/java/com/chwl/app/relation/cp/dialog/CpInviteReplyDialog.kt b/app/src/main/java/com/chwl/app/relation/cp/dialog/CpInviteReplyDialog.kt index e59e4bc1d..16718706e 100644 --- a/app/src/main/java/com/chwl/app/relation/cp/dialog/CpInviteReplyDialog.kt +++ b/app/src/main/java/com/chwl/app/relation/cp/dialog/CpInviteReplyDialog.kt @@ -11,7 +11,7 @@ import com.chwl.app.relation.cp.CpViewHelper.getColorSpan import com.chwl.app.relation.extention.toTimeString import com.chwl.app.treasure_box.widget.dialog.BaseBindingDialog import com.chwl.app.ui.utils.ImageLoadUtilsV2 -import com.chwl.core.relation.cp.CpInviteDetailEntity +import com.chwl.core.relation.cp.bean.CpInviteDetailEntity import com.chwl.library.annatation.ActLayoutRes import io.reactivex.Observable import io.reactivex.Observer diff --git a/app/src/main/java/com/chwl/app/relation/cp/model/Api.kt b/app/src/main/java/com/chwl/app/relation/cp/model/Api.kt index 3ea845b4d..4ec6e03f7 100644 --- a/app/src/main/java/com/chwl/app/relation/cp/model/Api.kt +++ b/app/src/main/java/com/chwl/app/relation/cp/model/Api.kt @@ -2,6 +2,13 @@ package com.chwl.app.relation.cp.model import com.chwl.core.bean.response.ServiceResult import com.chwl.core.relation.cp.* +import com.chwl.core.relation.cp.bean.CpInviteDetailEntity +import com.chwl.core.relation.cp.bean.CpInvitePageEntity +import com.chwl.core.relation.cp.bean.CpMpApplyListEntity +import com.chwl.core.relation.cp.bean.CpRelation +import com.chwl.core.relation.cp.bean.CpTaskEntity +import com.chwl.core.relation.cp.bean.UserCpLevelMpRootEntity +import com.chwl.core.relation.cp.bean.UserCpListEntity import retrofit2.http.* interface Api { diff --git a/app/src/main/java/com/chwl/app/relation/cp/model/CpModel.kt b/app/src/main/java/com/chwl/app/relation/cp/model/CpModel.kt index 7117804d6..66cb66a3f 100644 --- a/app/src/main/java/com/chwl/app/relation/cp/model/CpModel.kt +++ b/app/src/main/java/com/chwl/app/relation/cp/model/CpModel.kt @@ -1,7 +1,13 @@ package com.chwl.app.relation.cp.model import com.chwl.core.base.BaseModel -import com.chwl.core.relation.cp.* +import com.chwl.core.relation.cp.bean.CpInviteDetailEntity +import com.chwl.core.relation.cp.bean.CpInvitePageEntity +import com.chwl.core.relation.cp.bean.CpMpApplyListEntity +import com.chwl.core.relation.cp.bean.CpRelation +import com.chwl.core.relation.cp.bean.CpTaskEntity +import com.chwl.core.relation.cp.bean.UserCpLevelMpRootEntity +import com.chwl.core.relation.cp.bean.UserCpListEntity import com.chwl.core.utils.net.launchRequest import com.chwl.library.net.rxnet.RxNet diff --git a/app/src/main/java/com/chwl/app/relation/cp/viewmodel/CpViewModel.kt b/app/src/main/java/com/chwl/app/relation/cp/viewmodel/CpViewModel.kt index f423b2249..b16fc0606 100644 --- a/app/src/main/java/com/chwl/app/relation/cp/viewmodel/CpViewModel.kt +++ b/app/src/main/java/com/chwl/app/relation/cp/viewmodel/CpViewModel.kt @@ -6,6 +6,13 @@ import com.chwl.app.R import com.chwl.app.base.BaseViewModel import com.chwl.app.relation.cp.model.CpModel import com.chwl.core.relation.cp.* +import com.chwl.core.relation.cp.bean.CpInviteDetailEntity +import com.chwl.core.relation.cp.bean.CpInvitePageEntity +import com.chwl.core.relation.cp.bean.CpMpApplyListEntity +import com.chwl.core.relation.cp.bean.CpRelation +import com.chwl.core.relation.cp.bean.CpTaskEntity +import com.chwl.core.relation.cp.bean.UserCpLevelMpRootEntity +import com.chwl.core.relation.cp.bean.UserCpListEntity import com.chwl.core.utils.net.BalanceNotEnoughExeption import com.chwl.core.utils.net.ServerException import com.chwl.core.utils.toast diff --git a/app/src/main/java/com/chwl/app/relation/cp/widget/RelationCpCardView.kt b/app/src/main/java/com/chwl/app/relation/cp/widget/RelationCpCardView.kt index 54f450bc7..44fe6f714 100644 --- a/app/src/main/java/com/chwl/app/relation/cp/widget/RelationCpCardView.kt +++ b/app/src/main/java/com/chwl/app/relation/cp/widget/RelationCpCardView.kt @@ -14,8 +14,8 @@ import com.chwl.app.R import com.chwl.app.databinding.LayoutCpCardBinding import com.chwl.app.relation.extention.visibility import com.chwl.app.ui.utils.ImageLoadUtils -import com.chwl.core.relation.cp.CpInvitePageEntity -import com.chwl.core.relation.cp.CpRelation +import com.chwl.core.relation.cp.bean.CpInvitePageEntity +import com.chwl.core.relation.cp.bean.CpRelation import com.chwl.library.utils.ResUtil class RelationCpCardView(context: Context, attr: AttributeSet?, def: Int) : diff --git a/app/src/main/java/com/chwl/app/ui/im/chat/MsgViewHolderFairy.java b/app/src/main/java/com/chwl/app/ui/im/chat/MsgViewHolderFairy.java index 8f5694a42..d992f0715 100644 --- a/app/src/main/java/com/chwl/app/ui/im/chat/MsgViewHolderFairy.java +++ b/app/src/main/java/com/chwl/app/ui/im/chat/MsgViewHolderFairy.java @@ -1,7 +1,6 @@ package com.chwl.app.ui.im.chat; import android.annotation.SuppressLint; -import android.os.Bundle; import android.view.View; import android.widget.ImageView; import android.widget.TextView; @@ -10,13 +9,9 @@ import com.netease.nim.uikit.common.ui.recyclerview.adapter.BaseMultiItemFetchLo import com.chwl.app.R; import com.chwl.app.ui.utils.ImageLoadUtils; import com.chwl.core.auth.AuthModel; -import com.chwl.core.gift.bean.SimpleUserInfo; import com.chwl.core.im.custom.bean.CustomAttachment; import com.chwl.core.im.custom.bean.FairySendAttachment; -import com.chwl.core.manager.IMNetEaseManager; -import com.chwl.core.treasurefairy.FairyInfo; -import java.util.HashMap; import java.util.Map; /** diff --git a/app/src/main/java/com/chwl/app/ui/im/chat/MsgViewHolderRedPackage.java b/app/src/main/java/com/chwl/app/ui/im/chat/MsgViewHolderRedPackage.java index 8905f4e21..728bc5d51 100644 --- a/app/src/main/java/com/chwl/app/ui/im/chat/MsgViewHolderRedPackage.java +++ b/app/src/main/java/com/chwl/app/ui/im/chat/MsgViewHolderRedPackage.java @@ -12,7 +12,7 @@ import com.chwl.app.common.widget.dialog.DialogManager; import com.chwl.core.DemoCache; import com.chwl.core.im.custom.bean.RedPackageAttachment; import com.chwl.core.manager.AvRoomDataManager; -import com.chwl.core.redpackage.RedPackageNotifyInfo; +import com.chwl.core.redpackage.bean.RedPackageNotifyInfo; import com.chwl.core.utils.CurrentTimeUtils; import com.chwl.library.utils.ResUtil; diff --git a/app/src/main/java/com/chwl/app/ui/im/friend/FriendFragmentCpDelegate.kt b/app/src/main/java/com/chwl/app/ui/im/friend/FriendFragmentCpDelegate.kt index 76b308c2c..f258ab503 100644 --- a/app/src/main/java/com/chwl/app/ui/im/friend/FriendFragmentCpDelegate.kt +++ b/app/src/main/java/com/chwl/app/ui/im/friend/FriendFragmentCpDelegate.kt @@ -12,7 +12,7 @@ import com.chwl.app.ui.pay.ChargeActivity import com.chwl.app.ui.webview.CommonWebViewActivity import com.chwl.core.Constants import com.chwl.core.UriProvider -import com.chwl.core.relation.cp.CpInvitePageEntity +import com.chwl.core.relation.cp.bean.CpInvitePageEntity import com.chwl.core.utils.toast import com.chwl.library.common.util.DeviceUtil import com.chwl.library.utils.AppMetaDataUtil diff --git a/app/src/main/java/com/chwl/app/ui/widget/dialog/AllPlayEffectDialog.java b/app/src/main/java/com/chwl/app/ui/widget/dialog/AllPlayEffectDialog.java index 6879ed2d7..f36bac147 100644 --- a/app/src/main/java/com/chwl/app/ui/widget/dialog/AllPlayEffectDialog.java +++ b/app/src/main/java/com/chwl/app/ui/widget/dialog/AllPlayEffectDialog.java @@ -45,7 +45,7 @@ import com.chwl.core.im.custom.bean.PlayEffectInfo; import com.chwl.core.im.custom.bean.RoomBoxPrizeInfo; import com.chwl.core.im.custom.bean.RoomLuckySeaMsgBean; import com.chwl.core.im.custom.bean.TarotMsgBean; -import com.chwl.core.treasurefairy.FairyMsgInfoBean; +import com.chwl.core.treasurefairy.bean.FairyMsgInfoBean; import com.chwl.library.utils.ResUtil; import com.chwl.library.utils.StringUtils; diff --git a/app/src/main/java/com/chwl/app/ui/widget/dialog/AllServiceVipLevelUPDialog.java b/app/src/main/java/com/chwl/app/ui/widget/dialog/AllServiceVipLevelUPDialog.java index cfa58f98f..b71ad4b51 100644 --- a/app/src/main/java/com/chwl/app/ui/widget/dialog/AllServiceVipLevelUPDialog.java +++ b/app/src/main/java/com/chwl/app/ui/widget/dialog/AllServiceVipLevelUPDialog.java @@ -28,7 +28,7 @@ import com.chwl.app.common.widget.CircleImageSpan; import com.chwl.app.databinding.DialogVipAllServiceLevelUpBinding; import com.chwl.app.utils.SpannableBuilder; import com.chwl.core.utils.StringExtensionKt; -import com.chwl.core.vip.VipMessageInfo; +import com.chwl.core.vip.bean.VipMessageInfo; import com.chwl.library.utils.ResUtil; import java.net.URL; diff --git a/app/src/main/java/com/chwl/app/vip/VipMainActivity.kt b/app/src/main/java/com/chwl/app/vip/VipMainActivity.kt index 7bd6fcdfa..406766113 100644 --- a/app/src/main/java/com/chwl/app/vip/VipMainActivity.kt +++ b/app/src/main/java/com/chwl/app/vip/VipMainActivity.kt @@ -49,8 +49,8 @@ import com.chwl.core.pay.bean.ChargeBean import com.chwl.core.pay.bean.PayRecordId import com.chwl.core.utils.net.IgnoreException import com.chwl.core.utils.toast -import com.chwl.core.vip.VipAuthInfo -import com.chwl.core.vip.VipInfo +import com.chwl.core.vip.bean.VipAuthInfo +import com.chwl.core.vip.bean.VipInfo import com.chwl.core.vip.VipOpenEvent import com.chwl.library.common.util.DeviceUtil import com.chwl.library.utils.AppMetaDataUtil diff --git a/app/src/main/java/com/chwl/app/vip/VipViewModel.kt b/app/src/main/java/com/chwl/app/vip/VipViewModel.kt index 97e64bc94..1f3c710a0 100644 --- a/app/src/main/java/com/chwl/app/vip/VipViewModel.kt +++ b/app/src/main/java/com/chwl/app/vip/VipViewModel.kt @@ -5,14 +5,12 @@ import androidx.lifecycle.MutableLiveData import com.chwl.app.R import com.chwl.app.base.BaseViewModel import com.chwl.core.bean.response.BeanResult -import com.chwl.core.home.model.HomeModel -import com.chwl.core.module_hall.hall.HallModel import com.chwl.core.user.UserInfoUiMgr import com.chwl.core.user.UserModel import com.chwl.core.utils.toast -import com.chwl.core.vip.VipAuthInfo -import com.chwl.core.vip.VipBroadcastInfo -import com.chwl.core.vip.VipInfo +import com.chwl.core.vip.bean.VipAuthInfo +import com.chwl.core.vip.bean.VipBroadcastInfo +import com.chwl.core.vip.bean.VipInfo import com.chwl.core.vip.VipModel import com.chwl.library.utils.ResUtil diff --git a/app/src/main/java/com/chwl/app/vip/adapter/VipAuthAdapter.kt b/app/src/main/java/com/chwl/app/vip/adapter/VipAuthAdapter.kt index 61ab2c40e..7d000909d 100644 --- a/app/src/main/java/com/chwl/app/vip/adapter/VipAuthAdapter.kt +++ b/app/src/main/java/com/chwl/app/vip/adapter/VipAuthAdapter.kt @@ -5,8 +5,8 @@ import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder import com.chwl.app.R import com.chwl.app.ui.utils.load -import com.chwl.core.vip.VipAuthInfo -import com.chwl.core.vip.VipInfo +import com.chwl.core.vip.bean.VipAuthInfo +import com.chwl.core.vip.bean.VipInfo class VipAuthAdapter : BaseQuickAdapter(R.layout.item_vip_auth) { diff --git a/app/src/main/java/com/chwl/app/vip/dialog/VipUpgradeDialog.kt b/app/src/main/java/com/chwl/app/vip/dialog/VipUpgradeDialog.kt index 9dc7329a9..411b104ea 100644 --- a/app/src/main/java/com/chwl/app/vip/dialog/VipUpgradeDialog.kt +++ b/app/src/main/java/com/chwl/app/vip/dialog/VipUpgradeDialog.kt @@ -10,7 +10,7 @@ import com.chwl.app.base.BaseActivity import com.chwl.app.base.BaseDialog import com.chwl.app.databinding.DialogVipUpgradeBinding import com.chwl.app.vip.VipViewModel -import com.chwl.core.vip.VipInfo +import com.chwl.core.vip.bean.VipInfo import java.net.MalformedURLException import java.net.URL diff --git a/app/src/main/java/com/chwl/app/vip/util/VipHelper.java b/app/src/main/java/com/chwl/app/vip/util/VipHelper.java index 016c87d68..ca7a13584 100644 --- a/app/src/main/java/com/chwl/app/vip/util/VipHelper.java +++ b/app/src/main/java/com/chwl/app/vip/util/VipHelper.java @@ -12,7 +12,7 @@ import com.chwl.app.ui.utils.ImageLoadUtils; import com.chwl.core.user.UserModel; import com.chwl.core.user.bean.UserInfo; import com.chwl.core.utils.TextUtils; -import com.chwl.core.vip.UserVipInfo; +import com.chwl.core.vip.bean.UserVipInfo; public class VipHelper { diff --git a/app/src/main/res/layout/layout_cp_card.xml b/app/src/main/res/layout/layout_cp_card.xml index 9270b18a4..16dcb94da 100644 --- a/app/src/main/res/layout/layout_cp_card.xml +++ b/app/src/main/res/layout/layout_cp_card.xml @@ -5,11 +5,11 @@ + type="com.chwl.core.relation.cp.bean.CpRelation" /> + type="com.chwl.core.relation.cp.bean.CpInvitePageEntity" /> ? = null, - var userVO: UserVo -) \ No newline at end of file diff --git a/core/src/main/java/com/chwl/core/redpackage/RedPackageModel.kt b/core/src/main/java/com/chwl/core/redpackage/RedPackageModel.kt index d6b9fcaf4..8b2d954dd 100644 --- a/core/src/main/java/com/chwl/core/redpackage/RedPackageModel.kt +++ b/core/src/main/java/com/chwl/core/redpackage/RedPackageModel.kt @@ -2,6 +2,10 @@ package com.chwl.core.redpackage import com.chwl.core.bean.response.ServiceResult +import com.chwl.core.redpackage.bean.RedEnvelopeVO +import com.chwl.core.redpackage.bean.RedPackageData +import com.chwl.core.redpackage.bean.RedPackageInfo +import com.chwl.core.redpackage.bean.RedPackageNotifyInfo import com.chwl.core.utils.net.handleBeanData import com.chwl.core.utils.net.handleStringData import com.chwl.core.utils.net.io2main diff --git a/core/src/main/java/com/chwl/core/redpackage/RedEnvelopeGiftItemVO.kt b/core/src/main/java/com/chwl/core/redpackage/bean/RedEnvelopeGiftItemVO.kt similarity index 79% rename from core/src/main/java/com/chwl/core/redpackage/RedEnvelopeGiftItemVO.kt rename to core/src/main/java/com/chwl/core/redpackage/bean/RedEnvelopeGiftItemVO.kt index 464ae84db..d9f97f7c9 100644 --- a/core/src/main/java/com/chwl/core/redpackage/RedEnvelopeGiftItemVO.kt +++ b/core/src/main/java/com/chwl/core/redpackage/bean/RedEnvelopeGiftItemVO.kt @@ -1,4 +1,4 @@ -package com.chwl.core.redpackage +package com.chwl.core.redpackage.bean import com.chwl.core.gift.bean.GiftInfo diff --git a/core/src/main/java/com/chwl/core/redpackage/bean/RedEnvelopeItemVO.kt b/core/src/main/java/com/chwl/core/redpackage/bean/RedEnvelopeItemVO.kt new file mode 100644 index 000000000..144cf0fb9 --- /dev/null +++ b/core/src/main/java/com/chwl/core/redpackage/bean/RedEnvelopeItemVO.kt @@ -0,0 +1,11 @@ +package com.chwl.core.redpackage.bean + +import com.chwl.core.community.UserVo + + +class RedEnvelopeItemVO( + var amount: String, + var createTime: Long = 0, + var redEnvelopeGiftItemVOs: List? = null, + var userVO: UserVo +) \ No newline at end of file diff --git a/core/src/main/java/com/chwl/core/redpackage/RedEnvelopeRoomMsg.kt b/core/src/main/java/com/chwl/core/redpackage/bean/RedEnvelopeRoomMsg.kt similarity index 94% rename from core/src/main/java/com/chwl/core/redpackage/RedEnvelopeRoomMsg.kt rename to core/src/main/java/com/chwl/core/redpackage/bean/RedEnvelopeRoomMsg.kt index 436417d3c..b56fc5b87 100644 --- a/core/src/main/java/com/chwl/core/redpackage/RedEnvelopeRoomMsg.kt +++ b/core/src/main/java/com/chwl/core/redpackage/bean/RedEnvelopeRoomMsg.kt @@ -1,4 +1,4 @@ -package com.chwl.core.redpackage +package com.chwl.core.redpackage.bean import java.io.Serializable diff --git a/core/src/main/java/com/chwl/core/redpackage/RedEnvelopeState.kt b/core/src/main/java/com/chwl/core/redpackage/bean/RedEnvelopeState.kt similarity index 93% rename from core/src/main/java/com/chwl/core/redpackage/RedEnvelopeState.kt rename to core/src/main/java/com/chwl/core/redpackage/bean/RedEnvelopeState.kt index 734ed2c75..2ce5bdae8 100644 --- a/core/src/main/java/com/chwl/core/redpackage/RedEnvelopeState.kt +++ b/core/src/main/java/com/chwl/core/redpackage/bean/RedEnvelopeState.kt @@ -1,4 +1,4 @@ -package com.chwl.core.redpackage +package com.chwl.core.redpackage.bean /** * 红包状态 diff --git a/core/src/main/java/com/chwl/core/redpackage/RedEnvelopeVO.kt b/core/src/main/java/com/chwl/core/redpackage/bean/RedEnvelopeVO.kt similarity index 96% rename from core/src/main/java/com/chwl/core/redpackage/RedEnvelopeVO.kt rename to core/src/main/java/com/chwl/core/redpackage/bean/RedEnvelopeVO.kt index 99fd6a294..61331c735 100644 --- a/core/src/main/java/com/chwl/core/redpackage/RedEnvelopeVO.kt +++ b/core/src/main/java/com/chwl/core/redpackage/bean/RedEnvelopeVO.kt @@ -1,4 +1,4 @@ -package com.chwl.core.redpackage +package com.chwl.core.redpackage.bean import com.chwl.core.community.UserVo diff --git a/core/src/main/java/com/chwl/core/redpackage/RedPackageData.kt b/core/src/main/java/com/chwl/core/redpackage/bean/RedPackageData.kt similarity index 95% rename from core/src/main/java/com/chwl/core/redpackage/RedPackageData.kt rename to core/src/main/java/com/chwl/core/redpackage/bean/RedPackageData.kt index 7b31f1318..2338e7a2d 100644 --- a/core/src/main/java/com/chwl/core/redpackage/RedPackageData.kt +++ b/core/src/main/java/com/chwl/core/redpackage/bean/RedPackageData.kt @@ -1,4 +1,4 @@ -package com.chwl.core.redpackage +package com.chwl.core.redpackage.bean import java.io.Serializable diff --git a/core/src/main/java/com/chwl/core/redpackage/RedPackageInfo.kt b/core/src/main/java/com/chwl/core/redpackage/bean/RedPackageInfo.kt similarity index 92% rename from core/src/main/java/com/chwl/core/redpackage/RedPackageInfo.kt rename to core/src/main/java/com/chwl/core/redpackage/bean/RedPackageInfo.kt index 9f6601de1..d1bdc02c3 100644 --- a/core/src/main/java/com/chwl/core/redpackage/RedPackageInfo.kt +++ b/core/src/main/java/com/chwl/core/redpackage/bean/RedPackageInfo.kt @@ -1,4 +1,4 @@ -package com.chwl.core.redpackage +package com.chwl.core.redpackage.bean data class RedPackageInfo( diff --git a/core/src/main/java/com/chwl/core/redpackage/RedPackageNotifyInfo.kt b/core/src/main/java/com/chwl/core/redpackage/bean/RedPackageNotifyInfo.kt similarity index 96% rename from core/src/main/java/com/chwl/core/redpackage/RedPackageNotifyInfo.kt rename to core/src/main/java/com/chwl/core/redpackage/bean/RedPackageNotifyInfo.kt index 684afe1c7..2bebca378 100644 --- a/core/src/main/java/com/chwl/core/redpackage/RedPackageNotifyInfo.kt +++ b/core/src/main/java/com/chwl/core/redpackage/bean/RedPackageNotifyInfo.kt @@ -1,4 +1,4 @@ -package com.chwl.core.redpackage +package com.chwl.core.redpackage.bean import java.io.Serializable diff --git a/core/src/main/java/com/chwl/core/relation/cp/CpInviteDetailEntity.kt b/core/src/main/java/com/chwl/core/relation/cp/bean/CpInviteDetailEntity.kt similarity index 93% rename from core/src/main/java/com/chwl/core/relation/cp/CpInviteDetailEntity.kt rename to core/src/main/java/com/chwl/core/relation/cp/bean/CpInviteDetailEntity.kt index def415b9d..196cc885e 100644 --- a/core/src/main/java/com/chwl/core/relation/cp/CpInviteDetailEntity.kt +++ b/core/src/main/java/com/chwl/core/relation/cp/bean/CpInviteDetailEntity.kt @@ -1,4 +1,4 @@ -package com.chwl.core.relation.cp +package com.chwl.core.relation.cp.bean data class CpInviteDetailEntity( val acceptAvatar: String? = "", diff --git a/core/src/main/java/com/chwl/core/relation/cp/CpInviteInfo.kt b/core/src/main/java/com/chwl/core/relation/cp/bean/CpInviteInfo.kt similarity index 94% rename from core/src/main/java/com/chwl/core/relation/cp/CpInviteInfo.kt rename to core/src/main/java/com/chwl/core/relation/cp/bean/CpInviteInfo.kt index 58f79212d..26b0a3882 100644 --- a/core/src/main/java/com/chwl/core/relation/cp/CpInviteInfo.kt +++ b/core/src/main/java/com/chwl/core/relation/cp/bean/CpInviteInfo.kt @@ -1,4 +1,4 @@ -package com.chwl.core.relation.cp +package com.chwl.core.relation.cp.bean data class CpInviteMessage( val msg: String = "", diff --git a/core/src/main/java/com/chwl/core/relation/cp/CpInvitePageEntity.kt b/core/src/main/java/com/chwl/core/relation/cp/bean/CpInvitePageEntity.kt similarity index 93% rename from core/src/main/java/com/chwl/core/relation/cp/CpInvitePageEntity.kt rename to core/src/main/java/com/chwl/core/relation/cp/bean/CpInvitePageEntity.kt index bd0be6e7f..1abe79cdd 100644 --- a/core/src/main/java/com/chwl/core/relation/cp/CpInvitePageEntity.kt +++ b/core/src/main/java/com/chwl/core/relation/cp/bean/CpInvitePageEntity.kt @@ -1,4 +1,4 @@ -package com.chwl.core.relation.cp +package com.chwl.core.relation.cp.bean /** * 邀请CP弹窗信息 diff --git a/core/src/main/java/com/chwl/core/relation/cp/CpMpApplyListEntity.kt b/core/src/main/java/com/chwl/core/relation/cp/bean/CpMpApplyListEntity.kt similarity index 88% rename from core/src/main/java/com/chwl/core/relation/cp/CpMpApplyListEntity.kt rename to core/src/main/java/com/chwl/core/relation/cp/bean/CpMpApplyListEntity.kt index cd5127a53..ddd7d43f2 100644 --- a/core/src/main/java/com/chwl/core/relation/cp/CpMpApplyListEntity.kt +++ b/core/src/main/java/com/chwl/core/relation/cp/bean/CpMpApplyListEntity.kt @@ -1,4 +1,4 @@ -package com.chwl.core.relation.cp +package com.chwl.core.relation.cp.bean /** * diff --git a/core/src/main/java/com/chwl/core/relation/cp/CpRelation.kt b/core/src/main/java/com/chwl/core/relation/cp/bean/CpRelation.kt similarity index 94% rename from core/src/main/java/com/chwl/core/relation/cp/CpRelation.kt rename to core/src/main/java/com/chwl/core/relation/cp/bean/CpRelation.kt index 3e6c16ed4..63f6ab46e 100644 --- a/core/src/main/java/com/chwl/core/relation/cp/CpRelation.kt +++ b/core/src/main/java/com/chwl/core/relation/cp/bean/CpRelation.kt @@ -1,4 +1,4 @@ -package com.chwl.core.relation.cp +package com.chwl.core.relation.cp.bean data class CpRelation( /** diff --git a/core/src/main/java/com/chwl/core/relation/cp/CpTaskEntity.kt b/core/src/main/java/com/chwl/core/relation/cp/bean/CpTaskEntity.kt similarity index 96% rename from core/src/main/java/com/chwl/core/relation/cp/CpTaskEntity.kt rename to core/src/main/java/com/chwl/core/relation/cp/bean/CpTaskEntity.kt index 665b8e1f3..6c6124690 100644 --- a/core/src/main/java/com/chwl/core/relation/cp/CpTaskEntity.kt +++ b/core/src/main/java/com/chwl/core/relation/cp/bean/CpTaskEntity.kt @@ -1,4 +1,4 @@ -package com.chwl.core.relation.cp +package com.chwl.core.relation.cp.bean data class CpTaskEntity( val avatar: String = "", diff --git a/core/src/main/java/com/chwl/core/relation/cp/UserCpLevelMpEntity.kt b/core/src/main/java/com/chwl/core/relation/cp/bean/UserCpLevelMpEntity.kt similarity index 89% rename from core/src/main/java/com/chwl/core/relation/cp/UserCpLevelMpEntity.kt rename to core/src/main/java/com/chwl/core/relation/cp/bean/UserCpLevelMpEntity.kt index 782e03470..3f481cb45 100644 --- a/core/src/main/java/com/chwl/core/relation/cp/UserCpLevelMpEntity.kt +++ b/core/src/main/java/com/chwl/core/relation/cp/bean/UserCpLevelMpEntity.kt @@ -1,4 +1,4 @@ -package com.chwl.core.relation.cp +package com.chwl.core.relation.cp.bean data class UserCpLevelMpRootEntity( val haveCp: Boolean = false, diff --git a/core/src/main/java/com/chwl/core/relation/cp/UserCpListEntity.kt b/core/src/main/java/com/chwl/core/relation/cp/bean/UserCpListEntity.kt similarity index 95% rename from core/src/main/java/com/chwl/core/relation/cp/UserCpListEntity.kt rename to core/src/main/java/com/chwl/core/relation/cp/bean/UserCpListEntity.kt index a78b4dca5..80765b40c 100644 --- a/core/src/main/java/com/chwl/core/relation/cp/UserCpListEntity.kt +++ b/core/src/main/java/com/chwl/core/relation/cp/bean/UserCpListEntity.kt @@ -1,4 +1,4 @@ -package com.chwl.core.relation.cp +package com.chwl.core.relation.cp.bean data class UserCpListEntity( val acceptUid: Long = 0, diff --git a/core/src/main/java/com/chwl/core/room/face/DynamicFaceModel.java b/core/src/main/java/com/chwl/core/room/face/DynamicFaceModel.java index 570fc2877..6b350e9be 100644 --- a/core/src/main/java/com/chwl/core/room/face/DynamicFaceModel.java +++ b/core/src/main/java/com/chwl/core/room/face/DynamicFaceModel.java @@ -38,7 +38,7 @@ import com.chwl.core.room.queue.bean.MicMemberInfo; import com.chwl.core.user.UserModel; import com.chwl.core.user.bean.UserInfo; import com.chwl.core.utils.LogUtils; -import com.chwl.core.vip.UserVipInfo; +import com.chwl.core.vip.bean.UserVipInfo; import com.chwl.library.utils.ListUtils; import com.chwl.library.utils.NetworkUtils; import com.chwl.library.utils.codec.DESUtils; diff --git a/core/src/main/java/com/chwl/core/room/game/GameModel.kt b/core/src/main/java/com/chwl/core/room/game/GameModel.kt index 086d3e2a3..6dd27edb2 100644 --- a/core/src/main/java/com/chwl/core/room/game/GameModel.kt +++ b/core/src/main/java/com/chwl/core/room/game/GameModel.kt @@ -3,6 +3,8 @@ package com.chwl.core.room.game import com.chwl.core.auth.AuthModel import com.chwl.core.base.BaseModel import com.chwl.core.bean.response.ServiceResult +import com.chwl.core.room.game.bean.GameCodeInfo +import com.chwl.core.room.game.bean.GameInfo import com.chwl.core.utils.net.RxHelper import com.chwl.library.net.rxnet.RxNet import io.reactivex.Single diff --git a/core/src/main/java/com/chwl/core/room/game/GameCfg.kt b/core/src/main/java/com/chwl/core/room/game/bean/GameCfg.kt similarity index 98% rename from core/src/main/java/com/chwl/core/room/game/GameCfg.kt rename to core/src/main/java/com/chwl/core/room/game/bean/GameCfg.kt index b7188d16f..f71fc91c1 100644 --- a/core/src/main/java/com/chwl/core/room/game/GameCfg.kt +++ b/core/src/main/java/com/chwl/core/room/game/bean/GameCfg.kt @@ -1,4 +1,4 @@ -package com.chwl.core.room.game +package com.chwl.core.room.game.bean /*** * diff --git a/core/src/main/java/com/chwl/core/room/game/GameCodeInfo.kt b/core/src/main/java/com/chwl/core/room/game/bean/GameCodeInfo.kt similarity index 66% rename from core/src/main/java/com/chwl/core/room/game/GameCodeInfo.kt rename to core/src/main/java/com/chwl/core/room/game/bean/GameCodeInfo.kt index 7e547318e..e9777d733 100644 --- a/core/src/main/java/com/chwl/core/room/game/GameCodeInfo.kt +++ b/core/src/main/java/com/chwl/core/room/game/bean/GameCodeInfo.kt @@ -1,4 +1,4 @@ -package com.chwl.core.room.game +package com.chwl.core.room.game.bean data class GameCodeInfo( val code: String, diff --git a/core/src/main/java/com/chwl/core/room/game/GameInfo.kt b/core/src/main/java/com/chwl/core/room/game/bean/GameInfo.kt similarity index 85% rename from core/src/main/java/com/chwl/core/room/game/GameInfo.kt rename to core/src/main/java/com/chwl/core/room/game/bean/GameInfo.kt index bcd8ea403..711582236 100644 --- a/core/src/main/java/com/chwl/core/room/game/GameInfo.kt +++ b/core/src/main/java/com/chwl/core/room/game/bean/GameInfo.kt @@ -1,4 +1,4 @@ -package com.chwl.core.room.game +package com.chwl.core.room.game.bean data class GameInfo( val isShow: Boolean = false, diff --git a/core/src/main/java/com/chwl/core/room/model/RoomBaseModel.java b/core/src/main/java/com/chwl/core/room/model/RoomBaseModel.java index c6500a08c..f4827f481 100644 --- a/core/src/main/java/com/chwl/core/room/model/RoomBaseModel.java +++ b/core/src/main/java/com/chwl/core/room/model/RoomBaseModel.java @@ -53,7 +53,7 @@ import com.chwl.core.user.bean.BaseInfo; import com.chwl.core.user.bean.FirstChargeInfo; import com.chwl.core.user.bean.UserInfo; import com.chwl.core.utils.net.RxHelper; -import com.chwl.core.vip.UserVipInfo; +import com.chwl.core.vip.bean.UserVipInfo; import com.chwl.library.net.rxnet.RxNet; import com.chwl.library.net.rxnet.callback.CallBack; import com.chwl.library.utils.JavaUtil; diff --git a/core/src/main/java/com/chwl/core/treasurefairy/TreasureFairyModel.kt b/core/src/main/java/com/chwl/core/treasurefairy/TreasureFairyModel.kt index 2945afc73..da236060e 100644 --- a/core/src/main/java/com/chwl/core/treasurefairy/TreasureFairyModel.kt +++ b/core/src/main/java/com/chwl/core/treasurefairy/TreasureFairyModel.kt @@ -3,9 +3,20 @@ package com.chwl.core.treasurefairy import com.chwl.core.bean.response.ServiceResult import com.chwl.core.gift.bean.SimpleUserInfo import com.chwl.core.manager.AvRoomDataManager -import com.chwl.core.treasurefairy.FairyInfo.Companion.LEVEL_HIGH -import com.chwl.core.treasurefairy.FairyInfo.Companion.LEVEL_LOW -import com.chwl.core.treasurefairy.FairyInfo.Companion.LEVEL_MIDDLE +import com.chwl.core.treasurefairy.bean.FairyInfo.Companion.LEVEL_HIGH +import com.chwl.core.treasurefairy.bean.FairyInfo.Companion.LEVEL_LOW +import com.chwl.core.treasurefairy.bean.FairyInfo.Companion.LEVEL_MIDDLE +import com.chwl.core.treasurefairy.bean.DrawInfo +import com.chwl.core.treasurefairy.bean.ExchangeGiftInfo +import com.chwl.core.treasurefairy.bean.FairyInfo +import com.chwl.core.treasurefairy.bean.FairyResolveParam +import com.chwl.core.treasurefairy.bean.FairyTestParam +import com.chwl.core.treasurefairy.bean.ForestInfo +import com.chwl.core.treasurefairy.bean.MyFairyInfo +import com.chwl.core.treasurefairy.bean.PrizeInfo +import com.chwl.core.treasurefairy.bean.ResolveInfo +import com.chwl.core.treasurefairy.bean.SendFairyInfo +import com.chwl.core.treasurefairy.bean.TestFairyRecordInfo import com.chwl.core.utils.net.launchRequest import com.chwl.library.net.rxnet.RxNet import retrofit2.http.* diff --git a/core/src/main/java/com/chwl/core/treasurefairy/Compound.kt b/core/src/main/java/com/chwl/core/treasurefairy/bean/Compound.kt similarity index 60% rename from core/src/main/java/com/chwl/core/treasurefairy/Compound.kt rename to core/src/main/java/com/chwl/core/treasurefairy/bean/Compound.kt index 48394335a..04b08700a 100644 --- a/core/src/main/java/com/chwl/core/treasurefairy/Compound.kt +++ b/core/src/main/java/com/chwl/core/treasurefairy/bean/Compound.kt @@ -1,4 +1,4 @@ -package com.chwl.core.treasurefairy +package com.chwl.core.treasurefairy.bean data class Compound( val elfId: Long, diff --git a/core/src/main/java/com/chwl/core/treasurefairy/DrawInfo.kt b/core/src/main/java/com/chwl/core/treasurefairy/bean/DrawInfo.kt similarity index 73% rename from core/src/main/java/com/chwl/core/treasurefairy/DrawInfo.kt rename to core/src/main/java/com/chwl/core/treasurefairy/bean/DrawInfo.kt index 809b0c2a3..825cdc171 100644 --- a/core/src/main/java/com/chwl/core/treasurefairy/DrawInfo.kt +++ b/core/src/main/java/com/chwl/core/treasurefairy/bean/DrawInfo.kt @@ -1,4 +1,4 @@ -package com.chwl.core.treasurefairy +package com.chwl.core.treasurefairy.bean data class DrawInfo( var drawTicketNum: Int = 0, diff --git a/core/src/main/java/com/chwl/core/treasurefairy/ExchangeGiftInfo.kt b/core/src/main/java/com/chwl/core/treasurefairy/bean/ExchangeGiftInfo.kt similarity index 95% rename from core/src/main/java/com/chwl/core/treasurefairy/ExchangeGiftInfo.kt rename to core/src/main/java/com/chwl/core/treasurefairy/bean/ExchangeGiftInfo.kt index ebb318ef5..874bbf6cd 100644 --- a/core/src/main/java/com/chwl/core/treasurefairy/ExchangeGiftInfo.kt +++ b/core/src/main/java/com/chwl/core/treasurefairy/bean/ExchangeGiftInfo.kt @@ -1,4 +1,4 @@ -package com.chwl.core.treasurefairy +package com.chwl.core.treasurefairy.bean data class ExchangeGiftInfo( val expendNum: Int = 0, diff --git a/core/src/main/java/com/chwl/core/treasurefairy/FairyInfo.kt b/core/src/main/java/com/chwl/core/treasurefairy/bean/FairyInfo.kt similarity index 93% rename from core/src/main/java/com/chwl/core/treasurefairy/FairyInfo.kt rename to core/src/main/java/com/chwl/core/treasurefairy/bean/FairyInfo.kt index e883b0157..94afd030e 100644 --- a/core/src/main/java/com/chwl/core/treasurefairy/FairyInfo.kt +++ b/core/src/main/java/com/chwl/core/treasurefairy/bean/FairyInfo.kt @@ -1,4 +1,4 @@ -package com.chwl.core.treasurefairy +package com.chwl.core.treasurefairy.bean import java.io.Serializable diff --git a/core/src/main/java/com/chwl/core/treasurefairy/FairyMsgInfoBean.java b/core/src/main/java/com/chwl/core/treasurefairy/bean/FairyMsgInfoBean.java similarity index 90% rename from core/src/main/java/com/chwl/core/treasurefairy/FairyMsgInfoBean.java rename to core/src/main/java/com/chwl/core/treasurefairy/bean/FairyMsgInfoBean.java index a62398357..9edf28c6f 100644 --- a/core/src/main/java/com/chwl/core/treasurefairy/FairyMsgInfoBean.java +++ b/core/src/main/java/com/chwl/core/treasurefairy/bean/FairyMsgInfoBean.java @@ -1,4 +1,4 @@ -package com.chwl.core.treasurefairy; +package com.chwl.core.treasurefairy.bean; import lombok.Data; diff --git a/core/src/main/java/com/chwl/core/treasurefairy/FairyResolveParam.kt b/core/src/main/java/com/chwl/core/treasurefairy/bean/FairyResolveParam.kt similarity index 68% rename from core/src/main/java/com/chwl/core/treasurefairy/FairyResolveParam.kt rename to core/src/main/java/com/chwl/core/treasurefairy/bean/FairyResolveParam.kt index 579ca9e2a..364df0751 100644 --- a/core/src/main/java/com/chwl/core/treasurefairy/FairyResolveParam.kt +++ b/core/src/main/java/com/chwl/core/treasurefairy/bean/FairyResolveParam.kt @@ -1,4 +1,4 @@ -package com.chwl.core.treasurefairy +package com.chwl.core.treasurefairy.bean data class FairyResolveParam( val expendList: MutableList = arrayListOf() diff --git a/core/src/main/java/com/chwl/core/treasurefairy/FairyTestParam.kt b/core/src/main/java/com/chwl/core/treasurefairy/bean/FairyTestParam.kt similarity index 73% rename from core/src/main/java/com/chwl/core/treasurefairy/FairyTestParam.kt rename to core/src/main/java/com/chwl/core/treasurefairy/bean/FairyTestParam.kt index 94fa259ce..457752be1 100644 --- a/core/src/main/java/com/chwl/core/treasurefairy/FairyTestParam.kt +++ b/core/src/main/java/com/chwl/core/treasurefairy/bean/FairyTestParam.kt @@ -1,4 +1,4 @@ -package com.chwl.core.treasurefairy +package com.chwl.core.treasurefairy.bean data class FairyTestParam( val expendList: MutableList = arrayListOf(), diff --git a/core/src/main/java/com/chwl/core/treasurefairy/ForestInfo.kt b/core/src/main/java/com/chwl/core/treasurefairy/bean/ForestInfo.kt similarity index 85% rename from core/src/main/java/com/chwl/core/treasurefairy/ForestInfo.kt rename to core/src/main/java/com/chwl/core/treasurefairy/bean/ForestInfo.kt index 3f0782dcb..16edbb42f 100644 --- a/core/src/main/java/com/chwl/core/treasurefairy/ForestInfo.kt +++ b/core/src/main/java/com/chwl/core/treasurefairy/bean/ForestInfo.kt @@ -1,4 +1,4 @@ -package com.chwl.core.treasurefairy +package com.chwl.core.treasurefairy.bean data class ForestInfo( val avatar: String = "", diff --git a/core/src/main/java/com/chwl/core/treasurefairy/MyFairyInfo.kt b/core/src/main/java/com/chwl/core/treasurefairy/bean/MyFairyInfo.kt similarity index 85% rename from core/src/main/java/com/chwl/core/treasurefairy/MyFairyInfo.kt rename to core/src/main/java/com/chwl/core/treasurefairy/bean/MyFairyInfo.kt index 82068aece..1d108d422 100644 --- a/core/src/main/java/com/chwl/core/treasurefairy/MyFairyInfo.kt +++ b/core/src/main/java/com/chwl/core/treasurefairy/bean/MyFairyInfo.kt @@ -1,4 +1,4 @@ -package com.chwl.core.treasurefairy +package com.chwl.core.treasurefairy.bean data class MyFairyInfo( val highElves: ArrayList? = null, diff --git a/core/src/main/java/com/chwl/core/treasurefairy/PrizeInfo.kt b/core/src/main/java/com/chwl/core/treasurefairy/bean/PrizeInfo.kt similarity index 90% rename from core/src/main/java/com/chwl/core/treasurefairy/PrizeInfo.kt rename to core/src/main/java/com/chwl/core/treasurefairy/bean/PrizeInfo.kt index 4180fc271..ff709e493 100644 --- a/core/src/main/java/com/chwl/core/treasurefairy/PrizeInfo.kt +++ b/core/src/main/java/com/chwl/core/treasurefairy/bean/PrizeInfo.kt @@ -1,4 +1,4 @@ -package com.chwl.core.treasurefairy +package com.chwl.core.treasurefairy.bean data class PrizeInfo( val rewardId: Int = 0, diff --git a/core/src/main/java/com/chwl/core/treasurefairy/PropItemInfo.kt b/core/src/main/java/com/chwl/core/treasurefairy/bean/PropItemInfo.kt similarity index 76% rename from core/src/main/java/com/chwl/core/treasurefairy/PropItemInfo.kt rename to core/src/main/java/com/chwl/core/treasurefairy/bean/PropItemInfo.kt index c11f4a00f..97012bfd8 100644 --- a/core/src/main/java/com/chwl/core/treasurefairy/PropItemInfo.kt +++ b/core/src/main/java/com/chwl/core/treasurefairy/bean/PropItemInfo.kt @@ -1,4 +1,4 @@ -package com.chwl.core.treasurefairy +package com.chwl.core.treasurefairy.bean data class PropItemInfo( val picUrl: String = "", diff --git a/core/src/main/java/com/chwl/core/treasurefairy/ResolveInfo.kt b/core/src/main/java/com/chwl/core/treasurefairy/bean/ResolveInfo.kt similarity index 75% rename from core/src/main/java/com/chwl/core/treasurefairy/ResolveInfo.kt rename to core/src/main/java/com/chwl/core/treasurefairy/bean/ResolveInfo.kt index 36d4c1d00..0e53b79bf 100644 --- a/core/src/main/java/com/chwl/core/treasurefairy/ResolveInfo.kt +++ b/core/src/main/java/com/chwl/core/treasurefairy/bean/ResolveInfo.kt @@ -1,4 +1,4 @@ -package com.chwl.core.treasurefairy +package com.chwl.core.treasurefairy.bean import java.io.Serializable diff --git a/core/src/main/java/com/chwl/core/treasurefairy/SendFairyInfo.kt b/core/src/main/java/com/chwl/core/treasurefairy/bean/SendFairyInfo.kt similarity index 87% rename from core/src/main/java/com/chwl/core/treasurefairy/SendFairyInfo.kt rename to core/src/main/java/com/chwl/core/treasurefairy/bean/SendFairyInfo.kt index b90ae1752..2e4e51f3e 100644 --- a/core/src/main/java/com/chwl/core/treasurefairy/SendFairyInfo.kt +++ b/core/src/main/java/com/chwl/core/treasurefairy/bean/SendFairyInfo.kt @@ -1,4 +1,4 @@ -package com.chwl.core.treasurefairy +package com.chwl.core.treasurefairy.bean data class SendFairyInfo( val createTime: Long = 0, diff --git a/core/src/main/java/com/chwl/core/treasurefairy/TestFairyRecordInfo.kt b/core/src/main/java/com/chwl/core/treasurefairy/bean/TestFairyRecordInfo.kt similarity index 86% rename from core/src/main/java/com/chwl/core/treasurefairy/TestFairyRecordInfo.kt rename to core/src/main/java/com/chwl/core/treasurefairy/bean/TestFairyRecordInfo.kt index 59cfeab71..90c0e86eb 100644 --- a/core/src/main/java/com/chwl/core/treasurefairy/TestFairyRecordInfo.kt +++ b/core/src/main/java/com/chwl/core/treasurefairy/bean/TestFairyRecordInfo.kt @@ -1,4 +1,4 @@ -package com.chwl.core.treasurefairy +package com.chwl.core.treasurefairy.bean data class TestFairyRecordInfo( val compoundLevel: Int = 0, diff --git a/core/src/main/java/com/chwl/core/user/bean/AttentionInfo.java b/core/src/main/java/com/chwl/core/user/bean/AttentionInfo.java index bad35fb69..66372a1ef 100644 --- a/core/src/main/java/com/chwl/core/user/bean/AttentionInfo.java +++ b/core/src/main/java/com/chwl/core/user/bean/AttentionInfo.java @@ -3,7 +3,7 @@ package com.chwl.core.user.bean; import com.chwl.core.level.UserLevelVo; import com.chwl.core.noble.NobleInfo; import com.chwl.core.room.bean.RoomInfo; -import com.chwl.core.vip.UserVipInfo; +import com.chwl.core.vip.bean.UserVipInfo; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/chwl/core/user/bean/BaseUserInfo.java b/core/src/main/java/com/chwl/core/user/bean/BaseUserInfo.java index d6dd7203e..fc27c375f 100644 --- a/core/src/main/java/com/chwl/core/user/bean/BaseUserInfo.java +++ b/core/src/main/java/com/chwl/core/user/bean/BaseUserInfo.java @@ -1,6 +1,6 @@ package com.chwl.core.user.bean; -import com.chwl.core.vip.UserVipInfo; +import com.chwl.core.vip.bean.UserVipInfo; import java.io.Serializable; diff --git a/core/src/main/java/com/chwl/core/user/bean/FansInfo.java b/core/src/main/java/com/chwl/core/user/bean/FansInfo.java index cefa522ea..23c083a20 100644 --- a/core/src/main/java/com/chwl/core/user/bean/FansInfo.java +++ b/core/src/main/java/com/chwl/core/user/bean/FansInfo.java @@ -2,7 +2,7 @@ package com.chwl.core.user.bean; import com.chwl.core.level.UserLevelVo; import com.chwl.core.noble.NobleInfo; -import com.chwl.core.vip.UserVipInfo; +import com.chwl.core.vip.bean.UserVipInfo; import java.io.Serializable; diff --git a/core/src/main/java/com/chwl/core/user/bean/UserInfo.java b/core/src/main/java/com/chwl/core/user/bean/UserInfo.java index c24dd4140..c5e70aa25 100644 --- a/core/src/main/java/com/chwl/core/user/bean/UserInfo.java +++ b/core/src/main/java/com/chwl/core/user/bean/UserInfo.java @@ -15,12 +15,10 @@ import com.chwl.core.decoration.headwear.bean.HeadWearInfo; import com.chwl.core.level.UserLevelVo; import com.chwl.core.noble.NobleInfo; import com.chwl.core.noble.NobleResourceType; -import com.chwl.core.utils.StarUtils; -import com.chwl.core.vip.UserVipInfo; +import com.chwl.core.vip.bean.UserVipInfo; import java.io.Serializable; import java.util.ArrayList; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/core/src/main/java/com/chwl/core/vip/VipModel.kt b/core/src/main/java/com/chwl/core/vip/VipModel.kt index 1ae849998..79fffebc4 100644 --- a/core/src/main/java/com/chwl/core/vip/VipModel.kt +++ b/core/src/main/java/com/chwl/core/vip/VipModel.kt @@ -4,6 +4,8 @@ import com.chwl.core.base.BaseModel import com.chwl.core.bean.response.ServiceResult import com.chwl.core.manager.AvRoomDataManager import com.chwl.core.utils.net.launchRequest +import com.chwl.core.vip.bean.VipBroadcastInfo +import com.chwl.core.vip.bean.VipPageInfo import com.chwl.library.net.rxnet.RxNet import retrofit2.http.* diff --git a/core/src/main/java/com/chwl/core/vip/VipUpgradeEvent.kt b/core/src/main/java/com/chwl/core/vip/VipUpgradeEvent.kt index 7382f893a..dfa1f431b 100644 --- a/core/src/main/java/com/chwl/core/vip/VipUpgradeEvent.kt +++ b/core/src/main/java/com/chwl/core/vip/VipUpgradeEvent.kt @@ -1,3 +1,5 @@ package com.chwl.core.vip +import com.chwl.core.vip.bean.VipInfo + data class VipUpgradeEvent(val vipInfo: VipInfo) diff --git a/core/src/main/java/com/chwl/core/vip/UserVipInfo.kt b/core/src/main/java/com/chwl/core/vip/bean/UserVipInfo.kt similarity index 90% rename from core/src/main/java/com/chwl/core/vip/UserVipInfo.kt rename to core/src/main/java/com/chwl/core/vip/bean/UserVipInfo.kt index aadfbe841..25d16faa8 100644 --- a/core/src/main/java/com/chwl/core/vip/UserVipInfo.kt +++ b/core/src/main/java/com/chwl/core/vip/bean/UserVipInfo.kt @@ -1,4 +1,4 @@ -package com.chwl.core.vip +package com.chwl.core.vip.bean import java.io.Serializable diff --git a/core/src/main/java/com/chwl/core/vip/VipAuthInfo.kt b/core/src/main/java/com/chwl/core/vip/bean/VipAuthInfo.kt similarity index 92% rename from core/src/main/java/com/chwl/core/vip/VipAuthInfo.kt rename to core/src/main/java/com/chwl/core/vip/bean/VipAuthInfo.kt index 5671fb8bd..d1389e28e 100644 --- a/core/src/main/java/com/chwl/core/vip/VipAuthInfo.kt +++ b/core/src/main/java/com/chwl/core/vip/bean/VipAuthInfo.kt @@ -1,4 +1,4 @@ -package com.chwl.core.vip +package com.chwl.core.vip.bean data class VipAuthInfo( val authDesc: String = "", diff --git a/core/src/main/java/com/chwl/core/vip/VipBroadcastInfo.kt b/core/src/main/java/com/chwl/core/vip/bean/VipBroadcastInfo.kt similarity index 84% rename from core/src/main/java/com/chwl/core/vip/VipBroadcastInfo.kt rename to core/src/main/java/com/chwl/core/vip/bean/VipBroadcastInfo.kt index 488e03b7a..4ca854c03 100644 --- a/core/src/main/java/com/chwl/core/vip/VipBroadcastInfo.kt +++ b/core/src/main/java/com/chwl/core/vip/bean/VipBroadcastInfo.kt @@ -1,4 +1,4 @@ -package com.chwl.core.vip +package com.chwl.core.vip.bean import java.io.Serializable diff --git a/core/src/main/java/com/chwl/core/vip/VipInfo.kt b/core/src/main/java/com/chwl/core/vip/bean/VipInfo.kt similarity index 96% rename from core/src/main/java/com/chwl/core/vip/VipInfo.kt rename to core/src/main/java/com/chwl/core/vip/bean/VipInfo.kt index f3ca62584..68ba45faf 100644 --- a/core/src/main/java/com/chwl/core/vip/VipInfo.kt +++ b/core/src/main/java/com/chwl/core/vip/bean/VipInfo.kt @@ -1,4 +1,4 @@ -package com.chwl.core.vip +package com.chwl.core.vip.bean import java.io.Serializable diff --git a/core/src/main/java/com/chwl/core/vip/VipMessageInfo.java b/core/src/main/java/com/chwl/core/vip/bean/VipMessageInfo.java similarity index 91% rename from core/src/main/java/com/chwl/core/vip/VipMessageInfo.java rename to core/src/main/java/com/chwl/core/vip/bean/VipMessageInfo.java index 5666137db..0fe93fa72 100644 --- a/core/src/main/java/com/chwl/core/vip/VipMessageInfo.java +++ b/core/src/main/java/com/chwl/core/vip/bean/VipMessageInfo.java @@ -1,4 +1,4 @@ -package com.chwl.core.vip; +package com.chwl.core.vip.bean; import lombok.Data; diff --git a/core/src/main/java/com/chwl/core/vip/VipPageInfo.kt b/core/src/main/java/com/chwl/core/vip/bean/VipPageInfo.kt similarity index 88% rename from core/src/main/java/com/chwl/core/vip/VipPageInfo.kt rename to core/src/main/java/com/chwl/core/vip/bean/VipPageInfo.kt index 173acb9a9..44cfd6d77 100644 --- a/core/src/main/java/com/chwl/core/vip/VipPageInfo.kt +++ b/core/src/main/java/com/chwl/core/vip/bean/VipPageInfo.kt @@ -1,4 +1,4 @@ -package com.chwl.core.vip +package com.chwl.core.vip.bean data class VipPageInfo( val vipAuthInfos: List? = null, diff --git a/core/src/model_community/java/com/chwl/core/community/bean/Comment.java b/core/src/model_community/java/com/chwl/core/community/bean/Comment.java index 08c420196..9717fb114 100644 --- a/core/src/model_community/java/com/chwl/core/community/bean/Comment.java +++ b/core/src/model_community/java/com/chwl/core/community/bean/Comment.java @@ -2,7 +2,7 @@ package com.chwl.core.community.bean; import com.chwl.core.community.bean.comment.Reply; import com.chwl.core.community.bean.comment.ReplyResult; -import com.chwl.core.vip.UserVipInfo; +import com.chwl.core.vip.bean.UserVipInfo; import com.chwl.library.utils.ListUtils; import java.util.ArrayList; diff --git a/core/src/model_community/java/com/chwl/core/community/bean/comment/Reply.java b/core/src/model_community/java/com/chwl/core/community/bean/comment/Reply.java index 30cc9542b..3727d1255 100644 --- a/core/src/model_community/java/com/chwl/core/community/bean/comment/Reply.java +++ b/core/src/model_community/java/com/chwl/core/community/bean/comment/Reply.java @@ -1,6 +1,6 @@ package com.chwl.core.community.bean.comment; -import com.chwl.core.vip.UserVipInfo; +import com.chwl.core.vip.bean.UserVipInfo; import lombok.Data;