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

This commit is contained in:
Max
2023-11-29 22:09:42 +08:00
parent 5bda23c293
commit 0ce739db30
113 changed files with 170 additions and 124 deletions

View File

@@ -411,7 +411,7 @@ public class XChatApplication extends BaseApp {
httpParams.put("channel", AppMetaDataUtil.getChannelID());
httpParams.put("lang", LanguageUtils.INSTANCE.getSystemLanguage().toLanguageTag());
RxNet.init(context)
.debug(BuildConfig.DEBUG)
.debug(false)
.setBaseUrl(url)
.addInterceptors(new ParamsInterceptor(httpParams))
.addInterceptors(new NoParamsInterceptor())//注意:拦截器的添加顺序,请求的拦截顺序

View File

@@ -118,8 +118,8 @@ import com.chwl.core.monsterhunting.bean.MonsterHuntingResult;
import com.chwl.core.monsterhunting.bean.MonsterInfo;
import com.chwl.core.monsterhunting.bean.MonsterProtocol;
import com.chwl.core.monsterhunting.manager.MonsterDataManager;
import com.chwl.core.noble.AllServiceGiftProtocol;
import com.chwl.core.noble.NobleInfo;
import com.chwl.core.noble.bean.AllServiceGiftProtocol;
import com.chwl.core.noble.bean.NobleInfo;
import com.chwl.core.noble.NobleResourceType;
import com.chwl.core.noble.NobleUtil;
import com.chwl.core.patriarch.event.CloseMinRoomEvent;

View File

@@ -17,7 +17,7 @@ import com.chwl.app.ui.utils.ImageLoadUtils;
import com.chwl.app.ui.widget.NobleAvatarView;
import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil;
import com.chwl.app.utils.RegexUtil;
import com.chwl.core.noble.NobleInfo;
import com.chwl.core.noble.bean.NobleInfo;
import com.chwl.core.noble.NobleUtil;
import com.chwl.core.room.bean.RoomContributeUserInfo;
import com.chwl.core.room.bean.RoomRankMultiItem;

View File

@@ -29,7 +29,7 @@ import com.chwl.app.ui.webview.CommonWebViewActivity
import com.chwl.app.ui.webview.DialogWebViewActivity
import com.chwl.core.UriProvider
import com.chwl.core.auth.AuthModel
import com.chwl.core.fansteam.FansTeamInitInfo
import com.chwl.core.fansteam.bean.FansTeamInitInfo
import com.chwl.core.im.custom.bean.FansTeamMsgAttachment
import com.chwl.core.im.custom.bean.RequestUpmicAttachment
import com.chwl.core.im.custom.bean.RoomPKAttachment

View File

@@ -34,7 +34,7 @@ import com.chwl.app.R;
import com.chwl.app.common.svga.SimpleSvgaParseCompletion;
import com.chwl.app.ui.utils.ImageLoadUtils;
import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil;
import com.chwl.core.fansteam.FansTeamMsgInfo;
import com.chwl.core.fansteam.bean.FansTeamMsgInfo;
import com.chwl.core.gift.GiftModel;
import com.chwl.core.gift.bean.GiftEffectInfo;
import com.chwl.core.gift.bean.GiftInfo;

View File

@@ -93,7 +93,7 @@ import com.chwl.core.DemoCache;
import com.chwl.core.auth.AuthModel;
import com.chwl.core.bean.attachmsg.RoomQueueMsgAttachment;
import com.chwl.core.decoration.car.bean.CarInfo;
import com.chwl.core.fansteam.FansTeamMsgInfo;
import com.chwl.core.fansteam.bean.FansTeamMsgInfo;
import com.chwl.core.gift.GiftModel;
import com.chwl.core.gift.bean.GiftInfo;
import com.chwl.core.gift.bean.GiftList;
@@ -156,7 +156,7 @@ import com.chwl.core.manager.IMNetEaseManager;
import com.chwl.core.miniworld.bean.MiniWorldInWorldInfo;
import com.chwl.core.monsterhunting.bean.MonsterHuntingResult;
import com.chwl.core.monsterhunting.bean.MonsterProtocol;
import com.chwl.core.noble.NobleInfo;
import com.chwl.core.noble.bean.NobleInfo;
import com.chwl.core.noble.NobleUtil;
import com.chwl.core.praise.PraiseModel;
import com.chwl.core.redpackage.bean.RedEnvelopeRoomMsg;

View File

@@ -85,7 +85,6 @@ import com.chwl.app.ui.login.LoginCodeActivity;
import com.chwl.app.ui.login.LoginPhoneActivity;
import com.chwl.app.ui.pay.ChargeActivity;
import com.chwl.app.ui.setting.ResetPasswordActivity;
import com.chwl.app.ui.webview.CommonWebViewActivity;
import com.chwl.app.ui.widget.DefaultToolBar;
import com.chwl.app.ui.widget.dialog.AllPlayEffectDialog;
import com.chwl.app.ui.widget.dialog.AllServiceGiftLevelDialog;
@@ -94,8 +93,6 @@ import com.chwl.app.ui.widget.dialog.OpenNobleGlobalNoticeDialog;
import com.chwl.app.utils.UserUtils;
import com.chwl.app.mentoring_relationship.dialog.GrabApprenticesNoticeDialog;
import com.chwl.core.XConstants;
import com.chwl.core.Constants;
import com.chwl.core.UriProvider;
import com.chwl.core.bean.BaseProtocol;
import com.chwl.core.gift.bean.LuckyBagNoticeInfo;
import com.chwl.core.im.custom.bean.CustomAttachment;
@@ -108,11 +105,11 @@ import com.chwl.core.manager.AvRoomDataManager;
import com.chwl.core.manager.IMNetEaseManager;
import com.chwl.core.manager.RoomEvent;
import com.chwl.core.mentoring_relationship.event.GrabApprenticesEvent;
import com.chwl.core.newbie.NewbieHelloInfo;
import com.chwl.core.newbie.bean.NewbieHelloInfo;
import com.chwl.core.newbie.event.NewbieHelloDialogEvent;
import com.chwl.core.noble.AllServiceGiftProtocol;
import com.chwl.core.noble.NobleInfo;
import com.chwl.core.noble.NobleProtocol;
import com.chwl.core.noble.bean.AllServiceGiftProtocol;
import com.chwl.core.noble.bean.NobleInfo;
import com.chwl.core.noble.bean.NobleProtocol;
import com.chwl.core.pay.PayModel;
import com.chwl.core.pay.bean.WalletInfo;
import com.chwl.core.redpackage.bean.RedPackageNotifyInfo;
@@ -123,9 +120,7 @@ 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.bean.VipMessageInfo;
import com.chwl.library.common.util.DeviceUtil;
import com.chwl.library.rxbus.RxBus;
import com.chwl.library.utils.AppMetaDataUtil;
import com.chwl.library.utils.NetworkUtils;
import com.chwl.library.utils.ResUtil;
import com.chwl.library.utils.SingleToastUtil;

View File

@@ -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.decoration.DecorationInfo
import com.chwl.core.decoration.bean.DecorationInfo
open class DecorationCommonAdapter(layoutResId: Int = R.layout.item_decoration_common) :

View File

@@ -6,7 +6,7 @@ import android.text.TextUtils;
import com.chwl.app.R;
import com.chwl.app.common.widget.dialog.DialogManager;
import com.chwl.core.decoration.DecorationInfo;
import com.chwl.core.decoration.bean.DecorationInfo;
import com.chwl.core.decoration.DecorationInfoEvent;
import com.chwl.core.decoration.DecorationModel;
import com.chwl.core.utils.net.RxHelper;

View File

@@ -12,7 +12,7 @@ import com.chwl.app.decoration.adapter.DecorationCommonAdapter
import com.chwl.app.decoration.viewmodel.DecorationViewModel
import com.chwl.app.ui.relation.FansListActivity
import com.chwl.app.ui.utils.RVDelegate
import com.chwl.core.decoration.DecorationInfo
import com.chwl.core.decoration.bean.DecorationInfo
import com.chwl.core.decoration.DecorationInfoEvent
import com.chwl.library.annatation.ActLayoutRes
import com.chwl.library.utils.ResUtil

View File

@@ -5,7 +5,7 @@ import androidx.lifecycle.MutableLiveData
import com.chwl.app.R
import com.chwl.app.base.BaseViewModel
import com.chwl.core.bean.response.ListResult
import com.chwl.core.decoration.DecorationInfo
import com.chwl.core.decoration.bean.DecorationInfo
import com.chwl.core.decoration.DecorationModel
import com.chwl.core.home.bean.BannerInfo
import com.chwl.core.home.model.HomeModel

View File

@@ -21,7 +21,7 @@ import com.chwl.app.ui.utils.RVDelegate
import com.chwl.app.ui.utils.load
import com.chwl.app.ui.webview.DialogWebViewActivity
import com.chwl.core.UriProvider
import com.chwl.core.fansteam.FansTeamTaskInfo
import com.chwl.core.fansteam.bean.FansTeamTaskInfo
import com.chwl.core.manager.AvRoomDataManager
import com.chwl.core.utils.subAndReplaceDot
import com.chwl.core.utils.toast

View File

@@ -11,7 +11,7 @@ import com.chwl.app.base.BaseViewBindingActivity
import com.chwl.app.common.EmptyViewHelper
import com.chwl.app.databinding.ActivityFansTeamListBinding
import com.chwl.app.ui.utils.RVDelegate
import com.chwl.core.fansteam.FansTeamInfo
import com.chwl.core.fansteam.bean.FansTeamInfo
import com.chwl.library.annatation.ActLayoutRes
import com.chwl.library.utils.ResUtil

View File

@@ -5,7 +5,7 @@ import com.chad.library.adapter.base.BaseViewHolder
import com.chwl.app.R
import com.chwl.app.ui.user.activity.UserInfoActivity
import com.chwl.app.ui.utils.ImageLoadUtils
import com.chwl.core.fansteam.FansTeamInfo
import com.chwl.core.fansteam.bean.FansTeamInfo
class FansTeamListAdapter :

View File

@@ -8,7 +8,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.fansteam.FansTeamTaskInfo
import com.chwl.core.fansteam.bean.FansTeamTaskInfo
import com.chwl.library.utils.ResUtil
class FansTeamTaskAdapter :

View File

@@ -5,6 +5,10 @@ import androidx.lifecycle.MutableLiveData
import com.chwl.app.base.BaseViewModel
import com.chwl.core.bean.response.ListResult
import com.chwl.core.fansteam.*
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.utils.toast
class FansTeamViewModel : BaseViewModel() {

View File

@@ -11,7 +11,7 @@ import com.chwl.app.bindadapter.BaseAdapter;
import com.chwl.app.bindadapter.BindingViewHolder;
import com.chwl.app.ui.utils.ImageLoadUtils;
import com.chwl.core.family.model.FamilyModel;
import com.chwl.core.luckymoney.LuckyMoneyUserInfo;
import com.chwl.core.luckymoney.bean.LuckyMoneyUserInfo;
import java.text.SimpleDateFormat;
import java.util.Date;

View File

@@ -22,7 +22,7 @@ import com.chwl.app.ui.utils.ImageLoadUtils;
import com.chwl.core.auth.AuthModel;
import com.chwl.core.family.bean.FamilyInfo;
import com.chwl.core.family.model.FamilyModel;
import com.chwl.core.luckymoney.LuckyMoneyInfo;
import com.chwl.core.luckymoney.bean.LuckyMoneyInfo;
import com.chwl.core.manager.IMNetEaseManager;
import com.chwl.core.share.bean.SessionType;
import com.chwl.core.team.bean.TeamEvent;

View File

@@ -16,8 +16,8 @@ import com.chwl.app.team.viewmodel.TeamVM;
import com.chwl.app.ui.utils.ImageLoadUtils;
import com.chwl.core.family.bean.FamilyInfo;
import com.chwl.core.family.model.FamilyModel;
import com.chwl.core.luckymoney.LuckyMoneyInfo;
import com.chwl.core.luckymoney.LuckyMoneyUserInfo;
import com.chwl.core.luckymoney.bean.LuckyMoneyInfo;
import com.chwl.core.luckymoney.bean.LuckyMoneyUserInfo;
import com.chwl.core.user.UserModel;
import com.chwl.core.user.bean.UserInfo;
import com.chwl.library.annatation.ActLayoutRes;

View File

@@ -14,7 +14,7 @@ import com.chwl.app.R;
import com.chwl.app.luckymoney.dialog.LuckyMoneyDialog;
import com.chwl.app.luckymoney.view.LuckyMoneyDetailActivity;
import com.chwl.core.im.custom.bean.LuckyMoneyAttachment;
import com.chwl.core.luckymoney.LuckyMoneyInfo;
import com.chwl.core.luckymoney.bean.LuckyMoneyInfo;
import com.chwl.core.manager.IMNetEaseManager;
import com.chwl.core.team.bean.TeamInfo;
import com.chwl.core.team.model.TeamModel;

View File

@@ -13,7 +13,7 @@ import com.netease.nim.uikit.common.ui.recyclerview.adapter.BaseMultiItemFetchLo
import com.chwl.app.R;
import com.chwl.core.auth.AuthModel;
import com.chwl.core.im.custom.bean.LuckyMoneyTipsAttachment;
import com.chwl.core.luckymoney.LuckyMoneyInfo;
import com.chwl.core.luckymoney.bean.LuckyMoneyInfo;
import com.chwl.library.utils.ResUtil;
import java.util.Objects;

View File

@@ -17,16 +17,14 @@ import com.netease.nim.uikit.support.glide.GlideApp;
import com.chwl.app.MainActivity;
import com.chwl.app.NimMiddleActivity;
import com.chwl.app.R;
import com.chwl.app.application.XChatApplication;
import com.chwl.app.databinding.ActivitySplashBinding;
import com.chwl.app.other.SplashBitmapTransformation;
import com.chwl.app.other.dialog.PrivacyAgreementDialog;
import com.chwl.app.ui.login.LoginActivity;
import com.chwl.core.DemoCache;
import com.chwl.core.auth.entity.AccountInfo;
import com.chwl.core.channel_page.model.ChannelPageModel;
import com.chwl.core.initial.InitialModel;
import com.chwl.core.initial.SplashComponent;
import com.chwl.core.initial.bean.SplashComponent;
import com.chwl.core.utils.OaidUtil;
import com.chwl.core.utils.SharedPreferenceUtils;
import com.chwl.library.common.util.DeviceUtil;

View File

@@ -1,7 +1,7 @@
package com.chwl.app.sys;
import com.chwl.core.auth.AuthModel;
import com.chwl.core.msg.sys.ApproveMsgInfo;
import com.chwl.core.msg.sys.bean.ApproveMsgInfo;
import com.chwl.core.msg.sys.ErbanSysMsgModel;
import com.chwl.core.utils.net.RxHelper;
import com.chwl.library.net.rxnet.RxNet;

View File

@@ -2,8 +2,8 @@ package com.chwl.app.team.viewmodel;
import com.chwl.app.base.BaseVM;
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;

View File

@@ -16,7 +16,7 @@ import com.netease.nimlib.sdk.msg.model.IMMessage;
import com.chwl.app.R;
import com.chwl.core.auth.AuthModel;
import com.chwl.core.im.chatterbox.ChatterBoxModel;
import com.chwl.core.im.chatterbox.TopicBoxItemInfo;
import com.chwl.core.im.chatterbox.bean.TopicBoxItemInfo;
import com.chwl.core.im.custom.bean.ChatterBoxAttachment;
import com.chwl.core.im.custom.bean.DiceThrowAttachment;
import com.chwl.core.manager.IMNetEaseManager;

View File

@@ -29,9 +29,9 @@ import com.chwl.app.sys.ErbanSysMsgViewModel;
import com.chwl.app.ui.im.RouterHandler;
import com.chwl.core.im.custom.bean.SysMsgV2Attachment;
import com.chwl.core.manager.IMNetEaseManager;
import com.chwl.core.msg.sys.ApproveMsgInfo;
import com.chwl.core.msg.sysv2.ErbanSysMsgV2Component;
import com.chwl.core.msg.sysv2.ErbanSysMsgV2Info;
import com.chwl.core.msg.sys.bean.ApproveMsgInfo;
import com.chwl.core.msg.sysv2.bean.ErbanSysMsgV2Component;
import com.chwl.core.msg.sysv2.bean.ErbanSysMsgV2Info;
import com.chwl.core.msg.sysv2.ErbanSysMsgV2Layout;
import com.chwl.core.utils.net.RxHelper;
import com.chwl.library.utils.SingleToastUtil;

View File

@@ -32,9 +32,9 @@ import com.chwl.app.sys.ErbanSysMsgViewModel;
import com.chwl.app.ui.im.RouterHandler;
import com.chwl.core.im.custom.bean.SysMsgAttachment;
import com.chwl.core.manager.IMNetEaseManager;
import com.chwl.core.msg.sys.ApproveMsgInfo;
import com.chwl.core.msg.sys.ErbanSysMsgComponent;
import com.chwl.core.msg.sys.ErbanSysMsgInfo;
import com.chwl.core.msg.sys.bean.ApproveMsgInfo;
import com.chwl.core.msg.sys.bean.ErbanSysMsgComponent;
import com.chwl.core.msg.sys.bean.ErbanSysMsgInfo;
import com.chwl.core.msg.sys.ErbanSysMsgLayout;
import com.chwl.core.utils.net.RxHelper;
import com.chwl.library.utils.SingleToastUtil;

View File

@@ -2,7 +2,7 @@ package com.chwl.app.ui.user.decorationsend;
import com.chad.library.adapter.base.BaseViewHolder;
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.AttentionInfo;
import java.util.List;

View File

@@ -12,7 +12,7 @@ import com.chwl.app.R;
import com.chwl.app.ui.utils.ImageLoadUtils;
import com.chwl.app.ui.widget.NobleAvatarView;
import com.chwl.core.level.UserLevelVo;
import com.chwl.core.noble.NobleInfo;
import com.chwl.core.noble.bean.NobleInfo;
import com.chwl.core.noble.NobleUtil;
import java.util.List;

View File

@@ -2,7 +2,7 @@ package com.chwl.app.ui.user.decorationsend;
import com.chad.library.adapter.base.BaseViewHolder;
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.FansInfo;
import java.util.List;

View File

@@ -2,7 +2,7 @@ package com.chwl.app.ui.user.decorationsend;
import com.chad.library.adapter.base.BaseViewHolder;
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 java.util.List;

View File

@@ -11,7 +11,7 @@ import androidx.annotation.Nullable;
import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember;
import com.chwl.app.R;
import com.chwl.app.ui.utils.ImageLoadUtils;
import com.chwl.core.noble.NobleInfo;
import com.chwl.core.noble.bean.NobleInfo;
import com.chwl.core.noble.NobleResourceType;
import com.chwl.core.noble.NobleUtil;
import com.chwl.core.user.bean.UserInfo;

View File

@@ -20,7 +20,7 @@ import com.opensource.svgaplayer.SVGAImageView;
import com.opensource.svgaplayer.SVGAParser;
import com.opensource.svgaplayer.SVGAVideoEntity;
import com.chwl.app.R;
import com.chwl.core.noble.NobleInfo;
import com.chwl.core.noble.bean.NobleInfo;
import com.chwl.core.noble.NobleUtil;
import java.net.MalformedURLException;

View File

@@ -62,7 +62,7 @@ import com.chwl.core.manager.AvRoomDataManager;
import com.chwl.core.manager.IMNetEaseManager;
import com.chwl.core.manager.RoomEvent;
import com.chwl.core.market_verify.MarketVerifyModel;
import com.chwl.core.noble.NobleInfo;
import com.chwl.core.noble.bean.NobleInfo;
import com.chwl.core.noble.NobleUtil;
import com.chwl.core.praise.PraiseModel;
import com.chwl.core.room.bean.RoomInfo;

View File

@@ -21,7 +21,7 @@ import com.chwl.app.avroom.activity.AVRoomActivity
import com.chwl.app.databinding.DialogGiftAllServiceLevelBinding
import com.chwl.app.public_chat_hall.activity.PublicChatHallHomeActivity
import com.chwl.core.initial.InitialModel
import com.chwl.core.noble.AllServiceGiftProtocol
import com.chwl.core.noble.bean.AllServiceGiftProtocol
import com.chwl.library.utils.JavaUtil
import io.reactivex.Observable
import io.reactivex.disposables.Disposable

View File

@@ -16,7 +16,7 @@ import android.widget.TextView;
import androidx.appcompat.widget.AppCompatImageView;
import com.chwl.app.R;
import com.chwl.core.noble.NobleInfo;
import com.chwl.core.noble.bean.NobleInfo;
import com.chwl.core.noble.NobleUtil;
import com.chwl.library.utils.ScreenUtils;
import com.chwl.library.utils.SizeUtils;

View File

@@ -7,7 +7,7 @@
<variable
name="giftBean"
type="com.chwl.core.noble.AllServiceGiftProtocol.DataBean" />
type="com.chwl.core.noble.bean.AllServiceGiftProtocol.DataBean" />
</data>

View File

@@ -15,8 +15,8 @@ import com.netease.nim.uikit.common.ui.recyclerview.adapter.BaseMultiItemFetchLo
import com.chwl.app.R;
import com.chwl.app.ui.im.RouterHandler;
import com.chwl.core.community.attachment.DynamicSysAttachment;
import com.chwl.core.msg.sys.ErbanSysMsgComponent;
import com.chwl.core.msg.sys.ErbanSysMsgInfo;
import com.chwl.core.msg.sys.bean.ErbanSysMsgComponent;
import com.chwl.core.msg.sys.bean.ErbanSysMsgInfo;
import com.chwl.core.msg.sys.ErbanSysMsgLayout;
import com.chwl.library.utils.SizeUtils;

View File

@@ -7,7 +7,7 @@
<variable
name="giftBean"
type="com.chwl.core.noble.AllServiceGiftProtocol.DataBean" />
type="com.chwl.core.noble.bean.AllServiceGiftProtocol.DataBean" />
</data>
<LinearLayout