fix:调整混淆规则（core模块部分模型类被混淆问题）

core/src/main/java/com/chwl/core/DemoCache.java

@@ -11,10 +11,10 @@ import com.chwl.core.auth.AuthModel;
 import com.chwl.core.auth.entity.AccountInfo;
 import com.chwl.core.auth.entity.TicketInfo;
 import com.chwl.core.home.bean.MainTabInfo;
-import com.chwl.core.initial.SplashComponent;
+import com.chwl.core.initial.bean.SplashComponent;
 import com.chwl.core.initial.bean.InitInfo;
-import com.chwl.core.noble.NobleConfig;
-import com.chwl.core.noble.NobleRight;
+import com.chwl.core.noble.bean.NobleConfig;
+import com.chwl.core.noble.bean.NobleRight;
 import com.chwl.core.utils.CurrentTimeUtils;
 import com.chwl.core.utils.SharedPreferenceUtils;
 import com.chwl.library.utils.pref.ObjectPref;

core/src/main/java/com/chwl/core/community/UserVo.kt

@@ -1,10 +1,12 @@
 package com.chwl.core.community
 
+import androidx.annotation.Keep
 import com.chwl.core.decoration.headwear.bean.HeadWearInfo
 import com.chwl.core.utils.CurrentTimeUtils
 import java.io.Serializable
 
 
