feat:调整混淆配置（删减了core模块keep范围，仅keep数据模型相关类）

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.**.bean.** {*;}
--keep class com.chwl.core.** {*;}
+-keep class com.chwl.**.result.** {*;}
--keep class com.chwl.treasure_box.bean.** {*;}
+-keep class com.chwl.**.entity.** {*;}
--keep class com.chwl.app.avroom.bean.** {*;}
-
 
 #百度统计
 -keep class com.baidu.bottom.** { *; }

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;

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;

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<GameInfo, BaseViewHolder>(R.layout.item_room_create_game) {

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.bean.GameInfo
-import com.chwl.core.room.game.GameInfo
 
 class CreateRoomGameGuideAdapter :
     BaseQuickAdapter<GameInfo, BaseViewHolder>(R.layout.item_room_create_game_guide) {

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<GameInfo, BaseViewHolder>(R.layout.item_room_select_game) {

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<DialogCreateGameRoomBinding>() {
 

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

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

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
 

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

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

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

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;

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;

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 :

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 {
 

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.bean.CpInviteDetailEntity
-import com.chwl.core.relation.cp.CpInviteInfo
+import com.chwl.core.relation.cp.bean.CpInviteInfo
 
 object CpDataParser {
     fun inviteMsg2cpDetailEntity(msgEntity: CpInviteInfo) = CpInviteDetailEntity(

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.bean.CpInviteDetailEntity
-import com.chwl.core.relation.cp.UserCpListEntity
+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

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
 

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<Task, BaseViewHolder>(R.layout.item_cp_task) {

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) :

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

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
 

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

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 {

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
 

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

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.bean.CpInvitePageEntity
-import com.chwl.core.relation.cp.CpRelation
+import com.chwl.core.relation.cp.bean.CpRelation
 import com.chwl.library.utils.ResUtil
 
 class RelationCpCardView(context: Context, attr: AttributeSet?, def: Int) :

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;
 
 /**

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;
 

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

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;
 

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;

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.bean.VipAuthInfo
-import com.chwl.core.vip.VipInfo
+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

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.bean.VipAuthInfo
-import com.chwl.core.vip.VipBroadcastInfo
+import com.chwl.core.vip.bean.VipBroadcastInfo
-import com.chwl.core.vip.VipInfo
+import com.chwl.core.vip.bean.VipInfo
 import com.chwl.core.vip.VipModel
 import com.chwl.library.utils.ResUtil
 

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.bean.VipAuthInfo
-import com.chwl.core.vip.VipInfo
+import com.chwl.core.vip.bean.VipInfo
 
 class VipAuthAdapter :
     BaseQuickAdapter<VipAuthInfo, BaseViewHolder>(R.layout.item_vip_auth) {

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
 

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 {
 

app/src/main/res/layout/layout_cp_card.xml

@@ -5,11 +5,11 @@
 
         <variable
             name="cpEntity"
-            type="com.chwl.core.relation.cp.CpRelation" />
+            type="com.chwl.core.relation.cp.bean.CpRelation" />
 
         <variable
             name="inviteData"
-            type="com.chwl.core.relation.cp.CpInvitePageEntity" />
+            type="com.chwl.core.relation.cp.bean.CpInvitePageEntity" />
 
         <variable
             name="click"

core/src/main/java/com/chwl/core/file/UploadToken.java

@@ -1,7 +1,9 @@
 package com.chwl.core.file;
 
+import io.realm.internal.Keep;
 import lombok.Data;
 
+@Keep
 @Data
 public class UploadToken {
     private String key;

core/src/main/java/com/chwl/core/gift/GiftModel.java

@@ -55,7 +55,7 @@ import com.chwl.core.utils.net.BalanceNotEnoughExeption;
 import com.chwl.core.utils.net.RadishNotEnoughException;
 import com.chwl.core.utils.net.RxHelper;
 import com.chwl.core.utils.net.VipLevelNotEnoughException;
-import com.chwl.core.vip.UserVipInfo;
+import com.chwl.core.vip.bean.UserVipInfo;
 import com.chwl.library.common.util.SPUtils;
 import com.chwl.library.net.rxnet.RxNet;
 import com.chwl.library.utils.ListUtils;

core/src/main/java/com/chwl/core/home/model/HomeModel.kt

@@ -3,7 +3,6 @@ package com.chwl.core.home.model
 import com.chwl.core.R
 import com.chwl.core.auth.AuthModel
 import com.chwl.core.base.BaseModel
-import com.chwl.core.bean.response.ListResult
 import com.chwl.core.bean.response.ServiceResult
 import com.chwl.core.community.CommunityConstant
 import com.chwl.core.community.bean.UnReadCountInfo
@@ -12,7 +11,7 @@ import com.chwl.core.room.bean.AnchorInfo
 import com.chwl.core.room.bean.HomeLiveTopInfo
 import com.chwl.core.room.bean.MeCenterInfo
 import com.chwl.core.room.bean.SingleRoomSortInfo
-import com.chwl.core.room.game.GameInfo
+import com.chwl.core.room.game.bean.GameInfo
 import com.chwl.core.user.bean.DiamondGiveHistoryInfo
 import com.chwl.core.user.bean.SearchUserInfo
 import com.chwl.core.user.bean.UserInfo

core/src/main/java/com/chwl/core/im/custom/bean/CpInviteAttachment.java

@@ -2,8 +2,8 @@ package com.chwl.core.im.custom.bean;
 
 import com.alibaba.fastjson.JSONObject;
 import com.google.gson.Gson;
-import com.chwl.core.relation.cp.CpInviteInfo;
+import com.chwl.core.relation.cp.bean.CpInviteInfo;
-import com.chwl.core.relation.cp.CpInviteMessage;
+import com.chwl.core.relation.cp.bean.CpInviteMessage;
 
 public class CpInviteAttachment extends CustomAttachment {
 

core/src/main/java/com/chwl/core/im/custom/bean/FairyMsgAttachment.java

@@ -2,7 +2,7 @@ package com.chwl.core.im.custom.bean;
 
 import com.alibaba.fastjson.JSONObject;
 import com.google.gson.Gson;
-import com.chwl.core.treasurefairy.FairyMsgInfoBean;
+import com.chwl.core.treasurefairy.bean.FairyMsgInfoBean;
 
 /**
  * Created by chenran on 2017/10/4.

core/src/main/java/com/chwl/core/im/custom/bean/PlayEffectInfo.java

@@ -1,7 +1,7 @@
 package com.chwl.core.im.custom.bean;
 
 import com.chwl.core.gift.bean.LuckyBagNoticeInfo;
-import com.chwl.core.treasurefairy.FairyMsgInfoBean;
+import com.chwl.core.treasurefairy.bean.FairyMsgInfoBean;
 
 import lombok.Data;
 

core/src/main/java/com/chwl/core/im/custom/bean/RedPackageAttachment.java

@@ -2,7 +2,7 @@ package com.chwl.core.im.custom.bean;
 
 import com.alibaba.fastjson.JSONObject;
 import com.google.gson.Gson;
-import com.chwl.core.redpackage.RedPackageNotifyInfo;
+import com.chwl.core.redpackage.bean.RedPackageNotifyInfo;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

core/src/main/java/com/chwl/core/im/custom/bean/RedPackageRoomMsgAttachment.java

@@ -2,7 +2,7 @@ package com.chwl.core.im.custom.bean;
 
 import com.alibaba.fastjson.JSONObject;
 import com.google.gson.Gson;
-import com.chwl.core.redpackage.RedEnvelopeRoomMsg;
+import com.chwl.core.redpackage.bean.RedEnvelopeRoomMsg;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

core/src/main/java/com/chwl/core/im/custom/bean/VipMessageAttachment.java

@@ -2,7 +2,7 @@ package com.chwl.core.im.custom.bean;
 
 import com.alibaba.fastjson.JSONObject;
 import com.google.gson.Gson;
-import com.chwl.core.vip.VipMessageInfo;
+import com.chwl.core.vip.bean.VipMessageInfo;
 
 public class VipMessageAttachment extends CustomAttachment {
 

core/src/main/java/com/chwl/core/manager/IMMessageManager.java

@@ -41,7 +41,7 @@ import com.chwl.core.luckymoney.LuckyMoneyInfo;
 import com.chwl.core.manager.event.HallInfoChangeEvent;
 import com.chwl.core.newbie.NewbieHelloInfo;
 import com.chwl.core.newbie.event.NewbieHelloDialogEvent;
-import com.chwl.core.relation.cp.CpInviteInfo;
+import com.chwl.core.relation.cp.bean.CpInviteInfo;
 import com.chwl.core.web.event.WebViewRefreshEvent;
 
 import org.greenrobot.eventbus.EventBus;

core/src/main/java/com/chwl/core/manager/IMSystemMsgManager.java

@@ -56,7 +56,7 @@ import com.chwl.core.pay.event.FirstRechargeEvent;
 import com.chwl.core.pay.event.NewUserChargeEvent;
 import com.chwl.core.room.event.RoomTaskTipsEvent;
 import com.chwl.core.user.UserModel;
-import com.chwl.core.vip.VipInfo;
+import com.chwl.core.vip.bean.VipInfo;
 import com.chwl.core.vip.VipOpenEvent;
 import com.chwl.core.vip.VipUpgradeEvent;
 

core/src/main/java/com/chwl/core/redpackage/RedEnvelopeItemVO.kt

@@ -1,11 +0,0 @@
-package com.chwl.core.redpackage
-
-import com.chwl.core.community.UserVo
-
-
-class RedEnvelopeItemVO(
-        var amount: String,
-        var createTime: Long = 0,
-        var redEnvelopeGiftItemVOs: List<RedEnvelopeGiftItemVO>? = null,
-        var userVO: UserVo
-)

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

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
 

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<RedEnvelopeGiftItemVO>? = null,
+    var userVO: UserVo
+)

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
 

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
 
 /**
  * 红包状态

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
 

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
 

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(

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
 

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? = "",

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 = "",

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弹窗信息

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
 
 /**
  *

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(
     /**

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 = "",

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,

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,

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;

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

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
 
 /***
  *

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,

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,

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;

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.bean.FairyInfo.Companion.LEVEL_HIGH
-import com.chwl.core.treasurefairy.FairyInfo.Companion.LEVEL_LOW
+import com.chwl.core.treasurefairy.bean.FairyInfo.Companion.LEVEL_LOW
-import com.chwl.core.treasurefairy.FairyInfo.Companion.LEVEL_MIDDLE
+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.*

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,

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,

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,

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
 

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;
 

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<Compound> = arrayListOf()

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<Compound> = arrayListOf(),

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 = "",

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<FairyInfo>? = null,

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,

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 = "",

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
 

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,

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,

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;

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;
 

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;
 

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.bean.UserVipInfo;
-import com.chwl.core.vip.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;

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.*
 

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)

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
 

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 = "",

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
 

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