+@Keep
 data class UserVo(
         var erbanNo: Long = 0,
         var uid: Long = 0,

core/src/main/java/com/chwl/core/decoration/DecorationInfoEvent.java

@@ -1,5 +1,7 @@
 package com.chwl.core.decoration;
 
+import com.chwl.core.decoration.bean.DecorationInfo;
+
 import lombok.Data;
 
 @Data

core/src/main/java/com/chwl/core/decoration/DecorationModel.kt

@@ -2,6 +2,7 @@ package com.chwl.core.decoration
 
 import com.chwl.core.base.BaseModel
 import com.chwl.core.bean.response.ServiceResult
+import com.chwl.core.decoration.bean.DecorationInfo
 import com.chwl.core.utils.net.RxHelper
 import com.chwl.core.utils.net.launchRequest
 import com.chwl.library.net.rxnet.RxNet

core/src/main/java/com/chwl/core/decoration/bean/DecorationInfo.kt

@@ -1,4 +1,4 @@
-package com.chwl.core.decoration
+package com.chwl.core.decoration.bean
 
 data class DecorationInfo(
     val dressDay: Int = 0,

core/src/main/java/com/chwl/core/family/bean/FamilyMemberInfo.java

@@ -1,7 +1,7 @@
 package com.chwl.core.family.bean;
 
 import com.chwl.core.level.UserLevelVo;
-import com.chwl.core.noble.NobleInfo;
+import com.chwl.core.noble.bean.NobleInfo;
 
 import java.io.Serializable;
 

core/src/main/java/com/chwl/core/fansteam/FansTeamModel.kt

@@ -2,6 +2,10 @@ package com.chwl.core.fansteam
 
 import com.chwl.core.base.BaseModel
 import com.chwl.core.bean.response.ServiceResult
+import com.chwl.core.fansteam.bean.FansTeamInfo
+import com.chwl.core.fansteam.bean.FansTeamInitInfo
+import com.chwl.core.fansteam.bean.FansTeamJoinInfo
+import com.chwl.core.fansteam.bean.FansTeamJoinedInfo
 import com.chwl.core.manager.AvRoomDataManager
 import com.chwl.core.utils.net.launchRequest
 import com.chwl.library.net.rxnet.RxNet

core/src/main/java/com/chwl/core/fansteam/bean/FansTeamInfo.kt

@@ -1,4 +1,4 @@
-package com.chwl.core.fansteam
+package com.chwl.core.fansteam.bean
 
 data class FansTeamInfo(
     val anchorAvatar: String = "",

core/src/main/java/com/chwl/core/fansteam/bean/FansTeamInitInfo.kt

@@ -1,4 +1,4 @@
-package com.chwl.core.fansteam
+package com.chwl.core.fansteam.bean
 
 data class FansTeamInitInfo(
     val anchorFansNum: Int = 0,

core/src/main/java/com/chwl/core/fansteam/bean/FansTeamJoinInfo.kt

@@ -1,4 +1,4 @@
-package com.chwl.core.fansteam
+package com.chwl.core.fansteam.bean
 
 
 data class FansTeamJoinInfo(

core/src/main/java/com/chwl/core/fansteam/bean/FansTeamJoinedInfo.kt

@@ -1,4 +1,4 @@
-package com.chwl.core.fansteam
+package com.chwl.core.fansteam.bean
 
 data class FansTeamJoinedInfo(
     val anchorAvatar: String = "",

core/src/main/java/com/chwl/core/fansteam/bean/FansTeamMsgInfo.kt

@@ -1,4 +1,4 @@
-package com.chwl.core.fansteam
+package com.chwl.core.fansteam.bean
 
 import com.chwl.core.gift.bean.GiftInfo
 

core/src/main/java/com/chwl/core/fansteam/bean/FansTeamTaskInfo.kt

@@ -1,4 +1,4 @@
-package com.chwl.core.fansteam
+package com.chwl.core.fansteam.bean
 
 data class FansTeamTaskInfo(
     val awardVal: Int = 0,

core/src/main/java/com/chwl/core/fansteam/bean/PrivilegeConfigVo.kt

@@ -1,4 +1,4 @@
-package com.chwl.core.fansteam
+package com.chwl.core.fansteam.bean
 
 import com.chwl.core.gift.bean.GiftInfo
 

core/src/main/java/com/chwl/core/helper/ImHelperUtils.java

@@ -50,7 +50,7 @@ import com.chwl.core.im.custom.bean.NobleAttachment;
 import com.chwl.core.im.custom.bean.NoticeAttachment;
 import com.chwl.core.im.custom.bean.RedPacketAttachment;
 import com.chwl.core.im.custom.bean.SysMsgVoiceAttachment;
-import com.chwl.core.luckymoney.LuckyMoneyInfo;
+import com.chwl.core.luckymoney.bean.LuckyMoneyInfo;
 import com.chwl.core.manager.AvRoomDataManager;
 import com.chwl.core.manager.IMNetEaseManager;
 import com.chwl.core.public_chat_hall.attachment.AitMeAttachment;

core/src/main/java/com/chwl/core/im/chatterbox/ChatterBoxHelper.java

@@ -2,6 +2,8 @@ package com.chwl.core.im.chatterbox;
 
 import android.text.TextUtils;
 
+import com.chwl.core.im.chatterbox.bean.CanSendInfo;
+import com.chwl.core.im.chatterbox.bean.TopicBoxItemInfo;
 import com.netease.nim.uikit.business.session.helper.MessageListPanelHelper;
 import com.netease.nimlib.sdk.msg.MessageBuilder;
 import com.netease.nimlib.sdk.msg.constant.MsgStatusEnum;

core/src/main/java/com/chwl/core/im/chatterbox/ChatterBoxModel.java

@@ -2,6 +2,8 @@ package com.chwl.core.im.chatterbox;
 
 import com.chwl.core.base.BaseModel;
 import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.im.chatterbox.bean.CanSendInfo;
+import com.chwl.core.im.chatterbox.bean.TopicBoxItemInfo;
 import com.chwl.core.utils.net.RxHelper;
 import com.chwl.library.net.rxnet.RxNet;
 

core/src/main/java/com/chwl/core/im/chatterbox/IChatterBoxModel.java

@@ -1,6 +1,8 @@
 package com.chwl.core.im.chatterbox;
 
 import com.chwl.core.base.IModel;
+import com.chwl.core.im.chatterbox.bean.CanSendInfo;
+import com.chwl.core.im.chatterbox.bean.TopicBoxItemInfo;
 
 import java.util.List;
 

core/src/main/java/com/chwl/core/im/chatterbox/bean/CanSendInfo.java

@@ -1,4 +1,4 @@
-package com.chwl.core.im.chatterbox;
+package com.chwl.core.im.chatterbox.bean;
 
 import lombok.Data;
 

core/src/main/java/com/chwl/core/im/chatterbox/bean/TopicBoxItemInfo.java

@@ -1,4 +1,4 @@
-package com.chwl.core.im.chatterbox;
+package com.chwl.core.im.chatterbox.bean;
 
 import lombok.Data;
 

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

@@ -1,7 +1,7 @@
 package com.chwl.core.im.custom.bean;
 
 import com.alibaba.fastjson.JSONObject;
-import com.chwl.core.im.chatterbox.TopicBoxItemInfo;
+import com.chwl.core.im.chatterbox.bean.TopicBoxItemInfo;
 
 import java.util.List;
 

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

@@ -3,7 +3,7 @@ package com.chwl.core.im.custom.bean;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.netease.nimlib.sdk.msg.attachment.MsgAttachment;
-import com.chwl.core.noble.NobleInfo;
+import com.chwl.core.noble.bean.NobleInfo;
 
 /**
  * 先定义一个自定义消息附件的基类，负责解析你的自定义消息的公用字段，比如类型等等。

core/src/main/java/com/chwl/core/im/custom/bean/FansTeamMsgAttachment.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.fansteam.FansTeamMsgInfo;
+import com.chwl.core.fansteam.bean.FansTeamMsgInfo;
 
 public class FansTeamMsgAttachment extends CustomAttachment {
 

core/src/main/java/com/chwl/core/im/custom/bean/LuckyMoneyAttachment.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.luckymoney.LuckyMoneyInfo;
+import com.chwl.core.luckymoney.bean.LuckyMoneyInfo;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

core/src/main/java/com/chwl/core/im/custom/bean/LuckyMoneyTipsAttachment.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.luckymoney.LuckyMoneyInfo;
+import com.chwl.core.luckymoney.bean.LuckyMoneyInfo;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

core/src/main/java/com/chwl/core/im/custom/bean/NewbieHelloAttachment.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.newbie.NewbieHelloInfo;
+import com.chwl.core.newbie.bean.NewbieHelloInfo;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

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

@@ -9,8 +9,8 @@ import com.google.gson.stream.JsonToken;
 import com.google.gson.stream.JsonWriter;
 import com.orhanobut.logger.Logger;
 import com.chwl.core.R;
-import com.chwl.core.noble.NobleInfo;
-import com.chwl.core.noble.NobleProtocol;
+import com.chwl.core.noble.bean.NobleInfo;
+import com.chwl.core.noble.bean.NobleProtocol;
 import com.chwl.library.rxbus.RxBusHelper;
 import com.chwl.library.utils.ResUtil;
 

core/src/main/java/com/chwl/core/im/custom/bean/SysMsgAttachment.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.msg.sys.ErbanSysMsgInfo;
+import com.chwl.core.msg.sys.bean.ErbanSysMsgInfo;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

core/src/main/java/com/chwl/core/im/custom/bean/SysMsgV2Attachment.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.msg.sysv2.ErbanSysMsgV2Info;
+import com.chwl.core.msg.sysv2.bean.ErbanSysMsgV2Info;
 
 import lombok.Getter;
 import lombok.Setter;

core/src/main/java/com/chwl/core/initial/IInitialModel.java

@@ -12,6 +12,7 @@ import com.chwl.core.home.bean.MainTabInfo;
 import com.chwl.core.initial.bean.BoxInfo;
 import com.chwl.core.initial.bean.FairyOpenInfo;
 import com.chwl.core.initial.bean.InitInfo;
+import com.chwl.core.initial.bean.SplashComponent;
 
 import java.util.List;
 

core/src/main/java/com/chwl/core/initial/InitialModel.java

@@ -15,6 +15,7 @@ import androidx.lifecycle.MutableLiveData;
 
 import com.bumptech.glide.request.FutureTarget;
 import com.bumptech.glide.request.target.Target;
+import com.chwl.core.initial.bean.SplashComponent;
 import com.chwl.core.user.UserModel;
 import com.chwl.core.user.bean.UserInfo;
 import com.example.lib_utils.LanguageUtils;

core/src/main/java/com/chwl/core/initial/bean/FaceComponent.java

@@ -1,4 +1,4 @@
-package com.chwl.core.initial;
+package com.chwl.core.initial.bean;
 
 
 import java.io.Serializable;

core/src/main/java/com/chwl/core/initial/bean/InitInfo.java

@@ -2,11 +2,8 @@ package com.chwl.core.initial.bean;
 
 
 import com.google.gson.annotations.SerializedName;
-import com.chwl.core.initial.FaceComponent;
-import com.chwl.core.initial.NobleResourceComponent;
-import com.chwl.core.initial.SplashComponent;
 import com.chwl.core.monsterhunting.bean.MonsterInitInfo;
-import com.chwl.core.noble.NobleRight;
+import com.chwl.core.noble.bean.NobleRight;
 
 import java.io.Serializable;
 import java.util.List;

core/src/main/java/com/chwl/core/initial/bean/NobleResourceComponent.java

@@ -1,4 +1,4 @@
-package com.chwl.core.initial;
+package com.chwl.core.initial.bean;
 
 import com.google.gson.annotations.SerializedName;
 

core/src/main/java/com/chwl/core/initial/bean/SplashComponent.java

@@ -1,4 +1,4 @@
-package com.chwl.core.initial;
+package com.chwl.core.initial.bean;
 
 
 import java.io.Serializable;

core/src/main/java/com/chwl/core/luckymoney/bean/LuckyMoneyInfo.java

@@ -1,4 +1,4 @@
-package com.chwl.core.luckymoney;
+package com.chwl.core.luckymoney.bean;
 
 import java.io.Serializable;
 import java.util.HashMap;

core/src/main/java/com/chwl/core/luckymoney/bean/LuckyMoneyRecordsInfo.java

@@ -1,4 +1,4 @@
-package com.chwl.core.luckymoney;
+package com.chwl.core.luckymoney.bean;
 
 import java.util.List;
 

core/src/main/java/com/chwl/core/luckymoney/bean/LuckyMoneyUserInfo.java

@@ -1,4 +1,4 @@
-package com.chwl.core.luckymoney;
+package com.chwl.core.luckymoney.bean;
 
 import lombok.Data;
 

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

@@ -37,9 +37,9 @@ import com.chwl.core.im.custom.bean.NewbieHelloAttachment;
 import com.chwl.core.im.custom.bean.RedPacketAttachment;
 import com.chwl.core.level.event.CharmLevelUpEvent;
 import com.chwl.core.level.event.LevelUpEvent;
-import com.chwl.core.luckymoney.LuckyMoneyInfo;
+import com.chwl.core.luckymoney.bean.LuckyMoneyInfo;
 import com.chwl.core.manager.event.HallInfoChangeEvent;
-import com.chwl.core.newbie.NewbieHelloInfo;
+import com.chwl.core.newbie.bean.NewbieHelloInfo;
 import com.chwl.core.newbie.event.NewbieHelloDialogEvent;
 import com.chwl.core.relation.cp.bean.CpInviteInfo;
 import com.chwl.core.web.event.WebViewRefreshEvent;

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

@@ -114,7 +114,7 @@ import com.chwl.core.im.custom.bean.SysMsgAttachment;
 import com.chwl.core.im.custom.bean.TarotAttachment;
 import com.chwl.core.im.custom.bean.WelcomeAttachment;
 import com.chwl.core.level.UserLevelVo;
-import com.chwl.core.luckymoney.LuckyMoneyInfo;
+import com.chwl.core.luckymoney.bean.LuckyMoneyInfo;
 import com.chwl.core.magic.MagicModel;
 import com.chwl.core.magic.bean.MagicInfo;
 import com.chwl.core.magic.toolbox.MagicToolbox;
@@ -123,10 +123,10 @@ import com.chwl.core.miniworld.bean.MiniWorldDetailInfoWithCurrentMember;
 import com.chwl.core.miniworld.event.MiniWorldJoinVerifiedEvent;
 import com.chwl.core.monsterhunting.bean.MonsterInfo;
 import com.chwl.core.monsterhunting.bean.MonsterProtocol;
-import com.chwl.core.msg.sys.ErbanSysMsgInfo;
+import com.chwl.core.msg.sys.bean.ErbanSysMsgInfo;
 import com.chwl.core.msg.sys.ErbanSysMsgParamKey;
-import com.chwl.core.msg.sysv2.ErbanSysMsgV2Info;
-import com.chwl.core.noble.NobleInfo;
+import com.chwl.core.msg.sysv2.bean.ErbanSysMsgV2Info;
+import com.chwl.core.noble.bean.NobleInfo;
 import com.chwl.core.noble.NobleResourceType;
 import com.chwl.core.noble.NobleUtil;
 import com.chwl.core.public_chat_hall.manager.PublicChatHallDataManager;

core/src/main/java/com/chwl/core/msg/sys/ErbanSysMsgLayout.java

@@ -1,5 +1,7 @@
 package com.chwl.core.msg.sys;
 
+import com.chwl.core.msg.sys.bean.ErbanSysMsgComponent;
+
 import java.util.List;
 
 import lombok.Data;

core/src/main/java/com/chwl/core/msg/sys/ErbanSysMsgModel.java

@@ -1,6 +1,7 @@
 package com.chwl.core.msg.sys;
 
 import com.chwl.core.bean.response.ServiceResult;
+import com.chwl.core.msg.sys.bean.ApproveMsgInfo;
 
 import java.util.Map;
 

core/src/main/java/com/chwl/core/msg/sys/bean/ApproveMsgInfo.java

@@ -1,4 +1,4 @@
-package com.chwl.core.msg.sys;
+package com.chwl.core.msg.sys.bean;
 
 import lombok.Data;
 

core/src/main/java/com/chwl/core/msg/sys/bean/ErbanSysMsgComponent.java

@@ -1,4 +1,4 @@
-package com.chwl.core.msg.sys;
+package com.chwl.core.msg.sys.bean;
 
 import lombok.Data;
 

core/src/main/java/com/chwl/core/msg/sys/bean/ErbanSysMsgInfo.java

@@ -1,4 +1,4 @@
-package com.chwl.core.msg.sys;
+package com.chwl.core.msg.sys.bean;
 
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;

core/src/main/java/com/chwl/core/msg/sysv2/ErbanSysMsgV2Layout.java

@@ -1,6 +1,8 @@
 package com.chwl.core.msg.sysv2;
 
 
+import com.chwl.core.msg.sysv2.bean.ErbanSysMsgV2Component;
+
 import java.util.List;
 
 import lombok.Data;

core/src/main/java/com/chwl/core/msg/sysv2/bean/ErbanSysMsgV2Component.java

@@ -1,4 +1,4 @@
-package com.chwl.core.msg.sysv2;
+package com.chwl.core.msg.sysv2.bean;
 
 import lombok.Data;
 

core/src/main/java/com/chwl/core/msg/sysv2/bean/ErbanSysMsgV2Info.java

@@ -1,4 +1,4 @@
-package com.chwl.core.msg.sysv2;
+package com.chwl.core.msg.sysv2.bean;
 
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;

core/src/main/java/com/chwl/core/newbie/bean/NewbieHelloInfo.java

@@ -1,4 +1,4 @@
-package com.chwl.core.newbie;
+package com.chwl.core.newbie.bean;
 
 import java.io.Serializable;
 

core/src/main/java/com/chwl/core/newbie/event/NewbieHelloDialogEvent.java

@@ -1,6 +1,6 @@
 package com.chwl.core.newbie.event;
 
-import com.chwl.core.newbie.NewbieHelloInfo;
+import com.chwl.core.newbie.bean.NewbieHelloInfo;
 
 import lombok.Data;
 

core/src/main/java/com/chwl/core/noble/NobleDataManager.java

@@ -5,13 +5,16 @@ import android.util.Log;
 
 import androidx.collection.LongSparseArray;
 
+import com.chwl.core.noble.bean.NobleConfig;
+import com.chwl.core.noble.bean.NobleInfo;
+import com.chwl.core.noble.bean.NobleRight;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import com.chwl.core.DemoCache;
 import com.chwl.core.R;
 import com.chwl.core.bean.response.ServiceResult;
 import com.chwl.core.initial.InitialModel;
-import com.chwl.core.initial.NobleResourceComponent;
+import com.chwl.core.initial.bean.NobleResourceComponent;
 import com.chwl.core.manager.IMNetEaseManager;
 import com.chwl.core.manager.RoomEvent;
 import com.chwl.library.net.rxnet.RxNet;

core/src/main/java/com/chwl/core/noble/NobleUtil.java

@@ -25,6 +25,9 @@ import com.bumptech.glide.request.RequestListener;
 import com.bumptech.glide.request.target.Target;
 import com.bumptech.glide.request.target.ViewTarget;
 import com.bumptech.glide.request.transition.Transition;
+import com.chwl.core.noble.bean.NobleConfig;
+import com.chwl.core.noble.bean.NobleInfo;
+import com.chwl.core.noble.bean.NobleRight;
 import com.netease.nim.uikit.support.glide.GlideApp;
 import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember;
 import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage;

core/src/main/java/com/chwl/core/noble/bean/AllServiceGiftProtocol.java

@@ -1,4 +1,6 @@
-package com.chwl.core.noble;
+package com.chwl.core.noble.bean;
+
+import androidx.annotation.Keep;
 
 import com.chwl.core.bean.BaseProtocol;
 
@@ -6,8 +8,10 @@ import com.chwl.core.bean.BaseProtocol;
  * Created by MadisonRong on 09/04/2018.
  */
 
+@Keep
 public class AllServiceGiftProtocol extends BaseProtocol<AllServiceGiftProtocol.DataBean> {
 
+    @Keep
     public static class DataBean {
         /**
          * sendUserNick : 分么

core/src/main/java/com/chwl/core/noble/bean/NobleConfig.java

@@ -1,5 +1,6 @@
-package com.chwl.core.noble;
+package com.chwl.core.noble.bean;
 
+import com.chwl.core.noble.NobleResourceType;
 import com.google.gson.annotations.SerializedName;
 
 import java.io.Serializable;

core/src/main/java/com/chwl/core/noble/bean/NobleInfo.java

@@ -1,7 +1,9 @@
-package com.chwl.core.noble;
+package com.chwl.core.noble.bean;
 
 import android.text.TextUtils;
 
+import com.chwl.core.noble.NobleResourceType;
+import com.chwl.core.noble.NobleUtil;
 import com.google.gson.annotations.SerializedName;
 
 import java.io.Serializable;

core/src/main/java/com/chwl/core/noble/bean/NobleProtocol.java

@@ -1,4 +1,4 @@
-package com.chwl.core.noble;
+package com.chwl.core.noble.bean;
 
 import com.chwl.core.bean.BaseProtocol;
 

core/src/main/java/com/chwl/core/noble/bean/NobleRight.java

@@ -1,4 +1,4 @@
-package com.chwl.core.noble;
+package com.chwl.core.noble.bean;
 
 import java.io.Serializable;
 

core/src/main/java/com/chwl/core/retry/RetryChatRoomMessage.java

@@ -1,5 +1,7 @@
 package com.chwl.core.retry;
 
+import androidx.annotation.Keep;
+
 import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage;
 
 import lombok.Getter;
@@ -9,6 +11,7 @@ import lombok.Setter;
  *
  * Created by @lvzebiao on 2020/2/20.
  */
+@Keep
 @Setter
 @Getter
 public class RetryChatRoomMessage {

core/src/main/java/com/chwl/core/room/activitytimer/TimerBean.java

@@ -1,5 +1,7 @@
 package com.chwl.core.room.activitytimer;
 
+import androidx.annotation.Keep;
+
 import java.io.Serializable;
 
 import lombok.Getter;
@@ -8,6 +10,7 @@ import lombok.Setter;
 /**暴走倒计时的消息尸体
  * create by lvzebiao @2020/2/24
  */
+@Keep
 @Setter
 @Getter
 public class TimerBean implements Serializable {

core/src/main/java/com/chwl/core/room/anotherroompk/SimpleRoomInfo.kt

@@ -1,7 +1,9 @@
 package com.chwl.core.room.anotherroompk
 
+import androidx.annotation.Keep
 import java.io.Serializable
 
+@Keep
 data class SimpleRoomInfo(
     val title: String? = null,
     val nick: String? = null,

core/src/main/java/com/chwl/core/room/bean/SearchRoomInfo.java

@@ -11,7 +11,7 @@ import android.text.style.ForegroundColorSpan;
 import com.chad.library.adapter.base.entity.MultiItemEntity;
 import com.chwl.core.home.bean.BannerInfo;
 import com.chwl.core.level.UserLevelVo;
-import com.chwl.core.noble.NobleInfo;
+import com.chwl.core.noble.bean.NobleInfo;
 import com.chwl.core.user.bean.UserInfo;
 import com.chwl.library.utils.ListUtils;
 

core/src/main/java/com/chwl/core/room/face/FaceInfo.java

@@ -1,5 +1,7 @@
 package com.chwl.core.room.face;
 
+import androidx.annotation.Keep;
+
 import com.google.gson.annotations.SerializedName;
 import com.chwl.core.gift.bean.SimpleVipInfo;
 
@@ -8,6 +10,7 @@ import java.io.Serializable;
 /**
  * @author xiaoyu
  */
+@Keep
 public class FaceInfo implements Serializable {
 
     /**

core/src/main/java/com/chwl/core/room/face/FaceListInfo.java

@@ -1,6 +1,8 @@
 package com.chwl.core.room.face;
 
 
+import androidx.annotation.Keep;
+
 import java.io.Serializable;
 import java.util.List;
 
@@ -9,6 +11,7 @@ import java.util.List;
  * @date 2017/12/8
  */
 
+@Keep
 public class FaceListInfo implements Serializable {
     private List<FaceInfo> faces;
     private List<FaceInfo> vipFaces;

core/src/main/java/com/chwl/core/room/face/FaceReceiveInfo.java

@@ -1,5 +1,7 @@
 package com.chwl.core.room.face;
 
+import androidx.annotation.Keep;
+
 import java.io.Serializable;
 import java.util.List;
 
@@ -9,6 +11,7 @@ import java.util.List;
  * 房间里面其中一个人发运气表情，其他人通过云信收到对应的运气表情的java bean
  */
 
+@Keep
 public class FaceReceiveInfo implements Serializable {
     private long uid;
     private String nick;

core/src/main/java/com/chwl/core/room/model/AvRoomModel.java

@@ -36,7 +36,7 @@ import com.chwl.core.level.UserLevelVo;
 import com.chwl.core.manager.AvRoomDataManager;
 import com.chwl.core.manager.IMNetEaseManager;
 import com.chwl.core.manager.RoomEvent;
-import com.chwl.core.noble.NobleInfo;
+import com.chwl.core.noble.bean.NobleInfo;
 import com.chwl.core.patriarch.exception.PmRoomLimitException;
 import com.chwl.core.room.activitytimer.ActivityTimerEvent;
 import com.chwl.core.room.activitytimer.TimerBean;

core/src/main/java/com/chwl/core/room/queue/bean/RoomConsumeInfo.java

@@ -1,7 +1,7 @@
 package com.chwl.core.room.queue.bean;
 
 import com.chwl.core.level.UserLevelVo;
-import com.chwl.core.noble.NobleInfo;
+import com.chwl.core.noble.bean.NobleInfo;
 
 import java.io.Serializable;
 

core/src/main/java/com/chwl/core/team/model/ITeamModel.java

@@ -2,8 +2,8 @@ package com.chwl.core.team.model;
 
 import com.chwl.core.base.IModel;
 import com.chwl.core.bean.response.ServiceResult;
-import com.chwl.core.luckymoney.LuckyMoneyInfo;
-import com.chwl.core.luckymoney.LuckyMoneyRecordsInfo;
+import com.chwl.core.luckymoney.bean.LuckyMoneyInfo;
+import com.chwl.core.luckymoney.bean.LuckyMoneyRecordsInfo;
 import com.chwl.core.team.bean.RespTeamMemberInfo;
 import com.chwl.core.team.bean.TeamInfo;
 import com.chwl.core.team.bean.TeamMemberInfo;

core/src/main/java/com/chwl/core/team/model/TeamModel.java

@@ -8,8 +8,8 @@ import com.chwl.core.auth.AuthModel;
 import com.chwl.core.base.BaseModel;
 import com.chwl.core.bean.response.ServiceResult;
 import com.chwl.core.family.model.FamilyModel;
-import com.chwl.core.luckymoney.LuckyMoneyInfo;
-import com.chwl.core.luckymoney.LuckyMoneyRecordsInfo;
+import com.chwl.core.luckymoney.bean.LuckyMoneyInfo;
+import com.chwl.core.luckymoney.bean.LuckyMoneyRecordsInfo;
 import com.chwl.core.team.bean.RespTeamMemberInfo;
 import com.chwl.core.team.bean.TeamInfo;
 import com.chwl.core.team.bean.TeamMemberInfo;

core/src/main/java/com/chwl/core/user/bean/AttentionInfo.java

@@ -1,7 +1,7 @@
 package com.chwl.core.user.bean;
 
 import com.chwl.core.level.UserLevelVo;
-import com.chwl.core.noble.NobleInfo;
+import com.chwl.core.noble.bean.NobleInfo;
 import com.chwl.core.room.bean.RoomInfo;
 import com.chwl.core.vip.bean.UserVipInfo;
 

core/src/main/java/com/chwl/core/user/bean/FansInfo.java

@@ -1,7 +1,7 @@
 package com.chwl.core.user.bean;
 
 import com.chwl.core.level.UserLevelVo;
-import com.chwl.core.noble.NobleInfo;
+import com.chwl.core.noble.bean.NobleInfo;
 import com.chwl.core.vip.bean.UserVipInfo;
 
 import java.io.Serializable;

core/src/main/java/com/chwl/core/user/bean/UserInfo.java

@@ -13,7 +13,7 @@ import com.google.gson.annotations.SerializedName;
 import com.chwl.core.decoration.car.bean.CarInfo;
 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.bean.NobleInfo;
 import com.chwl.core.noble.NobleResourceType;
 import com.chwl.core.vip.bean.UserVipInfo;
 

core/src/model_community/java/com/chwl/core/community/attachment/DynamicSysAttachment.java

@@ -3,7 +3,7 @@ package com.chwl.core.community.attachment;
 import com.alibaba.fastjson.JSONObject;
 import com.google.gson.Gson;
 import com.chwl.core.im.custom.bean.CustomAttachment;
-import com.chwl.core.msg.sys.ErbanSysMsgInfo;
+import com.chwl.core.msg.sys.bean.ErbanSysMsgInfo;
 
 public class DynamicSysAttachment extends CustomAttachment {
     private ErbanSysMsgInfo erbanSysMsgInfo;

core/src/model_mentoring_relationship/java/com/chwl/core/mentoring_relationship/model/MentoringRelationshipModel.java

@@ -48,7 +48,7 @@ import com.chwl.core.mentoring_relationship.event.MentoringRelationshipMissionEv
 import com.chwl.core.mentoring_relationship.event.MentoringStartCountingEvent;
 import com.chwl.core.mentoring_relationship.event.MentoringStopCountingEvent;
 import com.chwl.core.mentoring_relationship.event.MentoringSuccessEvent;
-import com.chwl.core.msg.sys.ErbanSysMsgInfo;
+import com.chwl.core.msg.sys.bean.ErbanSysMsgInfo;
 import com.chwl.core.utils.SharedPreferenceUtils;
 import com.chwl.core.utils.net.BalanceNotEnoughExeption;
 import com.chwl.core.utils.net.RxHelper;

core/src/model_public_chat_hall/java/com/chwl/core/public_chat_hall/model/PublicChatHallModel.java

@@ -21,7 +21,7 @@ import com.chwl.core.decoration.car.bean.CarInfo;
 import com.chwl.core.decoration.headwear.bean.HeadWearInfo;
 import com.chwl.core.initial.InitialModel;
 import com.chwl.core.level.UserLevelVo;
-import com.chwl.core.noble.NobleInfo;
+import com.chwl.core.noble.bean.NobleInfo;
 import com.chwl.core.public_chat_hall.bean.PublicChatHallMessage;
 import com.chwl.core.public_chat_hall.manager.PublicChatHallDataManager;
 import com.chwl.core.user.UserModel;