diff --git a/app/src/main/java/com/pikolive/app/AgentActivity.java b/app/src/main/java/com/pikolive/app/AgentActivity.java index 8272a99ef..322e9dce3 100644 --- a/app/src/main/java/com/pikolive/app/AgentActivity.java +++ b/app/src/main/java/com/pikolive/app/AgentActivity.java @@ -12,10 +12,10 @@ import com.mob.moblink.Scene; import com.mob.moblink.SceneRestorable; import com.netease.nim.uikit.common.util.log.LogUtil; import com.pikolive.app.other.activity.SplashActivity; -import com.yizhuan.xchat_android_core.linked.LinkedModel; -import com.yizhuan.xchat_android_core.linked.bean.LinkedInfo; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.utils.TextUtils; +import com.pikolive.core.linked.LinkedModel; +import com.pikolive.core.linked.bean.LinkedInfo; +import com.pikolive.core.user.UserModel; +import com.pikolive.core.utils.TextUtils; import java.util.HashMap; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/MainActivity.java b/app/src/main/java/com/pikolive/app/MainActivity.java index de3ab4520..156d5d476 100644 --- a/app/src/main/java/com/pikolive/app/MainActivity.java +++ b/app/src/main/java/com/pikolive/app/MainActivity.java @@ -1,6 +1,6 @@ package com.pikolive.app; -import static com.yizhuan.xchat_android_core.channel_page.model.ChannelPageModel.KEY_FLAG_VALID_CHANNEL_PAGE; +import static com.pikolive.core.channel_page.model.ChannelPageModel.KEY_FLAG_VALID_CHANNEL_PAGE; import android.animation.ObjectAnimator; import android.annotation.SuppressLint; @@ -64,7 +64,7 @@ import com.pikolive.app.main.helper.NoticationsUiHelper; import com.yizhuan.erban.miniworld.activity.MiniWorldGuestPageActivity; import com.pikolive.app.module.Extras; import com.yizhuan.erban.module_hall.secretcode.PwdCodeMgr; -import com.yizhuan.erban.service.DaemonService; +import com.pikolive.app.service.DaemonService; import com.pikolive.app.ui.im.ImInitHelper; import com.pikolive.app.ui.im.avtivity.NimP2PMessageActivity; import com.pikolive.app.ui.login.BindPhoneActivity; @@ -80,43 +80,43 @@ import com.pikolive.app.ui.widget.LivingIconView; import com.pikolive.app.ui.widget.MainTabLayout; import com.pikolive.app.utils.CleanLeakUtils; import com.pikolive.app.utils.PushMessageHandler; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.DemoCache; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.auth.event.KickOutEvent; -import com.yizhuan.xchat_android_core.auth.event.LoginEvent; -import com.yizhuan.xchat_android_core.auth.event.LogoutEvent; -import com.yizhuan.xchat_android_core.channel_page.model.ChannelPageModel; -import com.yizhuan.xchat_android_core.community.event.SquareTaskEvent; -import com.yizhuan.xchat_android_core.community.event.UnReadCountEvent; -import com.yizhuan.xchat_android_core.home.bean.MainTabType; -import com.yizhuan.xchat_android_core.home.event.RefreshHomeDataEvent; -import com.yizhuan.xchat_android_core.home.event.VisitorUnreadCountEvent; -import com.yizhuan.xchat_android_core.home.model.GameHomeModel; -import com.yizhuan.xchat_android_core.home.model.HomeModel; -import com.yizhuan.xchat_android_core.initial.InitialModel; -import com.yizhuan.xchat_android_core.linked.LinkedModel; -import com.yizhuan.xchat_android_core.linked.bean.LinkedInfo; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMBroadcastManager; -import com.yizhuan.xchat_android_core.manager.IMMessageManager; -import com.yizhuan.xchat_android_core.manager.RoomEvent; -import com.yizhuan.xchat_android_core.patriarch.event.CloseMinRoomEvent; -import com.yizhuan.xchat_android_core.patriarch.event.ImPushMsgPmLimitTimeEvent; -import com.yizhuan.xchat_android_core.patriarch.event.PmDismissAllLimitDialogEvent; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.user.event.LoadLoginUserInfoEvent; -import com.yizhuan.xchat_android_core.user.event.LoginUserInfoUpdateEvent; -import com.yizhuan.xchat_android_core.user.event.NeedBindPhoneEvent; -import com.yizhuan.xchat_android_core.user.event.NeedCompleteInfoEvent; -import com.yizhuan.xchat_android_core.user.event.NeedVerifyBoundAuthCodeEvent; -import com.yizhuan.xchat_android_core.utils.CurrentTimeUtils; -import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; -import com.yizhuan.xchat_android_core.utils.StringUtils; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; +import com.pikolive.core.Constants; +import com.pikolive.core.DemoCache; +import com.pikolive.core2.UriProvider; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.auth.event.KickOutEvent; +import com.pikolive.core.auth.event.LoginEvent; +import com.pikolive.core.auth.event.LogoutEvent; +import com.pikolive.core.channel_page.model.ChannelPageModel; +import com.pikolive.core.community.event.SquareTaskEvent; +import com.pikolive.core.community.event.UnReadCountEvent; +import com.pikolive.core2.home.bean.MainTabType; +import com.pikolive.core2.home.event.RefreshHomeDataEvent; +import com.pikolive.core2.home.event.VisitorUnreadCountEvent; +import com.pikolive.core2.home.model.GameHomeModel; +import com.pikolive.core2.home.model.HomeModel; +import com.pikolive.core.initial.InitialModel; +import com.pikolive.core.linked.LinkedModel; +import com.pikolive.core.linked.bean.LinkedInfo; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core.manager.IMBroadcastManager; +import com.pikolive.core.manager.IMMessageManager; +import com.pikolive.core.manager.RoomEvent; +import com.pikolive.core.patriarch.event.CloseMinRoomEvent; +import com.pikolive.core.patriarch.event.ImPushMsgPmLimitTimeEvent; +import com.pikolive.core.patriarch.event.PmDismissAllLimitDialogEvent; +import com.pikolive.core.room.bean.RoomInfo; +import com.pikolive.core.user.UserModel; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.user.event.LoadLoginUserInfoEvent; +import com.pikolive.core.user.event.LoginUserInfoUpdateEvent; +import com.pikolive.core.user.event.NeedBindPhoneEvent; +import com.pikolive.core.user.event.NeedCompleteInfoEvent; +import com.pikolive.core.user.event.NeedVerifyBoundAuthCodeEvent; +import com.pikolive.core.utils.CurrentTimeUtils; +import com.pikolive.core.utils.SharedPreferenceUtils; +import com.pikolive.core.utils.StringUtils; +import com.pikolive.core.utils.net.BeanObserver; import com.pikolive.library.base.factory.CreatePresenter; import com.pikolive.library.threadmgr.ThreadPoolManager; import com.pikolive.library.utils.JavaUtil; @@ -567,7 +567,7 @@ public class MainActivity extends BaseMvpActivity .subscribe(new BeanObserver() { @Override public void onErrorMsg(String error) { - com.yizhuan.xchat_android_core.utils.Logger.info("isBoundAuthCode", error); + com.pikolive.core.utils.Logger.info("isBoundAuthCode", error); } @Override diff --git a/app/src/main/java/com/pikolive/app/NimMiddleActivity.java b/app/src/main/java/com/pikolive/app/NimMiddleActivity.java index 0c02eff1f..a4fd6f3e4 100644 --- a/app/src/main/java/com/pikolive/app/NimMiddleActivity.java +++ b/app/src/main/java/com/pikolive/app/NimMiddleActivity.java @@ -16,12 +16,12 @@ import com.pikolive.app.radish.signin.SignInActivity; import com.pikolive.app.ui.im.avtivity.NimP2PMessageActivity; import com.pikolive.app.ui.webview.CommonWebViewActivity; import com.pikolive.app.utils.PushMessageHandler; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.OpenRoomNotiAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.OpenSignInAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.RedPackageAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomInviteFansAttachment; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.im.custom.bean.CustomAttachment; +import com.pikolive.core.im.custom.bean.OpenRoomNotiAttachment; +import com.pikolive.core.im.custom.bean.OpenSignInAttachment; +import com.pikolive.core.im.custom.bean.RedPackageAttachment; +import com.pikolive.core.im.custom.bean.RoomInviteFansAttachment; import com.pikolive.library.utils.UIUtils; import java.util.ArrayList; diff --git a/app/src/main/java/com/pikolive/app/UIHelper.java b/app/src/main/java/com/pikolive/app/UIHelper.java index 4841c4335..2d1cc1872 100644 --- a/app/src/main/java/com/pikolive/app/UIHelper.java +++ b/app/src/main/java/com/pikolive/app/UIHelper.java @@ -15,8 +15,8 @@ import com.pikolive.app.ui.user.activity.UserInfoActivity; import com.pikolive.app.ui.user.activity.UserInfoModifyActivity; import com.pikolive.app.ui.user.activity.UserModifyPhotosActivity; import com.pikolive.app.ui.webview.CommonWebViewActivity; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.pikolive.core2.UriProvider; +import com.pikolive.core.user.bean.UserInfo; /** diff --git a/app/src/main/java/com/pikolive/app/UserGuideActivity.java b/app/src/main/java/com/pikolive/app/UserGuideActivity.java index 49509067a..3a849bb6f 100644 --- a/app/src/main/java/com/pikolive/app/UserGuideActivity.java +++ b/app/src/main/java/com/pikolive/app/UserGuideActivity.java @@ -10,7 +10,7 @@ import androidx.viewpager.widget.ViewPager; import com.pikolive.app.base.BaseActivity; import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.PreferencesUtils; +import com.pikolive.core.PreferencesUtils; public class UserGuideActivity extends BaseActivity { diff --git a/app/src/main/java/com/pikolive/app/application/GlobalHandleManager.java b/app/src/main/java/com/pikolive/app/application/GlobalHandleManager.java index d1cfa886d..a543944d8 100644 --- a/app/src/main/java/com/pikolive/app/application/GlobalHandleManager.java +++ b/app/src/main/java/com/pikolive/app/application/GlobalHandleManager.java @@ -5,23 +5,23 @@ import android.app.Activity; import com.tongdaxing.erban.upgrade.AppUpgradeHelper; import com.trello.rxlifecycle3.components.support.RxAppCompatActivity; import com.pikolive.app.avroom.newuserchargegift.NewUserChargePrizeDialog; -import com.yizhuan.erban.relation.cp.dialog.CpGlobalDialog; +import com.pikolive.app.relation.cp.dialog.CpGlobalDialog; import com.pikolive.app.ui.widget.LevelUpDialog; import com.pikolive.app.ui.widget.RecallDialog; import com.pikolive.app.vip.dialog.VipUpgradeDialog; import com.yizhuan.erban.ui.widget.lottery_dialog.LotteryDialogManager; -import com.yizhuan.xchat_android_core.activity.bean.LotteryInfo; -import com.yizhuan.xchat_android_core.level.event.CharmLevelUpEvent; -import com.yizhuan.xchat_android_core.level.event.LevelUpEvent; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.pay.event.NewUserChargeEvent; -import com.yizhuan.xchat_android_core.recall.bean.CheckLostUserInfo; -import com.yizhuan.xchat_android_core.recall.event.CheckLostUserEvent; -import com.yizhuan.xchat_android_core.relation.cp.CpInviteInfo; -import com.yizhuan.xchat_android_core.upgrade.event.ImPushUpdateAppEvent; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; -import com.yizhuan.xchat_android_core.vip.VipUpgradeEvent; +import com.pikolive.core.activity.bean.LotteryInfo; +import com.pikolive.core.level.event.CharmLevelUpEvent; +import com.pikolive.core.level.event.LevelUpEvent; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core.pay.event.NewUserChargeEvent; +import com.pikolive.core.recall.bean.CheckLostUserInfo; +import com.pikolive.core.recall.event.CheckLostUserEvent; +import com.pikolive.core.relation.cp.CpInviteInfo; +import com.pikolive.core.upgrade.event.ImPushUpdateAppEvent; +import com.pikolive.core.user.UserModel; +import com.pikolive.core.utils.SharedPreferenceUtils; +import com.pikolive.core.vip.VipUpgradeEvent; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/com/pikolive/app/application/XChatApplication.java b/app/src/main/java/com/pikolive/app/application/XChatApplication.java index 645fb3b59..ac1a2431c 100644 --- a/app/src/main/java/com/pikolive/app/application/XChatApplication.java +++ b/app/src/main/java/com/pikolive/app/application/XChatApplication.java @@ -1,6 +1,6 @@ package com.pikolive.app.application; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_OPEN_ROOM_NOTI; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_OPEN_ROOM_NOTI; import android.annotation.SuppressLint; import android.app.Activity; @@ -51,34 +51,34 @@ import com.pikolive.app.common.util.AppLifeCycleHelper; import com.yizhuan.erban.module_hall.HallDataManager; import com.pikolive.app.radish.wallet.RadishWalletManager; import com.pikolive.app.utils.PushMessageHandler; -import com.yizhuan.xchat_android_constants.XChatConstants; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.DemoCache; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.channel.ChannelModel; -import com.yizhuan.xchat_android_core.family.model.FamilyModel; -import com.yizhuan.xchat_android_core.gift.GiftModel; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.OpenSignInAttachment; -import com.yizhuan.xchat_android_core.initial.InitialModel; -import com.yizhuan.xchat_android_core.interceptor.NoParamsInterceptor; -import com.yizhuan.xchat_android_core.interceptor.ParamsInterceptor; -import com.yizhuan.xchat_android_core.interceptor.TimeSyncInterceptor; -import com.yizhuan.xchat_android_core.manager.IMMessageManager; -import com.yizhuan.xchat_android_core.manager.IMSystemMsgManager; -import com.yizhuan.xchat_android_core.market_verify.MarketVerifyModel; -import com.yizhuan.xchat_android_core.mentoring_relationship.model.MentoringRelationshipModel; -import com.yizhuan.xchat_android_core.pay.PayModel; -import com.yizhuan.xchat_android_core.public_chat_hall.model.PublicChatHallModel; -import com.yizhuan.xchat_android_core.radish.RadishModel; -import com.yizhuan.xchat_android_core.radish.signin.bean.ImNotice; -import com.yizhuan.xchat_android_core.room.face.DynamicFaceModel; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.event.NeedCompleteInfoEvent; -import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; -import com.yizhuan.xchat_android_core.utils.net.ServerException; +import com.pikolive.core2.XChatConstants; +import com.pikolive.core.Constants; +import com.pikolive.core.DemoCache; +import com.pikolive.core2.UriProvider; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core2.channel.ChannelModel; +import com.pikolive.core.family.model.FamilyModel; +import com.pikolive.core.gift.GiftModel; +import com.pikolive.core.im.custom.bean.CustomAttachment; +import com.pikolive.core.im.custom.bean.OpenSignInAttachment; +import com.pikolive.core.initial.InitialModel; +import com.pikolive.core.interceptor.NoParamsInterceptor; +import com.pikolive.core.interceptor.ParamsInterceptor; +import com.pikolive.core.interceptor.TimeSyncInterceptor; +import com.pikolive.core.manager.IMMessageManager; +import com.pikolive.core.manager.IMSystemMsgManager; +import com.pikolive.core2.market_verify.MarketVerifyModel; +import com.pikolive.core.mentoring_relationship.model.MentoringRelationshipModel; +import com.pikolive.core.pay.PayModel; +import com.pikolive.core.public_chat_hall.model.PublicChatHallModel; +import com.pikolive.core.radish.RadishModel; +import com.pikolive.core.radish.signin.bean.ImNotice; +import com.pikolive.core.room.face.DynamicFaceModel; +import com.pikolive.core.user.UserModel; +import com.pikolive.core.user.event.NeedCompleteInfoEvent; +import com.pikolive.core.utils.SharedPreferenceUtils; +import com.pikolive.core.utils.net.ServerException; import com.pikolive.library.common.application.BaseApp; import com.pikolive.library.common.application.Env; import com.pikolive.library.common.file.FileHelper; diff --git a/app/src/main/java/com/pikolive/app/audio/AudioRecordActivity.java b/app/src/main/java/com/pikolive/app/audio/AudioRecordActivity.java index c7e34871c..26a170764 100644 --- a/app/src/main/java/com/pikolive/app/audio/AudioRecordActivity.java +++ b/app/src/main/java/com/pikolive/app/audio/AudioRecordActivity.java @@ -16,14 +16,14 @@ import com.yizhuan.erban.R; import com.pikolive.app.base.BaseViewBindingActivity; import com.pikolive.app.common.widget.dialog.DialogManager; import com.yizhuan.erban.databinding.ActivityAudiorecordBinding; -import com.yizhuan.xchat_android_core.audio.AudioPlayAndRecordManager; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.file.FileModel; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.room.model.AvRoomModel; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.pikolive.core.audio.AudioPlayAndRecordManager; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.file.FileModel; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core.room.bean.RoomInfo; +import com.pikolive.core.room.model.AvRoomModel; +import com.pikolive.core.user.UserModel; +import com.pikolive.core.user.bean.UserInfo; import com.pikolive.library.utils.ResUtil; import com.pikolive.library.utils.log.MLog; diff --git a/app/src/main/java/com/pikolive/app/audio/MyVoiceActivity.java b/app/src/main/java/com/pikolive/app/audio/MyVoiceActivity.java index ce476bb74..22f2e078c 100644 --- a/app/src/main/java/com/pikolive/app/audio/MyVoiceActivity.java +++ b/app/src/main/java/com/pikolive/app/audio/MyVoiceActivity.java @@ -21,7 +21,7 @@ import com.pikolive.app.base.BaseMvpActivity; import com.pikolive.app.common.NoDataFragment; import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil; import com.pikolive.app.ui.widget.recyclerview.decoration.HorizontalDecoration; -import com.yizhuan.xchat_android_core.audio.bean.UserVoiceInfo; +import com.pikolive.core2.audio.bean.UserVoiceInfo; import com.pikolive.library.base.factory.CreatePresenter; import com.pikolive.library.utils.ListUtils; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/main/java/com/pikolive/app/audio/RecordingVoiceActivity.java b/app/src/main/java/com/pikolive/app/audio/RecordingVoiceActivity.java index 30c22919c..294b0f3a0 100644 --- a/app/src/main/java/com/pikolive/app/audio/RecordingVoiceActivity.java +++ b/app/src/main/java/com/pikolive/app/audio/RecordingVoiceActivity.java @@ -42,8 +42,8 @@ import com.pikolive.app.audio.widget.VoiceCardRecyclerView; import com.pikolive.app.audio.widget.VoiceWave; import com.pikolive.app.base.BaseMvpActivity; import com.pikolive.app.common.widget.dialog.DialogManager; -import com.yizhuan.xchat_android_core.audio.bean.VoiceCardInfo; -import com.yizhuan.xchat_android_core.room.model.AvRoomModel; +import com.pikolive.core2.audio.bean.VoiceCardInfo; +import com.pikolive.core.room.model.AvRoomModel; import com.pikolive.library.base.factory.CreatePresenter; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/main/java/com/pikolive/app/audio/SoundSignatureActivity.kt b/app/src/main/java/com/pikolive/app/audio/SoundSignatureActivity.kt index bc7047be6..3403f9b71 100644 --- a/app/src/main/java/com/pikolive/app/audio/SoundSignatureActivity.kt +++ b/app/src/main/java/com/pikolive/app/audio/SoundSignatureActivity.kt @@ -23,9 +23,9 @@ import com.pikolive.app.audio.viewmodel.SoundViewModel import com.pikolive.app.base.BaseViewBindingActivity import com.yizhuan.erban.databinding.ActivitySoundSignatureBinding import com.pikolive.app.ui.widget.dialog.CommonDialog -import com.yizhuan.xchat_android_core.file.FileModel -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager -import com.yizhuan.xchat_android_core.user.bean.UserInfo.SoundBean +import com.pikolive.core.file.FileModel +import com.pikolive.core.manager.AvRoomDataManager +import com.pikolive.core.user.bean.UserInfo.SoundBean import com.pikolive.library.utils.ResUtil import com.pikolive.library.utils.SingleToastUtil import io.reactivex.SingleObserver diff --git a/app/src/main/java/com/pikolive/app/audio/VoiceMatchActivity.java b/app/src/main/java/com/pikolive/app/audio/VoiceMatchActivity.java index 4c2a87968..2db1eddc0 100644 --- a/app/src/main/java/com/pikolive/app/audio/VoiceMatchActivity.java +++ b/app/src/main/java/com/pikolive/app/audio/VoiceMatchActivity.java @@ -31,16 +31,16 @@ import com.pikolive.app.common.widget.dialog.DialogManager; import com.yizhuan.erban.databinding.ActivityVoiceMatchBinding; import com.pikolive.app.ui.im.avtivity.NimP2PMessageActivity; import com.pikolive.app.ui.widget.higuide.TuTuGuideHelper; -import com.yizhuan.xchat_android_core.audio.AudioModel; -import com.yizhuan.xchat_android_core.audio.bean.HistoryVoiceInfo; -import com.yizhuan.xchat_android_core.audio.bean.VoiceMatchInfo; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.music.model.PlayerModel; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.utils.ActivityUtil; -import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; -import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; +import com.pikolive.core2.audio.AudioModel; +import com.pikolive.core2.audio.bean.HistoryVoiceInfo; +import com.pikolive.core2.audio.bean.VoiceMatchInfo; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.music.model.PlayerModel; +import com.pikolive.core.user.UserModel; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.utils.ActivityUtil; +import com.pikolive.core.utils.SharedPreferenceUtils; +import com.pikolive.core.utils.net.DontWarnObserver; import com.pikolive.library.utils.ListUtils; import com.pikolive.library.utils.ResUtil; import com.pikolive.library.utils.SingleToastUtil; diff --git a/app/src/main/java/com/pikolive/app/audio/adapter/CardAdapter.java b/app/src/main/java/com/pikolive/app/audio/adapter/CardAdapter.java index df54365c9..82887a960 100644 --- a/app/src/main/java/com/pikolive/app/audio/adapter/CardAdapter.java +++ b/app/src/main/java/com/pikolive/app/audio/adapter/CardAdapter.java @@ -12,7 +12,7 @@ import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.audio.bean.VoiceCardInfo; +import com.pikolive.core2.audio.bean.VoiceCardInfo; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/audio/adapter/MyVoiceListAdapter.java b/app/src/main/java/com/pikolive/app/audio/adapter/MyVoiceListAdapter.java index 87a521623..a520726c0 100644 --- a/app/src/main/java/com/pikolive/app/audio/adapter/MyVoiceListAdapter.java +++ b/app/src/main/java/com/pikolive/app/audio/adapter/MyVoiceListAdapter.java @@ -12,8 +12,8 @@ import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; import com.yizhuan.erban.R; import com.pikolive.app.audio.widget.VoiceLine; -import com.yizhuan.xchat_android_core.audio.bean.UserVoiceInfo; -import com.yizhuan.xchat_android_core.utils.StringUtils; +import com.pikolive.core2.audio.bean.UserVoiceInfo; +import com.pikolive.core.utils.StringUtils; import com.pikolive.library.utils.ResUtil; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/audio/presenter/MyVoicePresenter.java b/app/src/main/java/com/pikolive/app/audio/presenter/MyVoicePresenter.java index 91d02e36d..c37fee9b5 100644 --- a/app/src/main/java/com/pikolive/app/audio/presenter/MyVoicePresenter.java +++ b/app/src/main/java/com/pikolive/app/audio/presenter/MyVoicePresenter.java @@ -2,10 +2,10 @@ package com.pikolive.app.audio.presenter; import com.pikolive.app.audio.view.IMyVoiceView; import com.pikolive.app.base.BaseMvpPresenter; -import com.yizhuan.xchat_android_core.audio.AudioModel; -import com.yizhuan.xchat_android_core.audio.bean.UserVoiceInfo; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; +import com.pikolive.core2.audio.AudioModel; +import com.pikolive.core2.audio.bean.UserVoiceInfo; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.utils.net.DontWarnObserver; import com.pikolive.library.base.PresenterEvent; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/audio/presenter/RecordingVoicePresenter.java b/app/src/main/java/com/pikolive/app/audio/presenter/RecordingVoicePresenter.java index b32bf44b8..295a0ae22 100644 --- a/app/src/main/java/com/pikolive/app/audio/presenter/RecordingVoicePresenter.java +++ b/app/src/main/java/com/pikolive/app/audio/presenter/RecordingVoicePresenter.java @@ -15,15 +15,15 @@ import com.pikolive.app.audio.helper.OnPlayListener; import com.pikolive.app.audio.view.IRecordingVoiceView; import com.yizhuan.erban.R; import com.pikolive.app.base.BaseMvpPresenter; -import com.yizhuan.xchat_android_core.audio.AudioModel; -import com.yizhuan.xchat_android_core.audio.AudioPlayAndRecordManager; -import com.yizhuan.xchat_android_core.audio.bean.SaveVoiceSuccessResultInfo; -import com.yizhuan.xchat_android_core.audio.bean.VoiceCardInfo; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.file.FileModel; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; +import com.pikolive.core2.audio.AudioModel; +import com.pikolive.core.audio.AudioPlayAndRecordManager; +import com.pikolive.core2.audio.bean.SaveVoiceSuccessResultInfo; +import com.pikolive.core2.audio.bean.VoiceCardInfo; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.file.FileModel; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core.room.bean.RoomInfo; +import com.pikolive.core.utils.net.DontWarnObserver; import com.pikolive.library.base.PresenterEvent; import com.pikolive.library.utils.ListUtils; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/main/java/com/pikolive/app/audio/view/BottleContainer.java b/app/src/main/java/com/pikolive/app/audio/view/BottleContainer.java index ca62fb095..82bccaa85 100644 --- a/app/src/main/java/com/pikolive/app/audio/view/BottleContainer.java +++ b/app/src/main/java/com/pikolive/app/audio/view/BottleContainer.java @@ -10,7 +10,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.xchat_android_core.audio.bean.VoiceMatchInfo; +import com.pikolive.core2.audio.bean.VoiceMatchInfo; import com.pikolive.library.utils.ListUtils; import java.util.ArrayList; diff --git a/app/src/main/java/com/pikolive/app/audio/view/BottleLayout.java b/app/src/main/java/com/pikolive/app/audio/view/BottleLayout.java index 83bdfe7eb..936db1ec2 100644 --- a/app/src/main/java/com/pikolive/app/audio/view/BottleLayout.java +++ b/app/src/main/java/com/pikolive/app/audio/view/BottleLayout.java @@ -23,12 +23,12 @@ import com.pikolive.app.UIHelper; import com.pikolive.app.common.widget.CircleImageView; import com.pikolive.app.ui.utils.ImageLoadUtils; import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.xchat_android_constants.XChatConstants; -import com.yizhuan.xchat_android_core.audio.bean.VoiceMatchInfo; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; -import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core2.XChatConstants; +import com.pikolive.core2.audio.bean.VoiceMatchInfo; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.utils.SharedPreferenceUtils; +import com.pikolive.core.utils.net.DontWarnObserver; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.utils.ResUtil; import com.pikolive.library.utils.SingleToastUtil; import com.pikolive.library.utils.TimeUtils; diff --git a/app/src/main/java/com/pikolive/app/audio/view/IBottleOpListener.java b/app/src/main/java/com/pikolive/app/audio/view/IBottleOpListener.java index 3ba330a12..6ee23d050 100644 --- a/app/src/main/java/com/pikolive/app/audio/view/IBottleOpListener.java +++ b/app/src/main/java/com/pikolive/app/audio/view/IBottleOpListener.java @@ -1,6 +1,6 @@ package com.pikolive.app.audio.view; -import com.yizhuan.xchat_android_core.audio.bean.VoiceMatchInfo; +import com.pikolive.core2.audio.bean.VoiceMatchInfo; /** * create by lvzebiao @2019/6/19 diff --git a/app/src/main/java/com/pikolive/app/audio/view/IMyVoiceView.java b/app/src/main/java/com/pikolive/app/audio/view/IMyVoiceView.java index f6d8da9de..bef63296d 100644 --- a/app/src/main/java/com/pikolive/app/audio/view/IMyVoiceView.java +++ b/app/src/main/java/com/pikolive/app/audio/view/IMyVoiceView.java @@ -1,6 +1,6 @@ package com.pikolive.app.audio.view; -import com.yizhuan.xchat_android_core.audio.bean.UserVoiceInfo; +import com.pikolive.core2.audio.bean.UserVoiceInfo; import com.pikolive.library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/audio/view/IRecordingVoiceView.java b/app/src/main/java/com/pikolive/app/audio/view/IRecordingVoiceView.java index c0854c2dd..d5b0ed990 100644 --- a/app/src/main/java/com/pikolive/app/audio/view/IRecordingVoiceView.java +++ b/app/src/main/java/com/pikolive/app/audio/view/IRecordingVoiceView.java @@ -2,7 +2,7 @@ package com.pikolive.app.audio.view; import android.content.Intent; -import com.yizhuan.xchat_android_core.audio.bean.VoiceCardInfo; +import com.pikolive.core2.audio.bean.VoiceCardInfo; import com.pikolive.library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/audio/viewmodel/SoundViewModel.kt b/app/src/main/java/com/pikolive/app/audio/viewmodel/SoundViewModel.kt index 2b88408fd..97ee49d2b 100644 --- a/app/src/main/java/com/pikolive/app/audio/viewmodel/SoundViewModel.kt +++ b/app/src/main/java/com/pikolive/app/audio/viewmodel/SoundViewModel.kt @@ -11,13 +11,13 @@ import com.pikolive.app.audio.SoundSignatureActivity import com.pikolive.app.audio.helper.AudioPlayerHelper import com.pikolive.app.audio.helper.OnPlayListener import com.pikolive.app.base.BaseViewModel -import com.yizhuan.xchat_android_core.Constants -import com.yizhuan.xchat_android_core.audio.AudioPlayAndRecordManager -import com.yizhuan.xchat_android_core.auth.AuthModel -import com.yizhuan.xchat_android_core.manager.AudioEngineManager -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager -import com.yizhuan.xchat_android_core.sound.model.SoundModel -import com.yizhuan.xchat_android_core.utils.toast +import com.pikolive.core.Constants +import com.pikolive.core.audio.AudioPlayAndRecordManager +import com.pikolive.core.auth.AuthModel +import com.pikolive.core.manager.AvRoomDataManager +import com.pikolive.core2.sound.model.SoundModel +import com.pikolive.core.utils.toast +import com.pikolive.core2.manager.AudioEngineManager import com.pikolive.library.common.application.BaseApp import com.pikolive.library.utils.ResUtil import com.pikolive.library.utils.SingleToastUtil @@ -339,7 +339,8 @@ class SoundViewModel : BaseViewModel() { if (AvRoomDataManager.get().mCurrentRoomInfo != null) { AudioEngineManager.get().isRemoteMute = true //設置靜音 AudioEngineManager.get().isMute = true //不能説話 - AudioEngineManager.get().setRole(Constants.CLIENT_ROLE_AUDIENCE) + AudioEngineManager.get().setRole( + Constants.CLIENT_ROLE_AUDIENCE) } } diff --git a/app/src/main/java/com/pikolive/app/avroom/ButtonItemFactory.java b/app/src/main/java/com/pikolive/app/avroom/ButtonItemFactory.java index 659d55059..191f8dba0 100644 --- a/app/src/main/java/com/pikolive/app/avroom/ButtonItemFactory.java +++ b/app/src/main/java/com/pikolive/app/avroom/ButtonItemFactory.java @@ -20,23 +20,23 @@ import com.pikolive.app.ui.widget.ButtonItem; import com.pikolive.app.ui.widget.GiftDialog; import com.pikolive.app.vip.util.VipHelper; import com.yizhuan.tutu.room_chat.activity.RoomMsgActivity; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.bean.RoomQueueInfo; -import com.yizhuan.xchat_android_core.initial.InitialModel; -import com.yizhuan.xchat_android_core.initial.bean.InitInfo; -import com.yizhuan.xchat_android_core.kick.KickModel; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.public_chat_hall.manager.PublicChatHallDataManager; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.room.model.AvRoomModel; -import com.yizhuan.xchat_android_core.statistic.StatLogKey; -import com.yizhuan.xchat_android_core.super_admin.bean.KickOutExtBean; -import com.yizhuan.xchat_android_core.super_admin.model.SuperAdminModel; -import com.yizhuan.xchat_android_core.super_admin.util.SAdminOptUtil; -import com.yizhuan.xchat_android_core.super_admin.util.SaAttachmentFactory; -import com.yizhuan.xchat_android_core.super_admin.util.SuperAdminUtil; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.bean.RoomQueueInfo; +import com.pikolive.core.initial.InitialModel; +import com.pikolive.core.initial.bean.InitInfo; +import com.pikolive.core.kick.KickModel; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core2.manager.IMNetEaseManager; +import com.pikolive.core.public_chat_hall.manager.PublicChatHallDataManager; +import com.pikolive.core.room.bean.RoomInfo; +import com.pikolive.core.room.model.AvRoomModel; +import com.pikolive.core.statistic.StatLogKey; +import com.pikolive.core.admin.bean.KickOutExtBean; +import com.pikolive.core.admin.model.SuperAdminModel; +import com.pikolive.core.admin.util.SAdminOptUtil; +import com.pikolive.core.admin.util.SaAttachmentFactory; +import com.pikolive.core.admin.util.SuperAdminUtil; +import com.pikolive.core.user.bean.UserInfo; import com.pikolive.library.utils.JavaUtil; import com.pikolive.library.utils.ResUtil; import com.pikolive.library.utils.SingleToastUtil; diff --git a/app/src/main/java/com/pikolive/app/avroom/activity/AVRoomActivity.java b/app/src/main/java/com/pikolive/app/avroom/activity/AVRoomActivity.java index 3999c6b90..166aaec32 100644 --- a/app/src/main/java/com/pikolive/app/avroom/activity/AVRoomActivity.java +++ b/app/src/main/java/com/pikolive/app/avroom/activity/AVRoomActivity.java @@ -1,19 +1,19 @@ package com.pikolive.app.avroom.activity; import static android.view.View.VISIBLE; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_ALL_SERVICE_GIFT; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_BOX; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_FAIRY; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_GIFT; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_GIFT; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_GIFT_SERVER_ALL; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_GIFT_SERVER_NOTIFY; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_SEA; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_SEA_GIFT_SERVER_ALL; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_ROOM_PK; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_BOX_ALL_ROOM_NOTIFY_BY_SVGA; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_DRAW_GIFT_L5; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_ROOM_PK_NOTIFY; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_ALL_SERVICE_GIFT; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_BOX; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_FAIRY; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_GIFT; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_GIFT; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_GIFT_SERVER_ALL; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_GIFT_SERVER_NOTIFY; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_SEA; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_SEA_GIFT_SERVER_ALL; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_ROOM_PK; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_BOX_ALL_ROOM_NOTIFY_BY_SVGA; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_DRAW_GIFT_L5; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_ROOM_PK_NOTIFY; import android.annotation.SuppressLint; import android.app.Activity; @@ -59,6 +59,7 @@ import com.orhanobut.logger.Logger; import com.pikolive.app.avroom.firstcharge.FirstChargeDialog; import com.pikolive.app.avroom.fragment.FakeSingleRoomBackFragment; import com.pikolive.app.avroom.fragment.FakeSingleRoomFragment; +import com.pikolive.app.avroom.fragment.HomePartyFragment; import com.pikolive.app.avroom.fragment.InputPwdDialogFragment; import com.pikolive.app.avroom.presenter.AvRoomPresenter; import com.pikolive.app.avroom.presenter.HomePartyPresenter; @@ -68,7 +69,6 @@ import com.trello.rxlifecycle3.android.ActivityEvent; import com.yizhuan.erban.R; import com.pikolive.app.avroom.dialog.NewUserGiftDialog; import com.pikolive.app.avroom.dialog.SingleRoomTipDialog; -import com.pikolive.app.avroom.fragment.HomePartyFragment; import com.pikolive.app.avroom.widget.VerticalViewPagerAdapter; import com.pikolive.app.base.BaseMvpActivity; import com.pikolive.app.common.util.Utils; @@ -87,65 +87,65 @@ import com.pikolive.app.ui.widget.dialog.AllServiceGiftLevelDialog; import com.pikolive.app.ui.widget.dialog.MonsterDialog; import com.pikolive.app.utils.UserUtils; import com.yizhuan.tutu.room_chat.activity.RoomMsgActivity; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.DemoCache; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.auth.event.LogoutEvent; -import com.yizhuan.xchat_android_core.bean.BaseProtocol; -import com.yizhuan.xchat_android_core.channel_page.bean.HelloMessageInfo; -import com.yizhuan.xchat_android_core.gift.GiftModel; -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo; -import com.yizhuan.xchat_android_core.gift.bean.LuckyBagNoticeInfo; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.FairyMsgAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.NotifyH5Attachment; -import com.yizhuan.xchat_android_core.im.custom.bean.NotifyH5Info; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomBoxPrizeAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomBoxPrizeInfo; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomLuckySeaAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomLuckySeaMsgBean; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomPKAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomPkBean; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomReceivedLuckyGiftAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.TarotAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.TarotMsgBean; -import com.yizhuan.xchat_android_core.initial.InitialModel; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.manager.RoomEvent; -import com.yizhuan.xchat_android_core.module_hall.hall.HallModel; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.SuperAdminInfo; -import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterHuntingResult; -import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterInfo; -import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterProtocol; -import com.yizhuan.xchat_android_core.monsterhunting.manager.MonsterDataManager; -import com.yizhuan.xchat_android_core.noble.AllServiceGiftProtocol; -import com.yizhuan.xchat_android_core.noble.NobleInfo; -import com.yizhuan.xchat_android_core.noble.NobleResourceType; -import com.yizhuan.xchat_android_core.noble.NobleUtil; -import com.yizhuan.xchat_android_core.patriarch.event.CloseMinRoomEvent; -import com.yizhuan.xchat_android_core.patriarch.event.ImPushMsgPmLimitTimeEvent; -import com.yizhuan.xchat_android_core.patriarch.event.PmDismissAllLimitDialogEvent; -import com.yizhuan.xchat_android_core.patriarch.exception.PmRoomLimitException; -import com.yizhuan.xchat_android_core.redpackage.RedPackageNotifyInfo; -import com.yizhuan.xchat_android_core.room.anotherroompk.ShowGiftDialogEvent; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomModeType; -import com.yizhuan.xchat_android_core.room.dragonball.DragonBallModel; -import com.yizhuan.xchat_android_core.room.event.FinishAvRoomEvent; -import com.yizhuan.xchat_android_core.room.event.RoomExitEvent; -import com.yizhuan.xchat_android_core.room.event.RoomTaskTipsEvent; -import com.yizhuan.xchat_android_core.room.pk.event.PKStateEvent; -import com.yizhuan.xchat_android_core.super_admin.util.SAdminOptUtil; -import com.yizhuan.xchat_android_core.super_admin.util.SuperAdminUtil; -import com.yizhuan.xchat_android_core.support.room.RoomContext; -import com.yizhuan.xchat_android_core.support.room.RoomView; -import com.yizhuan.xchat_android_core.treasurefairy.FairyMsgInfoBean; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.FirstChargeInfo; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.utils.LogUtils; -import com.yizhuan.xchat_android_core.utils.StringUtils; +import com.pikolive.core.Constants; +import com.pikolive.core.DemoCache; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.auth.event.LogoutEvent; +import com.pikolive.core.bean.BaseProtocol; +import com.pikolive.core.channel_page.bean.HelloMessageInfo; +import com.pikolive.core.gift.GiftModel; +import com.pikolive.core.gift.bean.GiftInfo; +import com.pikolive.core.gift.bean.LuckyBagNoticeInfo; +import com.pikolive.core.im.custom.bean.CustomAttachment; +import com.pikolive.core.im.custom.bean.FairyMsgAttachment; +import com.pikolive.core.im.custom.bean.NotifyH5Attachment; +import com.pikolive.core.im.custom.bean.NotifyH5Info; +import com.pikolive.core.im.custom.bean.RoomBoxPrizeAttachment; +import com.pikolive.core.im.custom.bean.RoomBoxPrizeInfo; +import com.pikolive.core.im.custom.bean.RoomLuckySeaAttachment; +import com.pikolive.core.im.custom.bean.RoomLuckySeaMsgBean; +import com.pikolive.core.im.custom.bean.RoomPKAttachment; +import com.pikolive.core.im.custom.bean.RoomPkBean; +import com.pikolive.core.im.custom.bean.RoomReceivedLuckyGiftAttachment; +import com.pikolive.core.im.custom.bean.TarotAttachment; +import com.pikolive.core.im.custom.bean.TarotMsgBean; +import com.pikolive.core.initial.InitialModel; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core2.manager.IMNetEaseManager; +import com.pikolive.core.manager.RoomEvent; +import com.pikolive.core.module_hall.hall.HallModel; +import com.pikolive.core.module_hall.hall.bean.SuperAdminInfo; +import com.pikolive.core.monsterhunting.bean.MonsterHuntingResult; +import com.pikolive.core.monsterhunting.bean.MonsterInfo; +import com.pikolive.core.monsterhunting.bean.MonsterProtocol; +import com.pikolive.core.monsterhunting.manager.MonsterDataManager; +import com.pikolive.core.noble.AllServiceGiftProtocol; +import com.pikolive.core.noble.NobleInfo; +import com.pikolive.core.noble.NobleResourceType; +import com.pikolive.core.noble.NobleUtil; +import com.pikolive.core.patriarch.event.CloseMinRoomEvent; +import com.pikolive.core.patriarch.event.ImPushMsgPmLimitTimeEvent; +import com.pikolive.core.patriarch.event.PmDismissAllLimitDialogEvent; +import com.pikolive.core.patriarch.exception.PmRoomLimitException; +import com.pikolive.core.redpackage.RedPackageNotifyInfo; +import com.pikolive.core.room.anotherroompk.ShowGiftDialogEvent; +import com.pikolive.core.room.bean.RoomInfo; +import com.pikolive.core.room.bean.RoomModeType; +import com.pikolive.core.room.dragonball.DragonBallModel; +import com.pikolive.core.room.event.FinishAvRoomEvent; +import com.pikolive.core.room.event.RoomExitEvent; +import com.pikolive.core.room.event.RoomTaskTipsEvent; +import com.pikolive.core.room.pk.event.PKStateEvent; +import com.pikolive.core.admin.util.SAdminOptUtil; +import com.pikolive.core.admin.util.SuperAdminUtil; +import com.pikolive.core.support.room.RoomContext; +import com.pikolive.core.support.room.RoomView; +import com.pikolive.core2.treasurefairy.FairyMsgInfoBean; +import com.pikolive.core.user.UserModel; +import com.pikolive.core.user.bean.FirstChargeInfo; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.utils.LogUtils; +import com.pikolive.core.utils.StringUtils; import com.pikolive.library.base.factory.CreatePresenter; import com.pikolive.library.rxbus.RxBus; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/main/java/com/pikolive/app/avroom/activity/CpRoomInviteActivity.java b/app/src/main/java/com/pikolive/app/avroom/activity/CpRoomInviteActivity.java index 6736dc8c9..a324f38bb 100644 --- a/app/src/main/java/com/pikolive/app/avroom/activity/CpRoomInviteActivity.java +++ b/app/src/main/java/com/pikolive/app/avroom/activity/CpRoomInviteActivity.java @@ -7,13 +7,13 @@ import com.yizhuan.erban.R; import com.pikolive.app.base.BaseBindingActivity; import com.yizhuan.erban.databinding.ActivityCpRoomInviteBinding; import com.yizhuan.erban.public_chat_hall.event.AitFriendEvent; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.room.model.RoomSettingModel; -import com.yizhuan.xchat_android_core.share.bean.SessionType; -import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core2.manager.IMNetEaseManager; +import com.pikolive.core.room.bean.RoomInfo; +import com.pikolive.core.room.model.RoomSettingModel; +import com.pikolive.core.share.bean.SessionType; +import com.pikolive.core.utils.net.DontWarnObserver; import com.pikolive.library.annatation.ActLayoutRes; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/main/java/com/pikolive/app/avroom/activity/CreatePKActivity.java b/app/src/main/java/com/pikolive/app/avroom/activity/CreatePKActivity.java index 3f5d5969f..591b67919 100644 --- a/app/src/main/java/com/pikolive/app/avroom/activity/CreatePKActivity.java +++ b/app/src/main/java/com/pikolive/app/avroom/activity/CreatePKActivity.java @@ -22,11 +22,11 @@ import com.pikolive.app.avroom.dialog.PKTimePickerDialog; import com.pikolive.app.base.BaseMvpActivity; import com.pikolive.app.base.TitleBar; import com.pikolive.app.common.widget.dialog.DialogManager; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.room.pk.bean.PKMemberInfo; -import com.yizhuan.xchat_android_core.room.pk.bean.PKTeamInfo; -import com.yizhuan.xchat_android_core.room.pk.model.PkModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core.room.pk.bean.PKMemberInfo; +import com.pikolive.core.room.pk.bean.PKTeamInfo; +import com.pikolive.core.room.pk.model.PkModel; +import com.pikolive.core.user.bean.UserInfo; import com.pikolive.library.base.factory.CreatePresenter; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/main/java/com/pikolive/app/avroom/activity/RecordForPKActivity.java b/app/src/main/java/com/pikolive/app/avroom/activity/RecordForPKActivity.java index d5e2a7523..714dc9e44 100644 --- a/app/src/main/java/com/pikolive/app/avroom/activity/RecordForPKActivity.java +++ b/app/src/main/java/com/pikolive/app/avroom/activity/RecordForPKActivity.java @@ -18,7 +18,7 @@ import com.pikolive.app.avroom.view.IRecordForPKView; import com.pikolive.app.base.BaseMvpActivity; import com.pikolive.app.common.util.Utils; import com.pikolive.app.ui.widget.recyclerview.decoration.ColorDecoration; -import com.yizhuan.xchat_android_core.room.pk.bean.PKRecordInfo; +import com.pikolive.core.room.pk.bean.PKRecordInfo; import com.pikolive.library.base.factory.CreatePresenter; import com.pikolive.library.utils.ListUtils; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/main/java/com/pikolive/app/avroom/activity/RoomBlackListActivity.java b/app/src/main/java/com/pikolive/app/avroom/activity/RoomBlackListActivity.java index 309651a17..002faa782 100644 --- a/app/src/main/java/com/pikolive/app/avroom/activity/RoomBlackListActivity.java +++ b/app/src/main/java/com/pikolive/app/avroom/activity/RoomBlackListActivity.java @@ -17,14 +17,14 @@ import com.yizhuan.erban.R; import com.pikolive.app.avroom.adapter.RoomNormalListAdapter; import com.pikolive.app.base.BaseMvpActivity; import com.pikolive.app.common.widget.dialog.DialogManager; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.im.room.IIMRoomCoreClient; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.room.model.AvRoomModel; -import com.yizhuan.xchat_android_core.super_admin.model.SuperAdminModel; -import com.yizhuan.xchat_android_core.super_admin.util.SuperAdminUtil; -import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.im.room.IIMRoomCoreClient; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core.room.bean.RoomInfo; +import com.pikolive.core.room.model.AvRoomModel; +import com.pikolive.core.admin.model.SuperAdminModel; +import com.pikolive.core.admin.util.SuperAdminUtil; +import com.pikolive.core.utils.net.DontWarnObserver; import com.pikolive.library.base.factory.CreatePresenter; import com.pikolive.library.coremanager.CoreEvent; import com.pikolive.library.utils.JavaUtil; diff --git a/app/src/main/java/com/pikolive/app/avroom/activity/RoomInviteActivity.java b/app/src/main/java/com/pikolive/app/avroom/activity/RoomInviteActivity.java index bf67ed158..14ac36c26 100644 --- a/app/src/main/java/com/pikolive/app/avroom/activity/RoomInviteActivity.java +++ b/app/src/main/java/com/pikolive/app/avroom/activity/RoomInviteActivity.java @@ -18,10 +18,10 @@ import com.scwang.smartrefresh.layout.listener.OnRefreshLoadmoreListener; import com.yizhuan.erban.R; import com.pikolive.app.avroom.adapter.RoomInviteAdapter; import com.pikolive.app.base.BaseMvpActivity; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.noble.NobleResourceType; -import com.yizhuan.xchat_android_core.room.bean.OnlineChatMember; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.pikolive.core.Constants; +import com.pikolive.core.noble.NobleResourceType; +import com.pikolive.core.room.bean.OnlineChatMember; +import com.pikolive.core.user.bean.UserInfo; import com.pikolive.library.base.factory.CreatePresenter; import com.pikolive.library.utils.ListUtils; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/main/java/com/pikolive/app/avroom/activity/RoomManagerListActivity.java b/app/src/main/java/com/pikolive/app/avroom/activity/RoomManagerListActivity.java index 574121036..b656891b2 100644 --- a/app/src/main/java/com/pikolive/app/avroom/activity/RoomManagerListActivity.java +++ b/app/src/main/java/com/pikolive/app/avroom/activity/RoomManagerListActivity.java @@ -16,8 +16,8 @@ import com.pikolive.app.avroom.adapter.RoomNormalListAdapter; import com.pikolive.app.avroom.view.IRoomManagerView; import com.pikolive.app.base.BaseMvpActivity; import com.pikolive.app.common.widget.dialog.DialogManager; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core.room.bean.RoomInfo; import com.pikolive.library.base.factory.CreatePresenter; import com.pikolive.library.utils.ListUtils; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/main/java/com/pikolive/app/avroom/activity/RoomOnlineUserActivity.java b/app/src/main/java/com/pikolive/app/avroom/activity/RoomOnlineUserActivity.java index dfc1efce9..01c915c8c 100644 --- a/app/src/main/java/com/pikolive/app/avroom/activity/RoomOnlineUserActivity.java +++ b/app/src/main/java/com/pikolive/app/avroom/activity/RoomOnlineUserActivity.java @@ -8,8 +8,8 @@ import com.pikolive.app.avroom.fragment.OnlineUserFragment; import com.yizhuan.erban.R; import com.pikolive.app.base.BaseBindingActivity; import com.yizhuan.erban.databinding.ActivityRoomOnlineUserBinding; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core.room.bean.RoomInfo; import com.pikolive.library.annatation.ActLayoutRes; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/main/java/com/pikolive/app/avroom/activity/RoomRankListActivity.java b/app/src/main/java/com/pikolive/app/avroom/activity/RoomRankListActivity.java index 3ee03971e..b82f9daaf 100644 --- a/app/src/main/java/com/pikolive/app/avroom/activity/RoomRankListActivity.java +++ b/app/src/main/java/com/pikolive/app/avroom/activity/RoomRankListActivity.java @@ -13,7 +13,7 @@ import com.pikolive.app.avroom.fragment.RoomContributeListFragment; import com.yizhuan.erban.R; import com.pikolive.app.base.BaseBindingActivity; import com.yizhuan.erban.databinding.ActivityRoomRankListBinding; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; +import com.pikolive.core.manager.AvRoomDataManager; import com.pikolive.library.annatation.ActLayoutRes; import java.util.ArrayList; diff --git a/app/src/main/java/com/pikolive/app/avroom/activity/RoomSettingActivity.java b/app/src/main/java/com/pikolive/app/avroom/activity/RoomSettingActivity.java index 88e853fb2..59577c9b2 100644 --- a/app/src/main/java/com/pikolive/app/avroom/activity/RoomSettingActivity.java +++ b/app/src/main/java/com/pikolive/app/avroom/activity/RoomSettingActivity.java @@ -26,26 +26,26 @@ import com.pikolive.app.common.widget.dialog.DialogManager; import com.yizhuan.erban.databinding.ActivityRoomSettingBinding; import com.pikolive.app.ui.webview.CommonWebViewActivity; import com.pikolive.app.utils.RegexUtil; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.auth.event.KickOutEvent; -import com.yizhuan.xchat_android_core.bean.RoomQueueInfo; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomNoticeAttachment; -import com.yizhuan.xchat_android_core.kick.KickModel; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.manager.RoomEvent; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomMessageViewNoticeInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomSettingTabInfo; -import com.yizhuan.xchat_android_core.room.bean.SingleRoomSortInfo; -import com.yizhuan.xchat_android_core.room.giftvalue.GiftValueModel; -import com.yizhuan.xchat_android_core.room.giftvalue.helper.GiftValueMrg; -import com.yizhuan.xchat_android_core.room.model.AvRoomModel; -import com.yizhuan.xchat_android_core.room.model.RoomSettingModel; -import com.yizhuan.xchat_android_core.room.queue.bean.MicMemberInfo; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; +import com.pikolive.core2.UriProvider; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.auth.event.KickOutEvent; +import com.pikolive.core.bean.RoomQueueInfo; +import com.pikolive.core.im.custom.bean.CustomAttachment; +import com.pikolive.core.im.custom.bean.RoomNoticeAttachment; +import com.pikolive.core.kick.KickModel; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core2.manager.IMNetEaseManager; +import com.pikolive.core.manager.RoomEvent; +import com.pikolive.core.room.bean.RoomInfo; +import com.pikolive.core.room.bean.RoomMessageViewNoticeInfo; +import com.pikolive.core.room.bean.RoomSettingTabInfo; +import com.pikolive.core.room.bean.SingleRoomSortInfo; +import com.pikolive.core.room.giftvalue.GiftValueModel; +import com.pikolive.core.room.giftvalue.helper.GiftValueMrg; +import com.pikolive.core.room.model.AvRoomModel; +import com.pikolive.core.room.model.RoomSettingModel; +import com.pikolive.core.room.queue.bean.MicMemberInfo; +import com.pikolive.core.utils.net.BeanObserver; import com.pikolive.library.base.factory.CreatePresenter; import com.pikolive.library.net.rxnet.callback.CallBack; import com.pikolive.library.utils.CommonUtils; diff --git a/app/src/main/java/com/pikolive/app/avroom/activity/RoomTitleEditActivity.java b/app/src/main/java/com/pikolive/app/avroom/activity/RoomTitleEditActivity.java index 8a39c445f..1ed452588 100644 --- a/app/src/main/java/com/pikolive/app/avroom/activity/RoomTitleEditActivity.java +++ b/app/src/main/java/com/pikolive/app/avroom/activity/RoomTitleEditActivity.java @@ -12,10 +12,10 @@ import com.yizhuan.erban.R; import com.pikolive.app.base.BaseBindingActivity; import com.pikolive.app.common.widget.dialog.DialogManager; import com.yizhuan.erban.databinding.ActivityRoomTitleEditBinding; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.room.model.RoomSettingModel; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core.room.bean.RoomInfo; +import com.pikolive.core.room.model.RoomSettingModel; import com.pikolive.library.annatation.ActLayoutRes; import com.pikolive.library.utils.ResUtil; import com.pikolive.library.utils.SingleToastUtil; diff --git a/app/src/main/java/com/pikolive/app/avroom/adapter/AuctionListItem.java b/app/src/main/java/com/pikolive/app/avroom/adapter/AuctionListItem.java index 4059006c6..1ca76765c 100644 --- a/app/src/main/java/com/pikolive/app/avroom/adapter/AuctionListItem.java +++ b/app/src/main/java/com/pikolive/app/avroom/adapter/AuctionListItem.java @@ -12,7 +12,7 @@ import android.widget.TextView; import com.yizhuan.erban.R; import com.pikolive.app.common.widget.CircleImageView; import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.room.auction.bean.AuctionListUserInfo; +import com.pikolive.core.room.auction.bean.AuctionListUserInfo; import com.pikolive.library.list.BaseGroupItem; import com.pikolive.library.list.ViewHolder; diff --git a/app/src/main/java/com/pikolive/app/avroom/adapter/BaseMicroViewAdapter.java b/app/src/main/java/com/pikolive/app/avroom/adapter/BaseMicroViewAdapter.java index eb9af4fa5..08dcc8d5b 100644 --- a/app/src/main/java/com/pikolive/app/avroom/adapter/BaseMicroViewAdapter.java +++ b/app/src/main/java/com/pikolive/app/avroom/adapter/BaseMicroViewAdapter.java @@ -25,21 +25,21 @@ import com.pikolive.app.ui.utils.ImageLoadUtils; import com.pikolive.app.ui.webview.DialogWebViewActivity; import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil; import com.pikolive.app.utils.RegexUtil; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.bean.RoomMicInfo; -import com.yizhuan.xchat_android_core.bean.RoomQueueInfo; -import com.yizhuan.xchat_android_core.decoration.headwear.bean.HeadWearInfo; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.noble.NobleResourceType; -import com.yizhuan.xchat_android_core.noble.NobleUtil; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.room.giftvalue.bean.GiftValueData; -import com.yizhuan.xchat_android_core.room.giftvalue.helper.GiftValueFormat; -import com.yizhuan.xchat_android_core.room.pk.bean.PKTeamInfo; -import com.yizhuan.xchat_android_core.room.queue.bean.MicMemberInfo; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.utils.ActivityUtil; -import com.yizhuan.xchat_android_core.utils.StringExtensionKt; +import com.pikolive.core2.UriProvider; +import com.pikolive.core.bean.RoomMicInfo; +import com.pikolive.core.bean.RoomQueueInfo; +import com.pikolive.core.decoration.headwear.bean.HeadWearInfo; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core.noble.NobleResourceType; +import com.pikolive.core.noble.NobleUtil; +import com.pikolive.core.room.bean.RoomInfo; +import com.pikolive.core.room.giftvalue.bean.GiftValueData; +import com.pikolive.core.room.giftvalue.helper.GiftValueFormat; +import com.pikolive.core.room.pk.bean.PKTeamInfo; +import com.pikolive.core.room.queue.bean.MicMemberInfo; +import com.pikolive.core.user.UserModel; +import com.pikolive.core.utils.ActivityUtil; +import com.pikolive.core.utils.StringExtensionKt; import com.pikolive.library.utils.ResUtil; import com.pikolive.library.utils.config.BasicConfig; diff --git a/app/src/main/java/com/pikolive/app/avroom/adapter/CpMicroViewAdapter.java b/app/src/main/java/com/pikolive/app/avroom/adapter/CpMicroViewAdapter.java index 8dcd1040c..07889196a 100644 --- a/app/src/main/java/com/pikolive/app/avroom/adapter/CpMicroViewAdapter.java +++ b/app/src/main/java/com/pikolive/app/avroom/adapter/CpMicroViewAdapter.java @@ -12,7 +12,7 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.bean.RoomQueueInfo; +import com.pikolive.core.bean.RoomQueueInfo; import com.pikolive.library.utils.ResUtil; public class CpMicroViewAdapter extends BaseMicroViewAdapter { diff --git a/app/src/main/java/com/pikolive/app/avroom/adapter/CreateRoomGameAdapter.kt b/app/src/main/java/com/pikolive/app/avroom/adapter/CreateRoomGameAdapter.kt index d06968516..cb5575537 100644 --- a/app/src/main/java/com/pikolive/app/avroom/adapter/CreateRoomGameAdapter.kt +++ b/app/src/main/java/com/pikolive/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.pikolive.app.ui.utils.load import com.yizhuan.erban.R -import com.yizhuan.xchat_android_core.room.game.GameInfo +import com.pikolive.core.room.game.GameInfo class CreateRoomGameAdapter : BaseQuickAdapter(R.layout.item_room_create_game) { diff --git a/app/src/main/java/com/pikolive/app/avroom/adapter/CreateRoomGameGuideAdapter.kt b/app/src/main/java/com/pikolive/app/avroom/adapter/CreateRoomGameGuideAdapter.kt index 81159a2b8..0b8f24054 100644 --- a/app/src/main/java/com/pikolive/app/avroom/adapter/CreateRoomGameGuideAdapter.kt +++ b/app/src/main/java/com/pikolive/app/avroom/adapter/CreateRoomGameGuideAdapter.kt @@ -5,7 +5,7 @@ import com.chad.library.adapter.base.BaseViewHolder import com.yizhuan.erban.R import com.pikolive.library.common.glide.GlideUtils import com.pikolive.app.ui.utils.ImageLoadUtilsV2 -import com.yizhuan.xchat_android_core.room.game.GameInfo +import com.pikolive.core.room.game.GameInfo class CreateRoomGameGuideAdapter : BaseQuickAdapter(R.layout.item_room_create_game_guide) { diff --git a/app/src/main/java/com/pikolive/app/avroom/adapter/DatingMicroViewAdapter.kt b/app/src/main/java/com/pikolive/app/avroom/adapter/DatingMicroViewAdapter.kt index d78e9f7ab..80c63c01e 100644 --- a/app/src/main/java/com/pikolive/app/avroom/adapter/DatingMicroViewAdapter.kt +++ b/app/src/main/java/com/pikolive/app/avroom/adapter/DatingMicroViewAdapter.kt @@ -15,10 +15,10 @@ import androidx.recyclerview.widget.RecyclerView import com.pikolive.app.ui.utils.load import com.yizhuan.erban.R import com.pikolive.app.utils.UserUtils -import com.yizhuan.xchat_android_core.Constants -import com.yizhuan.xchat_android_core.bean.RoomQueueInfo -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager -import com.yizhuan.xchat_android_core.room.bean.RoomInfo +import com.pikolive.core.Constants +import com.pikolive.core.bean.RoomQueueInfo +import com.pikolive.core.manager.AvRoomDataManager +import com.pikolive.core.room.bean.RoomInfo import com.pikolive.library.utils.ResUtil diff --git a/app/src/main/java/com/pikolive/app/avroom/adapter/ExitRoomAdapter.kt b/app/src/main/java/com/pikolive/app/avroom/adapter/ExitRoomAdapter.kt index b236d03ca..a8559a188 100644 --- a/app/src/main/java/com/pikolive/app/avroom/adapter/ExitRoomAdapter.kt +++ b/app/src/main/java/com/pikolive/app/avroom/adapter/ExitRoomAdapter.kt @@ -4,8 +4,8 @@ import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder import com.yizhuan.erban.R import com.pikolive.app.ui.utils.ImageLoadUtils -import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo -import com.yizhuan.xchat_android_core.utils.subAndReplaceDot +import com.pikolive.core.utils.subAndReplaceDot +import com.pikolive.core2.home.bean.HomeRoomInfo class ExitRoomAdapter : BaseQuickAdapter(R.layout.item_exit_room) { diff --git a/app/src/main/java/com/pikolive/app/avroom/adapter/GameMicroViewAdapter.kt b/app/src/main/java/com/pikolive/app/avroom/adapter/GameMicroViewAdapter.kt index cca7c251b..19c99f053 100644 --- a/app/src/main/java/com/pikolive/app/avroom/adapter/GameMicroViewAdapter.kt +++ b/app/src/main/java/com/pikolive/app/avroom/adapter/GameMicroViewAdapter.kt @@ -12,8 +12,8 @@ import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.netease.nim.uikit.common.util.sys.ScreenUtil import com.yizhuan.erban.R -import com.yizhuan.xchat_android_core.bean.RoomQueueInfo -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager +import com.pikolive.core.bean.RoomQueueInfo +import com.pikolive.core.manager.AvRoomDataManager import com.pikolive.library.utils.ResUtil diff --git a/app/src/main/java/com/pikolive/app/avroom/adapter/GameMiniMicroViewAdapter.kt b/app/src/main/java/com/pikolive/app/avroom/adapter/GameMiniMicroViewAdapter.kt index d6e480785..b53b2fd71 100644 --- a/app/src/main/java/com/pikolive/app/avroom/adapter/GameMiniMicroViewAdapter.kt +++ b/app/src/main/java/com/pikolive/app/avroom/adapter/GameMiniMicroViewAdapter.kt @@ -8,8 +8,8 @@ import android.view.ViewGroup import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.yizhuan.erban.R -import com.yizhuan.xchat_android_core.bean.RoomQueueInfo -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager +import com.pikolive.core.bean.RoomQueueInfo +import com.pikolive.core.manager.AvRoomDataManager /** diff --git a/app/src/main/java/com/pikolive/app/avroom/adapter/InviteFriendListAdapter.java b/app/src/main/java/com/pikolive/app/avroom/adapter/InviteFriendListAdapter.java index f05529391..da1d96aa4 100644 --- a/app/src/main/java/com/pikolive/app/avroom/adapter/InviteFriendListAdapter.java +++ b/app/src/main/java/com/pikolive/app/avroom/adapter/InviteFriendListAdapter.java @@ -14,8 +14,8 @@ import com.yizhuan.erban.public_chat_hall.bean.PublicChatHallFriendInfo; import com.yizhuan.erban.public_chat_hall.event.AitFriendEvent; import com.pikolive.app.ui.utils.ImageLoadUtils; import com.pikolive.app.ui.widget.NobleAvatarView; -import com.yizhuan.xchat_android_core.noble.NobleUtil; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.pikolive.core.noble.NobleUtil; +import com.pikolive.core.user.bean.UserInfo; import com.pikolive.library.utils.ResUtil; import com.pikolive.library.utils.SingleToastUtil; diff --git a/app/src/main/java/com/pikolive/app/avroom/adapter/MicQueueAdapter.java b/app/src/main/java/com/pikolive/app/avroom/adapter/MicQueueAdapter.java index 5128f9ebb..bb0aa87c8 100644 --- a/app/src/main/java/com/pikolive/app/avroom/adapter/MicQueueAdapter.java +++ b/app/src/main/java/com/pikolive/app/avroom/adapter/MicQueueAdapter.java @@ -10,10 +10,10 @@ import com.chad.library.adapter.base.BaseViewHolder; import com.netease.nim.uikit.support.glide.GlideApp; import com.yizhuan.erban.R; import com.pikolive.app.common.widget.CircleImageView; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.room.queuing_mic.bean.GroupType; -import com.yizhuan.xchat_android_core.room.queuing_mic.bean.QueuingMicMemeberInfo; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core.room.queuing_mic.bean.GroupType; +import com.pikolive.core.room.queuing_mic.bean.QueuingMicMemeberInfo; +import com.pikolive.core.user.bean.UserInfo; import com.pikolive.library.utils.ResUtil; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/avroom/adapter/MicroViewAdapter.java b/app/src/main/java/com/pikolive/app/avroom/adapter/MicroViewAdapter.java index e776ae3ab..bb4d23c96 100644 --- a/app/src/main/java/com/pikolive/app/avroom/adapter/MicroViewAdapter.java +++ b/app/src/main/java/com/pikolive/app/avroom/adapter/MicroViewAdapter.java @@ -12,8 +12,8 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.bean.RoomQueueInfo; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; +import com.pikolive.core.bean.RoomQueueInfo; +import com.pikolive.core.manager.AvRoomDataManager; import com.pikolive.library.utils.ResUtil; /** diff --git a/app/src/main/java/com/pikolive/app/avroom/adapter/OnMicroItemClickListener.java b/app/src/main/java/com/pikolive/app/avroom/adapter/OnMicroItemClickListener.java index 5b095c03d..ba8dc6dec 100644 --- a/app/src/main/java/com/pikolive/app/avroom/adapter/OnMicroItemClickListener.java +++ b/app/src/main/java/com/pikolive/app/avroom/adapter/OnMicroItemClickListener.java @@ -1,6 +1,6 @@ package com.pikolive.app.avroom.adapter; -import com.yizhuan.xchat_android_core.room.queue.bean.MicMemberInfo; +import com.pikolive.core.room.queue.bean.MicMemberInfo; /** * Created by lvzebiao on 2018/11/5. diff --git a/app/src/main/java/com/pikolive/app/avroom/adapter/OnlineUserAdapter.java b/app/src/main/java/com/pikolive/app/avroom/adapter/OnlineUserAdapter.java index 4ce8b7d03..459aa7a23 100644 --- a/app/src/main/java/com/pikolive/app/avroom/adapter/OnlineUserAdapter.java +++ b/app/src/main/java/com/pikolive/app/avroom/adapter/OnlineUserAdapter.java @@ -20,15 +20,15 @@ import com.yizhuan.erban.R; import com.pikolive.app.ui.utils.ImageLoadUtils; import com.pikolive.app.ui.widget.NobleAvatarView; import com.pikolive.app.utils.RegexUtil; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.level.UserLevelResourceType; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.manager.RoomEvent; -import com.yizhuan.xchat_android_core.noble.NobleResourceType; -import com.yizhuan.xchat_android_core.noble.NobleUtil; -import com.yizhuan.xchat_android_core.room.bean.OnlineChatMember; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.level.UserLevelResourceType; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core2.manager.IMNetEaseManager; +import com.pikolive.core.manager.RoomEvent; +import com.pikolive.core.noble.NobleResourceType; +import com.pikolive.core.noble.NobleUtil; +import com.pikolive.core.room.bean.OnlineChatMember; +import com.pikolive.core.user.bean.UserInfo; import com.pikolive.library.utils.ListUtils; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/avroom/adapter/PKMicQueueAdapter.java b/app/src/main/java/com/pikolive/app/avroom/adapter/PKMicQueueAdapter.java index dd2ec1db4..91bdeeae4 100644 --- a/app/src/main/java/com/pikolive/app/avroom/adapter/PKMicQueueAdapter.java +++ b/app/src/main/java/com/pikolive/app/avroom/adapter/PKMicQueueAdapter.java @@ -10,10 +10,10 @@ import com.chad.library.adapter.base.BaseViewHolder; import com.netease.nim.uikit.support.glide.GlideApp; import com.yizhuan.erban.R; import com.pikolive.app.common.widget.CircleImageView; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.room.pk.bean.PKQueuingMicMemberInfo; -import com.yizhuan.xchat_android_core.room.pk.bean.PKTeamInfo; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core.room.pk.bean.PKQueuingMicMemberInfo; +import com.pikolive.core.room.pk.bean.PKTeamInfo; +import com.pikolive.core.user.bean.UserInfo; import com.pikolive.library.utils.ResUtil; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/avroom/adapter/RecordForPKAdapter.java b/app/src/main/java/com/pikolive/app/avroom/adapter/RecordForPKAdapter.java index 8dd278fa8..0ba5ea938 100644 --- a/app/src/main/java/com/pikolive/app/avroom/adapter/RecordForPKAdapter.java +++ b/app/src/main/java/com/pikolive/app/avroom/adapter/RecordForPKAdapter.java @@ -11,10 +11,10 @@ import androidx.annotation.Nullable; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.room.pk.bean.PKRecordInfo; -import com.yizhuan.xchat_android_core.room.pk.bean.PKTeamInfo; -import com.yizhuan.xchat_android_core.room.pk.bean.PKTeamMember; -import com.yizhuan.xchat_android_core.room.pk.bean.RoomPkData; +import com.pikolive.core.room.pk.bean.PKRecordInfo; +import com.pikolive.core.room.pk.bean.PKTeamInfo; +import com.pikolive.core.room.pk.bean.PKTeamMember; +import com.pikolive.core.room.pk.bean.RoomPkData; import com.pikolive.library.utils.FormatUtils; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/main/java/com/pikolive/app/avroom/adapter/RoomConsumeListAdapter.java b/app/src/main/java/com/pikolive/app/avroom/adapter/RoomConsumeListAdapter.java index ad5cd71d6..723381a1d 100644 --- a/app/src/main/java/com/pikolive/app/avroom/adapter/RoomConsumeListAdapter.java +++ b/app/src/main/java/com/pikolive/app/avroom/adapter/RoomConsumeListAdapter.java @@ -17,10 +17,10 @@ import com.pikolive.app.ui.utils.ImageLoadUtils; import com.pikolive.app.ui.widget.NobleAvatarView; import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil; import com.pikolive.app.utils.RegexUtil; -import com.yizhuan.xchat_android_core.noble.NobleInfo; -import com.yizhuan.xchat_android_core.noble.NobleUtil; -import com.yizhuan.xchat_android_core.room.bean.RoomContributeUserInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomRankMultiItem; +import com.pikolive.core.noble.NobleInfo; +import com.pikolive.core.noble.NobleUtil; +import com.pikolive.core.room.bean.RoomContributeUserInfo; +import com.pikolive.core.room.bean.RoomRankMultiItem; import com.pikolive.library.utils.ResUtil; import java.math.BigDecimal; diff --git a/app/src/main/java/com/pikolive/app/avroom/adapter/RoomConsumerListAdapterTemp.java b/app/src/main/java/com/pikolive/app/avroom/adapter/RoomConsumerListAdapterTemp.java index c34fc3491..12ab73441 100644 --- a/app/src/main/java/com/pikolive/app/avroom/adapter/RoomConsumerListAdapterTemp.java +++ b/app/src/main/java/com/pikolive/app/avroom/adapter/RoomConsumerListAdapterTemp.java @@ -15,8 +15,8 @@ import com.yizhuan.erban.R; import com.pikolive.app.common.widget.CircleImageView; import com.pikolive.app.ui.utils.ImageLoadUtils; import com.pikolive.app.utils.RegexUtil; -import com.yizhuan.xchat_android_core.room.bean.RoomContributeUserInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomRankMultiItem; +import com.pikolive.core.room.bean.RoomContributeUserInfo; +import com.pikolive.core.room.bean.RoomRankMultiItem; import java.util.ArrayList; diff --git a/app/src/main/java/com/pikolive/app/avroom/adapter/RoomInviteAdapter.java b/app/src/main/java/com/pikolive/app/avroom/adapter/RoomInviteAdapter.java index da7d2d34a..f02b7abff 100644 --- a/app/src/main/java/com/pikolive/app/avroom/adapter/RoomInviteAdapter.java +++ b/app/src/main/java/com/pikolive/app/avroom/adapter/RoomInviteAdapter.java @@ -18,9 +18,9 @@ import com.netease.nimlib.sdk.uinfo.model.NimUserInfo; import com.pikolive.app.avroom.ChatMemberDiffUtilCallback; import com.yizhuan.erban.R; import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.manager.RoomEvent; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core2.manager.IMNetEaseManager; +import com.pikolive.core.manager.RoomEvent; import com.pikolive.library.utils.ListUtils; import java.util.ArrayList; diff --git a/app/src/main/java/com/pikolive/app/avroom/adapter/RoomRankHalfHourListAdapter.java b/app/src/main/java/com/pikolive/app/avroom/adapter/RoomRankHalfHourListAdapter.java index a130ef474..fe50259bc 100644 --- a/app/src/main/java/com/pikolive/app/avroom/adapter/RoomRankHalfHourListAdapter.java +++ b/app/src/main/java/com/pikolive/app/avroom/adapter/RoomRankHalfHourListAdapter.java @@ -9,8 +9,8 @@ import com.pikolive.app.avroom.fragment.RoomRankDialogUtils; import com.yizhuan.erban.R; import com.pikolive.app.common.widget.CircleImageView; import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.room.bean.RoomRankHalfHourRankInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomRankMultiItem; +import com.pikolive.core.room.bean.RoomRankHalfHourRankInfo; +import com.pikolive.core.room.bean.RoomRankMultiItem; import java.util.ArrayList; diff --git a/app/src/main/java/com/pikolive/app/avroom/adapter/SelectGameAdapter.kt b/app/src/main/java/com/pikolive/app/avroom/adapter/SelectGameAdapter.kt index 3889edda3..7765a0af7 100644 --- a/app/src/main/java/com/pikolive/app/avroom/adapter/SelectGameAdapter.kt +++ b/app/src/main/java/com/pikolive/app/avroom/adapter/SelectGameAdapter.kt @@ -3,7 +3,7 @@ package com.pikolive.app.avroom.adapter import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder import com.yizhuan.erban.R -import com.yizhuan.xchat_android_core.room.game.GameInfo +import com.pikolive.core.room.game.GameInfo class SelectGameAdapter : BaseQuickAdapter(R.layout.item_room_select_game) { diff --git a/app/src/main/java/com/pikolive/app/avroom/adapter/SingleAnchorMicroViewAdapter.kt b/app/src/main/java/com/pikolive/app/avroom/adapter/SingleAnchorMicroViewAdapter.kt index 3e6a16417..4ef3b0a68 100644 --- a/app/src/main/java/com/pikolive/app/avroom/adapter/SingleAnchorMicroViewAdapter.kt +++ b/app/src/main/java/com/pikolive/app/avroom/adapter/SingleAnchorMicroViewAdapter.kt @@ -11,7 +11,7 @@ import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.RecyclerView import com.opensource.svgaplayer.SVGAImageView import com.yizhuan.erban.R -import com.yizhuan.xchat_android_core.bean.RoomQueueInfo +import com.pikolive.core.bean.RoomQueueInfo /** * @author xiaoyu diff --git a/app/src/main/java/com/pikolive/app/avroom/adapter/SingleRoomPKMicroViewAdapter.kt b/app/src/main/java/com/pikolive/app/avroom/adapter/SingleRoomPKMicroViewAdapter.kt index 8f5669d07..6d51192b6 100644 --- a/app/src/main/java/com/pikolive/app/avroom/adapter/SingleRoomPKMicroViewAdapter.kt +++ b/app/src/main/java/com/pikolive/app/avroom/adapter/SingleRoomPKMicroViewAdapter.kt @@ -13,10 +13,10 @@ import androidx.recyclerview.widget.RecyclerView import com.yizhuan.erban.R import com.pikolive.app.common.widget.CircleImageView import com.pikolive.app.ui.utils.ImageLoadUtils -import com.yizhuan.xchat_android_core.bean.RoomQueueInfo -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager -import com.yizhuan.xchat_android_core.praise.PraiseModel -import com.yizhuan.xchat_android_core.utils.toast +import com.pikolive.core.bean.RoomQueueInfo +import com.pikolive.core.manager.AvRoomDataManager +import com.pikolive.core.praise.PraiseModel +import com.pikolive.core.utils.toast import com.pikolive.library.utils.ResUtil import com.pikolive.library.utils.config.BasicConfig diff --git a/app/src/main/java/com/pikolive/app/avroom/adapter/UpMicAdapter.java b/app/src/main/java/com/pikolive/app/avroom/adapter/UpMicAdapter.java index 2df04f7fd..a63b072b7 100644 --- a/app/src/main/java/com/pikolive/app/avroom/adapter/UpMicAdapter.java +++ b/app/src/main/java/com/pikolive/app/avroom/adapter/UpMicAdapter.java @@ -8,9 +8,9 @@ import android.widget.TextView; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.bean.RoomQueueInfo; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; +import com.pikolive.core.Constants; +import com.pikolive.core.bean.RoomQueueInfo; +import com.pikolive.core.manager.AvRoomDataManager; import com.pikolive.library.utils.ResUtil; import java.util.ArrayList; diff --git a/app/src/main/java/com/pikolive/app/avroom/anotherroompk/RoomPKBoardView.kt b/app/src/main/java/com/pikolive/app/avroom/anotherroompk/RoomPKBoardView.kt index 304c352c1..2b9f32a00 100644 --- a/app/src/main/java/com/pikolive/app/avroom/anotherroompk/RoomPKBoardView.kt +++ b/app/src/main/java/com/pikolive/app/avroom/anotherroompk/RoomPKBoardView.kt @@ -20,12 +20,12 @@ import com.yizhuan.erban.R import com.pikolive.app.common.widget.DragLayout import com.yizhuan.erban.databinding.LayoutRoomPkBoardViewBinding import com.pikolive.app.ui.utils.ImageLoadUtils -import com.yizhuan.xchat_android_core.im.custom.bean.RoomPkBean -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager -import com.yizhuan.xchat_android_core.room.anotherroompk.ShowGiftDialogEvent -import com.yizhuan.xchat_android_core.room.anotherroompk.ShowUserInfoDialogEvent -import com.yizhuan.xchat_android_core.utils.CurrentTimeUtils -import com.yizhuan.xchat_android_core.utils.subAndReplaceDot +import com.pikolive.core.im.custom.bean.RoomPkBean +import com.pikolive.core.manager.AvRoomDataManager +import com.pikolive.core.room.anotherroompk.ShowGiftDialogEvent +import com.pikolive.core.room.anotherroompk.ShowUserInfoDialogEvent +import com.pikolive.core.utils.CurrentTimeUtils +import com.pikolive.core.utils.subAndReplaceDot import com.pikolive.library.rxbus.RxBus import com.pikolive.library.utils.CommonUtils import io.reactivex.Observable @@ -71,13 +71,21 @@ class RoomPKBoardView @JvmOverloads constructor( binding.ivAvatarLeft.setOnClickListener { roomPkBean?.let { - RxBus.get().post(ShowUserInfoDialogEvent(it.cUid.toString())) + RxBus.get().post( + ShowUserInfoDialogEvent( + it.cUid.toString() + ) + ) } } binding.ivAvatarRight.setOnClickListener { roomPkBean?.let { - RxBus.get().post(ShowUserInfoDialogEvent(it.aUid.toString())) + RxBus.get().post( + ShowUserInfoDialogEvent( + it.aUid.toString() + ) + ) } } diff --git a/app/src/main/java/com/pikolive/app/avroom/anotherroompk/RoomPKCreateActivity.kt b/app/src/main/java/com/pikolive/app/avroom/anotherroompk/RoomPKCreateActivity.kt index ef323dc89..24204b841 100644 --- a/app/src/main/java/com/pikolive/app/avroom/anotherroompk/RoomPKCreateActivity.kt +++ b/app/src/main/java/com/pikolive/app/avroom/anotherroompk/RoomPKCreateActivity.kt @@ -12,14 +12,14 @@ import com.pikolive.app.base.BaseViewBindingActivity import com.yizhuan.erban.databinding.ActivityRoomPkCreateBinding import com.pikolive.app.ui.utils.ImageLoadUtils import com.pikolive.app.ui.widget.TextWatcherSimple -import com.yizhuan.xchat_android_core.auth.AuthModel -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager -import com.yizhuan.xchat_android_core.room.anotherroompk.RoomPKModel -import com.yizhuan.xchat_android_core.room.anotherroompk.SimpleRoomInfo -import com.yizhuan.xchat_android_core.utils.ifNotNullOrEmpty -import com.yizhuan.xchat_android_core.utils.subAndReplaceDot -import com.yizhuan.xchat_android_core.utils.toIntOrDef -import com.yizhuan.xchat_android_core.utils.toast +import com.pikolive.core.auth.AuthModel +import com.pikolive.core.manager.AvRoomDataManager +import com.pikolive.core.room.anotherroompk.RoomPKModel +import com.pikolive.core.room.anotherroompk.SimpleRoomInfo +import com.pikolive.core.utils.ifNotNullOrEmpty +import com.pikolive.core.utils.subAndReplaceDot +import com.pikolive.core.utils.toIntOrDef +import com.pikolive.core.utils.toast import com.pikolive.library.utils.ResUtil class RoomPKCreateActivity : BaseViewBindingActivity() { diff --git a/app/src/main/java/com/pikolive/app/avroom/anotherroompk/RoomPKRankListView.kt b/app/src/main/java/com/pikolive/app/avroom/anotherroompk/RoomPKRankListView.kt index d4263d64d..1ef9b523d 100644 --- a/app/src/main/java/com/pikolive/app/avroom/anotherroompk/RoomPKRankListView.kt +++ b/app/src/main/java/com/pikolive/app/avroom/anotherroompk/RoomPKRankListView.kt @@ -8,8 +8,8 @@ import androidx.core.view.isGone import com.yizhuan.erban.R import com.yizhuan.erban.databinding.LayoutRoomPkRankListViewBinding import com.pikolive.app.ui.utils.ImageLoadUtils -import com.yizhuan.xchat_android_core.im.custom.bean.RoomPkBean -import com.yizhuan.xchat_android_core.room.anotherroompk.ShowUserInfoDialogEvent +import com.pikolive.core.im.custom.bean.RoomPkBean +import com.pikolive.core.room.anotherroompk.ShowUserInfoDialogEvent import com.pikolive.library.rxbus.RxBus class RoomPKRankListView @JvmOverloads constructor( @@ -26,7 +26,11 @@ class RoomPKRankListView @JvmOverloads constructor( ivAvatars.forEach { ivAvatar -> ivAvatar.setOnClickListener { ivAvatar.tag?.toString()?.let { - RxBus.get().post(ShowUserInfoDialogEvent(it)) + RxBus.get().post( + ShowUserInfoDialogEvent( + it + ) + ) } } } diff --git a/app/src/main/java/com/pikolive/app/avroom/anotherroompk/RoomPKSearchActivity.kt b/app/src/main/java/com/pikolive/app/avroom/anotherroompk/RoomPKSearchActivity.kt index 1fe3e589f..456d2c61d 100644 --- a/app/src/main/java/com/pikolive/app/avroom/anotherroompk/RoomPKSearchActivity.kt +++ b/app/src/main/java/com/pikolive/app/avroom/anotherroompk/RoomPKSearchActivity.kt @@ -13,10 +13,10 @@ import com.pikolive.app.common.EmptyViewHelper import com.yizhuan.erban.databinding.ActivityRoomPkSearchBinding import com.pikolive.app.ui.user.activity.UserInfoActivity import com.pikolive.app.ui.utils.RVDelegate -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager -import com.yizhuan.xchat_android_core.room.anotherroompk.RoomPKModel -import com.yizhuan.xchat_android_core.room.anotherroompk.SimpleRoomInfo -import com.yizhuan.xchat_android_core.utils.toast +import com.pikolive.core.manager.AvRoomDataManager +import com.pikolive.core.room.anotherroompk.RoomPKModel +import com.pikolive.core.room.anotherroompk.SimpleRoomInfo +import com.pikolive.core.utils.toast import com.pikolive.library.utils.ResUtil class RoomPKSearchActivity : BaseViewBindingActivity() { diff --git a/app/src/main/java/com/pikolive/app/avroom/anotherroompk/RoomPKSearchAdapter.kt b/app/src/main/java/com/pikolive/app/avroom/anotherroompk/RoomPKSearchAdapter.kt index a664a46a7..cfa203116 100644 --- a/app/src/main/java/com/pikolive/app/avroom/anotherroompk/RoomPKSearchAdapter.kt +++ b/app/src/main/java/com/pikolive/app/avroom/anotherroompk/RoomPKSearchAdapter.kt @@ -4,8 +4,8 @@ import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder import com.yizhuan.erban.R import com.pikolive.app.ui.utils.ImageLoadUtils -import com.yizhuan.xchat_android_core.room.anotherroompk.SimpleRoomInfo -import com.yizhuan.xchat_android_core.utils.subAndReplaceDot +import com.pikolive.core.room.anotherroompk.SimpleRoomInfo +import com.pikolive.core.utils.subAndReplaceDot class RoomPKSearchAdapter : BaseQuickAdapter(R.layout.item_room_pk_search) { diff --git a/app/src/main/java/com/pikolive/app/avroom/anotherroompk/RoomPkFinishDialog.kt b/app/src/main/java/com/pikolive/app/avroom/anotherroompk/RoomPkFinishDialog.kt index 10ca6ffa8..1dba77b62 100644 --- a/app/src/main/java/com/pikolive/app/avroom/anotherroompk/RoomPkFinishDialog.kt +++ b/app/src/main/java/com/pikolive/app/avroom/anotherroompk/RoomPkFinishDialog.kt @@ -8,8 +8,8 @@ import com.yizhuan.erban.R import com.pikolive.app.base.BaseDialog import com.yizhuan.erban.databinding.DialogRoomPkFinishBinding import com.pikolive.app.ui.utils.ImageLoadUtils -import com.yizhuan.xchat_android_core.im.custom.bean.RoomPkBean -import com.yizhuan.xchat_android_core.utils.subAndReplaceDot +import com.pikolive.core.im.custom.bean.RoomPkBean +import com.pikolive.core.utils.subAndReplaceDot class RoomPkFinishDialog : BaseDialog() { diff --git a/app/src/main/java/com/pikolive/app/avroom/anotherroompk/RoomPkForceFinishDialog.kt b/app/src/main/java/com/pikolive/app/avroom/anotherroompk/RoomPkForceFinishDialog.kt index 397c9a32e..664e5d94b 100644 --- a/app/src/main/java/com/pikolive/app/avroom/anotherroompk/RoomPkForceFinishDialog.kt +++ b/app/src/main/java/com/pikolive/app/avroom/anotherroompk/RoomPkForceFinishDialog.kt @@ -7,8 +7,8 @@ import com.yizhuan.erban.R import com.pikolive.app.base.BaseDialog import com.yizhuan.erban.databinding.DialogRoomPkForceFinishBinding import com.pikolive.app.ui.utils.ImageLoadUtils -import com.yizhuan.xchat_android_core.im.custom.bean.RoomPkBean -import com.yizhuan.xchat_android_core.utils.subAndReplaceDot +import com.pikolive.core.im.custom.bean.RoomPkBean +import com.pikolive.core.utils.subAndReplaceDot class RoomPkForceFinishDialog : BaseDialog() { diff --git a/app/src/main/java/com/pikolive/app/avroom/anotherroompk/RoomPkReceivedDialog.kt b/app/src/main/java/com/pikolive/app/avroom/anotherroompk/RoomPkReceivedDialog.kt index ca9410ce1..9b5a248b9 100644 --- a/app/src/main/java/com/pikolive/app/avroom/anotherroompk/RoomPkReceivedDialog.kt +++ b/app/src/main/java/com/pikolive/app/avroom/anotherroompk/RoomPkReceivedDialog.kt @@ -5,12 +5,12 @@ import android.os.Bundle import androidx.core.view.isVisible import com.pikolive.app.base.BaseDialog import com.yizhuan.erban.databinding.DialogRoomPkReceivedBinding -import com.yizhuan.xchat_android_core.im.custom.bean.RoomPkBean -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager -import com.yizhuan.xchat_android_core.room.anotherroompk.RoomPKModel -import com.yizhuan.xchat_android_core.utils.ifNotNullOrEmpty -import com.yizhuan.xchat_android_core.utils.subAndReplaceDot -import com.yizhuan.xchat_android_core.utils.toast +import com.pikolive.core.im.custom.bean.RoomPkBean +import com.pikolive.core.manager.AvRoomDataManager +import com.pikolive.core.room.anotherroompk.RoomPKModel +import com.pikolive.core.utils.ifNotNullOrEmpty +import com.pikolive.core.utils.subAndReplaceDot +import com.pikolive.core.utils.toast import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.Disposable diff --git a/app/src/main/java/com/pikolive/app/avroom/core/AudioRoomContext.kt b/app/src/main/java/com/pikolive/app/avroom/core/AudioRoomContext.kt index 0a4c7f89d..64aac43ec 100644 --- a/app/src/main/java/com/pikolive/app/avroom/core/AudioRoomContext.kt +++ b/app/src/main/java/com/pikolive/app/avroom/core/AudioRoomContext.kt @@ -1,8 +1,8 @@ package com.pikolive.app.avroom.core import com.pikolive.app.avroom.redpackage.RedPackageHandler -import com.yizhuan.xchat_android_core.support.room.RoomAbility -import com.yizhuan.xchat_android_core.support.room.RoomContext +import com.pikolive.core.support.room.RoomAbility +import com.pikolive.core.support.room.RoomContext /** * Created by Max on 2023/10/26 15:41 diff --git a/app/src/main/java/com/pikolive/app/avroom/dialog/AttentionHintDialog.java b/app/src/main/java/com/pikolive/app/avroom/dialog/AttentionHintDialog.java index f73149dc4..8f5821565 100644 --- a/app/src/main/java/com/pikolive/app/avroom/dialog/AttentionHintDialog.java +++ b/app/src/main/java/com/pikolive/app/avroom/dialog/AttentionHintDialog.java @@ -7,8 +7,8 @@ import android.widget.TextView; import com.yizhuan.erban.R; import com.pikolive.app.base.BaseBsDialog; import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.praise.PraiseModel; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core.praise.PraiseModel; import com.pikolive.library.utils.ResUtil; import com.pikolive.library.utils.SingleToastUtil; diff --git a/app/src/main/java/com/pikolive/app/avroom/dialog/CreateGameRoomDialog.kt b/app/src/main/java/com/pikolive/app/avroom/dialog/CreateGameRoomDialog.kt index b4d770f5b..e6bd08f75 100644 --- a/app/src/main/java/com/pikolive/app/avroom/dialog/CreateGameRoomDialog.kt +++ b/app/src/main/java/com/pikolive/app/avroom/dialog/CreateGameRoomDialog.kt @@ -9,9 +9,9 @@ import com.pikolive.app.base.BaseDialog import com.yizhuan.erban.databinding.DialogCreateGameRoomBinding import com.pikolive.app.home.helper.OpenRoomHelper import com.pikolive.app.ui.utils.RVDelegate -import com.yizhuan.xchat_android_core.room.bean.RoomInfo -import com.yizhuan.xchat_android_core.room.game.GameInfo -import com.yizhuan.xchat_android_core.room.game.GameModel +import com.pikolive.core.room.bean.RoomInfo +import com.pikolive.core.room.game.GameInfo +import com.pikolive.core.room.game.GameModel class CreateGameRoomDialog : BaseDialog() { diff --git a/app/src/main/java/com/pikolive/app/avroom/dialog/CreateRoomDialog.kt b/app/src/main/java/com/pikolive/app/avroom/dialog/CreateRoomDialog.kt index 6188b72b9..5e1cd87f5 100644 --- a/app/src/main/java/com/pikolive/app/avroom/dialog/CreateRoomDialog.kt +++ b/app/src/main/java/com/pikolive/app/avroom/dialog/CreateRoomDialog.kt @@ -12,10 +12,10 @@ import com.pikolive.app.base.BaseDialog import com.yizhuan.erban.databinding.DialogCreateRoomBinding import com.pikolive.app.home.helper.OpenRoomHelper import com.pikolive.app.ui.utils.RVDelegate -import com.yizhuan.xchat_android_core.room.bean.RoomInfo -import com.yizhuan.xchat_android_core.room.game.GameInfo -import com.yizhuan.xchat_android_core.room.game.GameModel -import com.yizhuan.xchat_android_core.utils.toast +import com.pikolive.core.room.bean.RoomInfo +import com.pikolive.core.room.game.GameInfo +import com.pikolive.core.room.game.GameModel +import com.pikolive.core.utils.toast import com.pikolive.library.utils.ResUtil class CreateRoomDialog : BaseDialog() { diff --git a/app/src/main/java/com/pikolive/app/avroom/dialog/ExitRoomPopupWindow.kt b/app/src/main/java/com/pikolive/app/avroom/dialog/ExitRoomPopupWindow.kt index 5a64c5d2a..df18da394 100644 --- a/app/src/main/java/com/pikolive/app/avroom/dialog/ExitRoomPopupWindow.kt +++ b/app/src/main/java/com/pikolive/app/avroom/dialog/ExitRoomPopupWindow.kt @@ -18,9 +18,9 @@ import com.yizhuan.erban.R import com.pikolive.app.common.widget.dialog.DialogManager.LambdaOkDialogListener import com.pikolive.app.common.widget.dialog.DialogManager.OkCancelDialogListener import com.pikolive.app.ui.utils.RVDelegate -import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager -import com.yizhuan.xchat_android_core.room.model.AvRoomModel +import com.pikolive.core.manager.AvRoomDataManager +import com.pikolive.core.room.model.AvRoomModel +import com.pikolive.core2.home.bean.HomeRoomInfo import com.pikolive.library.annatation.ActLayoutRes import com.pikolive.library.utils.ResUtil import io.reactivex.disposables.Disposable diff --git a/app/src/main/java/com/pikolive/app/avroom/dialog/MicQueueDialog.java b/app/src/main/java/com/pikolive/app/avroom/dialog/MicQueueDialog.java index ccadfad08..58745872f 100644 --- a/app/src/main/java/com/pikolive/app/avroom/dialog/MicQueueDialog.java +++ b/app/src/main/java/com/pikolive/app/avroom/dialog/MicQueueDialog.java @@ -27,19 +27,19 @@ import com.pikolive.app.common.util.Utils; import com.pikolive.app.home.helper.LoadPageDataHelper; import com.pikolive.app.ui.widget.dialog.BaseDialog; import com.pikolive.app.ui.widget.recyclerview.decoration.ColorDecoration; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.bean.RoomQueueInfo; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.room.giftvalue.helper.GiftValueMrg; -import com.yizhuan.xchat_android_core.room.model.HomePartyModel; -import com.yizhuan.xchat_android_core.room.model.MicQueueModel; -import com.yizhuan.xchat_android_core.room.queuing_mic.bean.GroupType; -import com.yizhuan.xchat_android_core.room.queuing_mic.bean.QueuingMicMemeberInfo; -import com.yizhuan.xchat_android_core.room.queuing_mic.bean.RespQueuingMicListInfo; -import com.yizhuan.xchat_android_core.user.bean.BaseInfo; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; +import com.pikolive.core.Constants; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.bean.RoomQueueInfo; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core.room.bean.RoomInfo; +import com.pikolive.core.room.giftvalue.helper.GiftValueMrg; +import com.pikolive.core.room.model.HomePartyModel; +import com.pikolive.core.room.model.MicQueueModel; +import com.pikolive.core.room.queuing_mic.bean.GroupType; +import com.pikolive.core.room.queuing_mic.bean.QueuingMicMemeberInfo; +import com.pikolive.core.room.queuing_mic.bean.RespQueuingMicListInfo; +import com.pikolive.core.user.bean.BaseInfo; +import com.pikolive.core.utils.net.BeanObserver; import com.pikolive.library.net.rxnet.callback.CallBack; import com.pikolive.library.utils.CommonUtils; import com.pikolive.library.utils.JavaUtil; diff --git a/app/src/main/java/com/pikolive/app/avroom/dialog/NewUserGiftDialog.kt b/app/src/main/java/com/pikolive/app/avroom/dialog/NewUserGiftDialog.kt index 4e63038ac..7491b5d5e 100644 --- a/app/src/main/java/com/pikolive/app/avroom/dialog/NewUserGiftDialog.kt +++ b/app/src/main/java/com/pikolive/app/avroom/dialog/NewUserGiftDialog.kt @@ -3,7 +3,7 @@ package com.pikolive.app.avroom.dialog import com.pikolive.app.base.BaseDialog import com.pikolive.app.ui.utils.load import com.yizhuan.erban.databinding.DialogNewUserGiftBinding -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo +import com.pikolive.core.gift.bean.GiftInfo class NewUserGiftDialog(val giftInfo: GiftInfo) : BaseDialog() { diff --git a/app/src/main/java/com/pikolive/app/avroom/dialog/PKMicQueueDialog.java b/app/src/main/java/com/pikolive/app/avroom/dialog/PKMicQueueDialog.java index 136c4d87c..e2dac7450 100644 --- a/app/src/main/java/com/pikolive/app/avroom/dialog/PKMicQueueDialog.java +++ b/app/src/main/java/com/pikolive/app/avroom/dialog/PKMicQueueDialog.java @@ -27,18 +27,18 @@ import com.pikolive.app.ui.widget.dialog.BaseDialog; import com.pikolive.app.ui.widget.dialog.CommonLoadingDialog; import com.pikolive.app.common.util.Utils; import com.pikolive.app.ui.widget.recyclerview.decoration.ColorDecoration; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.bean.RoomQueueInfo; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.room.pk.bean.PKMemberInfo; -import com.yizhuan.xchat_android_core.room.pk.bean.PKQueuingMicMemberInfo; -import com.yizhuan.xchat_android_core.room.pk.bean.PKRespQueuingMicListInfo; -import com.yizhuan.xchat_android_core.room.pk.bean.PKTeamInfo; -import com.yizhuan.xchat_android_core.room.pk.bean.RoomPKInvitedUpMicMember; -import com.yizhuan.xchat_android_core.room.pk.model.PkModel; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; +import com.pikolive.core.Constants; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.bean.RoomQueueInfo; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core.room.bean.RoomInfo; +import com.pikolive.core.room.pk.bean.PKMemberInfo; +import com.pikolive.core.room.pk.bean.PKQueuingMicMemberInfo; +import com.pikolive.core.room.pk.bean.PKRespQueuingMicListInfo; +import com.pikolive.core.room.pk.bean.PKTeamInfo; +import com.pikolive.core.room.pk.bean.RoomPKInvitedUpMicMember; +import com.pikolive.core.room.pk.model.PkModel; +import com.pikolive.core.utils.net.BeanObserver; import com.pikolive.library.utils.JavaUtil; import com.pikolive.library.utils.ListUtils; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/main/java/com/pikolive/app/avroom/dialog/PKResultDialog.java b/app/src/main/java/com/pikolive/app/avroom/dialog/PKResultDialog.java index 8a7a499ba..e6777c20a 100644 --- a/app/src/main/java/com/pikolive/app/avroom/dialog/PKResultDialog.java +++ b/app/src/main/java/com/pikolive/app/avroom/dialog/PKResultDialog.java @@ -23,10 +23,10 @@ import com.pikolive.app.common.widget.CircleImageView; import com.pikolive.app.ui.widget.dialog.BaseDialog; import com.pikolive.app.common.util.Utils; import com.pikolive.app.ui.widget.recyclerview.decoration.ColorDecoration; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.room.pk.bean.PKTeamInfo; -import com.yizhuan.xchat_android_core.room.pk.bean.PKTeamMember; -import com.yizhuan.xchat_android_core.room.pk.bean.RoomPkData; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.room.pk.bean.PKTeamInfo; +import com.pikolive.core.room.pk.bean.PKTeamMember; +import com.pikolive.core.room.pk.bean.RoomPkData; import com.pikolive.library.utils.FormatUtils; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/main/java/com/pikolive/app/avroom/dialog/PKScoreBoardDialog.java b/app/src/main/java/com/pikolive/app/avroom/dialog/PKScoreBoardDialog.java index 2d3f9f26b..3d6089f78 100644 --- a/app/src/main/java/com/pikolive/app/avroom/dialog/PKScoreBoardDialog.java +++ b/app/src/main/java/com/pikolive/app/avroom/dialog/PKScoreBoardDialog.java @@ -11,18 +11,18 @@ import com.yizhuan.erban.R; import com.pikolive.app.common.widget.CircleImageView; import com.pikolive.app.ui.widget.dialog.BaseDialog; import com.pikolive.app.ui.widget.dialog.CommonTipDialog; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.manager.RoomEvent; -import com.yizhuan.xchat_android_core.room.pk.bean.PKMemberInfo; -import com.yizhuan.xchat_android_core.room.pk.bean.PKTeamInfo; -import com.yizhuan.xchat_android_core.room.pk.bean.PKTeamMember; -import com.yizhuan.xchat_android_core.room.pk.bean.RoomPkData; -import com.yizhuan.xchat_android_core.room.pk.event.PKDataUpdateEvent; -import com.yizhuan.xchat_android_core.room.pk.event.PKTimeFinishEvent; -import com.yizhuan.xchat_android_core.room.pk.event.PKTimeTickEvent; -import com.yizhuan.xchat_android_core.room.pk.model.PkModel; -import com.yizhuan.xchat_android_core.super_admin.util.SuperAdminUtil; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core2.manager.IMNetEaseManager; +import com.pikolive.core.manager.RoomEvent; +import com.pikolive.core.room.pk.bean.PKMemberInfo; +import com.pikolive.core.room.pk.bean.PKTeamInfo; +import com.pikolive.core.room.pk.bean.PKTeamMember; +import com.pikolive.core.room.pk.bean.RoomPkData; +import com.pikolive.core.room.pk.event.PKDataUpdateEvent; +import com.pikolive.core.room.pk.event.PKTimeFinishEvent; +import com.pikolive.core.room.pk.event.PKTimeTickEvent; +import com.pikolive.core.room.pk.model.PkModel; +import com.pikolive.core.admin.util.SuperAdminUtil; import com.pikolive.library.utils.FormatUtils; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/main/java/com/pikolive/app/avroom/dialog/PKSelectPeopleDialog.java b/app/src/main/java/com/pikolive/app/avroom/dialog/PKSelectPeopleDialog.java index 828190910..9e4369c26 100644 --- a/app/src/main/java/com/pikolive/app/avroom/dialog/PKSelectPeopleDialog.java +++ b/app/src/main/java/com/pikolive/app/avroom/dialog/PKSelectPeopleDialog.java @@ -19,11 +19,11 @@ import com.yizhuan.erban.R; import com.pikolive.app.common.widget.CircleImageView; import com.pikolive.app.ui.widget.dialog.BaseDialog; import com.pikolive.app.common.util.Utils; -import com.yizhuan.xchat_android_core.bean.RoomQueueInfo; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.room.pk.bean.PKMemberInfo; -import com.yizhuan.xchat_android_core.room.pk.model.PkModel; -import com.yizhuan.xchat_android_core.room.queue.bean.MicMemberInfo; +import com.pikolive.core.bean.RoomQueueInfo; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core.room.pk.bean.PKMemberInfo; +import com.pikolive.core.room.pk.model.PkModel; +import com.pikolive.core.room.queue.bean.MicMemberInfo; import com.pikolive.library.utils.ResUtil; import java.util.ArrayList; diff --git a/app/src/main/java/com/pikolive/app/avroom/dialog/RequestUpMicDialog.kt b/app/src/main/java/com/pikolive/app/avroom/dialog/RequestUpMicDialog.kt index b05d3310f..19e63e4c0 100644 --- a/app/src/main/java/com/pikolive/app/avroom/dialog/RequestUpMicDialog.kt +++ b/app/src/main/java/com/pikolive/app/avroom/dialog/RequestUpMicDialog.kt @@ -2,13 +2,13 @@ package com.pikolive.app.avroom.dialog import android.content.Context import android.view.View +import com.pikolive.core.manager.AvRoomDataManager +import com.pikolive.core.user.bean.BaseInfo +import com.pikolive.core.user.bean.UserInfo +import com.pikolive.core2.manager.IMNetEaseManager import com.yizhuan.erban.R import com.yizhuan.erban.databinding.DialogRequestUpmicBinding import com.yizhuan.erban.treasure_box.widget.dialog.BaseBindingDialog -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager -import com.yizhuan.xchat_android_core.user.bean.BaseInfo -import com.yizhuan.xchat_android_core.user.bean.UserInfo import com.pikolive.library.annatation.ActLayoutRes @ActLayoutRes(R.layout.dialog_request_upmic) @@ -27,7 +27,8 @@ class RequestUpMicDialog(context: Context) : } R.id.btn_ok -> { userInfo?.let { - val baseInfo = BaseInfo(it.uid, it.nick) + val baseInfo = + BaseInfo(it.uid, it.nick) val position = AvRoomDataManager.get().findFreePosition() if ( position == Int.MIN_VALUE) return@let IMNetEaseManager.get().inviteMicroPhoneBySdk(baseInfo, position ).subscribe() diff --git a/app/src/main/java/com/pikolive/app/avroom/dialog/RoomFreeGiftDialog.java b/app/src/main/java/com/pikolive/app/avroom/dialog/RoomFreeGiftDialog.java index 53d9dc62b..373a1d2d0 100644 --- a/app/src/main/java/com/pikolive/app/avroom/dialog/RoomFreeGiftDialog.java +++ b/app/src/main/java/com/pikolive/app/avroom/dialog/RoomFreeGiftDialog.java @@ -13,7 +13,7 @@ import com.google.android.material.bottomsheet.BottomSheetDialog; import com.yizhuan.erban.R; import com.yizhuan.erban.databinding.DialogRoomFreeGiftBinding; import com.pikolive.app.ui.utils.ImageLoadUtilsV2; -import com.yizhuan.xchat_android_core.gift.bean.GiftFreeInfo; +import com.pikolive.core.gift.bean.GiftFreeInfo; import com.pikolive.library.utils.TimeUtils; /** diff --git a/app/src/main/java/com/pikolive/app/avroom/dialog/RoomImposeDialog.java b/app/src/main/java/com/pikolive/app/avroom/dialog/RoomImposeDialog.java index 6cb34b015..bd02fddfc 100644 --- a/app/src/main/java/com/pikolive/app/avroom/dialog/RoomImposeDialog.java +++ b/app/src/main/java/com/pikolive/app/avroom/dialog/RoomImposeDialog.java @@ -20,11 +20,11 @@ import com.yizhuan.erban.R; import com.yizhuan.erban.databinding.DialogRoomImposeBinding; import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil; import com.pikolive.app.common.util.Utils; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.room.model.RoomSettingModel; -import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core.room.bean.RoomInfo; +import com.pikolive.core.room.model.RoomSettingModel; +import com.pikolive.core.utils.net.DontWarnObserver; import com.pikolive.library.utils.ResUtil; import com.pikolive.library.utils.SingleToastUtil; import com.pikolive.library.utils.codec.DESUtils; diff --git a/app/src/main/java/com/pikolive/app/avroom/dialog/RoomOperationDialog.java b/app/src/main/java/com/pikolive/app/avroom/dialog/RoomOperationDialog.java index ec829c93d..6e980eb8a 100644 --- a/app/src/main/java/com/pikolive/app/avroom/dialog/RoomOperationDialog.java +++ b/app/src/main/java/com/pikolive/app/avroom/dialog/RoomOperationDialog.java @@ -33,27 +33,27 @@ import com.pikolive.app.ui.widget.recyclerview.decoration.ColorDecoration; import com.pikolive.app.ui.widget.recyclerview.layoutmanager.FullyGridLayoutManager; import com.pikolive.app.vip.dialog.VipBroadcastDialog; import com.yizhuan.tutu.room_chat.activity.RoomInviteFansActivity; -import com.yizhuan.xchat_android_constants.XChatConstants; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomPkBean; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.redpackage.RedPackageModel; -import com.yizhuan.xchat_android_core.room.anotherroompk.SingleRoomPKModel; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.room.event.RoomExitEvent; -import com.yizhuan.xchat_android_core.room.event.RoomShieldEvent; -import com.yizhuan.xchat_android_core.room.giftvalue.GiftValueModel; -import com.yizhuan.xchat_android_core.room.model.AvRoomModel; -import com.yizhuan.xchat_android_core.room.model.HomePartyModel; -import com.yizhuan.xchat_android_core.room.queuing_mic.event.HasAnimationEffect; -import com.yizhuan.xchat_android_core.super_admin.model.SuperAdminModel; -import com.yizhuan.xchat_android_core.super_admin.util.SuperAdminUtil; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.utils.CurrentTimeUtils; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; -import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core2.XChatConstants; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.im.custom.bean.RoomPkBean; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core2.manager.IMNetEaseManager; +import com.pikolive.core.redpackage.RedPackageModel; +import com.pikolive.core.room.anotherroompk.SingleRoomPKModel; +import com.pikolive.core.room.bean.RoomInfo; +import com.pikolive.core.room.event.RoomExitEvent; +import com.pikolive.core.room.event.RoomShieldEvent; +import com.pikolive.core.room.giftvalue.GiftValueModel; +import com.pikolive.core.room.model.AvRoomModel; +import com.pikolive.core.room.model.HomePartyModel; +import com.pikolive.core.room.queuing_mic.event.HasAnimationEffect; +import com.pikolive.core.admin.model.SuperAdminModel; +import com.pikolive.core.admin.util.SuperAdminUtil; +import com.pikolive.core.user.UserModel; +import com.pikolive.core.utils.CurrentTimeUtils; +import com.pikolive.core.utils.net.BeanObserver; +import com.pikolive.core.utils.net.DontWarnObserver; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.utils.ResUtil; import com.pikolive.library.utils.SingleToastUtil; diff --git a/app/src/main/java/com/pikolive/app/avroom/dialog/SendBroadcastDialog.kt b/app/src/main/java/com/pikolive/app/avroom/dialog/SendBroadcastDialog.kt index 5644d9bcd..cd27ba9ec 100644 --- a/app/src/main/java/com/pikolive/app/avroom/dialog/SendBroadcastDialog.kt +++ b/app/src/main/java/com/pikolive/app/avroom/dialog/SendBroadcastDialog.kt @@ -13,10 +13,10 @@ import com.pikolive.app.base.BaseDialog import com.yizhuan.erban.databinding.DialogSendBroadcastBinding import com.pikolive.app.ui.utils.RVDelegate import com.pikolive.app.utils.SpannableBuilder -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager -import com.yizhuan.xchat_android_core.room.bean.BroadcastInfo -import com.yizhuan.xchat_android_core.room.model.AvRoomModel -import com.yizhuan.xchat_android_core.utils.toast +import com.pikolive.core.manager.AvRoomDataManager +import com.pikolive.core.room.bean.BroadcastInfo +import com.pikolive.core.room.model.AvRoomModel +import com.pikolive.core.utils.toast import com.pikolive.library.utils.CommonUtils import com.pikolive.library.utils.TextWatcherWrapper import io.reactivex.Observable diff --git a/app/src/main/java/com/pikolive/app/avroom/firstcharge/FirstChargeDialog.kt b/app/src/main/java/com/pikolive/app/avroom/firstcharge/FirstChargeDialog.kt index ec3c5b885..5efedb464 100644 --- a/app/src/main/java/com/pikolive/app/avroom/firstcharge/FirstChargeDialog.kt +++ b/app/src/main/java/com/pikolive/app/avroom/firstcharge/FirstChargeDialog.kt @@ -31,17 +31,17 @@ import com.pikolive.app.ui.pay.BillingManager import com.pikolive.app.ui.setting.ModifyPwdActivity import com.pikolive.app.ui.webview.CommonWebViewActivity import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil -import com.yizhuan.xchat_android_core.Constants -import com.yizhuan.xchat_android_core.DemoCache -import com.yizhuan.xchat_android_core.UriProvider -import com.yizhuan.xchat_android_core.pay.PayModel -import com.yizhuan.xchat_android_core.pay.bean.FirstChargeGoods -import com.yizhuan.xchat_android_core.pay.bean.FirstChargeReward -import com.yizhuan.xchat_android_core.pay.bean.PayRecordId -import com.yizhuan.xchat_android_core.pay.event.FirstChargeEvent -import com.yizhuan.xchat_android_core.room.model.AvRoomModel -import com.yizhuan.xchat_android_core.utils.net.IgnoreException -import com.yizhuan.xchat_android_core.utils.toast +import com.pikolive.core.Constants +import com.pikolive.core.DemoCache +import com.pikolive.core.pay.PayModel +import com.pikolive.core.pay.bean.FirstChargeGoods +import com.pikolive.core.pay.bean.FirstChargeReward +import com.pikolive.core.pay.bean.PayRecordId +import com.pikolive.core.pay.event.FirstChargeEvent +import com.pikolive.core.room.model.AvRoomModel +import com.pikolive.core.utils.net.IgnoreException +import com.pikolive.core.utils.toast +import com.pikolive.core2.UriProvider import com.pikolive.library.common.util.DeviceUtil import com.pikolive.library.utils.AppMetaDataUtil import com.pikolive.library.utils.ResUtil diff --git a/app/src/main/java/com/pikolive/app/avroom/firstcharge/FirstChargePrizeDialog.kt b/app/src/main/java/com/pikolive/app/avroom/firstcharge/FirstChargePrizeDialog.kt index b641b50fc..746c8b4cc 100644 --- a/app/src/main/java/com/pikolive/app/avroom/firstcharge/FirstChargePrizeDialog.kt +++ b/app/src/main/java/com/pikolive/app/avroom/firstcharge/FirstChargePrizeDialog.kt @@ -9,7 +9,7 @@ import com.yizhuan.erban.R import com.yizhuan.erban.databinding.DialogFirstChargePrizeBinding import com.yizhuan.erban.treasure_box.widget.dialog.BaseBindingDialog import com.pikolive.app.ui.utils.RVDelegate -import com.yizhuan.xchat_android_core.pay.bean.FirstChargeReward +import com.pikolive.core.pay.bean.FirstChargeReward import com.pikolive.library.annatation.ActLayoutRes @ActLayoutRes(R.layout.dialog_first_charge_prize) diff --git a/app/src/main/java/com/pikolive/app/avroom/firstcharge/Reward2Adapter.kt b/app/src/main/java/com/pikolive/app/avroom/firstcharge/Reward2Adapter.kt index c2cfd1ceb..080e0d237 100644 --- a/app/src/main/java/com/pikolive/app/avroom/firstcharge/Reward2Adapter.kt +++ b/app/src/main/java/com/pikolive/app/avroom/firstcharge/Reward2Adapter.kt @@ -4,8 +4,8 @@ import com.chad.library.adapter.base.BaseMultiItemQuickAdapter import com.chad.library.adapter.base.BaseViewHolder import com.yizhuan.erban.R import com.pikolive.app.ui.utils.ImageLoadUtils -import com.yizhuan.xchat_android_core.pay.bean.FirstChargeReward -import com.yizhuan.xchat_android_core.utils.TextUtils +import com.pikolive.core.pay.bean.FirstChargeReward +import com.pikolive.core.utils.TextUtils class Reward2Adapter : BaseMultiItemQuickAdapter(null) { diff --git a/app/src/main/java/com/pikolive/app/avroom/firstcharge/RewardAdapter.kt b/app/src/main/java/com/pikolive/app/avroom/firstcharge/RewardAdapter.kt index a6540f6a0..4d33d90b5 100644 --- a/app/src/main/java/com/pikolive/app/avroom/firstcharge/RewardAdapter.kt +++ b/app/src/main/java/com/pikolive/app/avroom/firstcharge/RewardAdapter.kt @@ -7,8 +7,8 @@ import com.chad.library.adapter.base.BaseViewHolder import com.netease.nim.uikit.common.util.sys.ScreenUtil import com.yizhuan.erban.R import com.pikolive.app.ui.utils.ImageLoadUtils -import com.yizhuan.xchat_android_core.pay.bean.FirstChargeReward -import com.yizhuan.xchat_android_core.utils.TextUtils +import com.pikolive.core.pay.bean.FirstChargeReward +import com.pikolive.core.utils.TextUtils class RewardAdapter(private val itemWidth: Int) : BaseQuickAdapter(R.layout.item_first_charge_reward) { diff --git a/app/src/main/java/com/pikolive/app/avroom/fragment/BaseRoomFragment.kt b/app/src/main/java/com/pikolive/app/avroom/fragment/BaseRoomFragment.kt index fd55903f4..639985fbf 100644 --- a/app/src/main/java/com/pikolive/app/avroom/fragment/BaseRoomFragment.kt +++ b/app/src/main/java/com/pikolive/app/avroom/fragment/BaseRoomFragment.kt @@ -61,47 +61,47 @@ import com.pikolive.app.ui.widget.rollviewpager.RollPagerView import com.pikolive.app.ui.widget.rollviewpager.Util import com.pikolive.app.ui.widget.rollviewpager.hintview.ColorPointHintView import com.pikolive.app.utils.KeyBoardUtils +import com.pikolive.core.Constants +import com.pikolive.core.DemoCache +import com.pikolive.core.admin.SaConstant +import com.pikolive.core.admin.model.SuperAdminModel +import com.pikolive.core.admin.util.SuperAdminUtil +import com.pikolive.core.auth.AuthModel +import com.pikolive.core.bean.RoomMicInfo +import com.pikolive.core.gift.GiftModel +import com.pikolive.core.gift.bean.GiftInfo +import com.pikolive.core.gift.event.RoomFreeGiftEvent +import com.pikolive.core.im.custom.bean.RoomFollowOwnerAttachment +import com.pikolive.core.im.custom.bean.RoomFollowOwnerAttachment2 +import com.pikolive.core.manager.AvRoomDataManager +import com.pikolive.core.manager.RoomEvent import com.yizhuan.tutu.music.widget.MusicPlayerView import com.yizhuan.tutu.room_chat.activity.RoomMsgActivity -import com.yizhuan.xchat_android_constants.XChatConstants -import com.yizhuan.xchat_android_core.Constants -import com.yizhuan.xchat_android_core.DemoCache -import com.yizhuan.xchat_android_core.UriProvider -import com.yizhuan.xchat_android_core.auth.AuthModel -import com.yizhuan.xchat_android_core.bean.RoomMicInfo -import com.yizhuan.xchat_android_core.gift.GiftModel -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo -import com.yizhuan.xchat_android_core.gift.event.RoomFreeGiftEvent -import com.yizhuan.xchat_android_core.helper.AtProxy -import com.yizhuan.xchat_android_core.home.bean.BannerInfo -import com.yizhuan.xchat_android_core.home.event.OpenRoomMessageInputEvent -import com.yizhuan.xchat_android_core.im.custom.bean.RoomFollowOwnerAttachment -import com.yizhuan.xchat_android_core.im.custom.bean.RoomFollowOwnerAttachment2 -import com.yizhuan.xchat_android_core.manager.AudioEngineManager -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager -import com.yizhuan.xchat_android_core.manager.RoomEvent -import com.yizhuan.xchat_android_core.mentoring_relationship.event.MentoringStopCountingEvent -import com.yizhuan.xchat_android_core.room.anotherroompk.ShowGiftDialogEvent -import com.yizhuan.xchat_android_core.room.anotherroompk.ShowUserInfoDialogEvent -import com.yizhuan.xchat_android_core.room.bean.RoomContributeUserInfo -import com.yizhuan.xchat_android_core.room.bean.RoomInfo -import com.yizhuan.xchat_android_core.room.event.RoomAtEvent -import com.yizhuan.xchat_android_core.room.event.RoomClearScreenEvent -import com.yizhuan.xchat_android_core.room.game.GameStatus -import com.yizhuan.xchat_android_core.room.giftvalue.helper.GiftValueMrg -import com.yizhuan.xchat_android_core.room.queue.bean.MicMemberInfo -import com.yizhuan.xchat_android_core.share.bean.SessionType -import com.yizhuan.xchat_android_core.super_admin.SaConstant -import com.yizhuan.xchat_android_core.super_admin.model.SuperAdminModel -import com.yizhuan.xchat_android_core.super_admin.util.SuperAdminUtil -import com.yizhuan.xchat_android_core.support.room.RoomView -import com.yizhuan.xchat_android_core.support.room.RoomWidget -import com.yizhuan.xchat_android_core.user.UserModel -import com.yizhuan.xchat_android_core.user.bean.BaseInfo -import com.yizhuan.xchat_android_core.user.bean.UserInfo -import com.yizhuan.xchat_android_core.utils.CurrentTimeUtils -import com.yizhuan.xchat_android_core.utils.net.VipLevelNotEnoughException +import com.pikolive.core2.XChatConstants +import com.pikolive.core2.home.event.OpenRoomMessageInputEvent +import com.pikolive.core.mentoring_relationship.event.MentoringStopCountingEvent +import com.pikolive.core.room.anotherroompk.ShowGiftDialogEvent +import com.pikolive.core.room.anotherroompk.ShowUserInfoDialogEvent +import com.pikolive.core.room.bean.RoomContributeUserInfo +import com.pikolive.core.room.bean.RoomInfo +import com.pikolive.core.room.event.RoomAtEvent +import com.pikolive.core.room.event.RoomClearScreenEvent +import com.pikolive.core.room.game.GameStatus +import com.pikolive.core.room.giftvalue.helper.GiftValueMrg +import com.pikolive.core.room.queue.bean.MicMemberInfo +import com.pikolive.core.share.bean.SessionType +import com.pikolive.core.support.room.RoomView +import com.pikolive.core.support.room.RoomWidget +import com.pikolive.core.user.UserModel +import com.pikolive.core.user.bean.BaseInfo +import com.pikolive.core.user.bean.UserInfo +import com.pikolive.core.utils.CurrentTimeUtils +import com.pikolive.core.utils.net.VipLevelNotEnoughException +import com.pikolive.core2.UriProvider +import com.pikolive.core2.helper.AtProxy +import com.pikolive.core2.home.bean.BannerInfo +import com.pikolive.core2.manager.AudioEngineManager +import com.pikolive.core2.manager.IMNetEaseManager import com.pikolive.library.common.util.LimitClickUtils import com.pikolive.library.common.util.SPUtils import com.pikolive.library.net.rxnet.utils.RxNetWorkUtils @@ -232,7 +232,8 @@ open class BaseRoomFragment showInputLayout() - if (atProxy == null) atProxy = AtProxy(inputEdit) + if (atProxy == null) atProxy = + AtProxy(inputEdit) atProxy?.insertAitMember(account, name) } softKeyboardListener() @@ -924,7 +925,8 @@ open class BaseRoomFragment if (aBoolean) { AudioEngineManager.get().isMute = !AudioEngineManager.get().isMute - AudioEngineManager.get().setRole(Constants.CLIENT_ROLE_BROADCASTER) + AudioEngineManager.get().setRole( + Constants.CLIENT_ROLE_BROADCASTER) updateMicBtn() } else { toast("開啟權限後才能開麥") @@ -1272,7 +1278,8 @@ open class BaseRoomFragment showToast("遊戲：公屏消息") - com.pikolive.app.avroom.game.SudMGPMGState.MG_COMMON_KEY_WORD_TO_HIT -> { + SudMGPMGState.MG_COMMON_KEY_WORD_TO_HIT -> { if (TextUtils.isEmpty(dataJson)) { setKeyWord(null) } else { @@ -364,7 +364,7 @@ class GameDelegate(val activity: Activity, val container: FrameLayout, var mgId: } } } - com.pikolive.app.avroom.game.SudMGPMGState.APP_COMMON_SELF_CLICK_JOIN_BTN -> { + SudMGPMGState.APP_COMMON_SELF_CLICK_JOIN_BTN -> { try { val jsonObject = JSONObject(dataJson) @@ -375,10 +375,10 @@ class GameDelegate(val activity: Activity, val container: FrameLayout, var mgId: } } - com.pikolive.app.avroom.game.SudMGPMGState.APP_COMMON_SELF_CLICK_START_BTN -> { + SudMGPMGState.APP_COMMON_SELF_CLICK_START_BTN -> { notifySelfPlayingState(true) } - com.pikolive.app.avroom.game.SudMGPMGState.MG_COMMON_GAME_STATE -> handleGameState(dataJson) + SudMGPMGState.MG_COMMON_GAME_STATE -> handleGameState(dataJson) } } @@ -397,10 +397,10 @@ class GameDelegate(val activity: Activity, val container: FrameLayout, var mgId: ) { Log.d(TAG, "onPlayerStateChange userId:$userId--state:$state--dataJson:$dataJson") when (state) { - com.pikolive.app.avroom.game.SudMGPMGState.MG_COMMON_PLAYER_IN -> handlePlayerIn(userId, dataJson) - com.pikolive.app.avroom.game.SudMGPMGState.MG_COMMON_PLAYER_READY -> handlePlayerReady(userId, dataJson) - com.pikolive.app.avroom.game.SudMGPMGState.MG_COMMON_PLAYER_CAPTAIN -> handlePlayerCaptain(dataJson) - com.pikolive.app.avroom.game.SudMGPMGState.MG_COMMON_PLAYER_PLAYING -> handlePlayerPlaying(userId, dataJson) + SudMGPMGState.MG_COMMON_PLAYER_IN -> handlePlayerIn(userId, dataJson) + SudMGPMGState.MG_COMMON_PLAYER_READY -> handlePlayerReady(userId, dataJson) + SudMGPMGState.MG_COMMON_PLAYER_CAPTAIN -> handlePlayerCaptain(dataJson) + SudMGPMGState.MG_COMMON_PLAYER_PLAYING -> handlePlayerPlaying(userId, dataJson) } } } @@ -534,7 +534,7 @@ class GameDelegate(val activity: Activity, val container: FrameLayout, var mgId: notifySelfReadyState(false) } //狀態名稱 - val state = com.pikolive.app.avroom.game.SudMGPAPPState.APP_COMMON_SELF_IN + val state = SudMGPAPPState.APP_COMMON_SELF_IN //狀態數據 val jsonObject = JSONObject() jsonObject.put("isIn", isIn) // true 加入遊戲，false 退出遊戲 @@ -554,7 +554,7 @@ class GameDelegate(val activity: Activity, val container: FrameLayout, var mgId: private fun notifySelfReadyState(isReady: Boolean) { try { //狀態名稱 - val state = com.pikolive.app.avroom.game.SudMGPAPPState.APP_COMMON_SELF_READY + val state = SudMGPAPPState.APP_COMMON_SELF_READY //狀態數據 val jsonObject = JSONObject() @@ -571,7 +571,7 @@ class GameDelegate(val activity: Activity, val container: FrameLayout, var mgId: private fun notifySelfPlayingState(isPlaying: Boolean) { try { //狀態名稱 - val state = com.pikolive.app.avroom.game.SudMGPAPPState.APP_COMMON_SELF_PLAYING + val state = SudMGPAPPState.APP_COMMON_SELF_PLAYING //狀態數據 val jsonObject = JSONObject() @@ -588,7 +588,7 @@ class GameDelegate(val activity: Activity, val container: FrameLayout, var mgId: private fun notifySelfCaptainState(uid: String) { try { //狀態名稱 - val state = com.pikolive.app.avroom.game.SudMGPAPPState.APP_COMMON_SELF_CAPTAIN + val state = SudMGPAPPState.APP_COMMON_SELF_CAPTAIN //狀態數據 val jsonObject = JSONObject() @@ -605,7 +605,7 @@ class GameDelegate(val activity: Activity, val container: FrameLayout, var mgId: private fun notifySelfKickState(uid: String) { try { //狀態名稱 - val state = com.pikolive.app.avroom.game.SudMGPAPPState.APP_COMMON_SELF_KICK + val state = SudMGPAPPState.APP_COMMON_SELF_KICK //狀態數據 val jsonObject = JSONObject() @@ -622,7 +622,7 @@ class GameDelegate(val activity: Activity, val container: FrameLayout, var mgId: private fun notifySelfEndState() { try { //狀態名稱 - val state = com.pikolive.app.avroom.game.SudMGPAPPState.APP_COMMON_SELF_END + val state = SudMGPAPPState.APP_COMMON_SELF_END //狀態數據 val jsonObject = JSONObject() diff --git a/app/src/main/java/com/pikolive/app/avroom/giftvalue/GiftValueDialogUiHelper.java b/app/src/main/java/com/pikolive/app/avroom/giftvalue/GiftValueDialogUiHelper.java index d96803afe..786a836b3 100644 --- a/app/src/main/java/com/pikolive/app/avroom/giftvalue/GiftValueDialogUiHelper.java +++ b/app/src/main/java/com/pikolive/app/avroom/giftvalue/GiftValueDialogUiHelper.java @@ -6,9 +6,9 @@ import androidx.annotation.Nullable; import com.yizhuan.erban.R; import com.pikolive.app.common.widget.dialog.DialogManager; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.utils.ActivityUtil; -import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core.utils.ActivityUtil; +import com.pikolive.core.utils.SharedPreferenceUtils; /** * 礼物值的弹框处理 diff --git a/app/src/main/java/com/pikolive/app/avroom/helper/AnimHelper.java b/app/src/main/java/com/pikolive/app/avroom/helper/AnimHelper.java index f0b8f4c9d..8ca4137f5 100644 --- a/app/src/main/java/com/pikolive/app/avroom/helper/AnimHelper.java +++ b/app/src/main/java/com/pikolive/app/avroom/helper/AnimHelper.java @@ -1,6 +1,6 @@ package com.pikolive.app.avroom.helper; -import static com.yizhuan.xchat_android_constants.XChatConstants.SELECT_ANIM_DURATION; +import static com.pikolive.core2.XChatConstants.SELECT_ANIM_DURATION; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; diff --git a/app/src/main/java/com/pikolive/app/avroom/newuserchargegift/NewUserChargePrizeDialog.kt b/app/src/main/java/com/pikolive/app/avroom/newuserchargegift/NewUserChargePrizeDialog.kt index 1d6871b21..8e71b6524 100644 --- a/app/src/main/java/com/pikolive/app/avroom/newuserchargegift/NewUserChargePrizeDialog.kt +++ b/app/src/main/java/com/pikolive/app/avroom/newuserchargegift/NewUserChargePrizeDialog.kt @@ -7,7 +7,7 @@ import com.yizhuan.erban.R import com.yizhuan.erban.databinding.DialogNewUserChargePrizeBinding import com.yizhuan.erban.treasure_box.widget.dialog.BaseBindingDialog import com.pikolive.app.ui.utils.RVDelegate -import com.yizhuan.xchat_android_core.pay.bean.FirstChargeReward +import com.pikolive.core.pay.bean.FirstChargeReward import com.pikolive.library.annatation.ActLayoutRes @ActLayoutRes(R.layout.dialog_new_user_charge_prize) diff --git a/app/src/main/java/com/pikolive/app/avroom/newuserchargegift/RewardAdapter.kt b/app/src/main/java/com/pikolive/app/avroom/newuserchargegift/RewardAdapter.kt index ce73d95e4..f9c6b11dd 100644 --- a/app/src/main/java/com/pikolive/app/avroom/newuserchargegift/RewardAdapter.kt +++ b/app/src/main/java/com/pikolive/app/avroom/newuserchargegift/RewardAdapter.kt @@ -5,8 +5,8 @@ import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder import com.pikolive.app.ui.utils.load import com.yizhuan.erban.R -import com.yizhuan.xchat_android_core.pay.bean.FirstChargeReward -import com.yizhuan.xchat_android_core.utils.TextUtils +import com.pikolive.core.pay.bean.FirstChargeReward +import com.pikolive.core.utils.TextUtils class RewardAdapter : BaseQuickAdapter(R.layout.item_new_user_charge_reward) { diff --git a/app/src/main/java/com/pikolive/app/avroom/presenter/AvRoomPresenter.java b/app/src/main/java/com/pikolive/app/avroom/presenter/AvRoomPresenter.java index ee0ce6dbd..3a96537e8 100644 --- a/app/src/main/java/com/pikolive/app/avroom/presenter/AvRoomPresenter.java +++ b/app/src/main/java/com/pikolive/app/avroom/presenter/AvRoomPresenter.java @@ -23,36 +23,36 @@ import com.pikolive.app.avroom.view.IAvRoomView; import com.yizhuan.erban.R; import com.pikolive.app.avroom.activity.AVRoomActivity; import com.pikolive.app.base.BaseMvpPresenter; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.DemoCache; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.bean.RoomMicInfo; -import com.yizhuan.xchat_android_core.bean.RoomQueueInfo; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.channel_page.model.ChannelPageModel; -import com.yizhuan.xchat_android_core.manager.AudioEngineManager; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.manager.RoomEvent; -import com.yizhuan.xchat_android_core.miniworld.event.AudioPartyOpenEvent; -import com.yizhuan.xchat_android_core.module_hall.hall.HallModel; -import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterInfo; -import com.yizhuan.xchat_android_core.monsterhunting.model.MonsterHuntingModel; -import com.yizhuan.xchat_android_core.patriarch.exception.PmRoomLimitException; -import com.yizhuan.xchat_android_core.public_chat_hall.manager.PublicChatHallDataManager; -import com.yizhuan.xchat_android_core.room.anotherroompk.RoomPKModel; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.room.giftvalue.helper.GiftValueMrg; -import com.yizhuan.xchat_android_core.room.model.AvRoomModel; -import com.yizhuan.xchat_android_core.room.model.MicQueueModel; -import com.yizhuan.xchat_android_core.room.queue.bean.MicMemberInfo; -import com.yizhuan.xchat_android_core.room.queuing_mic.bean.QueuingMicMemeberInfo; -import com.yizhuan.xchat_android_core.room.queuing_mic.event.QueuingMicNotEmptyEvent; -import com.yizhuan.xchat_android_core.super_admin.SuperAdminDataMrg; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.utils.LogUtils; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.Constants; +import com.pikolive.core.DemoCache; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.bean.RoomMicInfo; +import com.pikolive.core.bean.RoomQueueInfo; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.channel_page.model.ChannelPageModel; +import com.pikolive.core2.manager.AudioEngineManager; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core2.manager.IMNetEaseManager; +import com.pikolive.core.manager.RoomEvent; +import com.pikolive.core.miniworld.event.AudioPartyOpenEvent; +import com.pikolive.core.module_hall.hall.HallModel; +import com.pikolive.core.monsterhunting.bean.MonsterInfo; +import com.pikolive.core.monsterhunting.model.MonsterHuntingModel; +import com.pikolive.core.patriarch.exception.PmRoomLimitException; +import com.pikolive.core.public_chat_hall.manager.PublicChatHallDataManager; +import com.pikolive.core.room.anotherroompk.RoomPKModel; +import com.pikolive.core.room.bean.RoomInfo; +import com.pikolive.core.room.giftvalue.helper.GiftValueMrg; +import com.pikolive.core.room.model.AvRoomModel; +import com.pikolive.core.room.model.MicQueueModel; +import com.pikolive.core.room.queue.bean.MicMemberInfo; +import com.pikolive.core.room.queuing_mic.bean.QueuingMicMemeberInfo; +import com.pikolive.core.room.queuing_mic.event.QueuingMicNotEmptyEvent; +import com.pikolive.core.admin.SuperAdminDataMrg; +import com.pikolive.core.user.UserModel; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.utils.LogUtils; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.base.PresenterEvent; import com.pikolive.library.net.rxnet.callback.CallBack; import com.pikolive.library.threadmgr.ThreadPoolManager; diff --git a/app/src/main/java/com/pikolive/app/avroom/presenter/BaseRoomPresenter.java b/app/src/main/java/com/pikolive/app/avroom/presenter/BaseRoomPresenter.java index 7478bb270..3b419771b 100644 --- a/app/src/main/java/com/pikolive/app/avroom/presenter/BaseRoomPresenter.java +++ b/app/src/main/java/com/pikolive/app/avroom/presenter/BaseRoomPresenter.java @@ -16,33 +16,33 @@ import com.orhanobut.logger.Logger; import com.pikolive.app.avroom.view.IBaseRoomView; import com.yizhuan.erban.R; import com.pikolive.app.base.BaseMvpPresenter; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.bean.RoomQueueInfo; -import com.yizhuan.xchat_android_core.gift.GiftModel; -import com.yizhuan.xchat_android_core.helper.AtProxy; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.RequestUpmicAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomInfoAttachment; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.praise.PraiseModel; -import com.yizhuan.xchat_android_core.room.bean.RoomContributeDataInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.room.exception.AntiSpamHitException; -import com.yizhuan.xchat_android_core.room.game.GameStatus; -import com.yizhuan.xchat_android_core.room.giftvalue.helper.GiftValueMrg; -import com.yizhuan.xchat_android_core.room.model.AvRoomModel; -import com.yizhuan.xchat_android_core.room.model.HomePartyModel; -import com.yizhuan.xchat_android_core.room.model.RoomBaseModel; -import com.yizhuan.xchat_android_core.room.model.RoomContributeListModel; -import com.yizhuan.xchat_android_core.room.queue.bean.MicMemberInfo; -import com.yizhuan.xchat_android_core.super_admin.model.SuperAdminModel; -import com.yizhuan.xchat_android_core.super_admin.util.SuperAdminUtil; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.BaseInfo; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.bean.RoomQueueInfo; +import com.pikolive.core.gift.GiftModel; +import com.pikolive.core2.helper.AtProxy; +import com.pikolive.core.im.custom.bean.CustomAttachment; +import com.pikolive.core.im.custom.bean.RequestUpmicAttachment; +import com.pikolive.core.im.custom.bean.RoomInfoAttachment; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core2.manager.IMNetEaseManager; +import com.pikolive.core.praise.PraiseModel; +import com.pikolive.core.room.bean.RoomContributeDataInfo; +import com.pikolive.core.room.bean.RoomInfo; +import com.pikolive.core.room.exception.AntiSpamHitException; +import com.pikolive.core.room.game.GameStatus; +import com.pikolive.core.room.giftvalue.helper.GiftValueMrg; +import com.pikolive.core.room.model.AvRoomModel; +import com.pikolive.core.room.model.HomePartyModel; +import com.pikolive.core.room.model.RoomBaseModel; +import com.pikolive.core.room.model.RoomContributeListModel; +import com.pikolive.core.room.queue.bean.MicMemberInfo; +import com.pikolive.core.admin.model.SuperAdminModel; +import com.pikolive.core.admin.util.SuperAdminUtil; +import com.pikolive.core.user.UserModel; +import com.pikolive.core.user.bean.BaseInfo; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.utils.net.DontWarnObserver; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.base.PresenterEvent; import com.pikolive.library.net.rxnet.callback.CallBack; import com.pikolive.library.utils.ListUtils; diff --git a/app/src/main/java/com/pikolive/app/avroom/presenter/BaseRoomRankPresenter.java b/app/src/main/java/com/pikolive/app/avroom/presenter/BaseRoomRankPresenter.java index a5b85644f..942eff226 100644 --- a/app/src/main/java/com/pikolive/app/avroom/presenter/BaseRoomRankPresenter.java +++ b/app/src/main/java/com/pikolive/app/avroom/presenter/BaseRoomRankPresenter.java @@ -6,8 +6,8 @@ import androidx.annotation.Nullable; import com.pikolive.app.avroom.adapter.RoomConsumerListAdapterTemp; import com.pikolive.app.base.BaseMvpPresenter; -import com.yizhuan.xchat_android_core.room.bean.RoomContributeUserInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomRankMultiItem; +import com.pikolive.core.room.bean.RoomContributeUserInfo; +import com.pikolive.core.room.bean.RoomRankMultiItem; import com.pikolive.library.base.IMvpBaseView; import java.util.ArrayList; diff --git a/app/src/main/java/com/pikolive/app/avroom/presenter/CreatePKPresenter.java b/app/src/main/java/com/pikolive/app/avroom/presenter/CreatePKPresenter.java index b216dd0d7..510ead304 100644 --- a/app/src/main/java/com/pikolive/app/avroom/presenter/CreatePKPresenter.java +++ b/app/src/main/java/com/pikolive/app/avroom/presenter/CreatePKPresenter.java @@ -3,8 +3,8 @@ package com.pikolive.app.avroom.presenter; import com.pikolive.app.avroom.view.ICreatePKView; import com.yizhuan.erban.R; import com.pikolive.app.base.BaseMvpPresenter; -import com.yizhuan.xchat_android_core.room.pk.model.PkModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.pikolive.core.room.pk.model.PkModel; +import com.pikolive.core.user.bean.UserInfo; import com.pikolive.library.utils.ResUtil; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/avroom/presenter/GameRoomPresenter.java b/app/src/main/java/com/pikolive/app/avroom/presenter/GameRoomPresenter.java index f5013e6f1..3f9d950f7 100644 --- a/app/src/main/java/com/pikolive/app/avroom/presenter/GameRoomPresenter.java +++ b/app/src/main/java/com/pikolive/app/avroom/presenter/GameRoomPresenter.java @@ -5,8 +5,8 @@ import android.annotation.SuppressLint; import com.pikolive.app.avroom.view.IGameRoomView; import com.yizhuan.erban.treasure_box.widget.GoldBoxHelper; import com.pikolive.app.utils.UserUtils; -import com.yizhuan.xchat_android_core.home.bean.BannerInfo; -import com.yizhuan.xchat_android_core.room.model.AvRoomModel; +import com.pikolive.core2.home.bean.BannerInfo; +import com.pikolive.core.room.model.AvRoomModel; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/avroom/presenter/HomePartyPresenter.java b/app/src/main/java/com/pikolive/app/avroom/presenter/HomePartyPresenter.java index 1a22eddfd..cb02b2c75 100644 --- a/app/src/main/java/com/pikolive/app/avroom/presenter/HomePartyPresenter.java +++ b/app/src/main/java/com/pikolive/app/avroom/presenter/HomePartyPresenter.java @@ -1,7 +1,7 @@ package com.pikolive.app.avroom.presenter; -import static com.yizhuan.xchat_android_core.manager.RoomEvent.DRAGON_BAR_CANCEL; -import static com.yizhuan.xchat_android_core.manager.RoomEvent.DRAGON_BAR_END; +import static com.pikolive.core.manager.RoomEvent.DRAGON_BAR_CANCEL; +import static com.pikolive.core.manager.RoomEvent.DRAGON_BAR_END; import android.annotation.SuppressLint; @@ -14,26 +14,26 @@ import com.pikolive.app.avroom.view.IHomePartyView; import com.yizhuan.erban.R; import com.yizhuan.erban.treasure_box.widget.GoldBoxHelper; import com.pikolive.app.utils.UserUtils; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.bean.RoomQueueInfo; -import com.yizhuan.xchat_android_core.home.bean.BannerInfo; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.FaceAttachment; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.manager.RoomEvent; -import com.yizhuan.xchat_android_core.room.bean.DragonBarInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.room.dragonball.DragonBallModel; -import com.yizhuan.xchat_android_core.room.face.FaceInfo; -import com.yizhuan.xchat_android_core.room.face.FaceReceiveInfo; -import com.yizhuan.xchat_android_core.room.giftvalue.helper.GiftValueMrg; -import com.yizhuan.xchat_android_core.room.model.RoomSettingModel; -import com.yizhuan.xchat_android_core.room.queue.bean.MicMemberInfo; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; +import com.pikolive.core.Constants; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.bean.RoomQueueInfo; +import com.pikolive.core2.home.bean.BannerInfo; +import com.pikolive.core.im.custom.bean.CustomAttachment; +import com.pikolive.core.im.custom.bean.FaceAttachment; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core2.manager.IMNetEaseManager; +import com.pikolive.core.manager.RoomEvent; +import com.pikolive.core.room.bean.DragonBarInfo; +import com.pikolive.core.room.bean.RoomInfo; +import com.pikolive.core.room.dragonball.DragonBallModel; +import com.pikolive.core.room.face.FaceInfo; +import com.pikolive.core.room.face.FaceReceiveInfo; +import com.pikolive.core.room.giftvalue.helper.GiftValueMrg; +import com.pikolive.core.room.model.RoomSettingModel; +import com.pikolive.core.room.queue.bean.MicMemberInfo; +import com.pikolive.core.user.UserModel; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.utils.net.BeanObserver; import com.pikolive.library.utils.ResUtil; import com.pikolive.library.utils.SingleToastUtil; import com.pikolive.library.utils.config.BasicConfig; diff --git a/app/src/main/java/com/pikolive/app/avroom/presenter/HomePartyUserListPresenter.java b/app/src/main/java/com/pikolive/app/avroom/presenter/HomePartyUserListPresenter.java index d5f9bda02..899ebf394 100644 --- a/app/src/main/java/com/pikolive/app/avroom/presenter/HomePartyUserListPresenter.java +++ b/app/src/main/java/com/pikolive/app/avroom/presenter/HomePartyUserListPresenter.java @@ -6,8 +6,8 @@ import com.orhanobut.logger.Logger; import com.pikolive.app.avroom.view.IHomePartyUserListView; import com.yizhuan.erban.R; import com.pikolive.app.base.BaseMvpPresenter; -import com.yizhuan.xchat_android_core.room.bean.OnlineChatMember; -import com.yizhuan.xchat_android_core.room.model.HomePartyUserListModel; +import com.pikolive.core.room.bean.OnlineChatMember; +import com.pikolive.core.room.model.HomePartyUserListModel; import com.pikolive.library.utils.ResUtil; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/avroom/presenter/RecordForPKPresenter.java b/app/src/main/java/com/pikolive/app/avroom/presenter/RecordForPKPresenter.java index 56a2e6aa8..74b539c21 100644 --- a/app/src/main/java/com/pikolive/app/avroom/presenter/RecordForPKPresenter.java +++ b/app/src/main/java/com/pikolive/app/avroom/presenter/RecordForPKPresenter.java @@ -4,12 +4,12 @@ import com.yizhuan.erban.R; import com.pikolive.app.avroom.view.IRecordForPKView; import com.pikolive.app.base.BaseMvpPresenter; import com.pikolive.app.home.helper.LoadPageDataHelper; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.room.pk.bean.PKRecordInfo; -import com.yizhuan.xchat_android_core.room.pk.bean.PKRecordListInfo; -import com.yizhuan.xchat_android_core.room.pk.model.PkModel; +import com.pikolive.core.Constants; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core.room.bean.RoomInfo; +import com.pikolive.core.room.pk.bean.PKRecordInfo; +import com.pikolive.core.room.pk.bean.PKRecordListInfo; +import com.pikolive.core.room.pk.model.PkModel; import com.pikolive.library.utils.ResUtil; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/avroom/presenter/RoomBlackPresenter.java b/app/src/main/java/com/pikolive/app/avroom/presenter/RoomBlackPresenter.java index 9417009f2..7dd5fff84 100644 --- a/app/src/main/java/com/pikolive/app/avroom/presenter/RoomBlackPresenter.java +++ b/app/src/main/java/com/pikolive/app/avroom/presenter/RoomBlackPresenter.java @@ -3,7 +3,7 @@ package com.pikolive.app.avroom.presenter; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember; import com.pikolive.app.avroom.view.IRoomBlackView; import com.pikolive.app.base.BaseMvpPresenter; -import com.yizhuan.xchat_android_core.room.model.RoomBaseModel; +import com.pikolive.core.room.model.RoomBaseModel; import com.pikolive.library.net.rxnet.callback.CallBack; /** diff --git a/app/src/main/java/com/pikolive/app/avroom/presenter/RoomCharmRankingPresenter.java b/app/src/main/java/com/pikolive/app/avroom/presenter/RoomCharmRankingPresenter.java index 19e3b56a9..dc3e0680f 100644 --- a/app/src/main/java/com/pikolive/app/avroom/presenter/RoomCharmRankingPresenter.java +++ b/app/src/main/java/com/pikolive/app/avroom/presenter/RoomCharmRankingPresenter.java @@ -2,13 +2,13 @@ package com.pikolive.app.avroom.presenter; import com.pikolive.app.avroom.view.IRoomCharmRankingListView; import com.pikolive.app.avroom.view.IRoomCharmRankingListView; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.room.bean.RoomContributeDataInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomContributeUserInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomRankMultiItem; -import com.yizhuan.xchat_android_core.room.model.RoomCharmModel; -import com.yizhuan.xchat_android_core.room.model.inteface.IRoomCharmModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core.room.bean.RoomContributeDataInfo; +import com.pikolive.core.room.bean.RoomContributeUserInfo; +import com.pikolive.core.room.bean.RoomRankMultiItem; +import com.pikolive.core.room.model.RoomCharmModel; +import com.pikolive.core.room.model.inteface.IRoomCharmModel; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/avroom/presenter/RoomContributeListPresenter.java b/app/src/main/java/com/pikolive/app/avroom/presenter/RoomContributeListPresenter.java index b9eadc9f7..ef9c91f87 100644 --- a/app/src/main/java/com/pikolive/app/avroom/presenter/RoomContributeListPresenter.java +++ b/app/src/main/java/com/pikolive/app/avroom/presenter/RoomContributeListPresenter.java @@ -4,7 +4,7 @@ import android.annotation.SuppressLint; import com.pikolive.app.avroom.view.IRoomContributeListView; import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.room.model.RoomContributeListModel; +import com.pikolive.core.room.model.RoomContributeListModel; import com.pikolive.library.utils.ResUtil; /** diff --git a/app/src/main/java/com/pikolive/app/avroom/presenter/RoomInvitePresenter.java b/app/src/main/java/com/pikolive/app/avroom/presenter/RoomInvitePresenter.java index 0cb2a8092..cc4949fbc 100644 --- a/app/src/main/java/com/pikolive/app/avroom/presenter/RoomInvitePresenter.java +++ b/app/src/main/java/com/pikolive/app/avroom/presenter/RoomInvitePresenter.java @@ -7,10 +7,10 @@ import com.netease.nimlib.sdk.chatroom.constant.MemberType; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember; import com.pikolive.app.avroom.view.IRoomInviteView; import com.pikolive.app.base.BaseMvpPresenter; -import com.yizhuan.xchat_android_core.bean.RoomQueueInfo; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.room.model.RoomInviteModel; -import com.yizhuan.xchat_android_core.super_admin.util.SuperAdminUtil; +import com.pikolive.core.bean.RoomQueueInfo; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core.room.model.RoomInviteModel; +import com.pikolive.core.admin.util.SuperAdminUtil; import java.util.List; import java.util.ListIterator; diff --git a/app/src/main/java/com/pikolive/app/avroom/presenter/RoomManagerPresenter.java b/app/src/main/java/com/pikolive/app/avroom/presenter/RoomManagerPresenter.java index 374d22a88..f4e0aefe0 100644 --- a/app/src/main/java/com/pikolive/app/avroom/presenter/RoomManagerPresenter.java +++ b/app/src/main/java/com/pikolive/app/avroom/presenter/RoomManagerPresenter.java @@ -6,11 +6,11 @@ import android.text.TextUtils; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember; import com.pikolive.app.avroom.view.IRoomManagerView; import com.pikolive.app.base.BaseMvpPresenter; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.room.model.AvRoomModel; -import com.yizhuan.xchat_android_core.room.model.RoomBaseModel; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core.room.model.AvRoomModel; +import com.pikolive.core.room.model.RoomBaseModel; +import com.pikolive.core.user.UserModel; +import com.pikolive.core.user.bean.UserInfo; import com.pikolive.library.base.PresenterEvent; import com.pikolive.library.net.rxnet.callback.CallBack; diff --git a/app/src/main/java/com/pikolive/app/avroom/presenter/RoomNewbieHellowWordPresenter.java b/app/src/main/java/com/pikolive/app/avroom/presenter/RoomNewbieHellowWordPresenter.java index 0b0e0db58..3cc52da4d 100644 --- a/app/src/main/java/com/pikolive/app/avroom/presenter/RoomNewbieHellowWordPresenter.java +++ b/app/src/main/java/com/pikolive/app/avroom/presenter/RoomNewbieHellowWordPresenter.java @@ -4,7 +4,7 @@ import com.yizhuan.erban.R; import com.pikolive.app.base.BaseMvpPresenter; import com.pikolive.app.module.IRoomNewbieMessageView; import com.pikolive.app.module.RoomNewbieModel; -import com.yizhuan.xchat_android_core.bean.RoomNewbieMessageInfo; +import com.pikolive.core.bean.RoomNewbieMessageInfo; import com.pikolive.library.utils.ResUtil; import io.reactivex.SingleObserver; diff --git a/app/src/main/java/com/pikolive/app/avroom/presenter/RoomNewbiePresenter.java b/app/src/main/java/com/pikolive/app/avroom/presenter/RoomNewbiePresenter.java index 79504c703..68bb0d24f 100644 --- a/app/src/main/java/com/pikolive/app/avroom/presenter/RoomNewbiePresenter.java +++ b/app/src/main/java/com/pikolive/app/avroom/presenter/RoomNewbiePresenter.java @@ -4,8 +4,8 @@ import com.yizhuan.erban.R; import com.pikolive.app.base.BaseMvpPresenter; import com.pikolive.app.module.IRoomNewbieView; import com.pikolive.app.module.RoomNewbieModel; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.bean.RoomNewbieInfo; +import com.pikolive.core.Constants; +import com.pikolive.core.bean.RoomNewbieInfo; import com.pikolive.library.utils.ResUtil; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/avroom/presenter/RoomRankHalfHourPresenter.java b/app/src/main/java/com/pikolive/app/avroom/presenter/RoomRankHalfHourPresenter.java index 883a7ca49..2f35a6eb2 100644 --- a/app/src/main/java/com/pikolive/app/avroom/presenter/RoomRankHalfHourPresenter.java +++ b/app/src/main/java/com/pikolive/app/avroom/presenter/RoomRankHalfHourPresenter.java @@ -1,12 +1,12 @@ package com.pikolive.app.avroom.presenter; import com.pikolive.app.avroom.fragment.IRoomRankHalfHourView; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomRankHalfHourDataInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomRankHalfHourRankInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomRankMultiItem; -import com.yizhuan.xchat_android_core.room.model.RoomRankModel; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core.room.bean.RoomInfo; +import com.pikolive.core.room.bean.RoomRankHalfHourDataInfo; +import com.pikolive.core.room.bean.RoomRankHalfHourRankInfo; +import com.pikolive.core.room.bean.RoomRankMultiItem; +import com.pikolive.core.room.model.RoomRankModel; import com.pikolive.library.base.factory.AbstractMvpPresenter; import com.pikolive.library.utils.SingleToastUtil; diff --git a/app/src/main/java/com/pikolive/app/avroom/presenter/RoomSettingPresenter.java b/app/src/main/java/com/pikolive/app/avroom/presenter/RoomSettingPresenter.java index 86ad0d817..9e7f4dd1e 100644 --- a/app/src/main/java/com/pikolive/app/avroom/presenter/RoomSettingPresenter.java +++ b/app/src/main/java/com/pikolive/app/avroom/presenter/RoomSettingPresenter.java @@ -5,20 +5,20 @@ import android.os.Handler; import com.pikolive.app.avroom.view.IRoomSettingView; import com.pikolive.app.base.BaseMvpPresenter; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.manager.RoomEvent; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomSettingTabInfo; -import com.yizhuan.xchat_android_core.room.giftvalue.GiftValueModel; -import com.yizhuan.xchat_android_core.room.giftvalue.bean.RoomGiftValue; -import com.yizhuan.xchat_android_core.room.giftvalue.helper.GiftValueMrg; -import com.yizhuan.xchat_android_core.room.model.MicQueueModel; -import com.yizhuan.xchat_android_core.room.model.RoomSettingModel; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; -import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core2.manager.IMNetEaseManager; +import com.pikolive.core.manager.RoomEvent; +import com.pikolive.core.room.bean.RoomInfo; +import com.pikolive.core.room.bean.RoomSettingTabInfo; +import com.pikolive.core.room.giftvalue.GiftValueModel; +import com.pikolive.core.room.giftvalue.bean.RoomGiftValue; +import com.pikolive.core.room.giftvalue.helper.GiftValueMrg; +import com.pikolive.core.room.model.MicQueueModel; +import com.pikolive.core.room.model.RoomSettingModel; +import com.pikolive.core.user.UserModel; +import com.pikolive.core.utils.net.BeanObserver; +import com.pikolive.core.utils.net.DontWarnObserver; import com.pikolive.library.net.rxnet.callback.CallBack; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/avroom/presenter/SingleRoomPresenter.java b/app/src/main/java/com/pikolive/app/avroom/presenter/SingleRoomPresenter.java index 7487ad243..bf170b16b 100644 --- a/app/src/main/java/com/pikolive/app/avroom/presenter/SingleRoomPresenter.java +++ b/app/src/main/java/com/pikolive/app/avroom/presenter/SingleRoomPresenter.java @@ -5,7 +5,7 @@ import android.annotation.SuppressLint; import com.pikolive.app.avroom.view.ISingleRoomView; import com.yizhuan.erban.treasure_box.widget.GoldBoxHelper; import com.pikolive.app.utils.UserUtils; -import com.yizhuan.xchat_android_core.home.bean.BannerInfo; +import com.pikolive.core2.home.bean.BannerInfo; /** *

diff --git a/app/src/main/java/com/pikolive/app/avroom/recommendcard/MyRecommendCardActivity.java b/app/src/main/java/com/pikolive/app/avroom/recommendcard/MyRecommendCardActivity.java index c455b66f8..03f1e1789 100644 --- a/app/src/main/java/com/pikolive/app/avroom/recommendcard/MyRecommendCardActivity.java +++ b/app/src/main/java/com/pikolive/app/avroom/recommendcard/MyRecommendCardActivity.java @@ -16,8 +16,8 @@ import com.yizhuan.erban.module_hall.hall.view.indicator.StatisticsIndicatorAdap import com.pikolive.app.ui.webview.CommonWebViewActivity; import com.pikolive.app.ui.widget.magicindicator.ViewPagerHelper; import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.room.recommendpos.bean.RcmdCardType; +import com.pikolive.core2.UriProvider; +import com.pikolive.core.room.recommendpos.bean.RcmdCardType; import com.pikolive.library.utils.ResUtil; import java.util.ArrayList; diff --git a/app/src/main/java/com/pikolive/app/avroom/recommendcard/RecommendCardFragment.java b/app/src/main/java/com/pikolive/app/avroom/recommendcard/RecommendCardFragment.java index 0d66113dc..7a9b45fdd 100644 --- a/app/src/main/java/com/pikolive/app/avroom/recommendcard/RecommendCardFragment.java +++ b/app/src/main/java/com/pikolive/app/avroom/recommendcard/RecommendCardFragment.java @@ -20,10 +20,10 @@ import com.pikolive.app.base.list.IRecyclerListener; import com.pikolive.app.base.list.RefreshRecyclerView; import com.pikolive.app.ui.webview.event.H5NotifyClientEvent; import com.pikolive.app.ui.widget.recyclerview.decoration.HorizontalDecoration; -import com.yizhuan.xchat_android_core.room.recommendpos.RecommendCardModel; -import com.yizhuan.xchat_android_core.room.recommendpos.bean.RcmdCardType; -import com.yizhuan.xchat_android_core.room.recommendpos.bean.RecommendCard; -import com.yizhuan.xchat_android_core.web.bean.H5NotifyData; +import com.pikolive.core.room.recommendpos.RecommendCardModel; +import com.pikolive.core.room.recommendpos.bean.RcmdCardType; +import com.pikolive.core.room.recommendpos.bean.RecommendCard; +import com.pikolive.core.web.bean.H5NotifyData; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/com/pikolive/app/avroom/recommendcard/RecommendCardListAdapter.java b/app/src/main/java/com/pikolive/app/avroom/recommendcard/RecommendCardListAdapter.java index 441247768..b0675c7f4 100644 --- a/app/src/main/java/com/pikolive/app/avroom/recommendcard/RecommendCardListAdapter.java +++ b/app/src/main/java/com/pikolive/app/avroom/recommendcard/RecommendCardListAdapter.java @@ -11,8 +11,8 @@ import com.pikolive.app.UIHelper; import com.pikolive.app.avroom.widget.MessageView; import com.pikolive.app.base.list.BaseViewHolder; import com.pikolive.app.base.list.CommonAdapter; -import com.yizhuan.xchat_android_core.room.recommendpos.bean.RcmdCardType; -import com.yizhuan.xchat_android_core.room.recommendpos.bean.RecommendCard; +import com.pikolive.core.room.recommendpos.bean.RcmdCardType; +import com.pikolive.core.room.recommendpos.bean.RecommendCard; import com.pikolive.library.utils.ResUtil; import com.pikolive.library.utils.TimeUtils; diff --git a/app/src/main/java/com/pikolive/app/avroom/redpackage/RedPackageGoRoomDialog.kt b/app/src/main/java/com/pikolive/app/avroom/redpackage/RedPackageGoRoomDialog.kt index a3ebc5753..f39a8483e 100644 --- a/app/src/main/java/com/pikolive/app/avroom/redpackage/RedPackageGoRoomDialog.kt +++ b/app/src/main/java/com/pikolive/app/avroom/redpackage/RedPackageGoRoomDialog.kt @@ -3,14 +3,15 @@ package com.pikolive.app.avroom.redpackage import android.os.Bundle import android.view.WindowManager import android.view.animation.AnimationUtils +import com.pikolive.app.avroom.activity.AVRoomActivity import com.yizhuan.erban.R import com.pikolive.app.base.BaseDialog import com.pikolive.app.common.widget.dialog.DialogManager import com.yizhuan.erban.databinding.DialogRedPackageGoRoomBinding import com.pikolive.app.ui.utils.ImageLoadUtils -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager -import com.yizhuan.xchat_android_core.redpackage.RedPackageNotifyInfo -import com.yizhuan.xchat_android_core.utils.subAndReplaceDot +import com.pikolive.core.manager.AvRoomDataManager +import com.pikolive.core.redpackage.RedPackageNotifyInfo +import com.pikolive.core.utils.subAndReplaceDot import com.pikolive.library.utils.ResUtil import org.greenrobot.eventbus.EventBus @@ -51,8 +52,8 @@ class RedPackageGoRoomDialog : BaseDialog() { binding?.ivClose?.setOnClickListener { dismissAllowingStateLoss() } binding?.ivGoRoom?.setOnClickListener { val jump = { - com.pikolive.app.avroom.activity.AVRoomActivity.start(context, redPackageNotifyInfo.roomUid, - com.pikolive.app.avroom.activity.AVRoomActivity.FROM_TYPE_ALL_RED, redPackageNotifyInfo.sendUserNick, redPackageNotifyInfo) + AVRoomActivity.start(context, redPackageNotifyInfo.roomUid, + AVRoomActivity.FROM_TYPE_ALL_RED, redPackageNotifyInfo.sendUserNick, redPackageNotifyInfo) dismissAllowingStateLoss() EventBus.getDefault().post(com.pikolive.app.avroom.redpackage.RedPackageEvent()) } diff --git a/app/src/main/java/com/pikolive/app/avroom/redpackage/RedPackageHandler.kt b/app/src/main/java/com/pikolive/app/avroom/redpackage/RedPackageHandler.kt index df9239b1c..4bf5ff146 100644 --- a/app/src/main/java/com/pikolive/app/avroom/redpackage/RedPackageHandler.kt +++ b/app/src/main/java/com/pikolive/app/avroom/redpackage/RedPackageHandler.kt @@ -4,15 +4,14 @@ import android.content.Context import androidx.lifecycle.Lifecycle import androidx.lifecycle.LifecycleOwner import androidx.lifecycle.MutableLiveData -import com.pikolive.app.avroom.activity.AVRoomActivity import com.pikolive.app.avroom.redpackage.open.RedPackageOpenDialog -import com.yizhuan.xchat_android_core.im.custom.bean.RedPackageAttachment -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager -import com.yizhuan.xchat_android_core.manager.RoomEvent -import com.yizhuan.xchat_android_core.redpackage.RedPackageModel -import com.yizhuan.xchat_android_core.redpackage.RedPackageNotifyInfo -import com.yizhuan.xchat_android_core.support.room.RoomContext -import com.yizhuan.xchat_android_core.support.room.RoomHandler +import com.pikolive.core.im.custom.bean.RedPackageAttachment +import com.pikolive.core.manager.RoomEvent +import com.pikolive.core.redpackage.RedPackageModel +import com.pikolive.core.redpackage.RedPackageNotifyInfo +import com.pikolive.core.support.room.RoomContext +import com.pikolive.core.support.room.RoomHandler +import com.pikolive.core2.manager.IMNetEaseManager /** * Created by Max on 2023/10/26 11:26 diff --git a/app/src/main/java/com/pikolive/app/avroom/redpackage/RedPackageWidget.kt b/app/src/main/java/com/pikolive/app/avroom/redpackage/RedPackageWidget.kt index a96b40aee..9670934b4 100644 --- a/app/src/main/java/com/pikolive/app/avroom/redpackage/RedPackageWidget.kt +++ b/app/src/main/java/com/pikolive/app/avroom/redpackage/RedPackageWidget.kt @@ -12,12 +12,12 @@ import com.yizhuan.erban.R import com.pikolive.app.avroom.redpackage.open.RedPackageOpenDialog import com.pikolive.app.common.widget.dialog.DialogManager import com.yizhuan.erban.databinding.RedPackageWidgetBinding -import com.yizhuan.xchat_android_core.redpackage.RedPackageModel -import com.yizhuan.xchat_android_core.redpackage.RedPackageNotifyInfo -import com.yizhuan.xchat_android_core.support.room.FrameLayoutRoomWidget -import com.yizhuan.xchat_android_core.support.room.RoomContext -import com.yizhuan.xchat_android_core.support.room.RoomView -import com.yizhuan.xchat_android_core.support.room.RoomWidget +import com.pikolive.core.redpackage.RedPackageModel +import com.pikolive.core.redpackage.RedPackageNotifyInfo +import com.pikolive.core.support.room.FrameLayoutRoomWidget +import com.pikolive.core.support.room.RoomContext +import com.pikolive.core.support.room.RoomView +import com.pikolive.core.support.room.RoomWidget import com.pikolive.library.utils.SingleToastUtil import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers diff --git a/app/src/main/java/com/pikolive/app/avroom/redpackage/open/RedPackageOpenDialog.kt b/app/src/main/java/com/pikolive/app/avroom/redpackage/open/RedPackageOpenDialog.kt index e86be4f5a..5c5eb924e 100644 --- a/app/src/main/java/com/pikolive/app/avroom/redpackage/open/RedPackageOpenDialog.kt +++ b/app/src/main/java/com/pikolive/app/avroom/redpackage/open/RedPackageOpenDialog.kt @@ -24,16 +24,20 @@ import com.pikolive.app.base.BaseDialog import com.yizhuan.erban.databinding.RedPackageOpenDialogBinding import com.pikolive.app.ui.utils.loadAvatar import com.pikolive.app.ui.widget.UserInfoDialog -import com.yizhuan.xchat_android_core.auth.AuthModel -import com.yizhuan.xchat_android_core.home.event.FollowRoomEvent -import com.yizhuan.xchat_android_core.home.event.OpenRoomMessageInputEvent -import com.yizhuan.xchat_android_core.home.event.ShareRoomEvent -import com.yizhuan.xchat_android_core.home.model.CollectionRoomModel -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager -import com.yizhuan.xchat_android_core.pay.PayModel -import com.yizhuan.xchat_android_core.redpackage.* -import com.yizhuan.xchat_android_core.support.config.Constants -import com.yizhuan.xchat_android_core.support.room.RoomContext +import com.pikolive.core.auth.AuthModel +import com.pikolive.core.manager.AvRoomDataManager +import com.pikolive.core.pay.PayModel +import com.pikolive.core.redpackage.RedEnvelopeState +import com.pikolive.core.redpackage.RedPackageData +import com.pikolive.core.redpackage.RedPackageInfo +import com.pikolive.core.redpackage.RedPackageModel +import com.pikolive.core.redpackage.RedPackageNotifyInfo +import com.pikolive.core2.home.event.OpenRoomMessageInputEvent +import com.pikolive.core.support.config.Constants +import com.pikolive.core.support.room.RoomContext +import com.pikolive.core2.home.event.FollowRoomEvent +import com.pikolive.core2.home.event.ShareRoomEvent +import com.pikolive.core2.home.model.CollectionRoomModel import com.pikolive.library.annatation.ActLayoutRes import com.pikolive.library.utils.SingleToastUtil import io.reactivex.Observable diff --git a/app/src/main/java/com/pikolive/app/avroom/redpackage/open/RedPackageResultAdapter.kt b/app/src/main/java/com/pikolive/app/avroom/redpackage/open/RedPackageResultAdapter.kt index 3eccd58eb..53fa0c270 100644 --- a/app/src/main/java/com/pikolive/app/avroom/redpackage/open/RedPackageResultAdapter.kt +++ b/app/src/main/java/com/pikolive/app/avroom/redpackage/open/RedPackageResultAdapter.kt @@ -8,8 +8,8 @@ import com.chad.library.adapter.base.BaseViewHolder import com.yizhuan.erban.R import com.pikolive.app.ui.utils.loadAvatar import com.pikolive.app.utils.UserUtils -import com.yizhuan.xchat_android_core.redpackage.RedEnvelopeItemVO -import com.yizhuan.xchat_android_core.utils.subAndReplaceDot +import com.pikolive.core.redpackage.RedEnvelopeItemVO +import com.pikolive.core.utils.subAndReplaceDot import com.pikolive.library.utils.ResUtil import java.text.SimpleDateFormat import java.util.Locale diff --git a/app/src/main/java/com/pikolive/app/avroom/redpackage/send/PrivateRedPackageEditorFragment.kt b/app/src/main/java/com/pikolive/app/avroom/redpackage/send/PrivateRedPackageEditorFragment.kt index 84430881d..03432ae62 100644 --- a/app/src/main/java/com/pikolive/app/avroom/redpackage/send/PrivateRedPackageEditorFragment.kt +++ b/app/src/main/java/com/pikolive/app/avroom/redpackage/send/PrivateRedPackageEditorFragment.kt @@ -15,13 +15,13 @@ import com.pikolive.app.pay.widget.GridPasswordNoFocusView import com.pikolive.app.ui.setting.ModifyPwdActivity import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil import com.pikolive.app.ui.widget.recyclerview.decoration.ColorDecoration -import com.yizhuan.xchat_android_core.auth.AuthModel -import com.yizhuan.xchat_android_core.initial.InitialModel -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager -import com.yizhuan.xchat_android_core.pay.PayModel -import com.yizhuan.xchat_android_core.redpackage.RedPackageModel -import com.yizhuan.xchat_android_core.user.UserModel -import com.yizhuan.xchat_android_core.utils.toIntOrDef +import com.pikolive.core.auth.AuthModel +import com.pikolive.core.initial.InitialModel +import com.pikolive.core.manager.AvRoomDataManager +import com.pikolive.core.pay.PayModel +import com.pikolive.core.redpackage.RedPackageModel +import com.pikolive.core.user.UserModel +import com.pikolive.core.utils.toIntOrDef import com.pikolive.library.annatation.ActLayoutRes import com.pikolive.library.utils.ResUtil import com.pikolive.library.utils.SingleToastUtil @@ -274,7 +274,8 @@ class PrivateRedPackageEditorFragment : BaseBindingFragment - PayModel.get().getWalletInfo(AuthModel.get().currentUid).subscribe() + PayModel.get().getWalletInfo( + AuthModel.get().currentUid).subscribe() dialogManager.dismissDialog() SingleToastUtil.showToast("發送成功") passWordFragment?.dismissAllowingStateLoss() diff --git a/app/src/main/java/com/pikolive/app/avroom/redpackage/send/PublicRedPackageEditorFragment.kt b/app/src/main/java/com/pikolive/app/avroom/redpackage/send/PublicRedPackageEditorFragment.kt index 982f95a3b..42ee4d2dc 100644 --- a/app/src/main/java/com/pikolive/app/avroom/redpackage/send/PublicRedPackageEditorFragment.kt +++ b/app/src/main/java/com/pikolive/app/avroom/redpackage/send/PublicRedPackageEditorFragment.kt @@ -10,14 +10,14 @@ import com.yizhuan.erban.databinding.RedPackagePublicFragmentBinding import com.pikolive.app.pay.password.GiveGoldPassWordFragment import com.pikolive.app.pay.widget.GridPasswordNoFocusView import com.pikolive.app.ui.setting.ModifyPwdActivity -import com.yizhuan.xchat_android_core.auth.AuthModel -import com.yizhuan.xchat_android_core.initial.InitialModel -import com.yizhuan.xchat_android_core.initial.bean.InitInfo -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager -import com.yizhuan.xchat_android_core.pay.PayModel -import com.yizhuan.xchat_android_core.redpackage.RedPackageModel -import com.yizhuan.xchat_android_core.user.UserModel -import com.yizhuan.xchat_android_core.utils.toIntOrDef +import com.pikolive.core.auth.AuthModel +import com.pikolive.core.initial.InitialModel +import com.pikolive.core.initial.bean.InitInfo +import com.pikolive.core.manager.AvRoomDataManager +import com.pikolive.core.pay.PayModel +import com.pikolive.core.redpackage.RedPackageModel +import com.pikolive.core.user.UserModel +import com.pikolive.core.utils.toIntOrDef import com.pikolive.library.annatation.ActLayoutRes import com.pikolive.library.utils.SingleToastUtil import com.pikolive.library.utils.codec.DESUtils @@ -141,7 +141,8 @@ class PublicRedPackageEditorFragment : BaseBindingFragment - PayModel.get().getWalletInfo(AuthModel.get().currentUid).subscribe() + PayModel.get().getWalletInfo( + AuthModel.get().currentUid).subscribe() dialogManager.dismissDialog() SingleToastUtil.showToast("發送成功") passWordFragment?.dismissAllowingStateLoss() diff --git a/app/src/main/java/com/pikolive/app/avroom/redpackage/send/RedPackageSendDialog.kt b/app/src/main/java/com/pikolive/app/avroom/redpackage/send/RedPackageSendDialog.kt index 9b0ad392e..3d7c9a5c4 100644 --- a/app/src/main/java/com/pikolive/app/avroom/redpackage/send/RedPackageSendDialog.kt +++ b/app/src/main/java/com/pikolive/app/avroom/redpackage/send/RedPackageSendDialog.kt @@ -6,6 +6,7 @@ import android.os.Bundle import android.view.Gravity import android.view.WindowManager import androidx.fragment.app.Fragment +import com.pikolive.app.avroom.redpackage.RedPackageEvent import com.pikolive.utils.ktx.singleClick import com.pikolive.utils.ktx.toStringRes import com.yizhuan.erban.R @@ -17,12 +18,12 @@ import com.pikolive.app.ui.webview.CommonWebViewActivity import com.pikolive.app.ui.webview.DialogWebViewActivity import com.pikolive.app.ui.widget.magicindicator.ViewPagerHelper import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator -import com.yizhuan.xchat_android_core.Constants -import com.yizhuan.xchat_android_core.UriProvider -import com.yizhuan.xchat_android_core.initial.InitialModel -import com.yizhuan.xchat_android_core.pay.PayModel -import com.yizhuan.xchat_android_core.pay.event.UpdateWalletInfoEvent -import com.yizhuan.xchat_android_core.redpackage.* +import com.pikolive.core.Constants +import com.pikolive.core.initial.InitialModel +import com.pikolive.core.pay.PayModel +import com.pikolive.core.pay.event.UpdateWalletInfoEvent +import com.pikolive.core.redpackage.* +import com.pikolive.core2.UriProvider import com.pikolive.library.annatation.ActLayoutRes import com.pikolive.library.common.util.DeviceUtil import com.pikolive.library.utils.AppMetaDataUtil @@ -40,7 +41,7 @@ import org.greenrobot.eventbus.ThreadMode class RedPackageSendDialog : BaseDialog() { private val permissionType: Int - get() = arguments?.getInt(com.yizhuan.xchat_android_core.support.config.Constants.KEY_INTENT) + get() = arguments?.getInt(com.pikolive.core.support.config.Constants.KEY_INTENT) ?: 0 /** @@ -61,7 +62,7 @@ class RedPackageSendDialog : BaseDialog() { return RedPackageSendDialog().apply { this.arguments = Bundle().apply { putInt( - com.yizhuan.xchat_android_core.support.config.Constants.KEY_INTENT, + com.pikolive.core.support.config.Constants.KEY_INTENT, permissionType ) } @@ -169,7 +170,7 @@ class RedPackageSendDialog : BaseDialog() { } @Subscribe(threadMode = ThreadMode.MAIN) - fun handleRedPackageDialog(event: com.pikolive.app.avroom.redpackage.RedPackageEvent?) { + fun handleRedPackageDialog(event: RedPackageEvent?) { dismissAllowingStateLoss() } } \ No newline at end of file diff --git a/app/src/main/java/com/pikolive/app/avroom/room_album/ChooseGiftRoomAlbumDialogFragment.kt b/app/src/main/java/com/pikolive/app/avroom/room_album/ChooseGiftRoomAlbumDialogFragment.kt index 48ee5ba87..36ea618a0 100644 --- a/app/src/main/java/com/pikolive/app/avroom/room_album/ChooseGiftRoomAlbumDialogFragment.kt +++ b/app/src/main/java/com/pikolive/app/avroom/room_album/ChooseGiftRoomAlbumDialogFragment.kt @@ -14,9 +14,9 @@ import com.yizhuan.erban.R import com.yizhuan.erban.databinding.DialogChooseGiftRoomAlbumBinding import com.pikolive.app.ui.utils.ImageLoadUtilsV2 import com.pikolive.app.ui.widget.recyclerview.decoration.GridSpacingItemNewDecoration -import com.yizhuan.xchat_android_core.gift.GiftModel -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo -import com.yizhuan.xchat_android_core.gift.bean.GiftType +import com.pikolive.core.gift.GiftModel +import com.pikolive.core.gift.bean.GiftInfo +import com.pikolive.core.gift.bean.GiftType class ChooseGiftRoomAlbumDialogFragment : BottomSheetDialogFragment() { @@ -63,7 +63,8 @@ class ChooseGiftRoomAlbumDialogFragment : BottomSheetDialogFragment() { helper.setText(R.id.tv_value, item.goldPrice.toString()) } }.apply { - val gifts = GiftModel.get().getGiftInfoList(GiftType.GIFT_TYPE_NORMAL) + val gifts = GiftModel.get().getGiftInfoList( + GiftType.GIFT_TYPE_NORMAL) setNewData(gifts) setOnItemClickListener { _, _, position -> diff --git a/app/src/main/java/com/pikolive/app/avroom/room_album/RoomAlbumFragment.kt b/app/src/main/java/com/pikolive/app/avroom/room_album/RoomAlbumFragment.kt index c6a82da94..d037ee86e 100644 --- a/app/src/main/java/com/pikolive/app/avroom/room_album/RoomAlbumFragment.kt +++ b/app/src/main/java/com/pikolive/app/avroom/room_album/RoomAlbumFragment.kt @@ -21,7 +21,7 @@ import com.pikolive.app.ui.utils.ImageLoadUtils import com.pikolive.app.ui.utils.ImageLoadUtilsV2 import com.pikolive.app.ui.widget.ButtonItem import com.pikolive.app.ui.widget.recyclerview.decoration.GridSpacingItemNewDecoration -import com.yizhuan.xchat_android_core.Constants +import com.pikolive.core.Constants class RoomAlbumFragment : BaseViewBindingFragment() { diff --git a/app/src/main/java/com/pikolive/app/avroom/room_album/RoomAlbumFragmentViewModel.kt b/app/src/main/java/com/pikolive/app/avroom/room_album/RoomAlbumFragmentViewModel.kt index e26398882..6a46e5b34 100644 --- a/app/src/main/java/com/pikolive/app/avroom/room_album/RoomAlbumFragmentViewModel.kt +++ b/app/src/main/java/com/pikolive/app/avroom/room_album/RoomAlbumFragmentViewModel.kt @@ -5,9 +5,9 @@ import androidx.lifecycle.MutableLiveData import com.hjq.toast.ToastUtils import com.pikolive.app.avroom.bean.RoomAlbumPhotoInfo import com.pikolive.app.base.BaseViewModel -import com.yizhuan.xchat_android_core.Constants -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager -import com.yizhuan.xchat_android_core.utils.toast +import com.pikolive.core.Constants +import com.pikolive.core.manager.AvRoomDataManager +import com.pikolive.core.utils.toast class RoomAlbumFragmentViewModel : BaseViewModel() { diff --git a/app/src/main/java/com/pikolive/app/avroom/room_album/RoomAlbumModel.kt b/app/src/main/java/com/pikolive/app/avroom/room_album/RoomAlbumModel.kt index 6ed9096c8..4ba29e20d 100644 --- a/app/src/main/java/com/pikolive/app/avroom/room_album/RoomAlbumModel.kt +++ b/app/src/main/java/com/pikolive/app/avroom/room_album/RoomAlbumModel.kt @@ -1,11 +1,11 @@ package com.pikolive.app.avroom.room_album import com.pikolive.app.avroom.bean.RoomAlbumPhotoInfo -import com.yizhuan.xchat_android_core.Constants -import com.yizhuan.xchat_android_core.bean.response.ServiceResult -import com.yizhuan.xchat_android_core.gift.bean.GiftReceiveInfo -import com.yizhuan.xchat_android_core.utils.net.RxHelper -import com.yizhuan.xchat_android_core.utils.net.launchRequest +import com.pikolive.core.Constants +import com.pikolive.core.bean.response.ServiceResult +import com.pikolive.core.gift.bean.GiftReceiveInfo +import com.pikolive.core.utils.net.RxHelper +import com.pikolive.core.utils.net.launchRequest import com.pikolive.library.net.rxnet.RxNet import io.reactivex.Single import retrofit2.http.Field diff --git a/app/src/main/java/com/pikolive/app/avroom/room_album/RoomAlbumViewModel.kt b/app/src/main/java/com/pikolive/app/avroom/room_album/RoomAlbumViewModel.kt index af3ca3eee..3097233b2 100644 --- a/app/src/main/java/com/pikolive/app/avroom/room_album/RoomAlbumViewModel.kt +++ b/app/src/main/java/com/pikolive/app/avroom/room_album/RoomAlbumViewModel.kt @@ -5,10 +5,10 @@ import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import com.pikolive.app.base.BaseViewModel import com.pikolive.app.base.Event -import com.yizhuan.xchat_android_core.file.FileModel -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager -import com.yizhuan.xchat_android_core.utils.toast +import com.pikolive.core.file.FileModel +import com.pikolive.core.gift.bean.GiftInfo +import com.pikolive.core.manager.AvRoomDataManager +import com.pikolive.core.utils.toast import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.schedulers.Schedulers diff --git a/app/src/main/java/com/pikolive/app/avroom/room_album/UnlockRoomAlbumPhotoDialog.kt b/app/src/main/java/com/pikolive/app/avroom/room_album/UnlockRoomAlbumPhotoDialog.kt index 9041f3945..22be4091a 100644 --- a/app/src/main/java/com/pikolive/app/avroom/room_album/UnlockRoomAlbumPhotoDialog.kt +++ b/app/src/main/java/com/pikolive/app/avroom/room_album/UnlockRoomAlbumPhotoDialog.kt @@ -6,8 +6,8 @@ import com.hjq.toast.ToastUtils import com.pikolive.app.base.BaseDialog import com.yizhuan.erban.databinding.DialogLockRoomAlbumPhotoBinding import com.pikolive.app.ui.utils.ImageLoadUtilsV2 -import com.yizhuan.xchat_android_core.gift.bean.GiftReceiveInfo -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager +import com.pikolive.core.gift.bean.GiftReceiveInfo +import com.pikolive.core.manager.AvRoomDataManager class UnlockRoomAlbumPhotoDialog : BaseDialog(){ diff --git a/app/src/main/java/com/pikolive/app/avroom/room_album/UploadRoomAlbumDialogFragment.kt b/app/src/main/java/com/pikolive/app/avroom/room_album/UploadRoomAlbumDialogFragment.kt index 4f5f4057d..d084e32ab 100644 --- a/app/src/main/java/com/pikolive/app/avroom/room_album/UploadRoomAlbumDialogFragment.kt +++ b/app/src/main/java/com/pikolive/app/avroom/room_album/UploadRoomAlbumDialogFragment.kt @@ -23,8 +23,8 @@ import com.pikolive.app.common.widget.dialog.DialogManager import com.yizhuan.erban.databinding.DialogRoomAlbumUploadBinding import com.pikolive.app.ui.utils.ImageLoadUtilsV2 import com.pikolive.app.ui.widget.recyclerview.decoration.GridSpacingItemNewDecoration -import com.yizhuan.xchat_android_core.Constants -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo +import com.pikolive.core.Constants +import com.pikolive.core.gift.bean.GiftInfo import com.yizhuan.xchat_android_library.common.photo.PhotoProvider import com.yizhuan.xchat_android_library.common.photo.PhotoProvider.photoProvider import com.pikolive.library.common.util.PhotoCompressUtil.compress diff --git a/app/src/main/java/com/pikolive/app/avroom/singleroompk/SingleRoomPKBoardView.kt b/app/src/main/java/com/pikolive/app/avroom/singleroompk/SingleRoomPKBoardView.kt index debe3f48f..8054b2df2 100644 --- a/app/src/main/java/com/pikolive/app/avroom/singleroompk/SingleRoomPKBoardView.kt +++ b/app/src/main/java/com/pikolive/app/avroom/singleroompk/SingleRoomPKBoardView.kt @@ -15,10 +15,10 @@ import com.pikolive.app.avroom.activity.AVRoomActivity import com.yizhuan.erban.databinding.LayoutSingleRoomPkBoardViewBinding import com.pikolive.app.ui.user.activity.UserInfoActivity import com.pikolive.app.ui.utils.load -import com.yizhuan.xchat_android_core.im.custom.bean.RoomPkBean -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager -import com.yizhuan.xchat_android_core.utils.CurrentTimeUtils -import com.yizhuan.xchat_android_core.utils.subAndReplaceDot +import com.pikolive.core.im.custom.bean.RoomPkBean +import com.pikolive.core.manager.AvRoomDataManager +import com.pikolive.core.utils.CurrentTimeUtils +import com.pikolive.core.utils.subAndReplaceDot import com.pikolive.library.utils.ResUtil import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers diff --git a/app/src/main/java/com/pikolive/app/avroom/singleroompk/SingleRoomPKCreateActivity.kt b/app/src/main/java/com/pikolive/app/avroom/singleroompk/SingleRoomPKCreateActivity.kt index a008603af..8f5c72d04 100644 --- a/app/src/main/java/com/pikolive/app/avroom/singleroompk/SingleRoomPKCreateActivity.kt +++ b/app/src/main/java/com/pikolive/app/avroom/singleroompk/SingleRoomPKCreateActivity.kt @@ -12,14 +12,14 @@ import com.pikolive.app.base.BaseViewBindingActivity import com.yizhuan.erban.databinding.ActivitySingleRoomPkCreateBinding import com.pikolive.app.ui.utils.ImageLoadUtils import com.pikolive.app.ui.widget.TextWatcherSimple -import com.yizhuan.xchat_android_core.auth.AuthModel -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager -import com.yizhuan.xchat_android_core.room.anotherroompk.SimpleRoomInfo -import com.yizhuan.xchat_android_core.room.anotherroompk.SingleRoomPKModel -import com.yizhuan.xchat_android_core.utils.ifNotNullOrEmpty -import com.yizhuan.xchat_android_core.utils.subAndReplaceDot -import com.yizhuan.xchat_android_core.utils.toIntOrDef -import com.yizhuan.xchat_android_core.utils.toast +import com.pikolive.core.auth.AuthModel +import com.pikolive.core.manager.AvRoomDataManager +import com.pikolive.core.room.anotherroompk.SimpleRoomInfo +import com.pikolive.core.room.anotherroompk.SingleRoomPKModel +import com.pikolive.core.utils.ifNotNullOrEmpty +import com.pikolive.core.utils.subAndReplaceDot +import com.pikolive.core.utils.toIntOrDef +import com.pikolive.core.utils.toast import com.pikolive.library.utils.ResUtil class SingleRoomPKCreateActivity : BaseViewBindingActivity() { diff --git a/app/src/main/java/com/pikolive/app/avroom/singleroompk/SingleRoomPKRankListView.kt b/app/src/main/java/com/pikolive/app/avroom/singleroompk/SingleRoomPKRankListView.kt index 5e7b1f19a..a0a119515 100644 --- a/app/src/main/java/com/pikolive/app/avroom/singleroompk/SingleRoomPKRankListView.kt +++ b/app/src/main/java/com/pikolive/app/avroom/singleroompk/SingleRoomPKRankListView.kt @@ -9,8 +9,8 @@ import androidx.core.view.isVisible import com.yizhuan.erban.R import com.yizhuan.erban.databinding.LayoutSingleRoomPkRankListViewBinding import com.pikolive.app.ui.utils.ImageLoadUtils -import com.yizhuan.xchat_android_core.im.custom.bean.RoomPkBean -import com.yizhuan.xchat_android_core.room.anotherroompk.ShowUserInfoDialogEvent +import com.pikolive.core.im.custom.bean.RoomPkBean +import com.pikolive.core.room.anotherroompk.ShowUserInfoDialogEvent import com.pikolive.library.rxbus.RxBus class SingleRoomPKRankListView @JvmOverloads constructor( @@ -28,7 +28,11 @@ class SingleRoomPKRankListView @JvmOverloads constructor( ivAvatars.forEach { ivAvatar -> ivAvatar.setOnClickListener { ivAvatar.tag?.toString()?.let { - RxBus.get().post(ShowUserInfoDialogEvent(it)) + RxBus.get().post( + ShowUserInfoDialogEvent( + it + ) + ) } } } diff --git a/app/src/main/java/com/pikolive/app/avroom/singleroompk/SingleRoomPKSearchActivity.kt b/app/src/main/java/com/pikolive/app/avroom/singleroompk/SingleRoomPKSearchActivity.kt index 73d93d328..87f52c1f0 100644 --- a/app/src/main/java/com/pikolive/app/avroom/singleroompk/SingleRoomPKSearchActivity.kt +++ b/app/src/main/java/com/pikolive/app/avroom/singleroompk/SingleRoomPKSearchActivity.kt @@ -12,9 +12,9 @@ import com.pikolive.app.common.EmptyViewHelper import com.yizhuan.erban.databinding.ActivitySingleRoomPkSearchBinding import com.pikolive.app.ui.user.activity.UserInfoActivity import com.pikolive.app.ui.utils.RVDelegate -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager -import com.yizhuan.xchat_android_core.room.anotherroompk.SimpleRoomInfo -import com.yizhuan.xchat_android_core.room.anotherroompk.SingleRoomPKModel +import com.pikolive.core.manager.AvRoomDataManager +import com.pikolive.core.room.anotherroompk.SimpleRoomInfo +import com.pikolive.core.room.anotherroompk.SingleRoomPKModel import com.pikolive.library.utils.ResUtil class SingleRoomPKSearchActivity : BaseViewBindingActivity() { diff --git a/app/src/main/java/com/pikolive/app/avroom/singleroompk/SingleRoomPKSearchAdapter.kt b/app/src/main/java/com/pikolive/app/avroom/singleroompk/SingleRoomPKSearchAdapter.kt index 392d476ad..b82024175 100644 --- a/app/src/main/java/com/pikolive/app/avroom/singleroompk/SingleRoomPKSearchAdapter.kt +++ b/app/src/main/java/com/pikolive/app/avroom/singleroompk/SingleRoomPKSearchAdapter.kt @@ -7,8 +7,8 @@ import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder import com.yizhuan.erban.R import com.pikolive.app.ui.utils.ImageLoadUtils -import com.yizhuan.xchat_android_core.room.anotherroompk.SimpleRoomInfo -import com.yizhuan.xchat_android_core.utils.subAndReplaceDot +import com.pikolive.core.room.anotherroompk.SimpleRoomInfo +import com.pikolive.core.utils.subAndReplaceDot class SingleRoomPKSearchAdapter : BaseQuickAdapter(R.layout.item_single_room_pk_search) { diff --git a/app/src/main/java/com/pikolive/app/avroom/singleroompk/SingleRoomPkFinishDialog.kt b/app/src/main/java/com/pikolive/app/avroom/singleroompk/SingleRoomPkFinishDialog.kt index e90e925ca..46e903fdf 100644 --- a/app/src/main/java/com/pikolive/app/avroom/singleroompk/SingleRoomPkFinishDialog.kt +++ b/app/src/main/java/com/pikolive/app/avroom/singleroompk/SingleRoomPkFinishDialog.kt @@ -8,8 +8,8 @@ import com.yizhuan.erban.R import com.pikolive.app.base.BaseDialog import com.yizhuan.erban.databinding.DialogSingleRoomPkFinishBinding import com.pikolive.app.ui.utils.load -import com.yizhuan.xchat_android_core.im.custom.bean.RoomPkBean -import com.yizhuan.xchat_android_core.utils.subAndReplaceDot +import com.pikolive.core.im.custom.bean.RoomPkBean +import com.pikolive.core.utils.subAndReplaceDot import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers import java.util.concurrent.TimeUnit diff --git a/app/src/main/java/com/pikolive/app/avroom/singleroompk/SingleRoomPkForceFinishDialog.kt b/app/src/main/java/com/pikolive/app/avroom/singleroompk/SingleRoomPkForceFinishDialog.kt index f5de2b03b..937bd720c 100644 --- a/app/src/main/java/com/pikolive/app/avroom/singleroompk/SingleRoomPkForceFinishDialog.kt +++ b/app/src/main/java/com/pikolive/app/avroom/singleroompk/SingleRoomPkForceFinishDialog.kt @@ -7,8 +7,8 @@ import com.yizhuan.erban.R import com.pikolive.app.base.BaseDialog import com.yizhuan.erban.databinding.DialogSingleRoomPkForceFinishBinding import com.pikolive.app.ui.utils.ImageLoadUtils -import com.yizhuan.xchat_android_core.im.custom.bean.RoomPkBean -import com.yizhuan.xchat_android_core.utils.subAndReplaceDot +import com.pikolive.core.im.custom.bean.RoomPkBean +import com.pikolive.core.utils.subAndReplaceDot class SingleRoomPkForceFinishDialog : BaseDialog() { diff --git a/app/src/main/java/com/pikolive/app/avroom/singleroompk/SingleRoomPkReceivedDialog.kt b/app/src/main/java/com/pikolive/app/avroom/singleroompk/SingleRoomPkReceivedDialog.kt index 0466aa6ff..090cc84f0 100644 --- a/app/src/main/java/com/pikolive/app/avroom/singleroompk/SingleRoomPkReceivedDialog.kt +++ b/app/src/main/java/com/pikolive/app/avroom/singleroompk/SingleRoomPkReceivedDialog.kt @@ -5,12 +5,12 @@ import android.os.Bundle import androidx.core.view.isVisible import com.pikolive.app.base.BaseDialog import com.yizhuan.erban.databinding.DialogSingleRoomPkReceivedBinding -import com.yizhuan.xchat_android_core.im.custom.bean.RoomPkBean -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager -import com.yizhuan.xchat_android_core.room.anotherroompk.SingleRoomPKModel -import com.yizhuan.xchat_android_core.utils.ifNotNullOrEmpty -import com.yizhuan.xchat_android_core.utils.subAndReplaceDot -import com.yizhuan.xchat_android_core.utils.toast +import com.pikolive.core.im.custom.bean.RoomPkBean +import com.pikolive.core.manager.AvRoomDataManager +import com.pikolive.core.room.anotherroompk.SingleRoomPKModel +import com.pikolive.core.utils.ifNotNullOrEmpty +import com.pikolive.core.utils.subAndReplaceDot +import com.pikolive.core.utils.toast import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.Disposable diff --git a/app/src/main/java/com/pikolive/app/avroom/singleroompk/SingleRoomPkRuleDialog.kt b/app/src/main/java/com/pikolive/app/avroom/singleroompk/SingleRoomPkRuleDialog.kt index 5bac6f085..6b3eacb3f 100644 --- a/app/src/main/java/com/pikolive/app/avroom/singleroompk/SingleRoomPkRuleDialog.kt +++ b/app/src/main/java/com/pikolive/app/avroom/singleroompk/SingleRoomPkRuleDialog.kt @@ -3,8 +3,8 @@ package com.pikolive.app.avroom.singleroompk import android.text.method.ScrollingMovementMethod import com.pikolive.app.base.BaseDialog import com.yizhuan.erban.databinding.DialogSingleRoomPkRuleBinding -import com.yizhuan.xchat_android_core.room.anotherroompk.SingleRoomPKModel -import com.yizhuan.xchat_android_core.utils.toast +import com.pikolive.core.room.anotherroompk.SingleRoomPKModel +import com.pikolive.core.utils.toast class SingleRoomPkRuleDialog : BaseDialog() { diff --git a/app/src/main/java/com/pikolive/app/avroom/view/IAvRoomView.java b/app/src/main/java/com/pikolive/app/avroom/view/IAvRoomView.java index 0df34cc06..1e6d9d16b 100644 --- a/app/src/main/java/com/pikolive/app/avroom/view/IAvRoomView.java +++ b/app/src/main/java/com/pikolive/app/avroom/view/IAvRoomView.java @@ -1,11 +1,11 @@ package com.pikolive.app.avroom.view; -import com.yizhuan.xchat_android_core.channel_page.bean.HelloMessageInfo; -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo; -import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.user.bean.FirstChargeInfo; +import com.pikolive.core.channel_page.bean.HelloMessageInfo; +import com.pikolive.core.gift.bean.GiftInfo; +import com.pikolive.core.monsterhunting.bean.MonsterInfo; +import com.pikolive.core.room.bean.RoomInfo; +import com.pikolive.core.user.bean.FirstChargeInfo; import com.pikolive.library.base.IMvpBaseView; /** diff --git a/app/src/main/java/com/pikolive/app/avroom/view/IBaseRoomView.kt b/app/src/main/java/com/pikolive/app/avroom/view/IBaseRoomView.kt index dd7c141f7..7d9efe7a6 100644 --- a/app/src/main/java/com/pikolive/app/avroom/view/IBaseRoomView.kt +++ b/app/src/main/java/com/pikolive/app/avroom/view/IBaseRoomView.kt @@ -1,7 +1,7 @@ package com.pikolive.app.avroom.view -import com.yizhuan.xchat_android_core.bean.RoomMicInfo -import com.yizhuan.xchat_android_core.room.bean.RoomContributeUserInfo +import com.pikolive.core.bean.RoomMicInfo +import com.pikolive.core.room.bean.RoomContributeUserInfo import com.pikolive.library.base.IMvpBaseView /** diff --git a/app/src/main/java/com/pikolive/app/avroom/view/IGameRoomView.java b/app/src/main/java/com/pikolive/app/avroom/view/IGameRoomView.java index f30ab52e6..de8462d7c 100644 --- a/app/src/main/java/com/pikolive/app/avroom/view/IGameRoomView.java +++ b/app/src/main/java/com/pikolive/app/avroom/view/IGameRoomView.java @@ -1,6 +1,6 @@ package com.pikolive.app.avroom.view; -import com.yizhuan.xchat_android_core.home.bean.BannerInfo; +import com.pikolive.core2.home.bean.BannerInfo; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/avroom/view/IHomePartyUserListView.java b/app/src/main/java/com/pikolive/app/avroom/view/IHomePartyUserListView.java index 427b0ccfa..f7dab2606 100644 --- a/app/src/main/java/com/pikolive/app/avroom/view/IHomePartyUserListView.java +++ b/app/src/main/java/com/pikolive/app/avroom/view/IHomePartyUserListView.java @@ -2,7 +2,7 @@ package com.pikolive.app.avroom.view; -import com.yizhuan.xchat_android_core.room.bean.OnlineChatMember; +import com.pikolive.core.room.bean.OnlineChatMember; import com.pikolive.library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/avroom/view/IHomePartyView.java b/app/src/main/java/com/pikolive/app/avroom/view/IHomePartyView.java index 266b988dd..53746d36f 100644 --- a/app/src/main/java/com/pikolive/app/avroom/view/IHomePartyView.java +++ b/app/src/main/java/com/pikolive/app/avroom/view/IHomePartyView.java @@ -1,7 +1,7 @@ package com.pikolive.app.avroom.view; -import com.yizhuan.xchat_android_core.home.bean.BannerInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; +import com.pikolive.core2.home.bean.BannerInfo; +import com.pikolive.core.room.bean.RoomInfo; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/avroom/view/ILightChatConsumeView.java b/app/src/main/java/com/pikolive/app/avroom/view/ILightChatConsumeView.java index 8fea7d105..0d825fc56 100644 --- a/app/src/main/java/com/pikolive/app/avroom/view/ILightChatConsumeView.java +++ b/app/src/main/java/com/pikolive/app/avroom/view/ILightChatConsumeView.java @@ -2,7 +2,7 @@ package com.pikolive.app.avroom.view; -import com.yizhuan.xchat_android_core.room.queue.bean.RoomConsumeInfo; +import com.pikolive.core.room.queue.bean.RoomConsumeInfo; import com.pikolive.library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/avroom/view/IRoomCharmRankingListView.java b/app/src/main/java/com/pikolive/app/avroom/view/IRoomCharmRankingListView.java index 68ca9a408..b44dee548 100644 --- a/app/src/main/java/com/pikolive/app/avroom/view/IRoomCharmRankingListView.java +++ b/app/src/main/java/com/pikolive/app/avroom/view/IRoomCharmRankingListView.java @@ -1,6 +1,6 @@ package com.pikolive.app.avroom.view; -import com.yizhuan.xchat_android_core.room.bean.RoomRankMultiItem; +import com.pikolive.core.room.bean.RoomRankMultiItem; import com.pikolive.library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/avroom/view/IRoomContributeListView.java b/app/src/main/java/com/pikolive/app/avroom/view/IRoomContributeListView.java index b37ad27b5..31ff84b51 100644 --- a/app/src/main/java/com/pikolive/app/avroom/view/IRoomContributeListView.java +++ b/app/src/main/java/com/pikolive/app/avroom/view/IRoomContributeListView.java @@ -1,7 +1,7 @@ package com.pikolive.app.avroom.view; -import com.yizhuan.xchat_android_core.room.bean.RoomContributeDataInfo; +import com.pikolive.core.room.bean.RoomContributeDataInfo; import com.pikolive.library.base.IMvpBaseView; /** diff --git a/app/src/main/java/com/pikolive/app/avroom/view/IRoomSettingView.java b/app/src/main/java/com/pikolive/app/avroom/view/IRoomSettingView.java index 3fefe3e5a..3977f9734 100644 --- a/app/src/main/java/com/pikolive/app/avroom/view/IRoomSettingView.java +++ b/app/src/main/java/com/pikolive/app/avroom/view/IRoomSettingView.java @@ -1,8 +1,8 @@ package com.pikolive.app.avroom.view; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomSettingTabInfo; -import com.yizhuan.xchat_android_core.room.bean.SingleRoomSortInfo; +import com.pikolive.core.room.bean.RoomInfo; +import com.pikolive.core.room.bean.RoomSettingTabInfo; +import com.pikolive.core.room.bean.SingleRoomSortInfo; import com.pikolive.library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/avroom/view/ISingleRoomView.java b/app/src/main/java/com/pikolive/app/avroom/view/ISingleRoomView.java index d64e7a497..6656075f8 100644 --- a/app/src/main/java/com/pikolive/app/avroom/view/ISingleRoomView.java +++ b/app/src/main/java/com/pikolive/app/avroom/view/ISingleRoomView.java @@ -1,6 +1,6 @@ package com.pikolive.app.avroom.view; -import com.yizhuan.xchat_android_core.home.bean.BannerInfo; +import com.pikolive.core2.home.bean.BannerInfo; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/avroom/widget/ActivityTimerView.java b/app/src/main/java/com/pikolive/app/avroom/widget/ActivityTimerView.java index 797230aaf..80278c073 100644 --- a/app/src/main/java/com/pikolive/app/avroom/widget/ActivityTimerView.java +++ b/app/src/main/java/com/pikolive/app/avroom/widget/ActivityTimerView.java @@ -8,7 +8,7 @@ import android.widget.TextView; import androidx.annotation.Nullable; import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.room.activitytimer.TimerBean; +import com.pikolive.core.room.activitytimer.TimerBean; import com.pikolive.library.utils.ResUtil; import java.util.concurrent.TimeUnit; diff --git a/app/src/main/java/com/pikolive/app/avroom/widget/BottomView.java b/app/src/main/java/com/pikolive/app/avroom/widget/BottomView.java index 50f6eb503..b41c63c85 100644 --- a/app/src/main/java/com/pikolive/app/avroom/widget/BottomView.java +++ b/app/src/main/java/com/pikolive/app/avroom/widget/BottomView.java @@ -30,17 +30,17 @@ import com.yizhuan.erban.R; import com.pikolive.app.ui.utils.ImageLoadUtils; import com.pikolive.app.vip.VipMainActivity; import com.yizhuan.tutu.room_chat.activity.RoomMsgActivity; -import com.yizhuan.xchat_android_core.helper.ImHelperUtils; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMMessageManager; -import com.yizhuan.xchat_android_core.pay.event.FirstChargeEvent; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomModeType; -import com.yizhuan.xchat_android_core.super_admin.util.SuperAdminUtil; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; -import com.yizhuan.xchat_android_core.utils.StringExtensionKt; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core2.helper.ImHelperUtils; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core.manager.IMMessageManager; +import com.pikolive.core.pay.event.FirstChargeEvent; +import com.pikolive.core.room.bean.RoomInfo; +import com.pikolive.core.room.bean.RoomModeType; +import com.pikolive.core.admin.util.SuperAdminUtil; +import com.pikolive.core.user.UserModel; +import com.pikolive.core.utils.SharedPreferenceUtils; +import com.pikolive.core.utils.StringExtensionKt; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.utils.ListUtils; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/main/java/com/pikolive/app/avroom/widget/GiftEffectView.java b/app/src/main/java/com/pikolive/app/avroom/widget/GiftEffectView.java index ce0f395ae..a2f678266 100644 --- a/app/src/main/java/com/pikolive/app/avroom/widget/GiftEffectView.java +++ b/app/src/main/java/com/pikolive/app/avroom/widget/GiftEffectView.java @@ -25,14 +25,14 @@ import com.tencent.qgame.animplayer.AnimView; import com.yizhuan.erban.R; import com.pikolive.app.common.widget.CircleImageView; import com.pikolive.app.ui.utils.ImageLoadKt; -import com.yizhuan.xchat_android_core.gift.GiftModel; -import com.yizhuan.xchat_android_core.gift.bean.GiftEffectInfo; -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo; -import com.yizhuan.xchat_android_core.initial.InitialModel; -import com.yizhuan.xchat_android_core.initial.bean.InitInfo; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.manager.RoomEvent; +import com.pikolive.core.gift.GiftModel; +import com.pikolive.core.gift.bean.GiftEffectInfo; +import com.pikolive.core.gift.bean.GiftInfo; +import com.pikolive.core.initial.InitialModel; +import com.pikolive.core.initial.bean.InitInfo; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core2.manager.IMNetEaseManager; +import com.pikolive.core.manager.RoomEvent; import com.pikolive.library.utils.ResolutionUtils; import java.lang.ref.WeakReference; diff --git a/app/src/main/java/com/pikolive/app/avroom/widget/GiftV2View.java b/app/src/main/java/com/pikolive/app/avroom/widget/GiftV2View.java index 870d8e35b..2b1e7d0b5 100644 --- a/app/src/main/java/com/pikolive/app/avroom/widget/GiftV2View.java +++ b/app/src/main/java/com/pikolive/app/avroom/widget/GiftV2View.java @@ -34,23 +34,23 @@ import com.yizhuan.erban.R; import com.pikolive.app.common.svga.SimpleSvgaParseCompletion; import com.pikolive.app.ui.utils.ImageLoadUtils; import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.xchat_android_core.fansteam.FansTeamMsgInfo; -import com.yizhuan.xchat_android_core.gift.GiftModel; -import com.yizhuan.xchat_android_core.gift.bean.GiftEffectInfo; -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo; -import com.yizhuan.xchat_android_core.gift.bean.GiftMultiReceiverInfo; -import com.yizhuan.xchat_android_core.gift.bean.GiftReceiveInfo; -import com.yizhuan.xchat_android_core.gift.bean.GiftReceiver; -import com.yizhuan.xchat_android_core.gift.bean.LuckyBagGifts; -import com.yizhuan.xchat_android_core.gift.bean.MultiGiftReceiveInfo; -import com.yizhuan.xchat_android_core.im.custom.bean.FansTeamMsgAttachment; -import com.yizhuan.xchat_android_core.magic.MagicModel; -import com.yizhuan.xchat_android_core.magic.ObjectPool; -import com.yizhuan.xchat_android_core.magic.bean.MagicInfo; -import com.yizhuan.xchat_android_core.magic.bean.MagicReceivedInfo; -import com.yizhuan.xchat_android_core.magic.bean.MultiMagicReceivedInfo; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; +import com.pikolive.core.fansteam.FansTeamMsgInfo; +import com.pikolive.core.gift.GiftModel; +import com.pikolive.core.gift.bean.GiftEffectInfo; +import com.pikolive.core.gift.bean.GiftInfo; +import com.pikolive.core.gift.bean.GiftMultiReceiverInfo; +import com.pikolive.core.gift.bean.GiftReceiveInfo; +import com.pikolive.core.gift.bean.GiftReceiver; +import com.pikolive.core.gift.bean.LuckyBagGifts; +import com.pikolive.core.gift.bean.MultiGiftReceiveInfo; +import com.pikolive.core.im.custom.bean.FansTeamMsgAttachment; +import com.pikolive.core.magic.MagicModel; +import com.pikolive.core.magic.ObjectPool; +import com.pikolive.core.magic.bean.MagicInfo; +import com.pikolive.core.magic.bean.MagicReceivedInfo; +import com.pikolive.core.magic.bean.MultiMagicReceivedInfo; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core.room.bean.RoomInfo; import com.pikolive.library.utils.ResUtil; import com.pikolive.library.utils.ResolutionUtils; diff --git a/app/src/main/java/com/pikolive/app/avroom/widget/MessageView.java b/app/src/main/java/com/pikolive/app/avroom/widget/MessageView.java index 7ec7c9201..044b425f5 100644 --- a/app/src/main/java/com/pikolive/app/avroom/widget/MessageView.java +++ b/app/src/main/java/com/pikolive/app/avroom/widget/MessageView.java @@ -1,27 +1,27 @@ package com.pikolive.app.avroom.widget; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_FAIRY; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_GIFT_COMPOUND; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_RED_PACKAGE; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_ROOM_ALBUM; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_BOX_ME; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_CONVERT_L1; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_CONVERT_L2; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_CONVERT_L3; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_DRAW_BALL_L1; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_DRAW_BALL_L2; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_DRAW_BALL_L3; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_DRAW_GIFT_L1; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_DRAW_GIFT_L2; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_DRAW_GIFT_L3; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_DRAW_GIFT_L4; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_DRAW_GIFT_L5; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_FANS_TEAM_JOIN; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_GIFT_COMPOUND; -import static com.yizhuan.xchat_android_core.redpackage.RedPackageTypeKt.ALL_DIAMOND; -import static com.yizhuan.xchat_android_core.redpackage.RedPackageTypeKt.ALL_GIFT; -import static com.yizhuan.xchat_android_core.redpackage.RedPackageTypeKt.ROOM_DIAMOND; -import static com.yizhuan.xchat_android_core.redpackage.RedPackageTypeKt.ROOM_GIFT; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_FAIRY; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_GIFT_COMPOUND; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_RED_PACKAGE; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_ROOM_ALBUM; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_BOX_ME; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_CONVERT_L1; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_CONVERT_L2; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_CONVERT_L3; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_DRAW_BALL_L1; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_DRAW_BALL_L2; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_DRAW_BALL_L3; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_DRAW_GIFT_L1; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_DRAW_GIFT_L2; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_DRAW_GIFT_L3; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_DRAW_GIFT_L4; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_DRAW_GIFT_L5; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_FANS_TEAM_JOIN; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_GIFT_COMPOUND; +import static com.pikolive.core.redpackage.RedPackageTypeKt.ALL_DIAMOND; +import static com.pikolive.core.redpackage.RedPackageTypeKt.ALL_GIFT; +import static com.pikolive.core.redpackage.RedPackageTypeKt.ROOM_DIAMOND; +import static com.pikolive.core.redpackage.RedPackageTypeKt.ROOM_GIFT; import android.annotation.SuppressLint; import android.app.Activity; @@ -90,101 +90,101 @@ import com.pikolive.app.ui.widget.RecyclerViewNoViewpagerScroll; import com.pikolive.app.ui.widget.UserInfoDialog; import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil; import com.pikolive.app.utils.RegexUtil; -import com.yizhuan.xchat_android_constants.XChatConstants; -import com.yizhuan.xchat_android_core.DemoCache; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.bean.attachmsg.RoomQueueMsgAttachment; -import com.yizhuan.xchat_android_core.decoration.car.bean.CarInfo; -import com.yizhuan.xchat_android_core.fansteam.FansTeamMsgInfo; -import com.yizhuan.xchat_android_core.gift.GiftModel; -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo; -import com.yizhuan.xchat_android_core.gift.bean.GiftList; -import com.yizhuan.xchat_android_core.gift.bean.GiftReceiveInfo; -import com.yizhuan.xchat_android_core.gift.bean.GiftReceiver; -import com.yizhuan.xchat_android_core.gift.bean.LuckyBagGifts; -import com.yizhuan.xchat_android_core.gift.bean.LuckyBagNoticeInfo; -import com.yizhuan.xchat_android_core.gift.toolbox.GiftToolbox; -import com.yizhuan.xchat_android_core.helper.ImHelperUtils; -import com.yizhuan.xchat_android_core.home.event.FollowRoomEvent; -import com.yizhuan.xchat_android_core.home.model.CollectionRoomModel; -import com.yizhuan.xchat_android_core.im.custom.bean.AuctionAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.CarveUpGoldAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.CleanScreenAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.DatingAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.FaceAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.FairyMsgAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.FansTeamMsgAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.GiftAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.GiftBatchAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.GiftCompoundAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.GiftCompoundMsgBean; -import com.yizhuan.xchat_android_core.im.custom.bean.JoinMiniWorldAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.JoinMiniWorldNoticeAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.MagicAllMicAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.MagicAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.MagicBatchAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.MonsterHuntingResultAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.MonsterStatusAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.MultiGiftAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.MultiLuckyGiftAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.NobleAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.RedPackageRoomMsgAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomAlbumAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomAlbumMsgInfo; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomBoxPrizeAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomFollowOwnerAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomFollowOwnerAttachment2; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomLuckySeaAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomLuckySeaMsgBean; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomNoticeAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomPhoto; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomReceivedLuckyGiftAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomTipAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.TarotAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.TarotMsgBean; -import com.yizhuan.xchat_android_core.im.custom.bean.User; -import com.yizhuan.xchat_android_core.im.custom.bean.VipMessageAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.WelcomeAttachment; -import com.yizhuan.xchat_android_core.level.UserLevelResourceType; -import com.yizhuan.xchat_android_core.magic.MagicModel; -import com.yizhuan.xchat_android_core.magic.bean.MagicInfo; -import com.yizhuan.xchat_android_core.magic.bean.MagicMultiReceiverInfo; -import com.yizhuan.xchat_android_core.magic.bean.MagicReceivedInfo; -import com.yizhuan.xchat_android_core.magic.bean.MagicReceiver; -import com.yizhuan.xchat_android_core.magic.bean.MultiMagicReceivedInfo; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldInWorldInfo; -import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterHuntingResult; -import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterProtocol; -import com.yizhuan.xchat_android_core.noble.NobleInfo; -import com.yizhuan.xchat_android_core.noble.NobleUtil; -import com.yizhuan.xchat_android_core.praise.PraiseModel; -import com.yizhuan.xchat_android_core.redpackage.RedEnvelopeRoomMsg; -import com.yizhuan.xchat_android_core.room.anotherroompk.ShowUserInfoDialogEvent; -import com.yizhuan.xchat_android_core.room.bean.DatingNotifyInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomMessageViewNoticeInfo; -import com.yizhuan.xchat_android_core.room.bean.WelcomeInfo; -import com.yizhuan.xchat_android_core.room.face.DynamicFaceModel; -import com.yizhuan.xchat_android_core.room.face.FaceInfo; -import com.yizhuan.xchat_android_core.room.face.FaceReceiveInfo; -import com.yizhuan.xchat_android_core.room.model.AvRoomModel; -import com.yizhuan.xchat_android_core.room.pk.attachment.RoomPkAttachment; -import com.yizhuan.xchat_android_core.room.pk.bean.PKTeamInfo; -import com.yizhuan.xchat_android_core.room.pk.bean.RoomPKInvitedUpMicMember; -import com.yizhuan.xchat_android_core.room.pk.bean.RoomPkData; -import com.yizhuan.xchat_android_core.room.queuing_mic.attachment.QueuingMicAttachment; -import com.yizhuan.xchat_android_core.room.queuing_mic.bean.QueuingMicInfo; -import com.yizhuan.xchat_android_core.treasurefairy.FairyMsgInfoBean; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.utils.ExtensionUtil; -import com.yizhuan.xchat_android_core.utils.StringExtensionKt; -import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_core.vip.VipMessageInfo; +import com.pikolive.core2.XChatConstants; +import com.pikolive.core.DemoCache; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.bean.attachmsg.RoomQueueMsgAttachment; +import com.pikolive.core.decoration.car.bean.CarInfo; +import com.pikolive.core.fansteam.FansTeamMsgInfo; +import com.pikolive.core.gift.GiftModel; +import com.pikolive.core.gift.bean.GiftInfo; +import com.pikolive.core.gift.bean.GiftList; +import com.pikolive.core.gift.bean.GiftReceiveInfo; +import com.pikolive.core.gift.bean.GiftReceiver; +import com.pikolive.core.gift.bean.LuckyBagGifts; +import com.pikolive.core.gift.bean.LuckyBagNoticeInfo; +import com.pikolive.core.gift.toolbox.GiftToolbox; +import com.pikolive.core2.helper.ImHelperUtils; +import com.pikolive.core2.home.event.FollowRoomEvent; +import com.pikolive.core2.home.model.CollectionRoomModel; +import com.pikolive.core.im.custom.bean.AuctionAttachment; +import com.pikolive.core.im.custom.bean.CarveUpGoldAttachment; +import com.pikolive.core.im.custom.bean.CleanScreenAttachment; +import com.pikolive.core.im.custom.bean.CustomAttachment; +import com.pikolive.core.im.custom.bean.DatingAttachment; +import com.pikolive.core.im.custom.bean.FaceAttachment; +import com.pikolive.core.im.custom.bean.FairyMsgAttachment; +import com.pikolive.core.im.custom.bean.FansTeamMsgAttachment; +import com.pikolive.core.im.custom.bean.GiftAttachment; +import com.pikolive.core.im.custom.bean.GiftBatchAttachment; +import com.pikolive.core.im.custom.bean.GiftCompoundAttachment; +import com.pikolive.core.im.custom.bean.GiftCompoundMsgBean; +import com.pikolive.core.im.custom.bean.JoinMiniWorldAttachment; +import com.pikolive.core.im.custom.bean.JoinMiniWorldNoticeAttachment; +import com.pikolive.core.im.custom.bean.MagicAllMicAttachment; +import com.pikolive.core.im.custom.bean.MagicAttachment; +import com.pikolive.core.im.custom.bean.MagicBatchAttachment; +import com.pikolive.core.im.custom.bean.MonsterHuntingResultAttachment; +import com.pikolive.core.im.custom.bean.MonsterStatusAttachment; +import com.pikolive.core.im.custom.bean.MultiGiftAttachment; +import com.pikolive.core.im.custom.bean.MultiLuckyGiftAttachment; +import com.pikolive.core.im.custom.bean.NobleAttachment; +import com.pikolive.core.im.custom.bean.RedPackageRoomMsgAttachment; +import com.pikolive.core.im.custom.bean.RoomAlbumAttachment; +import com.pikolive.core.im.custom.bean.RoomAlbumMsgInfo; +import com.pikolive.core.im.custom.bean.RoomBoxPrizeAttachment; +import com.pikolive.core.im.custom.bean.RoomFollowOwnerAttachment; +import com.pikolive.core.im.custom.bean.RoomFollowOwnerAttachment2; +import com.pikolive.core.im.custom.bean.RoomLuckySeaAttachment; +import com.pikolive.core.im.custom.bean.RoomLuckySeaMsgBean; +import com.pikolive.core.im.custom.bean.RoomNoticeAttachment; +import com.pikolive.core.im.custom.bean.RoomPhoto; +import com.pikolive.core.im.custom.bean.RoomReceivedLuckyGiftAttachment; +import com.pikolive.core.im.custom.bean.RoomTipAttachment; +import com.pikolive.core.im.custom.bean.TarotAttachment; +import com.pikolive.core.im.custom.bean.TarotMsgBean; +import com.pikolive.core.im.custom.bean.User; +import com.pikolive.core.im.custom.bean.VipMessageAttachment; +import com.pikolive.core.im.custom.bean.WelcomeAttachment; +import com.pikolive.core.level.UserLevelResourceType; +import com.pikolive.core.magic.MagicModel; +import com.pikolive.core.magic.bean.MagicInfo; +import com.pikolive.core.magic.bean.MagicMultiReceiverInfo; +import com.pikolive.core.magic.bean.MagicReceivedInfo; +import com.pikolive.core.magic.bean.MagicReceiver; +import com.pikolive.core.magic.bean.MultiMagicReceivedInfo; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core2.manager.IMNetEaseManager; +import com.pikolive.core.miniworld.bean.MiniWorldInWorldInfo; +import com.pikolive.core.monsterhunting.bean.MonsterHuntingResult; +import com.pikolive.core.monsterhunting.bean.MonsterProtocol; +import com.pikolive.core.noble.NobleInfo; +import com.pikolive.core.noble.NobleUtil; +import com.pikolive.core.praise.PraiseModel; +import com.pikolive.core.redpackage.RedEnvelopeRoomMsg; +import com.pikolive.core.room.anotherroompk.ShowUserInfoDialogEvent; +import com.pikolive.core.room.bean.DatingNotifyInfo; +import com.pikolive.core.room.bean.RoomInfo; +import com.pikolive.core.room.bean.RoomMessageViewNoticeInfo; +import com.pikolive.core.room.bean.WelcomeInfo; +import com.pikolive.core.room.face.DynamicFaceModel; +import com.pikolive.core.room.face.FaceInfo; +import com.pikolive.core.room.face.FaceReceiveInfo; +import com.pikolive.core.room.model.AvRoomModel; +import com.pikolive.core.room.pk.attachment.RoomPkAttachment; +import com.pikolive.core.room.pk.bean.PKTeamInfo; +import com.pikolive.core.room.pk.bean.RoomPKInvitedUpMicMember; +import com.pikolive.core.room.pk.bean.RoomPkData; +import com.pikolive.core.room.queuing_mic.attachment.QueuingMicAttachment; +import com.pikolive.core.room.queuing_mic.bean.QueuingMicInfo; +import com.pikolive.core2.treasurefairy.FairyMsgInfoBean; +import com.pikolive.core.user.UserModel; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.utils.ExtensionUtil; +import com.pikolive.core.utils.StringExtensionKt; +import com.pikolive.core.utils.net.DontWarnObserver; +import com.pikolive.core.utils.net.RxHelper; +import com.pikolive.core.vip.VipMessageInfo; import com.pikolive.library.rxbus.RxBus; import com.pikolive.library.utils.FormatUtils; import com.pikolive.library.utils.JavaUtil; diff --git a/app/src/main/java/com/pikolive/app/avroom/widget/MicroView.java b/app/src/main/java/com/pikolive/app/avroom/widget/MicroView.java index 36473aad7..4e52b723a 100644 --- a/app/src/main/java/com/pikolive/app/avroom/widget/MicroView.java +++ b/app/src/main/java/com/pikolive/app/avroom/widget/MicroView.java @@ -24,21 +24,18 @@ import com.pikolive.app.avroom.adapter.BaseMicroViewAdapter; import com.pikolive.app.avroom.adapter.DatingMicroViewAdapter; import com.pikolive.app.avroom.adapter.OnMicroItemClickListener; import com.yizhuan.erban.R; -import com.pikolive.app.avroom.adapter.BaseMicroViewAdapter; -import com.pikolive.app.avroom.adapter.DatingMicroViewAdapter; -import com.pikolive.app.avroom.adapter.OnMicroItemClickListener; import com.pikolive.app.ui.anim.AnimFactory; import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil; import com.pikolive.app.ui.widget.recyclerview.decoration.DatingItemDecoration; -import com.yizhuan.xchat_android_core.bean.RoomQueueInfo; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.manager.RoomEvent; -import com.yizhuan.xchat_android_core.noble.NobleResourceType; -import com.yizhuan.xchat_android_core.noble.NobleUtil; -import com.yizhuan.xchat_android_core.room.event.ReceiveFaceEvent; -import com.yizhuan.xchat_android_core.room.face.FaceReceiveInfo; -import com.yizhuan.xchat_android_core.utils.LogUtils; +import com.pikolive.core.bean.RoomQueueInfo; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core2.manager.IMNetEaseManager; +import com.pikolive.core.manager.RoomEvent; +import com.pikolive.core.noble.NobleResourceType; +import com.pikolive.core.noble.NobleUtil; +import com.pikolive.core.room.event.ReceiveFaceEvent; +import com.pikolive.core.room.face.FaceReceiveInfo; +import com.pikolive.core.utils.LogUtils; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/com/pikolive/app/avroom/widget/PKBoardView.java b/app/src/main/java/com/pikolive/app/avroom/widget/PKBoardView.java index 608089d61..ccbd9f924 100644 --- a/app/src/main/java/com/pikolive/app/avroom/widget/PKBoardView.java +++ b/app/src/main/java/com/pikolive/app/avroom/widget/PKBoardView.java @@ -15,16 +15,16 @@ import com.yizhuan.erban.R; import com.pikolive.app.avroom.dialog.PKScoreBoardDialog; import com.pikolive.app.avroom.dialog.PKSelectPeopleDialog; import com.pikolive.app.common.widget.CircleImageView; -import com.yizhuan.xchat_android_core.bean.RoomQueueInfo; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.room.pk.bean.PKMemberInfo; -import com.yizhuan.xchat_android_core.room.pk.bean.PKTeamInfo; -import com.yizhuan.xchat_android_core.room.pk.bean.RoomPKInvitedUpMicMember; -import com.yizhuan.xchat_android_core.room.pk.bean.RoomPkData; -import com.yizhuan.xchat_android_core.room.pk.event.PKDataUpdateEvent; -import com.yizhuan.xchat_android_core.room.pk.event.PKTimeFinishEvent; -import com.yizhuan.xchat_android_core.room.pk.event.PKTimeTickEvent; -import com.yizhuan.xchat_android_core.room.pk.model.PkModel; +import com.pikolive.core.bean.RoomQueueInfo; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core.room.pk.bean.PKMemberInfo; +import com.pikolive.core.room.pk.bean.PKTeamInfo; +import com.pikolive.core.room.pk.bean.RoomPKInvitedUpMicMember; +import com.pikolive.core.room.pk.bean.RoomPkData; +import com.pikolive.core.room.pk.event.PKDataUpdateEvent; +import com.pikolive.core.room.pk.event.PKTimeFinishEvent; +import com.pikolive.core.room.pk.event.PKTimeTickEvent; +import com.pikolive.core.room.pk.model.PkModel; import com.pikolive.library.utils.FormatUtils; import com.pikolive.library.utils.ResUtil; import com.pikolive.library.utils.SingleToastUtil; diff --git a/app/src/main/java/com/pikolive/app/avroom/widget/RoomEffectBoxView.kt b/app/src/main/java/com/pikolive/app/avroom/widget/RoomEffectBoxView.kt index a8b965bdb..3888dadf1 100644 --- a/app/src/main/java/com/pikolive/app/avroom/widget/RoomEffectBoxView.kt +++ b/app/src/main/java/com/pikolive/app/avroom/widget/RoomEffectBoxView.kt @@ -35,21 +35,21 @@ import com.pikolive.app.ui.utils.loadAnim import com.pikolive.app.ui.widget.SimpleAnimListener import com.pikolive.app.ui.widget.drawgift.DrawGiftPlayHelper import com.pikolive.app.utils.SpannableBuilder -import com.yizhuan.xchat_android_constants.XChatConstants -import com.yizhuan.xchat_android_core.auth.AuthModel -import com.yizhuan.xchat_android_core.decoration.car.bean.CarInfo -import com.yizhuan.xchat_android_core.im.custom.bean.* -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_BOX_ALL_ROOM_NOTIFY -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_BOX_ALL_ROOM_NOTIFY_BY_SVGA -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager -import com.yizhuan.xchat_android_core.manager.RoomEvent -import com.yizhuan.xchat_android_core.monsterhunting.SimpleAnimationListener -import com.yizhuan.xchat_android_core.room.bean.DatingNotifyInfo -import com.yizhuan.xchat_android_core.super_admin.util.SuperAdminUtil -import com.yizhuan.xchat_android_core.user.UserModel -import com.yizhuan.xchat_android_core.user.bean.UserInfo -import com.yizhuan.xchat_android_core.utils.subAndReplaceDot +import com.pikolive.core.admin.util.SuperAdminUtil +import com.pikolive.core.auth.AuthModel +import com.pikolive.core.decoration.car.bean.CarInfo +import com.pikolive.core2.XChatConstants +import com.pikolive.core.im.custom.bean.* +import com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_BOX_ALL_ROOM_NOTIFY +import com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_BOX_ALL_ROOM_NOTIFY_BY_SVGA +import com.pikolive.core.manager.AvRoomDataManager +import com.pikolive.core.manager.RoomEvent +import com.pikolive.core.monsterhunting.SimpleAnimationListener +import com.pikolive.core.room.bean.DatingNotifyInfo +import com.pikolive.core.user.UserModel +import com.pikolive.core.user.bean.UserInfo +import com.pikolive.core.utils.subAndReplaceDot +import com.pikolive.core2.manager.IMNetEaseManager import com.pikolive.library.utils.ListUtils import com.pikolive.library.utils.ResUtil import com.pikolive.library.utils.StringUtils @@ -468,7 +468,8 @@ class RoomEffectBoxView @JvmOverloads constructor( } private fun showRadishNotify(chatRoomMessage: ChatRoomMessage?) { - val attachment = chatRoomMessage?.attachment as? RoomBoxPrizeAttachment ?: return + val attachment = chatRoomMessage?.attachment as? RoomBoxPrizeAttachment + ?: return val textView = LayoutInflater.from(mContext) .inflate(R.layout.layout_room_radish_notify, null) as TextView @@ -548,7 +549,8 @@ class RoomEffectBoxView @JvmOverloads constructor( } private fun showRadishNotifyBySVGA(chatRoomMessage: ChatRoomMessage?) { - val attachment = chatRoomMessage?.attachment as? RoomBoxPrizeAttachment ?: return + val attachment = chatRoomMessage?.attachment as? RoomBoxPrizeAttachment + ?: return val text = SpannableBuilder() .append( ResUtil.getString(R.string.avroom_widget_roomeffectview_016), diff --git a/app/src/main/java/com/pikolive/app/avroom/widget/RoomEffectView.kt b/app/src/main/java/com/pikolive/app/avroom/widget/RoomEffectView.kt index 4230e5654..a46db18cc 100644 --- a/app/src/main/java/com/pikolive/app/avroom/widget/RoomEffectView.kt +++ b/app/src/main/java/com/pikolive/app/avroom/widget/RoomEffectView.kt @@ -42,19 +42,19 @@ import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil import com.pikolive.app.utils.MsgBuilder import com.pikolive.app.utils.RegexUtil import com.pikolive.app.utils.SpannableBuilder -import com.yizhuan.xchat_android_constants.XChatConstants -import com.yizhuan.xchat_android_core.auth.AuthModel -import com.yizhuan.xchat_android_core.decoration.car.bean.CarInfo -import com.yizhuan.xchat_android_core.im.custom.bean.* -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager -import com.yizhuan.xchat_android_core.manager.RoomEvent -import com.yizhuan.xchat_android_core.monsterhunting.SimpleAnimationListener -import com.yizhuan.xchat_android_core.room.bean.DatingNotifyInfo -import com.yizhuan.xchat_android_core.super_admin.util.SuperAdminUtil -import com.yizhuan.xchat_android_core.user.UserModel -import com.yizhuan.xchat_android_core.user.bean.UserInfo -import com.yizhuan.xchat_android_core.utils.subAndReplaceDot +import com.pikolive.core.admin.util.SuperAdminUtil +import com.pikolive.core.auth.AuthModel +import com.pikolive.core.decoration.car.bean.CarInfo +import com.pikolive.core2.XChatConstants +import com.pikolive.core.im.custom.bean.* +import com.pikolive.core.manager.AvRoomDataManager +import com.pikolive.core.manager.RoomEvent +import com.pikolive.core.monsterhunting.SimpleAnimationListener +import com.pikolive.core.room.bean.DatingNotifyInfo +import com.pikolive.core.user.UserModel +import com.pikolive.core.user.bean.UserInfo +import com.pikolive.core.utils.subAndReplaceDot +import com.pikolive.core2.manager.IMNetEaseManager import com.pikolive.library.utils.ListUtils import com.pikolive.library.utils.ResUtil import com.pikolive.library.utils.StringUtils @@ -653,7 +653,8 @@ class RoomEffectView @JvmOverloads constructor( private fun showLuckyBagNotify(roomPlayBean: RoomPlayBean) { val message = roomPlayBean.chatRoomMessage - val attachment = message.attachment as? RoomReceivedLuckyGiftAttachment ?: return + val attachment = message.attachment as? RoomReceivedLuckyGiftAttachment + ?: return val noticeInfo = attachment.luckyBagNoticeInfo ?: return val text = SpannableBuilder() .append( @@ -1164,7 +1165,8 @@ class RoomEffectView @JvmOverloads constructor( } private fun showRadishNotify(chatRoomMessage: ChatRoomMessage?) { - val attachment = chatRoomMessage?.attachment as? RoomBoxPrizeAttachment ?: return + val attachment = chatRoomMessage?.attachment as? RoomBoxPrizeAttachment + ?: return val textView = LayoutInflater.from(mContext) .inflate(R.layout.layout_room_radish_notify, null) as TextView @@ -1244,7 +1246,8 @@ class RoomEffectView @JvmOverloads constructor( } private fun showRadishNotifyBySVGA(chatRoomMessage: ChatRoomMessage?) { - val attachment = chatRoomMessage?.attachment as? RoomBoxPrizeAttachment ?: return + val attachment = chatRoomMessage?.attachment as? RoomBoxPrizeAttachment + ?: return val text = SpannableBuilder() .append( ResUtil.getString(R.string.avroom_widget_roomeffectview_016), diff --git a/app/src/main/java/com/pikolive/app/avroom/widget/VerticalViewPagerAdapter.java b/app/src/main/java/com/pikolive/app/avroom/widget/VerticalViewPagerAdapter.java index cab3fa654..d822c9460 100644 --- a/app/src/main/java/com/pikolive/app/avroom/widget/VerticalViewPagerAdapter.java +++ b/app/src/main/java/com/pikolive/app/avroom/widget/VerticalViewPagerAdapter.java @@ -10,9 +10,6 @@ import androidx.viewpager2.adapter.FragmentStateAdapter; import com.pikolive.app.avroom.fragment.FakeSingleRoomBackFragment; import com.pikolive.app.avroom.fragment.FakeSingleRoomFragment; import com.pikolive.app.avroom.fragment.HomePartyFragment; -import com.pikolive.app.avroom.fragment.FakeSingleRoomBackFragment; -import com.pikolive.app.avroom.fragment.FakeSingleRoomFragment; -import com.pikolive.app.avroom.fragment.HomePartyFragment; /** diff --git a/app/src/main/java/com/pikolive/app/base/BaseActivity.java b/app/src/main/java/com/pikolive/app/base/BaseActivity.java index 0b692a807..060932117 100644 --- a/app/src/main/java/com/pikolive/app/base/BaseActivity.java +++ b/app/src/main/java/com/pikolive/app/base/BaseActivity.java @@ -1,24 +1,24 @@ package com.pikolive.app.base; -import static com.yizhuan.xchat_android_core.Constants.DEBUG_MAX_UID; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MESS_HEAD_NOBLE; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MESS_SUB_OPENNOBLE; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MESS_SUB_RENEWNOBLE; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_ALL_SERVICE_GIFT; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_BOX; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_FAIRY; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_GIFT; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_GIFT; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_GIFT_SERVER_ALL; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_SEA; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_SEA_GIFT_SERVER_ALL; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_NOTIFY_H5_SUB_WHOLE_SERVICE; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_RED_PACKAGE; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_BOX_ALL_ROOM_NOTIFY_BY_SVGA; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_DRAW_GIFT_L5; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_RED_PACKAGE_RECEIVE_ALL_DIAMOND; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_VIP; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_VIP_USER_ALL_UPGRADE; +import static com.pikolive.core.Constants.DEBUG_MAX_UID; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MESS_HEAD_NOBLE; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MESS_SUB_OPENNOBLE; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MESS_SUB_RENEWNOBLE; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_ALL_SERVICE_GIFT; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_BOX; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_FAIRY; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_GIFT; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_GIFT; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_GIFT_SERVER_ALL; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_SEA; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_SEA_GIFT_SERVER_ALL; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_NOTIFY_H5_SUB_WHOLE_SERVICE; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_RED_PACKAGE; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_BOX_ALL_ROOM_NOTIFY_BY_SVGA; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_DRAW_GIFT_L5; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_RED_PACKAGE_RECEIVE_ALL_DIAMOND; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_VIP; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_VIP_USER_ALL_UPGRADE; import static com.pikolive.library.utils.UIUtils.getActivityByContext; import android.annotation.SuppressLint; @@ -95,36 +95,36 @@ import com.pikolive.app.ui.widget.dialog.AllServiceVipLevelUPDialog; import com.pikolive.app.ui.widget.dialog.OpenNobleGlobalNoticeDialog; import com.pikolive.app.utils.UserUtils; import com.yizhuan.tutu.mentoring_relationship.dialog.GrabApprenticesNoticeDialog; -import com.yizhuan.xchat_android_constants.XChatConstants; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.bean.BaseProtocol; -import com.yizhuan.xchat_android_core.gift.bean.LuckyBagNoticeInfo; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.NotifyH5Info; -import com.yizhuan.xchat_android_core.im.custom.bean.PlayEffectInfo; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomBoxPrizeInfo; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomLuckySeaMsgBean; -import com.yizhuan.xchat_android_core.im.custom.bean.TarotMsgBean; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.manager.RoomEvent; -import com.yizhuan.xchat_android_core.mentoring_relationship.event.GrabApprenticesEvent; -import com.yizhuan.xchat_android_core.newbie.NewbieHelloInfo; -import com.yizhuan.xchat_android_core.newbie.event.NewbieHelloDialogEvent; -import com.yizhuan.xchat_android_core.noble.AllServiceGiftProtocol; -import com.yizhuan.xchat_android_core.noble.NobleInfo; -import com.yizhuan.xchat_android_core.noble.NobleProtocol; -import com.yizhuan.xchat_android_core.pay.PayModel; -import com.yizhuan.xchat_android_core.pay.bean.WalletInfo; -import com.yizhuan.xchat_android_core.redpackage.RedPackageNotifyInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.room.model.AvRoomModel; -import com.yizhuan.xchat_android_core.support.room.RoomContext; -import com.yizhuan.xchat_android_core.treasurefairy.FairyMsgInfoBean; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_core.vip.VipMessageInfo; +import com.pikolive.core2.XChatConstants; +import com.pikolive.core.Constants; +import com.pikolive.core2.UriProvider; +import com.pikolive.core.bean.BaseProtocol; +import com.pikolive.core.gift.bean.LuckyBagNoticeInfo; +import com.pikolive.core.im.custom.bean.CustomAttachment; +import com.pikolive.core.im.custom.bean.NotifyH5Info; +import com.pikolive.core.im.custom.bean.PlayEffectInfo; +import com.pikolive.core.im.custom.bean.RoomBoxPrizeInfo; +import com.pikolive.core.im.custom.bean.RoomLuckySeaMsgBean; +import com.pikolive.core.im.custom.bean.TarotMsgBean; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core2.manager.IMNetEaseManager; +import com.pikolive.core.manager.RoomEvent; +import com.pikolive.core.mentoring_relationship.event.GrabApprenticesEvent; +import com.pikolive.core.newbie.NewbieHelloInfo; +import com.pikolive.core.newbie.event.NewbieHelloDialogEvent; +import com.pikolive.core.noble.AllServiceGiftProtocol; +import com.pikolive.core.noble.NobleInfo; +import com.pikolive.core.noble.NobleProtocol; +import com.pikolive.core.pay.PayModel; +import com.pikolive.core.pay.bean.WalletInfo; +import com.pikolive.core.redpackage.RedPackageNotifyInfo; +import com.pikolive.core.room.bean.RoomInfo; +import com.pikolive.core.room.model.AvRoomModel; +import com.pikolive.core.support.room.RoomContext; +import com.pikolive.core2.treasurefairy.FairyMsgInfoBean; +import com.pikolive.core.user.UserModel; +import com.pikolive.core.utils.net.RxHelper; +import com.pikolive.core.vip.VipMessageInfo; import com.pikolive.library.common.util.DeviceUtil; import com.pikolive.library.rxbus.RxBus; import com.pikolive.library.utils.AppMetaDataUtil; diff --git a/app/src/main/java/com/pikolive/app/base/BaseBindingTakePhotoActivity.java b/app/src/main/java/com/pikolive/app/base/BaseBindingTakePhotoActivity.java index 1288f0159..ec4fa0775 100644 --- a/app/src/main/java/com/pikolive/app/base/BaseBindingTakePhotoActivity.java +++ b/app/src/main/java/com/pikolive/app/base/BaseBindingTakePhotoActivity.java @@ -14,7 +14,7 @@ import com.jph.takephoto.model.CropOptions; import com.jph.takephoto.model.TResult; import com.yizhuan.erban.R; import com.pikolive.app.ui.widget.ButtonItem; -import com.yizhuan.xchat_android_core.file.FileModel; +import com.pikolive.core.file.FileModel; import com.pikolive.library.annatation.ActLayoutRes; import com.pikolive.library.utils.ResUtil; import com.pikolive.library.utils.file.JXFileUtils; diff --git a/app/src/main/java/com/pikolive/app/base/BaseListViewModel.java b/app/src/main/java/com/pikolive/app/base/BaseListViewModel.java index f5395d333..37b6a1fa1 100644 --- a/app/src/main/java/com/pikolive/app/base/BaseListViewModel.java +++ b/app/src/main/java/com/pikolive/app/base/BaseListViewModel.java @@ -6,9 +6,9 @@ import androidx.databinding.ObservableField; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import com.chad.library.adapter.base.BaseQuickAdapter; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.Constants; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.utils.SingleToastUtil; import com.pikolive.library.utils.config.BasicConfig; diff --git a/app/src/main/java/com/pikolive/app/base/BaseMsListViewModel.java b/app/src/main/java/com/pikolive/app/base/BaseMsListViewModel.java index d33e602c7..0a30f4087 100644 --- a/app/src/main/java/com/pikolive/app/base/BaseMsListViewModel.java +++ b/app/src/main/java/com/pikolive/app/base/BaseMsListViewModel.java @@ -6,9 +6,9 @@ import androidx.databinding.ObservableField; import androidx.databinding.ViewDataBinding; import com.trello.rxlifecycle3.LifecycleProvider; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.Constants; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.utils.net.RxHelper; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/base/BaseMvpTakePhotoActivity.java b/app/src/main/java/com/pikolive/app/base/BaseMvpTakePhotoActivity.java index c39dcefdb..70e515845 100644 --- a/app/src/main/java/com/pikolive/app/base/BaseMvpTakePhotoActivity.java +++ b/app/src/main/java/com/pikolive/app/base/BaseMvpTakePhotoActivity.java @@ -22,7 +22,7 @@ import com.jph.takephoto.permission.TakePhotoInvocationHandler; import com.yizhuan.erban.R; import com.pikolive.app.common.permission.PermissionActivity; import com.pikolive.app.ui.widget.ButtonItem; -import com.yizhuan.xchat_android_core.file.FileModel; +import com.pikolive.core.file.FileModel; import com.pikolive.library.base.IMvpBaseView; import com.pikolive.library.base.factory.AbstractMvpPresenter; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/main/java/com/pikolive/app/base/BaseViewModel.kt b/app/src/main/java/com/pikolive/app/base/BaseViewModel.kt index 2ef2d486a..1a0900f8b 100644 --- a/app/src/main/java/com/pikolive/app/base/BaseViewModel.kt +++ b/app/src/main/java/com/pikolive/app/base/BaseViewModel.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.yizhuan.xchat_android_core.utils.toast +import com.pikolive.core.utils.toast import com.pikolive.library.net.rxnet.exception.ExceptionHandle import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch diff --git a/app/src/main/java/com/pikolive/app/bills/activities/BillBaseActivity.java b/app/src/main/java/com/pikolive/app/bills/activities/BillBaseActivity.java index ab919d488..97e154432 100644 --- a/app/src/main/java/com/pikolive/app/bills/activities/BillBaseActivity.java +++ b/app/src/main/java/com/pikolive/app/bills/activities/BillBaseActivity.java @@ -16,8 +16,8 @@ import com.yizhuan.erban.R; import com.pikolive.app.base.BaseBindingActivity; import com.pikolive.app.bills.adapter.BillBaseAdapter; import com.pikolive.app.common.NoDataFragment; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.bills.bean.BillItemEntity; +import com.pikolive.core.Constants; +import com.pikolive.core.bills.bean.BillItemEntity; import com.pikolive.library.utils.ResUtil; import com.pikolive.library.utils.TimeUtils; diff --git a/app/src/main/java/com/pikolive/app/bills/activities/BillGiftExpendActivity.java b/app/src/main/java/com/pikolive/app/bills/activities/BillGiftExpendActivity.java index 9e31a6b2d..1462c5740 100644 --- a/app/src/main/java/com/pikolive/app/bills/activities/BillGiftExpendActivity.java +++ b/app/src/main/java/com/pikolive/app/bills/activities/BillGiftExpendActivity.java @@ -12,14 +12,14 @@ import com.yizhuan.erban.databinding.ActivityBillsGiftBinding; import com.pikolive.app.ui.pay.ChargeActivity; import com.pikolive.app.ui.webview.CommonWebViewActivity; import com.pikolive.app.ui.widget.RecyclerViewNoBugLinearLayoutManager; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.bills.BillModel; -import com.yizhuan.xchat_android_core.bills.bean.BillItemEntity; -import com.yizhuan.xchat_android_core.bills.bean.ExpendInfo; -import com.yizhuan.xchat_android_core.bills.bean.ExpendListInfo; -import com.yizhuan.xchat_android_core.pay.PayModel; -import com.yizhuan.xchat_android_core.pay.bean.WalletInfo; +import com.pikolive.core.Constants; +import com.pikolive.core2.UriProvider; +import com.pikolive.core.bills.BillModel; +import com.pikolive.core.bills.bean.BillItemEntity; +import com.pikolive.core.bills.bean.ExpendInfo; +import com.pikolive.core.bills.bean.ExpendListInfo; +import com.pikolive.core.pay.PayModel; +import com.pikolive.core.pay.bean.WalletInfo; import com.pikolive.library.annatation.ActLayoutRes; import com.pikolive.library.common.util.DeviceUtil; import com.pikolive.library.utils.AppMetaDataUtil; diff --git a/app/src/main/java/com/pikolive/app/bills/activities/BillGiftInComeActivity.java b/app/src/main/java/com/pikolive/app/bills/activities/BillGiftInComeActivity.java index a263778bc..80a3f23b3 100644 --- a/app/src/main/java/com/pikolive/app/bills/activities/BillGiftInComeActivity.java +++ b/app/src/main/java/com/pikolive/app/bills/activities/BillGiftInComeActivity.java @@ -14,14 +14,14 @@ import com.yizhuan.erban.databinding.ActivityBillsGiftBinding; import com.pikolive.app.ui.pay.ChargeActivity; import com.pikolive.app.ui.webview.CommonWebViewActivity; import com.pikolive.app.ui.widget.RecyclerViewNoBugLinearLayoutManager; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.bills.BillModel; -import com.yizhuan.xchat_android_core.bills.bean.BillItemEntity; -import com.yizhuan.xchat_android_core.bills.bean.IncomeInfo; -import com.yizhuan.xchat_android_core.bills.bean.IncomeListInfo; -import com.yizhuan.xchat_android_core.pay.PayModel; -import com.yizhuan.xchat_android_core.pay.bean.WalletInfo; +import com.pikolive.core.Constants; +import com.pikolive.core2.UriProvider; +import com.pikolive.core.bills.BillModel; +import com.pikolive.core.bills.bean.BillItemEntity; +import com.pikolive.core.bills.bean.IncomeInfo; +import com.pikolive.core.bills.bean.IncomeListInfo; +import com.pikolive.core.pay.PayModel; +import com.pikolive.core.pay.bean.WalletInfo; import com.pikolive.library.annatation.ActLayoutRes; import com.pikolive.library.common.util.DeviceUtil; import com.pikolive.library.utils.AppMetaDataUtil; diff --git a/app/src/main/java/com/pikolive/app/bills/activities/BillGiftIncomeGroupActivity.java b/app/src/main/java/com/pikolive/app/bills/activities/BillGiftIncomeGroupActivity.java index 0baa31793..da6d99f18 100644 --- a/app/src/main/java/com/pikolive/app/bills/activities/BillGiftIncomeGroupActivity.java +++ b/app/src/main/java/com/pikolive/app/bills/activities/BillGiftIncomeGroupActivity.java @@ -26,8 +26,8 @@ import com.pikolive.app.ui.webview.CommonWebViewActivity; import com.pikolive.app.ui.widget.magicindicator.MagicIndicator; import com.pikolive.app.ui.widget.magicindicator.ViewPagerHelper; import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.UriProvider; +import com.pikolive.core.Constants; +import com.pikolive.core2.UriProvider; import com.pikolive.library.base.factory.CreatePresenter; import com.pikolive.library.common.util.DeviceUtil; import com.pikolive.library.utils.AppMetaDataUtil; diff --git a/app/src/main/java/com/pikolive/app/bills/activities/BillNobleActivity.java b/app/src/main/java/com/pikolive/app/bills/activities/BillNobleActivity.java index 2e83e4bd2..81b44a02a 100644 --- a/app/src/main/java/com/pikolive/app/bills/activities/BillNobleActivity.java +++ b/app/src/main/java/com/pikolive/app/bills/activities/BillNobleActivity.java @@ -10,10 +10,10 @@ import com.yizhuan.erban.R; import com.pikolive.app.bills.adapter.NobleBillAdapter; import com.yizhuan.erban.databinding.ActivityBillsBinding; import com.pikolive.app.ui.widget.RecyclerViewNoBugLinearLayoutManager; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.bills.BillModel; -import com.yizhuan.xchat_android_core.bills.bean.BillItemEntity; -import com.yizhuan.xchat_android_core.bills.bean.NobleBillListInfo; +import com.pikolive.core.Constants; +import com.pikolive.core.bills.BillModel; +import com.pikolive.core.bills.bean.BillItemEntity; +import com.pikolive.core.bills.bean.NobleBillListInfo; import com.pikolive.library.annatation.ActLayoutRes; import com.pikolive.library.utils.ListUtils; diff --git a/app/src/main/java/com/pikolive/app/bills/activities/ChargeBillsActivity.java b/app/src/main/java/com/pikolive/app/bills/activities/ChargeBillsActivity.java index 43421ea8a..16d8b9fe9 100644 --- a/app/src/main/java/com/pikolive/app/bills/activities/ChargeBillsActivity.java +++ b/app/src/main/java/com/pikolive/app/bills/activities/ChargeBillsActivity.java @@ -14,13 +14,13 @@ import com.yizhuan.erban.databinding.ActivityBillsBinding; import com.pikolive.app.ui.pay.ChargeActivity; import com.pikolive.app.ui.webview.CommonWebViewActivity; import com.pikolive.app.ui.widget.RecyclerViewNoBugLinearLayoutManager; -import com.yizhuan.xchat_android_constants.XChatConstants; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.bills.BillModel; -import com.yizhuan.xchat_android_core.bills.bean.BillItemEntity; -import com.yizhuan.xchat_android_core.bills.bean.ExpendInfo; -import com.yizhuan.xchat_android_core.bills.bean.ExpendListInfo; +import com.pikolive.core2.XChatConstants; +import com.pikolive.core.Constants; +import com.pikolive.core2.UriProvider; +import com.pikolive.core.bills.BillModel; +import com.pikolive.core.bills.bean.BillItemEntity; +import com.pikolive.core.bills.bean.ExpendInfo; +import com.pikolive.core.bills.bean.ExpendListInfo; import com.pikolive.library.annatation.ActLayoutRes; import com.pikolive.library.common.util.DeviceUtil; import com.pikolive.library.utils.AppMetaDataUtil; diff --git a/app/src/main/java/com/pikolive/app/bills/activities/ChatBillsActivity.java b/app/src/main/java/com/pikolive/app/bills/activities/ChatBillsActivity.java index 859829090..0979b2915 100644 --- a/app/src/main/java/com/pikolive/app/bills/activities/ChatBillsActivity.java +++ b/app/src/main/java/com/pikolive/app/bills/activities/ChatBillsActivity.java @@ -11,11 +11,11 @@ import com.pikolive.app.bills.adapter.ChatBillsAdapter; import com.yizhuan.erban.R; import com.yizhuan.erban.databinding.ActivityBillsBinding; import com.pikolive.app.ui.widget.RecyclerViewNoBugLinearLayoutManager; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.bills.BillModel; -import com.yizhuan.xchat_android_core.bills.bean.BillItemEntity; -import com.yizhuan.xchat_android_core.bills.bean.IncomeInfo; -import com.yizhuan.xchat_android_core.bills.bean.IncomeListInfo; +import com.pikolive.core.Constants; +import com.pikolive.core.bills.BillModel; +import com.pikolive.core.bills.bean.BillItemEntity; +import com.pikolive.core.bills.bean.IncomeInfo; +import com.pikolive.core.bills.bean.IncomeListInfo; import com.pikolive.library.annatation.ActLayoutRes; import com.pikolive.library.utils.ListUtils; diff --git a/app/src/main/java/com/pikolive/app/bills/activities/RedBagBillsActivity.java b/app/src/main/java/com/pikolive/app/bills/activities/RedBagBillsActivity.java index 2f3ebcd91..59f4e5c4e 100644 --- a/app/src/main/java/com/pikolive/app/bills/activities/RedBagBillsActivity.java +++ b/app/src/main/java/com/pikolive/app/bills/activities/RedBagBillsActivity.java @@ -14,12 +14,12 @@ import com.yizhuan.erban.databinding.ActivityBillsBinding; import com.pikolive.app.ui.pay.ChargeActivity; import com.pikolive.app.ui.webview.CommonWebViewActivity; import com.pikolive.app.ui.widget.RecyclerViewNoBugLinearLayoutManager; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.bills.BillModel; -import com.yizhuan.xchat_android_core.bills.bean.BillItemEntity; -import com.yizhuan.xchat_android_core.bills.bean.RedBagInfo; -import com.yizhuan.xchat_android_core.bills.bean.RedBagListInfo; +import com.pikolive.core.Constants; +import com.pikolive.core2.UriProvider; +import com.pikolive.core.bills.BillModel; +import com.pikolive.core.bills.bean.BillItemEntity; +import com.pikolive.core.bills.bean.RedBagInfo; +import com.pikolive.core.bills.bean.RedBagListInfo; import com.pikolive.library.annatation.ActLayoutRes; import com.pikolive.library.common.util.DeviceUtil; import com.pikolive.library.utils.AppMetaDataUtil; diff --git a/app/src/main/java/com/pikolive/app/bills/activities/WithdrawBillsActivity.java b/app/src/main/java/com/pikolive/app/bills/activities/WithdrawBillsActivity.java index 85fccbb3d..8dc94df80 100644 --- a/app/src/main/java/com/pikolive/app/bills/activities/WithdrawBillsActivity.java +++ b/app/src/main/java/com/pikolive/app/bills/activities/WithdrawBillsActivity.java @@ -19,8 +19,8 @@ import com.pikolive.app.base.TitleBar; import com.yizhuan.erban.databinding.ActivityWithdrawBillsBinding; import com.pikolive.app.ui.pay.ChargeActivity; import com.pikolive.app.ui.webview.CommonWebViewActivity; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.UriProvider; +import com.pikolive.core.Constants; +import com.pikolive.core2.UriProvider; import com.pikolive.library.annatation.ActLayoutRes; import com.pikolive.library.common.util.DeviceUtil; import com.pikolive.library.utils.AppMetaDataUtil; diff --git a/app/src/main/java/com/pikolive/app/bills/adapter/BillBaseAdapter.java b/app/src/main/java/com/pikolive/app/bills/adapter/BillBaseAdapter.java index 7c1fc41c6..d37d3c265 100644 --- a/app/src/main/java/com/pikolive/app/bills/adapter/BillBaseAdapter.java +++ b/app/src/main/java/com/pikolive/app/bills/adapter/BillBaseAdapter.java @@ -3,7 +3,7 @@ package com.pikolive.app.bills.adapter; import com.chad.library.adapter.base.BaseMultiItemQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.bills.bean.BillItemEntity; +import com.pikolive.core.bills.bean.BillItemEntity; import com.pikolive.library.utils.TimeUtils; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/bills/adapter/ChargeBillsAdapter.java b/app/src/main/java/com/pikolive/app/bills/adapter/ChargeBillsAdapter.java index 5400ec7fe..92e74f807 100644 --- a/app/src/main/java/com/pikolive/app/bills/adapter/ChargeBillsAdapter.java +++ b/app/src/main/java/com/pikolive/app/bills/adapter/ChargeBillsAdapter.java @@ -2,8 +2,8 @@ package com.pikolive.app.bills.adapter; import com.chad.library.adapter.base.BaseViewHolder; import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.bills.bean.BillItemEntity; -import com.yizhuan.xchat_android_core.bills.bean.ExpendInfo; +import com.pikolive.core.bills.bean.BillItemEntity; +import com.pikolive.core.bills.bean.ExpendInfo; import com.pikolive.library.utils.ResUtil; import com.pikolive.library.utils.TimeUtils; diff --git a/app/src/main/java/com/pikolive/app/bills/adapter/ChatBillsAdapter.java b/app/src/main/java/com/pikolive/app/bills/adapter/ChatBillsAdapter.java index aaafd5f63..e5b8a13a9 100644 --- a/app/src/main/java/com/pikolive/app/bills/adapter/ChatBillsAdapter.java +++ b/app/src/main/java/com/pikolive/app/bills/adapter/ChatBillsAdapter.java @@ -4,8 +4,8 @@ import com.chad.library.adapter.base.BaseViewHolder; import com.yizhuan.erban.R; import com.pikolive.app.common.widget.CircleImageView; import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.bills.bean.BillItemEntity; -import com.yizhuan.xchat_android_core.bills.bean.IncomeInfo; +import com.pikolive.core.bills.bean.BillItemEntity; +import com.pikolive.core.bills.bean.IncomeInfo; import com.pikolive.library.utils.TimeUtils; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/bills/adapter/GiftExpendAdapter.java b/app/src/main/java/com/pikolive/app/bills/adapter/GiftExpendAdapter.java index 5c604eec9..65307641d 100644 --- a/app/src/main/java/com/pikolive/app/bills/adapter/GiftExpendAdapter.java +++ b/app/src/main/java/com/pikolive/app/bills/adapter/GiftExpendAdapter.java @@ -5,8 +5,8 @@ import android.widget.ImageView; import com.chad.library.adapter.base.BaseViewHolder; import com.yizhuan.erban.R; import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.bills.bean.BillItemEntity; -import com.yizhuan.xchat_android_core.bills.bean.ExpendInfo; +import com.pikolive.core.bills.bean.BillItemEntity; +import com.pikolive.core.bills.bean.ExpendInfo; import com.pikolive.library.utils.ResUtil; import com.pikolive.library.utils.TimeUtils; diff --git a/app/src/main/java/com/pikolive/app/bills/adapter/GiftIncomeAdapter.java b/app/src/main/java/com/pikolive/app/bills/adapter/GiftIncomeAdapter.java index a2f4c81cf..7f81bf704 100644 --- a/app/src/main/java/com/pikolive/app/bills/adapter/GiftIncomeAdapter.java +++ b/app/src/main/java/com/pikolive/app/bills/adapter/GiftIncomeAdapter.java @@ -5,8 +5,8 @@ import android.widget.ImageView; import com.chad.library.adapter.base.BaseViewHolder; import com.yizhuan.erban.R; import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.bills.bean.BillItemEntity; -import com.yizhuan.xchat_android_core.bills.bean.IncomeInfo; +import com.pikolive.core.bills.bean.BillItemEntity; +import com.pikolive.core.bills.bean.IncomeInfo; import com.pikolive.library.utils.ResUtil; import com.pikolive.library.utils.TimeUtils; diff --git a/app/src/main/java/com/pikolive/app/bills/adapter/NobleBillAdapter.java b/app/src/main/java/com/pikolive/app/bills/adapter/NobleBillAdapter.java index f1987c579..472c2d77b 100644 --- a/app/src/main/java/com/pikolive/app/bills/adapter/NobleBillAdapter.java +++ b/app/src/main/java/com/pikolive/app/bills/adapter/NobleBillAdapter.java @@ -2,8 +2,8 @@ package com.pikolive.app.bills.adapter; import com.chad.library.adapter.base.BaseViewHolder; import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.bills.bean.BillItemEntity; -import com.yizhuan.xchat_android_core.bills.bean.NobleBillListInfo; +import com.pikolive.core.bills.bean.BillItemEntity; +import com.pikolive.core.bills.bean.NobleBillListInfo; import com.pikolive.library.utils.TimeUtils; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/bills/adapter/RadishGiftAdapter.java b/app/src/main/java/com/pikolive/app/bills/adapter/RadishGiftAdapter.java index 620f5e07a..ab477ddc5 100644 --- a/app/src/main/java/com/pikolive/app/bills/adapter/RadishGiftAdapter.java +++ b/app/src/main/java/com/pikolive/app/bills/adapter/RadishGiftAdapter.java @@ -8,8 +8,8 @@ import com.chad.library.adapter.base.BaseViewHolder; import com.pikolive.app.bills.fragmemt.RadishGiftFragment; import com.yizhuan.erban.R; import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.bills.bean.BillItemEntity; -import com.yizhuan.xchat_android_core.bills.bean.RadishGiftInfo; +import com.pikolive.core.bills.bean.BillItemEntity; +import com.pikolive.core.bills.bean.RadishGiftInfo; import com.pikolive.library.utils.TimeUtils; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/bills/adapter/RedBagBillsAdapter.java b/app/src/main/java/com/pikolive/app/bills/adapter/RedBagBillsAdapter.java index 95632c021..a191be90b 100644 --- a/app/src/main/java/com/pikolive/app/bills/adapter/RedBagBillsAdapter.java +++ b/app/src/main/java/com/pikolive/app/bills/adapter/RedBagBillsAdapter.java @@ -2,8 +2,8 @@ package com.pikolive.app.bills.adapter; import com.chad.library.adapter.base.BaseViewHolder; import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.bills.bean.BillItemEntity; -import com.yizhuan.xchat_android_core.bills.bean.RedBagInfo; +import com.pikolive.core.bills.bean.BillItemEntity; +import com.pikolive.core.bills.bean.RedBagInfo; import com.pikolive.library.utils.ResUtil; import com.pikolive.library.utils.TimeUtils; diff --git a/app/src/main/java/com/pikolive/app/bills/adapter/WithdrawBillsAdapter.java b/app/src/main/java/com/pikolive/app/bills/adapter/WithdrawBillsAdapter.java index e84267c48..fe6066fd1 100644 --- a/app/src/main/java/com/pikolive/app/bills/adapter/WithdrawBillsAdapter.java +++ b/app/src/main/java/com/pikolive/app/bills/adapter/WithdrawBillsAdapter.java @@ -2,8 +2,8 @@ package com.pikolive.app.bills.adapter; import com.chad.library.adapter.base.BaseViewHolder; import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.bills.bean.BillItemEntity; -import com.yizhuan.xchat_android_core.bills.bean.IncomeInfo; +import com.pikolive.core.bills.bean.BillItemEntity; +import com.pikolive.core.bills.bean.IncomeInfo; import com.pikolive.library.utils.ResUtil; import com.pikolive.library.utils.TimeUtils; diff --git a/app/src/main/java/com/pikolive/app/bills/adapter/WithdrawRedBillsAdapter.java b/app/src/main/java/com/pikolive/app/bills/adapter/WithdrawRedBillsAdapter.java index 88a16edf9..1434d3f62 100644 --- a/app/src/main/java/com/pikolive/app/bills/adapter/WithdrawRedBillsAdapter.java +++ b/app/src/main/java/com/pikolive/app/bills/adapter/WithdrawRedBillsAdapter.java @@ -2,8 +2,8 @@ package com.pikolive.app.bills.adapter; import com.chad.library.adapter.base.BaseViewHolder; import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.bills.bean.BillItemEntity; -import com.yizhuan.xchat_android_core.bills.bean.RedBagInfo; +import com.pikolive.core.bills.bean.BillItemEntity; +import com.pikolive.core.bills.bean.RedBagInfo; import com.pikolive.library.utils.ResUtil; import com.pikolive.library.utils.TimeUtils; diff --git a/app/src/main/java/com/pikolive/app/bills/fragmemt/BaseBillsFragment.java b/app/src/main/java/com/pikolive/app/bills/fragmemt/BaseBillsFragment.java index b220a60ad..680da88c5 100644 --- a/app/src/main/java/com/pikolive/app/bills/fragmemt/BaseBillsFragment.java +++ b/app/src/main/java/com/pikolive/app/bills/fragmemt/BaseBillsFragment.java @@ -12,9 +12,9 @@ import com.jzxiang.pickerview.data.Type; import com.jzxiang.pickerview.listener.OnDateSetListener; import com.yizhuan.erban.R; import com.pikolive.app.base.BaseMvpFragment; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.bills.bean.BillItemEntity; -import com.yizhuan.xchat_android_core.radish.RadishModel; +import com.pikolive.core.Constants; +import com.pikolive.core.bills.bean.BillItemEntity; +import com.pikolive.core.radish.RadishModel; import com.pikolive.library.base.IMvpBaseView; import com.pikolive.library.base.factory.AbstractMvpPresenter; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/main/java/com/pikolive/app/bills/fragmemt/GiftIncomeFragment.java b/app/src/main/java/com/pikolive/app/bills/fragmemt/GiftIncomeFragment.java index de09f44ef..5ed797451 100644 --- a/app/src/main/java/com/pikolive/app/bills/fragmemt/GiftIncomeFragment.java +++ b/app/src/main/java/com/pikolive/app/bills/fragmemt/GiftIncomeFragment.java @@ -13,11 +13,11 @@ import com.pikolive.app.bills.adapter.BillBaseAdapter; import com.pikolive.app.bills.adapter.GiftIncomeAdapter; import com.pikolive.app.bills.view.IGiftIncomeView; import com.pikolive.app.ui.widget.RecyclerViewNoBugLinearLayoutManager; -import com.yizhuan.xchat_android_constants.XChatConstants; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.bills.bean.BillItemEntity; -import com.yizhuan.xchat_android_core.bills.bean.IncomeInfo; -import com.yizhuan.xchat_android_core.bills.bean.IncomeListInfo; +import com.pikolive.core2.XChatConstants; +import com.pikolive.core.Constants; +import com.pikolive.core.bills.bean.BillItemEntity; +import com.pikolive.core.bills.bean.IncomeInfo; +import com.pikolive.core.bills.bean.IncomeListInfo; import com.pikolive.library.base.factory.CreatePresenter; import com.pikolive.library.utils.ListUtils; diff --git a/app/src/main/java/com/pikolive/app/bills/fragmemt/GiftOutputFragment.java b/app/src/main/java/com/pikolive/app/bills/fragmemt/GiftOutputFragment.java index 69d73ad27..50aec3880 100644 --- a/app/src/main/java/com/pikolive/app/bills/fragmemt/GiftOutputFragment.java +++ b/app/src/main/java/com/pikolive/app/bills/fragmemt/GiftOutputFragment.java @@ -13,11 +13,11 @@ import com.pikolive.app.bills.adapter.BillBaseAdapter; import com.pikolive.app.bills.adapter.GiftExpendAdapter; import com.pikolive.app.bills.view.IGiftOutputView; import com.pikolive.app.ui.widget.RecyclerViewNoBugLinearLayoutManager; -import com.yizhuan.xchat_android_constants.XChatConstants; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.bills.bean.BillItemEntity; -import com.yizhuan.xchat_android_core.bills.bean.ExpendInfo; -import com.yizhuan.xchat_android_core.bills.bean.ExpendListInfo; +import com.pikolive.core2.XChatConstants; +import com.pikolive.core.Constants; +import com.pikolive.core.bills.bean.BillItemEntity; +import com.pikolive.core.bills.bean.ExpendInfo; +import com.pikolive.core.bills.bean.ExpendListInfo; import com.pikolive.library.base.factory.CreatePresenter; import com.pikolive.library.utils.ListUtils; diff --git a/app/src/main/java/com/pikolive/app/bills/fragmemt/RadishGiftFragment.java b/app/src/main/java/com/pikolive/app/bills/fragmemt/RadishGiftFragment.java index 8c4bd8119..692c9aa63 100644 --- a/app/src/main/java/com/pikolive/app/bills/fragmemt/RadishGiftFragment.java +++ b/app/src/main/java/com/pikolive/app/bills/fragmemt/RadishGiftFragment.java @@ -12,10 +12,10 @@ import com.pikolive.app.bills.adapter.BillBaseAdapter; import com.pikolive.app.bills.adapter.RadishGiftAdapter; import com.pikolive.app.bills.view.IRadishGiftView; import com.pikolive.app.ui.widget.RecyclerViewNoBugLinearLayoutManager; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.bills.bean.BillItemEntity; -import com.yizhuan.xchat_android_core.bills.bean.RadishGiftInfo; -import com.yizhuan.xchat_android_core.bills.bean.RadishGiftListInfo; +import com.pikolive.core.Constants; +import com.pikolive.core.bills.bean.BillItemEntity; +import com.pikolive.core.bills.bean.RadishGiftInfo; +import com.pikolive.core.bills.bean.RadishGiftListInfo; import com.pikolive.library.base.factory.CreatePresenter; import com.pikolive.library.utils.ListUtils; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/main/java/com/pikolive/app/bills/fragmemt/WithdrawBillsFragment.java b/app/src/main/java/com/pikolive/app/bills/fragmemt/WithdrawBillsFragment.java index 35f6d8bdf..91cb28c43 100644 --- a/app/src/main/java/com/pikolive/app/bills/fragmemt/WithdrawBillsFragment.java +++ b/app/src/main/java/com/pikolive/app/bills/fragmemt/WithdrawBillsFragment.java @@ -19,12 +19,12 @@ import com.pikolive.app.bills.event.TopEvent; import com.pikolive.app.common.NoDataFragment; import com.yizhuan.erban.databinding.FragmentXrexylerviewBinding; import com.pikolive.app.ui.widget.RecyclerViewNoBugLinearLayoutManager; -import com.yizhuan.xchat_android_constants.XChatConstants; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.bills.BillModel; -import com.yizhuan.xchat_android_core.bills.bean.BillItemEntity; -import com.yizhuan.xchat_android_core.bills.bean.IncomeInfo; -import com.yizhuan.xchat_android_core.bills.bean.IncomeListInfo; +import com.pikolive.core2.XChatConstants; +import com.pikolive.core.Constants; +import com.pikolive.core.bills.BillModel; +import com.pikolive.core.bills.bean.BillItemEntity; +import com.pikolive.core.bills.bean.IncomeInfo; +import com.pikolive.core.bills.bean.IncomeListInfo; import com.pikolive.library.annatation.ActLayoutRes; import com.pikolive.library.utils.ListUtils; diff --git a/app/src/main/java/com/pikolive/app/bills/presenter/GiftIncomePresenter.java b/app/src/main/java/com/pikolive/app/bills/presenter/GiftIncomePresenter.java index 3c02a5896..8f9155f36 100644 --- a/app/src/main/java/com/pikolive/app/bills/presenter/GiftIncomePresenter.java +++ b/app/src/main/java/com/pikolive/app/bills/presenter/GiftIncomePresenter.java @@ -4,7 +4,7 @@ import android.annotation.SuppressLint; import com.pikolive.app.base.BaseMvpPresenter; import com.pikolive.app.bills.view.IGiftIncomeView; -import com.yizhuan.xchat_android_core.bills.BillModel; +import com.pikolive.core.bills.BillModel; public class GiftIncomePresenter extends BaseMvpPresenter { diff --git a/app/src/main/java/com/pikolive/app/bills/presenter/GiftOutputPresenter.java b/app/src/main/java/com/pikolive/app/bills/presenter/GiftOutputPresenter.java index 659d8a74a..118add726 100644 --- a/app/src/main/java/com/pikolive/app/bills/presenter/GiftOutputPresenter.java +++ b/app/src/main/java/com/pikolive/app/bills/presenter/GiftOutputPresenter.java @@ -4,7 +4,7 @@ import android.annotation.SuppressLint; import com.pikolive.app.base.BaseMvpPresenter; import com.pikolive.app.bills.view.IGiftOutputView; -import com.yizhuan.xchat_android_core.bills.BillModel; +import com.pikolive.core.bills.BillModel; public class GiftOutputPresenter extends BaseMvpPresenter { diff --git a/app/src/main/java/com/pikolive/app/bills/presenter/RadishGiftPresenter.java b/app/src/main/java/com/pikolive/app/bills/presenter/RadishGiftPresenter.java index ddf15a272..aa564fa69 100644 --- a/app/src/main/java/com/pikolive/app/bills/presenter/RadishGiftPresenter.java +++ b/app/src/main/java/com/pikolive/app/bills/presenter/RadishGiftPresenter.java @@ -2,8 +2,8 @@ package com.pikolive.app.bills.presenter; import com.pikolive.app.base.BaseMvpPresenter; import com.pikolive.app.bills.view.IRadishGiftView; -import com.yizhuan.xchat_android_core.bills.RadishGiftModel; -import com.yizhuan.xchat_android_core.bills.result.RadishGiftResult; +import com.pikolive.core.bills.RadishGiftModel; +import com.pikolive.core.bills.result.RadishGiftResult; import io.reactivex.SingleObserver; import io.reactivex.disposables.Disposable; diff --git a/app/src/main/java/com/pikolive/app/bills/view/IGiftIncomeView.java b/app/src/main/java/com/pikolive/app/bills/view/IGiftIncomeView.java index 048ed7834..dae29175f 100644 --- a/app/src/main/java/com/pikolive/app/bills/view/IGiftIncomeView.java +++ b/app/src/main/java/com/pikolive/app/bills/view/IGiftIncomeView.java @@ -1,6 +1,6 @@ package com.pikolive.app.bills.view; -import com.yizhuan.xchat_android_core.bills.bean.IncomeListInfo; +import com.pikolive.core.bills.bean.IncomeListInfo; public interface IGiftIncomeView extends ISmoothToTopView { void onGetDataError(String message); diff --git a/app/src/main/java/com/pikolive/app/bills/view/IGiftOutputView.java b/app/src/main/java/com/pikolive/app/bills/view/IGiftOutputView.java index ff6c448e9..b0ebfcaf0 100644 --- a/app/src/main/java/com/pikolive/app/bills/view/IGiftOutputView.java +++ b/app/src/main/java/com/pikolive/app/bills/view/IGiftOutputView.java @@ -1,6 +1,6 @@ package com.pikolive.app.bills.view; -import com.yizhuan.xchat_android_core.bills.bean.ExpendListInfo; +import com.pikolive.core.bills.bean.ExpendListInfo; import com.pikolive.library.base.IMvpBaseView; public interface IGiftOutputView extends IMvpBaseView { diff --git a/app/src/main/java/com/pikolive/app/bills/view/IRadishGiftView.java b/app/src/main/java/com/pikolive/app/bills/view/IRadishGiftView.java index 67bd47519..88af60fc3 100644 --- a/app/src/main/java/com/pikolive/app/bills/view/IRadishGiftView.java +++ b/app/src/main/java/com/pikolive/app/bills/view/IRadishGiftView.java @@ -1,6 +1,6 @@ package com.pikolive.app.bills.view; -import com.yizhuan.xchat_android_core.bills.bean.RadishGiftListInfo; +import com.pikolive.core.bills.bean.RadishGiftListInfo; public interface IRadishGiftView extends ISmoothToTopView { void getRadishRecordSuccess(RadishGiftListInfo list); diff --git a/app/src/main/java/com/pikolive/app/common/app/ActivityStack.java b/app/src/main/java/com/pikolive/app/common/app/ActivityStack.java index 57d76fb90..a61728e9d 100644 --- a/app/src/main/java/com/pikolive/app/common/app/ActivityStack.java +++ b/app/src/main/java/com/pikolive/app/common/app/ActivityStack.java @@ -6,7 +6,7 @@ import android.content.Context; import com.pikolive.app.application.XChatApplication; import com.pikolive.app.avroom.activity.AVRoomActivity; import com.pikolive.app.utils.ActWhiteListMrg; -import com.yizhuan.xchat_android_core.utils.Logger; +import com.pikolive.core.utils.Logger; import java.lang.ref.WeakReference; import java.util.concurrent.CopyOnWriteArrayList; diff --git a/app/src/main/java/com/pikolive/app/common/util/AppLifeCycleHelper.java b/app/src/main/java/com/pikolive/app/common/util/AppLifeCycleHelper.java index 1496166f4..8a371a7cf 100644 --- a/app/src/main/java/com/pikolive/app/common/util/AppLifeCycleHelper.java +++ b/app/src/main/java/com/pikolive/app/common/util/AppLifeCycleHelper.java @@ -7,7 +7,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import com.pikolive.app.application.XChatApplication; -import com.yizhuan.xchat_android_core.auth.AuthModel; +import com.pikolive.core.auth.AuthModel; import com.pikolive.library.common.util.CoreUtils; diff --git a/app/src/main/java/com/pikolive/app/common/util/DialogFragmentUtils.java b/app/src/main/java/com/pikolive/app/common/util/DialogFragmentUtils.java index 4bb65db5c..9e4ed9862 100644 --- a/app/src/main/java/com/pikolive/app/common/util/DialogFragmentUtils.java +++ b/app/src/main/java/com/pikolive/app/common/util/DialogFragmentUtils.java @@ -9,7 +9,7 @@ import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; import com.pikolive.app.base.BaseActivity; -import com.yizhuan.xchat_android_core.utils.Logger; +import com.pikolive.core.utils.Logger; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/common/util/PauseWorkerHandler.java b/app/src/main/java/com/pikolive/app/common/util/PauseWorkerHandler.java index e677e4602..e2eecf66c 100644 --- a/app/src/main/java/com/pikolive/app/common/util/PauseWorkerHandler.java +++ b/app/src/main/java/com/pikolive/app/common/util/PauseWorkerHandler.java @@ -2,7 +2,7 @@ package com.pikolive.app.common.util; import android.os.Handler; import android.os.Looper; -import com.yizhuan.xchat_android_core.utils.Logger; +import com.pikolive.core.utils.Logger; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; diff --git a/app/src/main/java/com/pikolive/app/common/util/Utils.java b/app/src/main/java/com/pikolive/app/common/util/Utils.java index 740847cfd..f039ab777 100644 --- a/app/src/main/java/com/pikolive/app/common/util/Utils.java +++ b/app/src/main/java/com/pikolive/app/common/util/Utils.java @@ -9,7 +9,7 @@ import android.view.WindowManager; import androidx.fragment.app.FragmentManager; -import com.yizhuan.xchat_android_core.utils.Logger; +import com.pikolive.core.utils.Logger; import java.lang.reflect.Field; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/common/widget/dialog/ChooseWorldsDialog.java b/app/src/main/java/com/pikolive/app/common/widget/dialog/ChooseWorldsDialog.java index 36974a392..4a13c6645 100644 --- a/app/src/main/java/com/pikolive/app/common/widget/dialog/ChooseWorldsDialog.java +++ b/app/src/main/java/com/pikolive/app/common/widget/dialog/ChooseWorldsDialog.java @@ -25,9 +25,9 @@ import com.pikolive.app.home.adapter.FragmentViewPagerAdapter; import com.pikolive.app.ui.widget.magicindicator.MagicIndicator; import com.pikolive.app.ui.widget.magicindicator.ViewPagerHelper; import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.community.bean.MiniWorldChooseInfo; -import com.yizhuan.xchat_android_core.home.bean.TabInfo; +import com.pikolive.core.Constants; +import com.pikolive.core.community.bean.MiniWorldChooseInfo; +import com.pikolive.core2.home.bean.TabInfo; import com.pikolive.library.utils.ResUtil; import java.util.ArrayList; diff --git a/app/src/main/java/com/pikolive/app/common/widget/dialog/ChooseWorldsIndicatorAdapter.java b/app/src/main/java/com/pikolive/app/common/widget/dialog/ChooseWorldsIndicatorAdapter.java index bbc6dbde5..3b1f754b6 100644 --- a/app/src/main/java/com/pikolive/app/common/widget/dialog/ChooseWorldsIndicatorAdapter.java +++ b/app/src/main/java/com/pikolive/app/common/widget/dialog/ChooseWorldsIndicatorAdapter.java @@ -13,7 +13,7 @@ import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.abs.Co import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator; -import com.yizhuan.xchat_android_core.home.bean.TabInfo; +import com.pikolive.core2.home.bean.TabInfo; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/common/widget/dialog/DialogManager.java b/app/src/main/java/com/pikolive/app/common/widget/dialog/DialogManager.java index 1eba4db4d..3ec5548f8 100644 --- a/app/src/main/java/com/pikolive/app/common/widget/dialog/DialogManager.java +++ b/app/src/main/java/com/pikolive/app/common/widget/dialog/DialogManager.java @@ -31,7 +31,7 @@ import com.yizhuan.erban.R; import com.pikolive.app.ui.utils.ImageLoadUtils; import com.pikolive.app.ui.widget.ButtonItem; import com.pikolive.app.utils.SpannableBuilder; -import com.yizhuan.xchat_android_core.utils.ActivityUtil; +import com.pikolive.core.utils.ActivityUtil; import com.pikolive.library.utils.log.MLog; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/common/widget/dialog/DialogUiHelper.java b/app/src/main/java/com/pikolive/app/common/widget/dialog/DialogUiHelper.java index 2b1083491..0c23c0496 100644 --- a/app/src/main/java/com/pikolive/app/common/widget/dialog/DialogUiHelper.java +++ b/app/src/main/java/com/pikolive/app/common/widget/dialog/DialogUiHelper.java @@ -8,11 +8,11 @@ import com.pikolive.app.application.ReportManager; import com.pikolive.app.radish.task.activity.TaskCenterActivity; import com.pikolive.app.ui.pay.ChargeActivity; import com.pikolive.app.ui.webview.CommonWebViewActivity; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.pay.PayModel; -import com.yizhuan.xchat_android_core.pay.bean.WalletInfo; -import com.yizhuan.xchat_android_core.utils.ActivityUtil; +import com.pikolive.core.Constants; +import com.pikolive.core2.UriProvider; +import com.pikolive.core.pay.PayModel; +import com.pikolive.core.pay.bean.WalletInfo; +import com.pikolive.core.utils.ActivityUtil; import com.pikolive.library.common.util.DeviceUtil; import com.pikolive.library.utils.AppMetaDataUtil; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/main/java/com/pikolive/app/decoration/adapter/CarShopAdapter.java b/app/src/main/java/com/pikolive/app/decoration/adapter/CarShopAdapter.java index 2bca275f3..ae254ad78 100644 --- a/app/src/main/java/com/pikolive/app/decoration/adapter/CarShopAdapter.java +++ b/app/src/main/java/com/pikolive/app/decoration/adapter/CarShopAdapter.java @@ -6,7 +6,7 @@ import com.yizhuan.erban.R; import com.pikolive.app.bindadapter.BaseAdapter; import com.pikolive.app.bindadapter.BindingViewHolder; import com.yizhuan.erban.databinding.ItemCarShopBinding; -import com.yizhuan.xchat_android_core.decoration.car.bean.CarInfo; +import com.pikolive.core.decoration.car.bean.CarInfo; import com.pikolive.library.utils.ListUtils; /** diff --git a/app/src/main/java/com/pikolive/app/decoration/adapter/DecorationCommonAdapter.kt b/app/src/main/java/com/pikolive/app/decoration/adapter/DecorationCommonAdapter.kt index 0e499d83a..04d29bfea 100644 --- a/app/src/main/java/com/pikolive/app/decoration/adapter/DecorationCommonAdapter.kt +++ b/app/src/main/java/com/pikolive/app/decoration/adapter/DecorationCommonAdapter.kt @@ -5,7 +5,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder import com.yizhuan.erban.R import com.pikolive.app.ui.utils.load -import com.yizhuan.xchat_android_core.decoration.DecorationInfo +import com.pikolive.core.decoration.DecorationInfo open class DecorationCommonAdapter(layoutResId: Int = R.layout.item_decoration_common) : diff --git a/app/src/main/java/com/pikolive/app/decoration/adapter/HeadWearShopAdapter.java b/app/src/main/java/com/pikolive/app/decoration/adapter/HeadWearShopAdapter.java index f7a5a3b05..cc2374e8d 100644 --- a/app/src/main/java/com/pikolive/app/decoration/adapter/HeadWearShopAdapter.java +++ b/app/src/main/java/com/pikolive/app/decoration/adapter/HeadWearShopAdapter.java @@ -6,8 +6,8 @@ import com.yizhuan.erban.R; import com.pikolive.app.bindadapter.BaseAdapter; import com.pikolive.app.bindadapter.BindingViewHolder; import com.yizhuan.erban.databinding.ItemHeadWearBinding; -import com.yizhuan.xchat_android_core.decoration.headwear.bean.HeadWearInfo; -import com.yizhuan.xchat_android_core.noble.NobleUtil; +import com.pikolive.core.decoration.headwear.bean.HeadWearInfo; +import com.pikolive.core.noble.NobleUtil; import com.pikolive.library.utils.ListUtils; /** diff --git a/app/src/main/java/com/pikolive/app/decoration/adapter/MyCarAdapter.java b/app/src/main/java/com/pikolive/app/decoration/adapter/MyCarAdapter.java index 8f35744f1..554b0345c 100644 --- a/app/src/main/java/com/pikolive/app/decoration/adapter/MyCarAdapter.java +++ b/app/src/main/java/com/pikolive/app/decoration/adapter/MyCarAdapter.java @@ -9,7 +9,7 @@ import com.yizhuan.erban.R; import com.pikolive.app.bindadapter.BaseAdapter; import com.pikolive.app.bindadapter.BindingViewHolder; import com.yizhuan.erban.databinding.ItemCarGarageNormalBinding; -import com.yizhuan.xchat_android_core.decoration.car.bean.CarInfo; +import com.pikolive.core.decoration.car.bean.CarInfo; import com.pikolive.library.utils.ListUtils; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/main/java/com/pikolive/app/decoration/adapter/MyChatBubbleAdapter.java b/app/src/main/java/com/pikolive/app/decoration/adapter/MyChatBubbleAdapter.java index 722f8d50b..2ce16df45 100644 --- a/app/src/main/java/com/pikolive/app/decoration/adapter/MyChatBubbleAdapter.java +++ b/app/src/main/java/com/pikolive/app/decoration/adapter/MyChatBubbleAdapter.java @@ -10,8 +10,8 @@ import com.pikolive.app.bindadapter.BaseAdapter; import com.pikolive.app.bindadapter.BindingViewHolder; import com.yizhuan.erban.databinding.ItemMyChatBubbleBinding; import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.decoration.headwear.bean.ChatBubbleInfo; -import com.yizhuan.xchat_android_core.decoration.headwear.bean.HeadWearInfo; +import com.pikolive.core.decoration.headwear.bean.ChatBubbleInfo; +import com.pikolive.core.decoration.headwear.bean.HeadWearInfo; import com.pikolive.library.utils.ResUtil; /** diff --git a/app/src/main/java/com/pikolive/app/decoration/adapter/MyHeadWearAdapter.java b/app/src/main/java/com/pikolive/app/decoration/adapter/MyHeadWearAdapter.java index 2e0ad48b2..7faa1dc39 100644 --- a/app/src/main/java/com/pikolive/app/decoration/adapter/MyHeadWearAdapter.java +++ b/app/src/main/java/com/pikolive/app/decoration/adapter/MyHeadWearAdapter.java @@ -6,8 +6,8 @@ import com.yizhuan.erban.R; import com.pikolive.app.bindadapter.BaseAdapter; import com.pikolive.app.bindadapter.BindingViewHolder; import com.yizhuan.erban.databinding.ItemMyHeadWearBinding; -import com.yizhuan.xchat_android_core.decoration.headwear.bean.HeadWearInfo; -import com.yizhuan.xchat_android_core.noble.NobleUtil; +import com.pikolive.core.decoration.headwear.bean.HeadWearInfo; +import com.pikolive.core.noble.NobleUtil; import com.pikolive.library.utils.ResUtil; /** diff --git a/app/src/main/java/com/pikolive/app/decoration/adapter/MyNamePlateAdapter.java b/app/src/main/java/com/pikolive/app/decoration/adapter/MyNamePlateAdapter.java index 1bfe114bb..ac09c2e46 100644 --- a/app/src/main/java/com/pikolive/app/decoration/adapter/MyNamePlateAdapter.java +++ b/app/src/main/java/com/pikolive/app/decoration/adapter/MyNamePlateAdapter.java @@ -8,7 +8,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; import com.netease.nim.uikit.support.glide.GlideApp; import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.decoration.nameplate.bean.NamePlateInfo; +import com.pikolive.core.decoration.nameplate.bean.NamePlateInfo; import com.pikolive.library.utils.ResUtil; /** diff --git a/app/src/main/java/com/pikolive/app/decoration/adapter/MyUserCardWearAdapter.java b/app/src/main/java/com/pikolive/app/decoration/adapter/MyUserCardWearAdapter.java index d2e546c39..436e524cd 100644 --- a/app/src/main/java/com/pikolive/app/decoration/adapter/MyUserCardWearAdapter.java +++ b/app/src/main/java/com/pikolive/app/decoration/adapter/MyUserCardWearAdapter.java @@ -9,8 +9,8 @@ import com.pikolive.app.bindadapter.BaseAdapter; import com.pikolive.app.bindadapter.BindingViewHolder; import com.yizhuan.erban.databinding.ItemMyUserCardWearBinding; import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.decoration.headwear.bean.HeadWearInfo; -import com.yizhuan.xchat_android_core.decoration.headwear.bean.UserCardWearInfo; +import com.pikolive.core.decoration.headwear.bean.HeadWearInfo; +import com.pikolive.core.decoration.headwear.bean.UserCardWearInfo; import com.pikolive.library.utils.ResUtil; /** diff --git a/app/src/main/java/com/pikolive/app/decoration/helper/DecorationDialogHelper.java b/app/src/main/java/com/pikolive/app/decoration/helper/DecorationDialogHelper.java index acdf9b8a3..08b009680 100644 --- a/app/src/main/java/com/pikolive/app/decoration/helper/DecorationDialogHelper.java +++ b/app/src/main/java/com/pikolive/app/decoration/helper/DecorationDialogHelper.java @@ -9,14 +9,14 @@ import android.widget.TextView; import com.yizhuan.erban.R; import com.pikolive.app.common.widget.dialog.DialogManager; import com.pikolive.app.common.widget.dialog.DialogUiHelper; -import com.yizhuan.xchat_android_core.decoration.bean.BaseDecoration; -import com.yizhuan.xchat_android_core.decoration.bean.CurrencyType; -import com.yizhuan.xchat_android_core.decoration.car.CarModel; -import com.yizhuan.xchat_android_core.decoration.headwear.HeadwearModel; -import com.yizhuan.xchat_android_core.utils.ActivityUtil; -import com.yizhuan.xchat_android_core.utils.net.BalanceNotEnoughExeption; -import com.yizhuan.xchat_android_core.utils.net.RadishNotEnoughException; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.decoration.bean.BaseDecoration; +import com.pikolive.core.decoration.bean.CurrencyType; +import com.pikolive.core.decoration.car.CarModel; +import com.pikolive.core.decoration.headwear.HeadwearModel; +import com.pikolive.core.utils.ActivityUtil; +import com.pikolive.core.utils.net.BalanceNotEnoughExeption; +import com.pikolive.core.utils.net.RadishNotEnoughException; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.utils.ResUtil; import com.pikolive.library.utils.SingleToastUtil; diff --git a/app/src/main/java/com/pikolive/app/decoration/helper/DecorationHelper.java b/app/src/main/java/com/pikolive/app/decoration/helper/DecorationHelper.java index a5e27e2c1..cc514dcc9 100644 --- a/app/src/main/java/com/pikolive/app/decoration/helper/DecorationHelper.java +++ b/app/src/main/java/com/pikolive/app/decoration/helper/DecorationHelper.java @@ -6,10 +6,10 @@ import android.text.TextUtils; import com.yizhuan.erban.R; import com.pikolive.app.common.widget.dialog.DialogManager; -import com.yizhuan.xchat_android_core.decoration.DecorationInfo; -import com.yizhuan.xchat_android_core.decoration.DecorationInfoEvent; -import com.yizhuan.xchat_android_core.decoration.DecorationModel; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.decoration.DecorationInfo; +import com.pikolive.core.decoration.DecorationInfoEvent; +import com.pikolive.core.decoration.DecorationModel; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.utils.ResUtil; import com.pikolive.library.utils.SingleToastUtil; diff --git a/app/src/main/java/com/pikolive/app/decoration/view/DecorationCommonFragment.kt b/app/src/main/java/com/pikolive/app/decoration/view/DecorationCommonFragment.kt index 36dfb0e98..ef61feda2 100644 --- a/app/src/main/java/com/pikolive/app/decoration/view/DecorationCommonFragment.kt +++ b/app/src/main/java/com/pikolive/app/decoration/view/DecorationCommonFragment.kt @@ -12,8 +12,8 @@ import com.pikolive.app.decoration.adapter.DecorationCommonAdapter import com.pikolive.app.decoration.viewmodel.DecorationViewModel import com.pikolive.app.ui.relation.FansListActivity import com.pikolive.app.ui.utils.RVDelegate -import com.yizhuan.xchat_android_core.decoration.DecorationInfo -import com.yizhuan.xchat_android_core.decoration.DecorationInfoEvent +import com.pikolive.core.decoration.DecorationInfo +import com.pikolive.core.decoration.DecorationInfoEvent import com.pikolive.library.annatation.ActLayoutRes import com.pikolive.library.utils.ResUtil import org.greenrobot.eventbus.EventBus @@ -94,7 +94,11 @@ class DecorationCommonFragment : BaseViewBindingFragment { - EventBus.getDefault().postSticky(DecorationInfoEvent(decorationInfo)) + EventBus.getDefault().postSticky( + DecorationInfoEvent( + decorationInfo + ) + ) FansListActivity.start(mContext, FansListActivity.TYPE_DECORATION) } } diff --git a/app/src/main/java/com/pikolive/app/decoration/view/DecorationStoreActivity.kt b/app/src/main/java/com/pikolive/app/decoration/view/DecorationStoreActivity.kt index b74704826..782f451db 100644 --- a/app/src/main/java/com/pikolive/app/decoration/view/DecorationStoreActivity.kt +++ b/app/src/main/java/com/pikolive/app/decoration/view/DecorationStoreActivity.kt @@ -20,11 +20,11 @@ import com.pikolive.app.ui.pay.ChargeActivity import com.pikolive.app.ui.webview.CommonWebViewActivity import com.pikolive.app.ui.widget.magicindicator.ViewPagerHelper import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator -import com.yizhuan.xchat_android_core.Constants -import com.yizhuan.xchat_android_core.UriProvider -import com.yizhuan.xchat_android_core.home.bean.TabInfo -import com.yizhuan.xchat_android_core.pay.PayModel -import com.yizhuan.xchat_android_core.pay.event.UpdateWalletInfoEvent +import com.pikolive.core.Constants +import com.pikolive.core.pay.PayModel +import com.pikolive.core.pay.event.UpdateWalletInfoEvent +import com.pikolive.core2.UriProvider +import com.pikolive.core2.home.bean.TabInfo import com.pikolive.library.annatation.ActLayoutRes import com.pikolive.library.common.util.DeviceUtil import com.pikolive.library.utils.AppMetaDataUtil @@ -92,11 +92,36 @@ class DecorationStoreActivity : BaseViewBindingActivity = ArrayList(5) - tabInfoList.add(TabInfo(TAB_HEAD_WEAR, ResUtil.getString(R.string.decoration_view_decorationstoreactivity_03))) - tabInfoList.add(TabInfo(TAB_CAR, ResUtil.getString(R.string.decoration_view_decorationstoreactivity_04))) - tabInfoList.add(TabInfo(TAB_NAMEPLATE, ResUtil.getString(R.string.decoration_view_decorationstoreactivity_05))) - tabInfoList.add(TabInfo(TAB_USER_CARD, ResUtil.getString(R.string.decoration_view_decorationstoreactivity_06))) - tabInfoList.add(TabInfo(TAB_CHAT_BUBBLE, ResUtil.getString(R.string.decoration_view_decorationstoreactivity_07))) + tabInfoList.add( + TabInfo( + TAB_HEAD_WEAR, + ResUtil.getString(R.string.decoration_view_decorationstoreactivity_03) + ) + ) + tabInfoList.add( + TabInfo( + TAB_CAR, + ResUtil.getString(R.string.decoration_view_decorationstoreactivity_04) + ) + ) + tabInfoList.add( + TabInfo( + TAB_NAMEPLATE, + ResUtil.getString(R.string.decoration_view_decorationstoreactivity_05) + ) + ) + tabInfoList.add( + TabInfo( + TAB_USER_CARD, + ResUtil.getString(R.string.decoration_view_decorationstoreactivity_06) + ) + ) + tabInfoList.add( + TabInfo( + TAB_CHAT_BUBBLE, + ResUtil.getString(R.string.decoration_view_decorationstoreactivity_07) + ) + ) val commonNavigator = CommonNavigator( this diff --git a/app/src/main/java/com/pikolive/app/decoration/view/ICarView.java b/app/src/main/java/com/pikolive/app/decoration/view/ICarView.java index daad50b2e..3f3ca4ee2 100644 --- a/app/src/main/java/com/pikolive/app/decoration/view/ICarView.java +++ b/app/src/main/java/com/pikolive/app/decoration/view/ICarView.java @@ -1,6 +1,6 @@ package com.pikolive.app.decoration.view; -import com.yizhuan.xchat_android_core.decoration.car.bean.CarInfo; +import com.pikolive.core.decoration.car.bean.CarInfo; import com.pikolive.library.base.IMvpBaseView; /** diff --git a/app/src/main/java/com/pikolive/app/decoration/view/MyCarFragment.java b/app/src/main/java/com/pikolive/app/decoration/view/MyCarFragment.java index 1a3641dc3..f195372ec 100644 --- a/app/src/main/java/com/pikolive/app/decoration/view/MyCarFragment.java +++ b/app/src/main/java/com/pikolive/app/decoration/view/MyCarFragment.java @@ -15,9 +15,9 @@ import com.yizhuan.erban.databinding.FrgMyDecorationCommonBinding; import com.pikolive.app.decoration.adapter.MyCarAdapter; import com.pikolive.app.decoration.viewmodel.MyCarVm; import com.pikolive.app.ui.widget.LoadingDialog; -import com.yizhuan.xchat_android_core.decoration.car.CarModel; -import com.yizhuan.xchat_android_core.decoration.car.bean.CarInfo; -import com.yizhuan.xchat_android_core.user.UserModel; +import com.pikolive.core.decoration.car.CarModel; +import com.pikolive.core.decoration.car.bean.CarInfo; +import com.pikolive.core.user.UserModel; import com.pikolive.library.annatation.ActLayoutRes; import com.pikolive.library.utils.ListUtils; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/main/java/com/pikolive/app/decoration/view/MyChatBubbleFragment.java b/app/src/main/java/com/pikolive/app/decoration/view/MyChatBubbleFragment.java index a793db22e..f9f70d4e0 100644 --- a/app/src/main/java/com/pikolive/app/decoration/view/MyChatBubbleFragment.java +++ b/app/src/main/java/com/pikolive/app/decoration/view/MyChatBubbleFragment.java @@ -13,8 +13,8 @@ import com.pikolive.app.common.NoDataFragment; import com.yizhuan.erban.databinding.FragmentMyChatBubbleBinding; import com.pikolive.app.decoration.adapter.MyChatBubbleAdapter; import com.pikolive.app.decoration.viewmodel.UserChatBubbleVm; -import com.yizhuan.xchat_android_core.decoration.headwear.bean.ChatBubbleInfo; -import com.yizhuan.xchat_android_core.user.UserModel; +import com.pikolive.core.decoration.headwear.bean.ChatBubbleInfo; +import com.pikolive.core.user.UserModel; import com.pikolive.library.annatation.ActLayoutRes; import com.pikolive.library.utils.ListUtils; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/main/java/com/pikolive/app/decoration/view/MyDecorationActivity.java b/app/src/main/java/com/pikolive/app/decoration/view/MyDecorationActivity.java index a8d1e367b..d9d811e0e 100644 --- a/app/src/main/java/com/pikolive/app/decoration/view/MyDecorationActivity.java +++ b/app/src/main/java/com/pikolive/app/decoration/view/MyDecorationActivity.java @@ -30,13 +30,13 @@ import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil; import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; import com.pikolive.app.ui.widget.rollviewpager.Util; import com.pikolive.app.ui.widget.rollviewpager.hintview.ColorPointHintView; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.decoration.car.CarModel; -import com.yizhuan.xchat_android_core.decoration.car.bean.CarInfo; -import com.yizhuan.xchat_android_core.home.bean.BannerInfo; -import com.yizhuan.xchat_android_core.home.bean.TabInfo; -import com.yizhuan.xchat_android_core.home.model.GameHomeModel; -import com.yizhuan.xchat_android_core.market_verify.MarketVerifyModel; +import com.pikolive.core.Constants; +import com.pikolive.core.decoration.car.CarModel; +import com.pikolive.core.decoration.car.bean.CarInfo; +import com.pikolive.core2.home.bean.BannerInfo; +import com.pikolive.core2.home.bean.TabInfo; +import com.pikolive.core2.home.model.GameHomeModel; +import com.pikolive.core2.market_verify.MarketVerifyModel; import com.pikolive.library.annatation.ActLayoutRes; import com.pikolive.library.utils.ListUtils; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/main/java/com/pikolive/app/decoration/view/MyHeadWearFragment.java b/app/src/main/java/com/pikolive/app/decoration/view/MyHeadWearFragment.java index 413eb0e94..b9802f4ad 100644 --- a/app/src/main/java/com/pikolive/app/decoration/view/MyHeadWearFragment.java +++ b/app/src/main/java/com/pikolive/app/decoration/view/MyHeadWearFragment.java @@ -17,8 +17,8 @@ import com.pikolive.app.decoration.adapter.MyHeadWearAdapter; import com.pikolive.app.decoration.helper.DecorationDialogHelper; import com.pikolive.app.decoration.helper.DecorationSaleType; import com.pikolive.app.decoration.viewmodel.HeadWearVm; -import com.yizhuan.xchat_android_core.decoration.headwear.bean.HeadWearInfo; -import com.yizhuan.xchat_android_core.user.UserModel; +import com.pikolive.core.decoration.headwear.bean.HeadWearInfo; +import com.pikolive.core.user.UserModel; import com.pikolive.library.annatation.ActLayoutRes; import com.pikolive.library.utils.ListUtils; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/main/java/com/pikolive/app/decoration/view/MyNamePlateFragment.java b/app/src/main/java/com/pikolive/app/decoration/view/MyNamePlateFragment.java index 8a296531d..40644ee4b 100644 --- a/app/src/main/java/com/pikolive/app/decoration/view/MyNamePlateFragment.java +++ b/app/src/main/java/com/pikolive/app/decoration/view/MyNamePlateFragment.java @@ -14,10 +14,10 @@ import com.yizhuan.erban.R; import com.pikolive.app.base.BaseFragment; import com.pikolive.app.common.NoDataFragment; import com.pikolive.app.decoration.adapter.MyNamePlateAdapter; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.decoration.nameplate.NamePlateModel; -import com.yizhuan.xchat_android_core.decoration.nameplate.bean.NamePlateInfo; -import com.yizhuan.xchat_android_core.user.UserModel; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.decoration.nameplate.NamePlateModel; +import com.pikolive.core.decoration.nameplate.bean.NamePlateInfo; +import com.pikolive.core.user.UserModel; import com.pikolive.library.utils.ListUtils; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/main/java/com/pikolive/app/decoration/view/MyUserCardWearFragment.java b/app/src/main/java/com/pikolive/app/decoration/view/MyUserCardWearFragment.java index 502eb6ad4..8a5b3bfd9 100644 --- a/app/src/main/java/com/pikolive/app/decoration/view/MyUserCardWearFragment.java +++ b/app/src/main/java/com/pikolive/app/decoration/view/MyUserCardWearFragment.java @@ -14,8 +14,8 @@ import com.pikolive.app.common.NoDataFragment; import com.yizhuan.erban.databinding.FrgMyDecorationCommonBinding; import com.pikolive.app.decoration.adapter.MyUserCardWearAdapter; import com.pikolive.app.decoration.viewmodel.UserCardWearVm; -import com.yizhuan.xchat_android_core.decoration.headwear.bean.UserCardWearInfo; -import com.yizhuan.xchat_android_core.user.UserModel; +import com.pikolive.core.decoration.headwear.bean.UserCardWearInfo; +import com.pikolive.core.user.UserModel; import com.pikolive.library.annatation.ActLayoutRes; import com.pikolive.library.utils.ListUtils; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/main/java/com/pikolive/app/decoration/view/widgets/CarMagicIndicator.java b/app/src/main/java/com/pikolive/app/decoration/view/widgets/CarMagicIndicator.java index 958d1d5bc..51aa7f566 100644 --- a/app/src/main/java/com/pikolive/app/decoration/view/widgets/CarMagicIndicator.java +++ b/app/src/main/java/com/pikolive/app/decoration/view/widgets/CarMagicIndicator.java @@ -8,7 +8,7 @@ import com.yizhuan.erban.R; import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; -import com.yizhuan.xchat_android_core.home.bean.TabInfo; +import com.pikolive.core2.home.bean.TabInfo; import com.pikolive.library.utils.ResUtil; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/decoration/view/widgets/MyDecorationMagicIndicator.java b/app/src/main/java/com/pikolive/app/decoration/view/widgets/MyDecorationMagicIndicator.java index 6825e378e..52763398d 100644 --- a/app/src/main/java/com/pikolive/app/decoration/view/widgets/MyDecorationMagicIndicator.java +++ b/app/src/main/java/com/pikolive/app/decoration/view/widgets/MyDecorationMagicIndicator.java @@ -8,7 +8,7 @@ import com.yizhuan.erban.R; import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; -import com.yizhuan.xchat_android_core.home.bean.TabInfo; +import com.pikolive.core2.home.bean.TabInfo; import com.pikolive.library.utils.ResUtil; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/decoration/viewmodel/CarShopVm.java b/app/src/main/java/com/pikolive/app/decoration/viewmodel/CarShopVm.java index 7380f32c1..970bac8b2 100644 --- a/app/src/main/java/com/pikolive/app/decoration/viewmodel/CarShopVm.java +++ b/app/src/main/java/com/pikolive/app/decoration/viewmodel/CarShopVm.java @@ -1,9 +1,9 @@ package com.pikolive.app.decoration.viewmodel; import com.pikolive.app.base.BaseListViewModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.decoration.car.CarModel; -import com.yizhuan.xchat_android_core.decoration.car.bean.CarInfo; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.decoration.car.CarModel; +import com.pikolive.core.decoration.car.bean.CarInfo; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/decoration/viewmodel/DecorationViewModel.kt b/app/src/main/java/com/pikolive/app/decoration/viewmodel/DecorationViewModel.kt index 5bac822dc..b573db77a 100644 --- a/app/src/main/java/com/pikolive/app/decoration/viewmodel/DecorationViewModel.kt +++ b/app/src/main/java/com/pikolive/app/decoration/viewmodel/DecorationViewModel.kt @@ -4,12 +4,12 @@ import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import com.yizhuan.erban.R import com.pikolive.app.base.BaseViewModel -import com.yizhuan.xchat_android_core.bean.response.ListResult -import com.yizhuan.xchat_android_core.decoration.DecorationInfo -import com.yizhuan.xchat_android_core.decoration.DecorationModel -import com.yizhuan.xchat_android_core.home.bean.BannerInfo -import com.yizhuan.xchat_android_core.home.model.HomeModel -import com.yizhuan.xchat_android_core.utils.toast +import com.pikolive.core.bean.response.ListResult +import com.pikolive.core.decoration.DecorationInfo +import com.pikolive.core.decoration.DecorationModel +import com.pikolive.core2.home.model.HomeModel +import com.pikolive.core.utils.toast +import com.pikolive.core2.home.bean.BannerInfo import com.pikolive.library.utils.ResUtil class DecorationViewModel : BaseViewModel() { diff --git a/app/src/main/java/com/pikolive/app/decoration/viewmodel/HeadWearVm.java b/app/src/main/java/com/pikolive/app/decoration/viewmodel/HeadWearVm.java index 8609a6a03..9b12c9703 100644 --- a/app/src/main/java/com/pikolive/app/decoration/viewmodel/HeadWearVm.java +++ b/app/src/main/java/com/pikolive/app/decoration/viewmodel/HeadWearVm.java @@ -1,10 +1,10 @@ package com.pikolive.app.decoration.viewmodel; import com.pikolive.app.base.BaseListViewModel; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.decoration.headwear.HeadwearModel; -import com.yizhuan.xchat_android_core.decoration.headwear.bean.HeadWearInfo; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.decoration.headwear.HeadwearModel; +import com.pikolive.core.decoration.headwear.bean.HeadWearInfo; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/decoration/viewmodel/MyCarVm.java b/app/src/main/java/com/pikolive/app/decoration/viewmodel/MyCarVm.java index 548a18189..9a921ccde 100644 --- a/app/src/main/java/com/pikolive/app/decoration/viewmodel/MyCarVm.java +++ b/app/src/main/java/com/pikolive/app/decoration/viewmodel/MyCarVm.java @@ -1,9 +1,9 @@ package com.pikolive.app.decoration.viewmodel; import com.pikolive.app.base.BaseListViewModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.decoration.car.CarModel; -import com.yizhuan.xchat_android_core.decoration.car.bean.CarInfo; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.decoration.car.CarModel; +import com.pikolive.core.decoration.car.bean.CarInfo; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/decoration/viewmodel/UserCardWearVm.java b/app/src/main/java/com/pikolive/app/decoration/viewmodel/UserCardWearVm.java index 1d8c04027..cab8a0ac1 100644 --- a/app/src/main/java/com/pikolive/app/decoration/viewmodel/UserCardWearVm.java +++ b/app/src/main/java/com/pikolive/app/decoration/viewmodel/UserCardWearVm.java @@ -1,9 +1,9 @@ package com.pikolive.app.decoration.viewmodel; import com.pikolive.app.base.BaseListViewModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.decoration.headwear.HeadwearModel; -import com.yizhuan.xchat_android_core.decoration.headwear.bean.UserCardWearInfo; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.decoration.headwear.HeadwearModel; +import com.pikolive.core.decoration.headwear.bean.UserCardWearInfo; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/decoration/viewmodel/UserChatBubbleVm.java b/app/src/main/java/com/pikolive/app/decoration/viewmodel/UserChatBubbleVm.java index 750220778..238a2ccbd 100644 --- a/app/src/main/java/com/pikolive/app/decoration/viewmodel/UserChatBubbleVm.java +++ b/app/src/main/java/com/pikolive/app/decoration/viewmodel/UserChatBubbleVm.java @@ -1,9 +1,9 @@ package com.pikolive.app.decoration.viewmodel; import com.pikolive.app.base.BaseListViewModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.decoration.headwear.HeadwearModel; -import com.yizhuan.xchat_android_core.decoration.headwear.bean.ChatBubbleInfo; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.decoration.headwear.HeadwearModel; +import com.pikolive.core.decoration.headwear.bean.ChatBubbleInfo; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/earn/EarnRecordViewModel.kt b/app/src/main/java/com/pikolive/app/earn/EarnRecordViewModel.kt index de00c72b0..11935d979 100644 --- a/app/src/main/java/com/pikolive/app/earn/EarnRecordViewModel.kt +++ b/app/src/main/java/com/pikolive/app/earn/EarnRecordViewModel.kt @@ -2,8 +2,8 @@ package com.pikolive.app.earn import androidx.lifecycle.MutableLiveData import com.pikolive.app.base.BaseViewModel -import com.yizhuan.xchat_android_core.earn.bean.* -import com.yizhuan.xchat_android_core.earn.model.EarnModel +import com.pikolive.core2.earn.bean.* +import com.pikolive.core2.earn.model.EarnModel import com.pikolive.library.utils.TimeUtils import java.util.* diff --git a/app/src/main/java/com/pikolive/app/earn/activity/BindWithdrawMsgActivity.kt b/app/src/main/java/com/pikolive/app/earn/activity/BindWithdrawMsgActivity.kt index 1c2c79577..aee7c5ff3 100644 --- a/app/src/main/java/com/pikolive/app/earn/activity/BindWithdrawMsgActivity.kt +++ b/app/src/main/java/com/pikolive/app/earn/activity/BindWithdrawMsgActivity.kt @@ -10,8 +10,8 @@ import com.yizhuan.erban.R import com.pikolive.app.base.BaseViewBindingActivity import com.yizhuan.erban.databinding.ActivityBindWithdrawMsgBinding import com.pikolive.app.earn.EarnRecordViewModel -import com.yizhuan.xchat_android_core.auth.AuthModel -import com.yizhuan.xchat_android_core.earn.bean.WithdrawAccount +import com.pikolive.core.auth.AuthModel +import com.pikolive.core2.earn.bean.WithdrawAccount /** * 绑定提现信息 diff --git a/app/src/main/java/com/pikolive/app/earn/activity/ConvertDiamondActivity.kt b/app/src/main/java/com/pikolive/app/earn/activity/ConvertDiamondActivity.kt index 27895b050..62449f30e 100644 --- a/app/src/main/java/com/pikolive/app/earn/activity/ConvertDiamondActivity.kt +++ b/app/src/main/java/com/pikolive/app/earn/activity/ConvertDiamondActivity.kt @@ -11,7 +11,7 @@ import com.pikolive.app.base.BaseViewBindingActivity import com.yizhuan.erban.databinding.ActivityConvertDiamondBinding import com.pikolive.app.earn.EarnRecordViewModel import com.pikolive.app.ui.widget.dialog.ExchangeDiamondTipDialog -import com.yizhuan.xchat_android_core.earn.bean.GoldToDiamondInfo +import com.pikolive.core2.earn.bean.GoldToDiamondInfo import com.pikolive.library.common.util.DoubleUtils import kotlin.math.ceil import kotlin.math.floor diff --git a/app/src/main/java/com/pikolive/app/earn/activity/EarnRecordActivity.kt b/app/src/main/java/com/pikolive/app/earn/activity/EarnRecordActivity.kt index 3b3234c40..5e9edf903 100644 --- a/app/src/main/java/com/pikolive/app/earn/activity/EarnRecordActivity.kt +++ b/app/src/main/java/com/pikolive/app/earn/activity/EarnRecordActivity.kt @@ -12,9 +12,9 @@ import com.yizhuan.erban.databinding.ActivityEarnRecordBinding import com.pikolive.app.earn.EarnRecordViewModel import com.pikolive.app.ui.pay.ChargeActivity import com.pikolive.app.ui.webview.CommonWebViewActivity -import com.yizhuan.xchat_android_core.Constants -import com.yizhuan.xchat_android_core.UriProvider -import com.yizhuan.xchat_android_core.earn.bean.RoomTypeInfo +import com.pikolive.core.Constants +import com.pikolive.core2.UriProvider +import com.pikolive.core2.earn.bean.RoomTypeInfo import com.pikolive.library.common.util.DeviceUtil import com.pikolive.library.utils.AppMetaDataUtil diff --git a/app/src/main/java/com/pikolive/app/earn/activity/EarnWithdrawActivity.kt b/app/src/main/java/com/pikolive/app/earn/activity/EarnWithdrawActivity.kt index e5471d224..dbf8cfc8c 100644 --- a/app/src/main/java/com/pikolive/app/earn/activity/EarnWithdrawActivity.kt +++ b/app/src/main/java/com/pikolive/app/earn/activity/EarnWithdrawActivity.kt @@ -16,9 +16,9 @@ import com.pikolive.app.pay.widget.GridPasswordNoFocusView import com.pikolive.app.ui.setting.ModifyPwdActivity import com.pikolive.app.ui.webview.CommonWebViewActivity import com.pikolive.app.ui.widget.dialog.CommonTipDialog -import com.yizhuan.xchat_android_core.UriProvider -import com.yizhuan.xchat_android_core.earn.bean.ConfigWithdrawInfo -import com.yizhuan.xchat_android_core.user.UserModel +import com.pikolive.core.user.UserModel +import com.pikolive.core2.UriProvider +import com.pikolive.core2.earn.bean.ConfigWithdrawInfo import com.pikolive.library.utils.ResUtil /** diff --git a/app/src/main/java/com/pikolive/app/earn/activity/GoldDetailActivity.kt b/app/src/main/java/com/pikolive/app/earn/activity/GoldDetailActivity.kt index 413068fd4..253ec3422 100644 --- a/app/src/main/java/com/pikolive/app/earn/activity/GoldDetailActivity.kt +++ b/app/src/main/java/com/pikolive/app/earn/activity/GoldDetailActivity.kt @@ -20,8 +20,8 @@ import com.yizhuan.erban.module_hall.hall.view.dialog.TimePickerGoldDialog import com.pikolive.app.ui.utils.RVDelegate import com.pikolive.app.ui.widget.recyclerview.decoration.ColorDecoration import com.pikolive.app.utils.SpannableBuilder -import com.yizhuan.xchat_android_core.earn.bean.HallMemberGoldFlowInfo -import com.yizhuan.xchat_android_core.earn.bean.HallMemberGoldFlowTotalInfo +import com.pikolive.core2.earn.bean.HallMemberGoldFlowInfo +import com.pikolive.core2.earn.bean.HallMemberGoldFlowTotalInfo import com.pikolive.library.utils.FormatUtils /** diff --git a/app/src/main/java/com/pikolive/app/earn/adapter/GoldDetailAdapter.kt b/app/src/main/java/com/pikolive/app/earn/adapter/GoldDetailAdapter.kt index c2df7575b..c47174dbc 100644 --- a/app/src/main/java/com/pikolive/app/earn/adapter/GoldDetailAdapter.kt +++ b/app/src/main/java/com/pikolive/app/earn/adapter/GoldDetailAdapter.kt @@ -4,7 +4,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder import com.yizhuan.erban.R import com.pikolive.app.ui.utils.ImageLoadUtilsV2 -import com.yizhuan.xchat_android_core.earn.bean.HallMemberGoldFlowInfo +import com.pikolive.core2.earn.bean.HallMemberGoldFlowInfo import com.pikolive.library.utils.FormatUtils class GoldDetailAdapter : diff --git a/app/src/main/java/com/pikolive/app/earn/adapter/GoldRecordAdapter.kt b/app/src/main/java/com/pikolive/app/earn/adapter/GoldRecordAdapter.kt index 659be60d7..d36dddd2a 100644 --- a/app/src/main/java/com/pikolive/app/earn/adapter/GoldRecordAdapter.kt +++ b/app/src/main/java/com/pikolive/app/earn/adapter/GoldRecordAdapter.kt @@ -4,7 +4,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder import com.yizhuan.erban.R import com.pikolive.app.ui.utils.ImageLoadUtilsV2 -import com.yizhuan.xchat_android_core.earn.bean.HallMemberGoldFlowInfo +import com.pikolive.core2.earn.bean.HallMemberGoldFlowInfo import com.pikolive.library.utils.FormatUtils class GoldRecordAdapter : diff --git a/app/src/main/java/com/pikolive/app/earn/adapter/GoldRoomAdapter.kt b/app/src/main/java/com/pikolive/app/earn/adapter/GoldRoomAdapter.kt index 741b450d5..0e1b7c0b5 100644 --- a/app/src/main/java/com/pikolive/app/earn/adapter/GoldRoomAdapter.kt +++ b/app/src/main/java/com/pikolive/app/earn/adapter/GoldRoomAdapter.kt @@ -4,7 +4,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder import com.yizhuan.erban.R import com.pikolive.app.ui.utils.ImageLoadUtilsV2 -import com.yizhuan.xchat_android_core.earn.bean.HallVo +import com.pikolive.core2.earn.bean.HallVo class GoldRoomAdapter : BaseQuickAdapter(R.layout.item_gold_room) { diff --git a/app/src/main/java/com/pikolive/app/family/contract/viewinterface/IFamilyAttentionFragmentView.java b/app/src/main/java/com/pikolive/app/family/contract/viewinterface/IFamilyAttentionFragmentView.java index d698db93a..ce4f4bd02 100644 --- a/app/src/main/java/com/pikolive/app/family/contract/viewinterface/IFamilyAttentionFragmentView.java +++ b/app/src/main/java/com/pikolive/app/family/contract/viewinterface/IFamilyAttentionFragmentView.java @@ -1,6 +1,6 @@ package com.pikolive.app.family.contract.viewinterface; -import com.yizhuan.xchat_android_core.user.bean.AttentionInfo; +import com.pikolive.core.user.bean.AttentionInfo; import com.pikolive.library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/family/contract/viewinterface/IFamilyCurrencyView.java b/app/src/main/java/com/pikolive/app/family/contract/viewinterface/IFamilyCurrencyView.java index 99d4c3463..234e86021 100644 --- a/app/src/main/java/com/pikolive/app/family/contract/viewinterface/IFamilyCurrencyView.java +++ b/app/src/main/java/com/pikolive/app/family/contract/viewinterface/IFamilyCurrencyView.java @@ -1,6 +1,6 @@ package com.pikolive.app.family.contract.viewinterface; -import com.yizhuan.xchat_android_core.family.bean.VMBillItemInfo; +import com.pikolive.core.family.bean.VMBillItemInfo; import com.pikolive.library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/family/contract/viewinterface/IFamilyFansListFragmentView.java b/app/src/main/java/com/pikolive/app/family/contract/viewinterface/IFamilyFansListFragmentView.java index cc801b3d8..2086777f2 100644 --- a/app/src/main/java/com/pikolive/app/family/contract/viewinterface/IFamilyFansListFragmentView.java +++ b/app/src/main/java/com/pikolive/app/family/contract/viewinterface/IFamilyFansListFragmentView.java @@ -1,6 +1,6 @@ package com.pikolive.app.family.contract.viewinterface; -import com.yizhuan.xchat_android_core.user.bean.FansListInfo; +import com.pikolive.core.user.bean.FansListInfo; import com.pikolive.library.base.IMvpBaseView; /** diff --git a/app/src/main/java/com/pikolive/app/family/contract/viewinterface/IFamilyFriendListFragmentView.java b/app/src/main/java/com/pikolive/app/family/contract/viewinterface/IFamilyFriendListFragmentView.java index c32dcae0e..ed2fd3888 100644 --- a/app/src/main/java/com/pikolive/app/family/contract/viewinterface/IFamilyFriendListFragmentView.java +++ b/app/src/main/java/com/pikolive/app/family/contract/viewinterface/IFamilyFriendListFragmentView.java @@ -1,6 +1,6 @@ package com.pikolive.app.family.contract.viewinterface; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.pikolive.core.user.bean.UserInfo; import com.pikolive.library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/family/contract/viewinterface/IFamilyGameListActivityView.java b/app/src/main/java/com/pikolive/app/family/contract/viewinterface/IFamilyGameListActivityView.java index 840a3c5b1..14d9806e3 100644 --- a/app/src/main/java/com/pikolive/app/family/contract/viewinterface/IFamilyGameListActivityView.java +++ b/app/src/main/java/com/pikolive/app/family/contract/viewinterface/IFamilyGameListActivityView.java @@ -1,6 +1,6 @@ package com.pikolive.app.family.contract.viewinterface; -import com.yizhuan.xchat_android_core.family.bean.FamilyGameInfo; +import com.pikolive.core.family.bean.FamilyGameInfo; import com.pikolive.library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/family/contract/viewinterface/IFamilyMemberListView.java b/app/src/main/java/com/pikolive/app/family/contract/viewinterface/IFamilyMemberListView.java index 64e14d90c..0c0f98a68 100644 --- a/app/src/main/java/com/pikolive/app/family/contract/viewinterface/IFamilyMemberListView.java +++ b/app/src/main/java/com/pikolive/app/family/contract/viewinterface/IFamilyMemberListView.java @@ -1,6 +1,6 @@ package com.pikolive.app.family.contract.viewinterface; -import com.yizhuan.xchat_android_core.family.bean.FamilyMemberInfo; +import com.pikolive.core.family.bean.FamilyMemberInfo; import com.pikolive.library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/family/contract/viewinterface/IFamilyMemberSearchView.java b/app/src/main/java/com/pikolive/app/family/contract/viewinterface/IFamilyMemberSearchView.java index 20d19ecf0..80b06b8eb 100644 --- a/app/src/main/java/com/pikolive/app/family/contract/viewinterface/IFamilyMemberSearchView.java +++ b/app/src/main/java/com/pikolive/app/family/contract/viewinterface/IFamilyMemberSearchView.java @@ -1,6 +1,6 @@ package com.pikolive.app.family.contract.viewinterface; -import com.yizhuan.xchat_android_core.family.bean.FamilyMemberInfo; +import com.pikolive.core.family.bean.FamilyMemberInfo; import com.pikolive.library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/family/presenter/FamilyAttentionPresenter.java b/app/src/main/java/com/pikolive/app/family/presenter/FamilyAttentionPresenter.java index 37f4a1880..538882e08 100644 --- a/app/src/main/java/com/pikolive/app/family/presenter/FamilyAttentionPresenter.java +++ b/app/src/main/java/com/pikolive/app/family/presenter/FamilyAttentionPresenter.java @@ -3,10 +3,10 @@ package com.pikolive.app.family.presenter; import com.pikolive.app.family.contract.viewinterface.IFamilyAttentionFragmentView; import com.yizhuan.erban.R; import com.pikolive.app.base.BaseMvpPresenter; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.user.AttentionModel; -import com.yizhuan.xchat_android_core.user.bean.AttentionInfo; +import com.pikolive.core.Constants; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.user.AttentionModel; +import com.pikolive.core.user.bean.AttentionInfo; import com.pikolive.library.utils.ResUtil; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/family/presenter/FamilyCurrencyPresenter.java b/app/src/main/java/com/pikolive/app/family/presenter/FamilyCurrencyPresenter.java index 942b76165..da504a185 100644 --- a/app/src/main/java/com/pikolive/app/family/presenter/FamilyCurrencyPresenter.java +++ b/app/src/main/java/com/pikolive/app/family/presenter/FamilyCurrencyPresenter.java @@ -8,16 +8,16 @@ import androidx.annotation.Nullable; import com.pikolive.app.family.contract.viewinterface.IFamilyCurrencyView; import com.yizhuan.erban.R; import com.pikolive.app.base.BaseMvpPresenter; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.family.bean.BillDateDivInfo; -import com.yizhuan.xchat_android_core.family.bean.TransactionRecordInfo; -import com.yizhuan.xchat_android_core.family.bean.VMBillItemInfo; -import com.yizhuan.xchat_android_core.family.bean.response.moneyManagement.FamilyMoneyManagementInfo; -import com.yizhuan.xchat_android_core.family.bean.response.moneyManagement.MonthlyRecord; -import com.yizhuan.xchat_android_core.family.bean.response.moneyManagement.TradeMoneyRecord; -import com.yizhuan.xchat_android_core.family.event.FamilyCurrencyUpdateEvent; -import com.yizhuan.xchat_android_core.family.model.FamilyModel; +import com.pikolive.core.Constants; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.family.bean.BillDateDivInfo; +import com.pikolive.core.family.bean.TransactionRecordInfo; +import com.pikolive.core.family.bean.VMBillItemInfo; +import com.pikolive.core.family.bean.response.moneyManagement.FamilyMoneyManagementInfo; +import com.pikolive.core.family.bean.response.moneyManagement.MonthlyRecord; +import com.pikolive.core.family.bean.response.moneyManagement.TradeMoneyRecord; +import com.pikolive.core.family.event.FamilyCurrencyUpdateEvent; +import com.pikolive.core.family.model.FamilyModel; import com.pikolive.library.base.PresenterEvent; import com.pikolive.library.rxbus.RxBusHelper; import com.pikolive.library.utils.ListUtils; diff --git a/app/src/main/java/com/pikolive/app/family/presenter/FamilyFansListPresenter.java b/app/src/main/java/com/pikolive/app/family/presenter/FamilyFansListPresenter.java index 7e6b1289d..4c2910736 100644 --- a/app/src/main/java/com/pikolive/app/family/presenter/FamilyFansListPresenter.java +++ b/app/src/main/java/com/pikolive/app/family/presenter/FamilyFansListPresenter.java @@ -3,10 +3,10 @@ package com.pikolive.app.family.presenter; import com.yizhuan.erban.R; import com.pikolive.app.base.BaseMvpPresenter; import com.pikolive.app.family.contract.viewinterface.IFamilyFansListFragmentView; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.user.AttentionModel; -import com.yizhuan.xchat_android_core.user.bean.FansListInfo; +import com.pikolive.core.Constants; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.user.AttentionModel; +import com.pikolive.core.user.bean.FansListInfo; import com.pikolive.library.utils.ResUtil; import io.reactivex.SingleObserver; diff --git a/app/src/main/java/com/pikolive/app/family/presenter/FamilyFriendListPresenter.java b/app/src/main/java/com/pikolive/app/family/presenter/FamilyFriendListPresenter.java index 6fd5b8c86..9afecf12c 100644 --- a/app/src/main/java/com/pikolive/app/family/presenter/FamilyFriendListPresenter.java +++ b/app/src/main/java/com/pikolive/app/family/presenter/FamilyFriendListPresenter.java @@ -3,9 +3,9 @@ package com.pikolive.app.family.presenter; import com.yizhuan.erban.R; import com.pikolive.app.base.BaseMvpPresenter; import com.pikolive.app.family.contract.viewinterface.IFamilyFriendListFragmentView; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.im.friend.IMFriendModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.pikolive.core.Constants; +import com.pikolive.core.im.friend.IMFriendModel; +import com.pikolive.core.user.bean.UserInfo; import com.pikolive.library.utils.ResUtil; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/family/presenter/FamilyGameListPresenter.java b/app/src/main/java/com/pikolive/app/family/presenter/FamilyGameListPresenter.java index fc3b8adfe..46a359613 100644 --- a/app/src/main/java/com/pikolive/app/family/presenter/FamilyGameListPresenter.java +++ b/app/src/main/java/com/pikolive/app/family/presenter/FamilyGameListPresenter.java @@ -3,10 +3,10 @@ package com.pikolive.app.family.presenter; import com.pikolive.app.family.contract.viewinterface.IFamilyGameListActivityView; import com.yizhuan.erban.R; import com.pikolive.app.base.BaseMvpPresenter; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.family.bean.FamilyGameInfo; -import com.yizhuan.xchat_android_core.family.bean.FamilyInfo; -import com.yizhuan.xchat_android_core.family.model.FamilyModel; +import com.pikolive.core.Constants; +import com.pikolive.core.family.bean.FamilyGameInfo; +import com.pikolive.core.family.bean.FamilyInfo; +import com.pikolive.core.family.model.FamilyModel; import com.pikolive.library.base.PresenterEvent; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/main/java/com/pikolive/app/family/presenter/FamilyHomePresenter.java b/app/src/main/java/com/pikolive/app/family/presenter/FamilyHomePresenter.java index 915500670..1bc9ccb2a 100644 --- a/app/src/main/java/com/pikolive/app/family/presenter/FamilyHomePresenter.java +++ b/app/src/main/java/com/pikolive/app/family/presenter/FamilyHomePresenter.java @@ -7,11 +7,11 @@ import androidx.annotation.Nullable; import com.yizhuan.erban.R; import com.pikolive.app.base.BaseMvpPresenter; import com.pikolive.app.home.view.IFamilyHomeActivityView; -import com.yizhuan.xchat_android_core.family.bean.FamilyInfo; -import com.yizhuan.xchat_android_core.family.event.FamilyCurrencyUpdateEvent; -import com.yizhuan.xchat_android_core.family.event.FamilyMemberUpdateEvent; -import com.yizhuan.xchat_android_core.family.event.FamilyUpdateEvent; -import com.yizhuan.xchat_android_core.family.model.FamilyModel; +import com.pikolive.core.family.bean.FamilyInfo; +import com.pikolive.core.family.event.FamilyCurrencyUpdateEvent; +import com.pikolive.core.family.event.FamilyMemberUpdateEvent; +import com.pikolive.core.family.event.FamilyUpdateEvent; +import com.pikolive.core.family.model.FamilyModel; import com.pikolive.library.base.PresenterEvent; import com.pikolive.library.rxbus.RxBusHelper; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/main/java/com/pikolive/app/family/presenter/FamilyInfoPresenter.java b/app/src/main/java/com/pikolive/app/family/presenter/FamilyInfoPresenter.java index f0e6be5b3..14aceb0b6 100644 --- a/app/src/main/java/com/pikolive/app/family/presenter/FamilyInfoPresenter.java +++ b/app/src/main/java/com/pikolive/app/family/presenter/FamilyInfoPresenter.java @@ -3,8 +3,8 @@ package com.pikolive.app.family.presenter; import com.pikolive.app.family.contract.viewinterface.IFamilyInfoView; import com.yizhuan.erban.R; import com.pikolive.app.base.BaseMvpPresenter; -import com.yizhuan.xchat_android_core.family.bean.FamilyInfo; -import com.yizhuan.xchat_android_core.family.model.FamilyModel; +import com.pikolive.core.family.bean.FamilyInfo; +import com.pikolive.core.family.model.FamilyModel; import com.pikolive.library.base.PresenterEvent; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/main/java/com/pikolive/app/family/presenter/FamilyListPresenter.java b/app/src/main/java/com/pikolive/app/family/presenter/FamilyListPresenter.java index f504cc27b..afe38b750 100644 --- a/app/src/main/java/com/pikolive/app/family/presenter/FamilyListPresenter.java +++ b/app/src/main/java/com/pikolive/app/family/presenter/FamilyListPresenter.java @@ -2,10 +2,10 @@ package com.pikolive.app.family.presenter; import com.pikolive.app.base.BaseMvpPresenter; import com.pikolive.app.family.contract.viewinterface.IFamilySearchView; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.family.bean.response.RankingFamilyInfo; -import com.yizhuan.xchat_android_core.family.bean.response.RespFamilyRankList; -import com.yizhuan.xchat_android_core.family.model.FamilyModel; +import com.pikolive.core.Constants; +import com.pikolive.core.family.bean.response.RankingFamilyInfo; +import com.pikolive.core.family.bean.response.RespFamilyRankList; +import com.pikolive.core.family.model.FamilyModel; import com.pikolive.library.base.PresenterEvent; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/family/presenter/FamilyMemberCurrencyPresenter.java b/app/src/main/java/com/pikolive/app/family/presenter/FamilyMemberCurrencyPresenter.java index 7e771a37a..b9fc13f52 100644 --- a/app/src/main/java/com/pikolive/app/family/presenter/FamilyMemberCurrencyPresenter.java +++ b/app/src/main/java/com/pikolive/app/family/presenter/FamilyMemberCurrencyPresenter.java @@ -8,13 +8,13 @@ import androidx.annotation.Nullable; import com.pikolive.app.family.contract.viewinterface.IFamilyCurrencyView; import com.yizhuan.erban.R; import com.pikolive.app.base.BaseMvpPresenter; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.family.bean.BillDateDivInfo; -import com.yizhuan.xchat_android_core.family.bean.TransactionRecordInfo; -import com.yizhuan.xchat_android_core.family.bean.VMBillItemInfo; -import com.yizhuan.xchat_android_core.family.bean.response.moneyManagement.MonthlyRecord; -import com.yizhuan.xchat_android_core.family.bean.response.moneyManagement.TradeMoneyRecord; -import com.yizhuan.xchat_android_core.family.model.FamilyModel; +import com.pikolive.core.Constants; +import com.pikolive.core.family.bean.BillDateDivInfo; +import com.pikolive.core.family.bean.TransactionRecordInfo; +import com.pikolive.core.family.bean.VMBillItemInfo; +import com.pikolive.core.family.bean.response.moneyManagement.MonthlyRecord; +import com.pikolive.core.family.bean.response.moneyManagement.TradeMoneyRecord; +import com.pikolive.core.family.model.FamilyModel; import com.pikolive.library.base.PresenterEvent; import com.pikolive.library.utils.ListUtils; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/main/java/com/pikolive/app/family/presenter/FamilyMemberListPresenter.java b/app/src/main/java/com/pikolive/app/family/presenter/FamilyMemberListPresenter.java index c8871bc46..919e115f1 100644 --- a/app/src/main/java/com/pikolive/app/family/presenter/FamilyMemberListPresenter.java +++ b/app/src/main/java/com/pikolive/app/family/presenter/FamilyMemberListPresenter.java @@ -7,12 +7,12 @@ import androidx.annotation.Nullable; import com.pikolive.app.family.contract.viewinterface.IFamilyMemberListView; import com.yizhuan.erban.R; import com.pikolive.app.base.BaseMvpPresenter; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.family.bean.FamilyInfo; -import com.yizhuan.xchat_android_core.family.bean.FamilyMemberInfo; -import com.yizhuan.xchat_android_core.family.bean.response.memberList.RespFamilymember; -import com.yizhuan.xchat_android_core.family.event.FamilyMemberUpdateEvent; -import com.yizhuan.xchat_android_core.family.model.FamilyModel; +import com.pikolive.core.Constants; +import com.pikolive.core.family.bean.FamilyInfo; +import com.pikolive.core.family.bean.FamilyMemberInfo; +import com.pikolive.core.family.bean.response.memberList.RespFamilymember; +import com.pikolive.core.family.event.FamilyMemberUpdateEvent; +import com.pikolive.core.family.model.FamilyModel; import com.pikolive.library.base.PresenterEvent; import com.pikolive.library.rxbus.RxBusHelper; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/main/java/com/pikolive/app/family/presenter/FamilyMemberSearchPresenter.java b/app/src/main/java/com/pikolive/app/family/presenter/FamilyMemberSearchPresenter.java index 85f91ca3c..53f619f08 100644 --- a/app/src/main/java/com/pikolive/app/family/presenter/FamilyMemberSearchPresenter.java +++ b/app/src/main/java/com/pikolive/app/family/presenter/FamilyMemberSearchPresenter.java @@ -3,11 +3,11 @@ package com.pikolive.app.family.presenter; import com.pikolive.app.family.contract.viewinterface.IFamilyMemberSearchView; import com.yizhuan.erban.R; import com.pikolive.app.base.BaseMvpPresenter; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.family.bean.FamilyInfo; -import com.yizhuan.xchat_android_core.family.bean.FamilyMemberInfo; -import com.yizhuan.xchat_android_core.family.bean.response.memberList.RespFamilymember; -import com.yizhuan.xchat_android_core.family.model.FamilyModel; +import com.pikolive.core.Constants; +import com.pikolive.core.family.bean.FamilyInfo; +import com.pikolive.core.family.bean.FamilyMemberInfo; +import com.pikolive.core.family.bean.response.memberList.RespFamilymember; +import com.pikolive.core.family.model.FamilyModel; import com.pikolive.library.base.PresenterEvent; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/main/java/com/pikolive/app/family/presenter/FamilyPlazaPresenter.java b/app/src/main/java/com/pikolive/app/family/presenter/FamilyPlazaPresenter.java index 72c7ea872..7caf6f9eb 100644 --- a/app/src/main/java/com/pikolive/app/family/presenter/FamilyPlazaPresenter.java +++ b/app/src/main/java/com/pikolive/app/family/presenter/FamilyPlazaPresenter.java @@ -2,9 +2,9 @@ package com.pikolive.app.family.presenter; import com.pikolive.app.base.BaseMvpPresenter; import com.pikolive.app.family.contract.viewinterface.IFamilyPlazaActivityView; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.family.bean.response.RespFamilyRankList; -import com.yizhuan.xchat_android_core.family.model.FamilyModel; +import com.pikolive.core.Constants; +import com.pikolive.core.family.bean.response.RespFamilyRankList; +import com.pikolive.core.family.model.FamilyModel; import com.pikolive.library.base.PresenterEvent; import io.reactivex.Single; diff --git a/app/src/main/java/com/pikolive/app/family/presenter/FamilySearchPresent.java b/app/src/main/java/com/pikolive/app/family/presenter/FamilySearchPresent.java index 9db3b743a..e1bd53723 100644 --- a/app/src/main/java/com/pikolive/app/family/presenter/FamilySearchPresent.java +++ b/app/src/main/java/com/pikolive/app/family/presenter/FamilySearchPresent.java @@ -3,10 +3,10 @@ package com.pikolive.app.family.presenter; import com.pikolive.app.family.contract.viewinterface.IFamilySearchView; import com.yizhuan.erban.R; import com.pikolive.app.base.BaseMvpPresenter; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.family.bean.FamilyInfo; -import com.yizhuan.xchat_android_core.family.bean.response.familyPlaza.RespFamily; -import com.yizhuan.xchat_android_core.family.model.FamilyModel; +import com.pikolive.core.Constants; +import com.pikolive.core.family.bean.FamilyInfo; +import com.pikolive.core.family.bean.response.familyPlaza.RespFamily; +import com.pikolive.core.family.model.FamilyModel; import com.pikolive.library.base.PresenterEvent; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/main/java/com/pikolive/app/family/view/activity/FamilyCurrencyActivity.java b/app/src/main/java/com/pikolive/app/family/view/activity/FamilyCurrencyActivity.java index 709cf18bb..c483120ce 100644 --- a/app/src/main/java/com/pikolive/app/family/view/activity/FamilyCurrencyActivity.java +++ b/app/src/main/java/com/pikolive/app/family/view/activity/FamilyCurrencyActivity.java @@ -30,11 +30,11 @@ import com.pikolive.app.family.presenter.FamilyCurrencyPresenter; import com.pikolive.app.family.view.adapter.FamilyCurrencyBillAdapter; import com.pikolive.app.family.view.dialog.FamilyContributionDialog; import com.pikolive.app.ui.webview.CommonWebViewActivity; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.family.bean.FamilyMemberInfo; -import com.yizhuan.xchat_android_core.family.bean.VMBillItemInfo; -import com.yizhuan.xchat_android_core.family.bean.response.moneyManagement.FamilyMoneyManagementInfo; +import com.pikolive.core.Constants; +import com.pikolive.core2.UriProvider; +import com.pikolive.core.family.bean.FamilyMemberInfo; +import com.pikolive.core.family.bean.VMBillItemInfo; +import com.pikolive.core.family.bean.response.moneyManagement.FamilyMoneyManagementInfo; import com.pikolive.library.base.factory.CreatePresenter; import com.pikolive.library.utils.FormatUtils; import com.pikolive.library.utils.ListUtils; diff --git a/app/src/main/java/com/pikolive/app/family/view/activity/FamilyGameListActivity.java b/app/src/main/java/com/pikolive/app/family/view/activity/FamilyGameListActivity.java index 4060def88..31c234640 100644 --- a/app/src/main/java/com/pikolive/app/family/view/activity/FamilyGameListActivity.java +++ b/app/src/main/java/com/pikolive/app/family/view/activity/FamilyGameListActivity.java @@ -21,10 +21,10 @@ import com.pikolive.app.base.BaseMvpActivity; import com.pikolive.app.family.presenter.FamilyGameListPresenter; import com.pikolive.app.family.view.adapter.FamilyGameListAdapter; import com.pikolive.app.ui.webview.CommonWebViewActivity; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.family.bean.FamilyGameInfo; -import com.yizhuan.xchat_android_core.family.bean.FamilyInfo; -import com.yizhuan.xchat_android_core.family.model.FamilyModel; +import com.pikolive.core.Constants; +import com.pikolive.core.family.bean.FamilyGameInfo; +import com.pikolive.core.family.bean.FamilyInfo; +import com.pikolive.core.family.model.FamilyModel; import com.pikolive.library.base.factory.CreatePresenter; import com.pikolive.library.utils.ListUtils; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/main/java/com/pikolive/app/family/view/activity/FamilyHomeActivity.java b/app/src/main/java/com/pikolive/app/family/view/activity/FamilyHomeActivity.java index 1e5d8876d..5f27cfd87 100644 --- a/app/src/main/java/com/pikolive/app/family/view/activity/FamilyHomeActivity.java +++ b/app/src/main/java/com/pikolive/app/family/view/activity/FamilyHomeActivity.java @@ -45,15 +45,15 @@ import com.pikolive.app.ui.webview.CommonWebViewActivity; import com.pikolive.app.ui.widget.ShareDialog; import com.pikolive.app.ui.widget.recyclerview.decoration.ColorDecoration; import com.pikolive.app.ui.widget.recyclerview.layoutmanager.FullyLinearLayoutManager; -import com.yizhuan.xchat_android_core.family.bean.FamilyGameInfo; -import com.yizhuan.xchat_android_core.family.bean.FamilyGroupInfo; -import com.yizhuan.xchat_android_core.family.bean.FamilyInfo; -import com.yizhuan.xchat_android_core.family.bean.FamilyMemberInfo; -import com.yizhuan.xchat_android_core.family.model.FamilyModel; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.share.ShareModel; -import com.yizhuan.xchat_android_core.share.bean.SessionType; -import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; +import com.pikolive.core.family.bean.FamilyGameInfo; +import com.pikolive.core.family.bean.FamilyGroupInfo; +import com.pikolive.core.family.bean.FamilyInfo; +import com.pikolive.core.family.bean.FamilyMemberInfo; +import com.pikolive.core.family.model.FamilyModel; +import com.pikolive.core2.manager.IMNetEaseManager; +import com.pikolive.core.share.ShareModel; +import com.pikolive.core.share.bean.SessionType; +import com.pikolive.core.utils.SharedPreferenceUtils; import com.pikolive.library.base.factory.CreatePresenter; import com.pikolive.library.utils.FormatUtils; import com.pikolive.library.utils.ListUtils; diff --git a/app/src/main/java/com/pikolive/app/family/view/activity/FamilyInfoActivity.java b/app/src/main/java/com/pikolive/app/family/view/activity/FamilyInfoActivity.java index 8258e503c..169b3b63f 100644 --- a/app/src/main/java/com/pikolive/app/family/view/activity/FamilyInfoActivity.java +++ b/app/src/main/java/com/pikolive/app/family/view/activity/FamilyInfoActivity.java @@ -18,9 +18,9 @@ import com.pikolive.app.base.BaseMvpActivity; import com.pikolive.app.family.presenter.FamilyInfoPresenter; import com.pikolive.app.family.view.dialog.FamilyDisbandDialog; import com.pikolive.app.ui.widget.ButtonItem; -import com.yizhuan.xchat_android_core.family.bean.FamilyInfo; -import com.yizhuan.xchat_android_core.family.model.FamilyModel; -import com.yizhuan.xchat_android_core.file.FileModel; +import com.pikolive.core.family.bean.FamilyInfo; +import com.pikolive.core.family.model.FamilyModel; +import com.pikolive.core.file.FileModel; import com.pikolive.library.base.factory.CreatePresenter; import com.pikolive.library.utils.ResUtil; import com.pikolive.library.widget.IOSSwitchView; diff --git a/app/src/main/java/com/pikolive/app/family/view/activity/FamilyListActivity.java b/app/src/main/java/com/pikolive/app/family/view/activity/FamilyListActivity.java index 34b15b139..4a9e4caf9 100644 --- a/app/src/main/java/com/pikolive/app/family/view/activity/FamilyListActivity.java +++ b/app/src/main/java/com/pikolive/app/family/view/activity/FamilyListActivity.java @@ -16,7 +16,7 @@ import com.pikolive.app.base.TitleBar; import com.pikolive.app.family.presenter.FamilyListPresenter; import com.pikolive.app.family.view.adapter.FamilyWeeklyRankBoardAdapter; import com.pikolive.app.ui.widget.recyclerview.decoration.ColorDecoration; -import com.yizhuan.xchat_android_core.family.bean.response.RankingFamilyInfo; +import com.pikolive.core.family.bean.response.RankingFamilyInfo; import com.pikolive.library.base.factory.CreatePresenter; import com.pikolive.library.utils.ListUtils; import com.pikolive.library.utils.SizeUtils; diff --git a/app/src/main/java/com/pikolive/app/family/view/activity/FamilyManageActivity.java b/app/src/main/java/com/pikolive/app/family/view/activity/FamilyManageActivity.java index b90476134..29a809a22 100644 --- a/app/src/main/java/com/pikolive/app/family/view/activity/FamilyManageActivity.java +++ b/app/src/main/java/com/pikolive/app/family/view/activity/FamilyManageActivity.java @@ -14,8 +14,8 @@ import com.yizhuan.erban.R; import com.pikolive.app.base.BaseMvpActivity; import com.pikolive.app.family.presenter.FamilyManagePresenter; import com.pikolive.app.family.view.adapter.FamilyManageAdapter; -import com.yizhuan.xchat_android_core.family.bean.FamilyManageItemInfo; -import com.yizhuan.xchat_android_core.family.model.FamilyModel; +import com.pikolive.core.family.bean.FamilyManageItemInfo; +import com.pikolive.core.family.model.FamilyModel; import com.pikolive.library.base.factory.CreatePresenter; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/main/java/com/pikolive/app/family/view/activity/FamilyMemberCurrencyActivity.java b/app/src/main/java/com/pikolive/app/family/view/activity/FamilyMemberCurrencyActivity.java index 36b65ca01..258b8fa96 100644 --- a/app/src/main/java/com/pikolive/app/family/view/activity/FamilyMemberCurrencyActivity.java +++ b/app/src/main/java/com/pikolive/app/family/view/activity/FamilyMemberCurrencyActivity.java @@ -19,8 +19,8 @@ import com.pikolive.app.base.BaseMvpActivity; import com.pikolive.app.constants.BundleKeys; import com.pikolive.app.family.presenter.FamilyMemberCurrencyPresenter; import com.pikolive.app.family.view.adapter.FamilyCurrencyBillAdapter; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.family.bean.VMBillItemInfo; +import com.pikolive.core.Constants; +import com.pikolive.core.family.bean.VMBillItemInfo; import com.pikolive.library.base.factory.CreatePresenter; import com.pikolive.library.utils.ListUtils; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/main/java/com/pikolive/app/family/view/activity/FamilyMemberListActivity.java b/app/src/main/java/com/pikolive/app/family/view/activity/FamilyMemberListActivity.java index 11f9b1846..403dd9983 100644 --- a/app/src/main/java/com/pikolive/app/family/view/activity/FamilyMemberListActivity.java +++ b/app/src/main/java/com/pikolive/app/family/view/activity/FamilyMemberListActivity.java @@ -22,8 +22,8 @@ import com.pikolive.app.family.presenter.FamilyMemberListPresenter; import com.pikolive.app.family.view.adapter.FamilyMemberListAdapter; import com.pikolive.app.family.view.dialog.FamilyTransferDialog; import com.pikolive.app.ui.user.activity.UserInfoActivity; -import com.yizhuan.xchat_android_core.family.bean.FamilyMemberInfo; -import com.yizhuan.xchat_android_core.family.bean.response.memberList.RespFamilymember; +import com.pikolive.core.family.bean.FamilyMemberInfo; +import com.pikolive.core.family.bean.response.memberList.RespFamilymember; import com.pikolive.library.base.factory.CreatePresenter; import com.pikolive.library.utils.ListUtils; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/main/java/com/pikolive/app/family/view/activity/FamilyMemberSearchActivity.java b/app/src/main/java/com/pikolive/app/family/view/activity/FamilyMemberSearchActivity.java index db6c1eb58..04caa45b4 100644 --- a/app/src/main/java/com/pikolive/app/family/view/activity/FamilyMemberSearchActivity.java +++ b/app/src/main/java/com/pikolive/app/family/view/activity/FamilyMemberSearchActivity.java @@ -29,7 +29,7 @@ import com.pikolive.app.family.view.dialog.FamilyRemoveMemberDialog; import com.pikolive.app.family.view.dialog.FamilyTransferDialog; import com.pikolive.app.ui.user.activity.UserInfoActivity; import com.pikolive.app.ui.widget.recyclerview.decoration.ColorDecoration; -import com.yizhuan.xchat_android_core.family.bean.FamilyMemberInfo; +import com.pikolive.core.family.bean.FamilyMemberInfo; import com.pikolive.library.base.factory.CreatePresenter; import com.pikolive.library.utils.ResUtil; import com.pikolive.library.utils.SingleToastUtil; diff --git a/app/src/main/java/com/pikolive/app/family/view/activity/FamilyPlazaActivity.java b/app/src/main/java/com/pikolive/app/family/view/activity/FamilyPlazaActivity.java index 48a27d8dd..2a42ebcfb 100644 --- a/app/src/main/java/com/pikolive/app/family/view/activity/FamilyPlazaActivity.java +++ b/app/src/main/java/com/pikolive/app/family/view/activity/FamilyPlazaActivity.java @@ -19,8 +19,8 @@ import com.pikolive.app.family.presenter.FamilyPlazaPresenter; import com.pikolive.app.family.view.adapter.FamilyWeeklyRankBoardAdapter; import com.pikolive.app.ui.widget.recyclerview.decoration.ColorDecoration; import com.pikolive.app.ui.widget.recyclerview.layoutmanager.FullyLinearLayoutManager; -import com.yizhuan.xchat_android_core.family.bean.response.RankingFamilyInfo; -import com.yizhuan.xchat_android_core.family.bean.response.RespFamilyRankList; +import com.pikolive.core.family.bean.response.RankingFamilyInfo; +import com.pikolive.core.family.bean.response.RespFamilyRankList; import com.pikolive.library.base.factory.CreatePresenter; import com.pikolive.library.utils.ListUtils; import com.pikolive.library.utils.SizeUtils; diff --git a/app/src/main/java/com/pikolive/app/family/view/activity/FamilySearchActivity.java b/app/src/main/java/com/pikolive/app/family/view/activity/FamilySearchActivity.java index 6add7a7be..ce131b41b 100644 --- a/app/src/main/java/com/pikolive/app/family/view/activity/FamilySearchActivity.java +++ b/app/src/main/java/com/pikolive/app/family/view/activity/FamilySearchActivity.java @@ -24,7 +24,7 @@ import com.pikolive.app.base.BaseMvpActivity; import com.pikolive.app.family.presenter.FamilySearchPresent; import com.pikolive.app.family.view.adapter.FamilyAdapter; import com.pikolive.app.ui.widget.recyclerview.decoration.ColorDecoration; -import com.yizhuan.xchat_android_core.family.bean.FamilyInfo; +import com.pikolive.core.family.bean.FamilyInfo; import com.pikolive.library.base.factory.CreatePresenter; import com.pikolive.library.utils.ListUtils; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/main/java/com/pikolive/app/family/view/activity/FamilySelectFriendActivity.java b/app/src/main/java/com/pikolive/app/family/view/activity/FamilySelectFriendActivity.java index 79d9ef03d..74ccc7f18 100644 --- a/app/src/main/java/com/pikolive/app/family/view/activity/FamilySelectFriendActivity.java +++ b/app/src/main/java/com/pikolive/app/family/view/activity/FamilySelectFriendActivity.java @@ -23,8 +23,8 @@ import com.pikolive.app.family.view.dialog.FamilyInviteConfirmDialog; import com.pikolive.app.ui.widget.magicindicator.MagicIndicator; import com.pikolive.app.ui.widget.magicindicator.ViewPagerHelper; import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; -import com.yizhuan.xchat_android_core.home.bean.TabInfo; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.pikolive.core2.home.bean.TabInfo; +import com.pikolive.core.user.bean.UserInfo; import com.pikolive.library.base.factory.CreatePresenter; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/main/java/com/pikolive/app/family/view/adapter/FamilyAdapter.java b/app/src/main/java/com/pikolive/app/family/view/adapter/FamilyAdapter.java index 4de8ff8f0..2d7944908 100644 --- a/app/src/main/java/com/pikolive/app/family/view/adapter/FamilyAdapter.java +++ b/app/src/main/java/com/pikolive/app/family/view/adapter/FamilyAdapter.java @@ -12,7 +12,7 @@ import com.chad.library.adapter.base.BaseViewHolder; import com.netease.nim.uikit.support.glide.GlideApp; import com.yizhuan.erban.R; import com.pikolive.app.ui.widget.SquareImageView; -import com.yizhuan.xchat_android_core.family.bean.FamilyInfo; +import com.pikolive.core.family.bean.FamilyInfo; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/family/view/adapter/FamilyAttentionListAdapter.java b/app/src/main/java/com/pikolive/app/family/view/adapter/FamilyAttentionListAdapter.java index de080d932..8d879c5ee 100644 --- a/app/src/main/java/com/pikolive/app/family/view/adapter/FamilyAttentionListAdapter.java +++ b/app/src/main/java/com/pikolive/app/family/view/adapter/FamilyAttentionListAdapter.java @@ -10,8 +10,8 @@ import com.chad.library.adapter.base.BaseViewHolder; import com.yizhuan.erban.R; import com.pikolive.app.ui.utils.ImageLoadUtils; import com.pikolive.app.ui.widget.NobleAvatarView; -import com.yizhuan.xchat_android_core.noble.NobleUtil; -import com.yizhuan.xchat_android_core.user.bean.AttentionInfo; +import com.pikolive.core.noble.NobleUtil; +import com.pikolive.core.user.bean.AttentionInfo; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/family/view/adapter/FamilyBannerAdapter.java b/app/src/main/java/com/pikolive/app/family/view/adapter/FamilyBannerAdapter.java index 5c444e784..b96b299b8 100644 --- a/app/src/main/java/com/pikolive/app/family/view/adapter/FamilyBannerAdapter.java +++ b/app/src/main/java/com/pikolive/app/family/view/adapter/FamilyBannerAdapter.java @@ -12,7 +12,7 @@ import com.pikolive.app.avroom.activity.AVRoomActivity; import com.pikolive.app.ui.utils.ImageLoadUtils; import com.pikolive.app.ui.webview.CommonWebViewActivity; import com.pikolive.app.ui.widget.rollviewpager.adapter.StaticPagerAdapter; -import com.yizhuan.xchat_android_core.family.bean.FindBannerInfo; +import com.pikolive.core.family.bean.FindBannerInfo; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/family/view/adapter/FamilyCurrencyBillAdapter.java b/app/src/main/java/com/pikolive/app/family/view/adapter/FamilyCurrencyBillAdapter.java index 4f58fb16f..4f3faebe2 100644 --- a/app/src/main/java/com/pikolive/app/family/view/adapter/FamilyCurrencyBillAdapter.java +++ b/app/src/main/java/com/pikolive/app/family/view/adapter/FamilyCurrencyBillAdapter.java @@ -13,9 +13,9 @@ import com.netease.nim.uikit.support.glide.GlideApp; import com.yizhuan.erban.R; import com.pikolive.app.common.widget.CircleImageView; import com.pikolive.app.ui.widget.UserInfoDialog; -import com.yizhuan.xchat_android_core.family.bean.BillDateDivInfo; -import com.yizhuan.xchat_android_core.family.bean.TransactionRecordInfo; -import com.yizhuan.xchat_android_core.family.bean.VMBillItemInfo; +import com.pikolive.core.family.bean.BillDateDivInfo; +import com.pikolive.core.family.bean.TransactionRecordInfo; +import com.pikolive.core.family.bean.VMBillItemInfo; import com.pikolive.library.utils.FormatUtils; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/family/view/adapter/FamilyFansViewAdapter.java b/app/src/main/java/com/pikolive/app/family/view/adapter/FamilyFansViewAdapter.java index cb28c1aa2..24a52da01 100644 --- a/app/src/main/java/com/pikolive/app/family/view/adapter/FamilyFansViewAdapter.java +++ b/app/src/main/java/com/pikolive/app/family/view/adapter/FamilyFansViewAdapter.java @@ -10,8 +10,8 @@ import com.chad.library.adapter.base.BaseViewHolder; import com.yizhuan.erban.R; import com.pikolive.app.ui.utils.ImageLoadUtils; import com.pikolive.app.ui.widget.NobleAvatarView; -import com.yizhuan.xchat_android_core.noble.NobleUtil; -import com.yizhuan.xchat_android_core.user.bean.FansInfo; +import com.pikolive.core.noble.NobleUtil; +import com.pikolive.core.user.bean.FansInfo; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/family/view/adapter/FamilyFriendListAdapter.java b/app/src/main/java/com/pikolive/app/family/view/adapter/FamilyFriendListAdapter.java index 5f4556664..2af56b26f 100644 --- a/app/src/main/java/com/pikolive/app/family/view/adapter/FamilyFriendListAdapter.java +++ b/app/src/main/java/com/pikolive/app/family/view/adapter/FamilyFriendListAdapter.java @@ -12,8 +12,8 @@ import com.chad.library.adapter.base.BaseViewHolder; import com.yizhuan.erban.R; import com.pikolive.app.ui.utils.ImageLoadUtils; import com.pikolive.app.ui.widget.NobleAvatarView; -import com.yizhuan.xchat_android_core.noble.NobleUtil; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.pikolive.core.noble.NobleUtil; +import com.pikolive.core.user.bean.UserInfo; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/family/view/adapter/FamilyGameListAdapter.java b/app/src/main/java/com/pikolive/app/family/view/adapter/FamilyGameListAdapter.java index a2fdcdc74..f0d43518d 100644 --- a/app/src/main/java/com/pikolive/app/family/view/adapter/FamilyGameListAdapter.java +++ b/app/src/main/java/com/pikolive/app/family/view/adapter/FamilyGameListAdapter.java @@ -11,7 +11,7 @@ import com.chad.library.adapter.base.BaseViewHolder; import com.makeramen.roundedimageview.RoundedImageView; import com.netease.nim.uikit.support.glide.GlideApp; import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.family.bean.FamilyGameInfo; +import com.pikolive.core.family.bean.FamilyGameInfo; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/family/view/adapter/FamilyGamesAdapter.java b/app/src/main/java/com/pikolive/app/family/view/adapter/FamilyGamesAdapter.java index df9a3a31e..952b11f66 100644 --- a/app/src/main/java/com/pikolive/app/family/view/adapter/FamilyGamesAdapter.java +++ b/app/src/main/java/com/pikolive/app/family/view/adapter/FamilyGamesAdapter.java @@ -11,7 +11,7 @@ import com.chad.library.adapter.base.BaseViewHolder; import com.makeramen.roundedimageview.RoundedImageView; import com.netease.nim.uikit.support.glide.GlideApp; import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.family.bean.FamilyGameInfo; +import com.pikolive.core.family.bean.FamilyGameInfo; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/family/view/adapter/FamilyGroupAdapter.java b/app/src/main/java/com/pikolive/app/family/view/adapter/FamilyGroupAdapter.java index 9fd9ae4a9..3553f4b4b 100644 --- a/app/src/main/java/com/pikolive/app/family/view/adapter/FamilyGroupAdapter.java +++ b/app/src/main/java/com/pikolive/app/family/view/adapter/FamilyGroupAdapter.java @@ -15,7 +15,7 @@ import com.chad.library.adapter.base.BaseViewHolder; import com.netease.nim.uikit.support.glide.GlideApp; import com.yizhuan.erban.R; import com.pikolive.app.ui.widget.SquareImageView; -import com.yizhuan.xchat_android_core.family.bean.FamilyGroupInfo; +import com.pikolive.core.family.bean.FamilyGroupInfo; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/family/view/adapter/FamilyManageAdapter.java b/app/src/main/java/com/pikolive/app/family/view/adapter/FamilyManageAdapter.java index 24937238b..4eb8b3f6e 100644 --- a/app/src/main/java/com/pikolive/app/family/view/adapter/FamilyManageAdapter.java +++ b/app/src/main/java/com/pikolive/app/family/view/adapter/FamilyManageAdapter.java @@ -8,7 +8,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; import com.yizhuan.erban.R; import com.pikolive.app.ui.widget.SquareImageView; -import com.yizhuan.xchat_android_core.family.bean.FamilyManageItemInfo; +import com.pikolive.core.family.bean.FamilyManageItemInfo; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/family/view/adapter/FamilyMemberAdapter.java b/app/src/main/java/com/pikolive/app/family/view/adapter/FamilyMemberAdapter.java index 47d3731f1..70021facf 100644 --- a/app/src/main/java/com/pikolive/app/family/view/adapter/FamilyMemberAdapter.java +++ b/app/src/main/java/com/pikolive/app/family/view/adapter/FamilyMemberAdapter.java @@ -15,7 +15,7 @@ import com.netease.nim.uikit.support.glide.GlideApp; import com.yizhuan.erban.R; import com.pikolive.app.common.widget.CircleImageView; import com.pikolive.app.common.util.Utils; -import com.yizhuan.xchat_android_core.family.bean.FamilyMemberInfo; +import com.pikolive.core.family.bean.FamilyMemberInfo; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/family/view/adapter/FamilyMemberListAdapter.java b/app/src/main/java/com/pikolive/app/family/view/adapter/FamilyMemberListAdapter.java index ec0de0e32..b94b83d7f 100644 --- a/app/src/main/java/com/pikolive/app/family/view/adapter/FamilyMemberListAdapter.java +++ b/app/src/main/java/com/pikolive/app/family/view/adapter/FamilyMemberListAdapter.java @@ -16,8 +16,8 @@ import com.pikolive.app.family.view.activity.FamilyMemberListActivity; import com.yizhuan.erban.R; import com.pikolive.app.common.widget.CircleImageView; import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.family.bean.FamilyMemberInfo; -import com.yizhuan.xchat_android_core.level.UserLevelVo; +import com.pikolive.core.family.bean.FamilyMemberInfo; +import com.pikolive.core.level.UserLevelVo; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/family/view/adapter/FamilyWeeklyRankBoardAdapter.java b/app/src/main/java/com/pikolive/app/family/view/adapter/FamilyWeeklyRankBoardAdapter.java index 2f5a050d8..eb9b7e21d 100644 --- a/app/src/main/java/com/pikolive/app/family/view/adapter/FamilyWeeklyRankBoardAdapter.java +++ b/app/src/main/java/com/pikolive/app/family/view/adapter/FamilyWeeklyRankBoardAdapter.java @@ -13,7 +13,7 @@ import com.chad.library.adapter.base.BaseViewHolder; import com.netease.nim.uikit.support.glide.GlideApp; import com.yizhuan.erban.R; import com.pikolive.app.ui.widget.SquareImageView; -import com.yizhuan.xchat_android_core.family.bean.response.RankingFamilyInfo; +import com.pikolive.core.family.bean.response.RankingFamilyInfo; import com.pikolive.library.utils.FormatUtils; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/family/view/dialog/FamilyContributionDialog.java b/app/src/main/java/com/pikolive/app/family/view/dialog/FamilyContributionDialog.java index ec93db6c3..937d7ea82 100644 --- a/app/src/main/java/com/pikolive/app/family/view/dialog/FamilyContributionDialog.java +++ b/app/src/main/java/com/pikolive/app/family/view/dialog/FamilyContributionDialog.java @@ -14,7 +14,7 @@ import android.widget.TextView; import androidx.annotation.NonNull; import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.family.bean.response.moneyManagement.FamilyMoneyManagementInfo; +import com.pikolive.core.family.bean.response.moneyManagement.FamilyMoneyManagementInfo; import com.pikolive.library.utils.FormatUtils; import com.pikolive.library.utils.ImeUtil; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/main/java/com/pikolive/app/family/view/dialog/FamilyDisbandDialog.java b/app/src/main/java/com/pikolive/app/family/view/dialog/FamilyDisbandDialog.java index ff6334dfc..e8a2c5f91 100644 --- a/app/src/main/java/com/pikolive/app/family/view/dialog/FamilyDisbandDialog.java +++ b/app/src/main/java/com/pikolive/app/family/view/dialog/FamilyDisbandDialog.java @@ -9,9 +9,9 @@ import androidx.annotation.NonNull; import com.yizhuan.erban.R; import com.pikolive.app.ui.im.avtivity.NimP2PMessageActivity; -import com.yizhuan.xchat_android_core.family.bean.CustomServiceInfo; -import com.yizhuan.xchat_android_core.family.bean.FamilyCustomServiceInfo; -import com.yizhuan.xchat_android_core.family.model.FamilyModel; +import com.pikolive.core.family.bean.CustomServiceInfo; +import com.pikolive.core.family.bean.FamilyCustomServiceInfo; +import com.pikolive.core.family.model.FamilyModel; import com.pikolive.library.utils.ResUtil; import com.pikolive.library.utils.SingleToastUtil; diff --git a/app/src/main/java/com/pikolive/app/family/view/dialog/FamilyExitTipDialog.java b/app/src/main/java/com/pikolive/app/family/view/dialog/FamilyExitTipDialog.java index 0f38bc58c..bd353ebda 100644 --- a/app/src/main/java/com/pikolive/app/family/view/dialog/FamilyExitTipDialog.java +++ b/app/src/main/java/com/pikolive/app/family/view/dialog/FamilyExitTipDialog.java @@ -9,7 +9,7 @@ import android.widget.TextView; import androidx.annotation.NonNull; import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.family.bean.FamilyInfo; +import com.pikolive.core.family.bean.FamilyInfo; /** * @author jack diff --git a/app/src/main/java/com/pikolive/app/family/view/dialog/FamilyMenuDialog.java b/app/src/main/java/com/pikolive/app/family/view/dialog/FamilyMenuDialog.java index a92d69c3e..4d357b6d2 100644 --- a/app/src/main/java/com/pikolive/app/family/view/dialog/FamilyMenuDialog.java +++ b/app/src/main/java/com/pikolive/app/family/view/dialog/FamilyMenuDialog.java @@ -13,7 +13,7 @@ import androidx.annotation.NonNull; import androidx.core.content.ContextCompat; import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.family.bean.FamilyInfo; +import com.pikolive.core.family.bean.FamilyInfo; import com.pikolive.library.utils.SizeUtils; import com.pikolive.library.widget.DrawableCenterTextView; diff --git a/app/src/main/java/com/pikolive/app/family/view/dialog/FamilyRemoveMemberDialog.java b/app/src/main/java/com/pikolive/app/family/view/dialog/FamilyRemoveMemberDialog.java index b98ec88e3..d5b1e7f8b 100644 --- a/app/src/main/java/com/pikolive/app/family/view/dialog/FamilyRemoveMemberDialog.java +++ b/app/src/main/java/com/pikolive/app/family/view/dialog/FamilyRemoveMemberDialog.java @@ -10,7 +10,7 @@ import android.widget.TextView; import androidx.annotation.NonNull; import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.family.bean.FamilyMemberInfo; +import com.pikolive.core.family.bean.FamilyMemberInfo; /** * @author jack diff --git a/app/src/main/java/com/pikolive/app/family/view/dialog/FamilyTransferDialog.java b/app/src/main/java/com/pikolive/app/family/view/dialog/FamilyTransferDialog.java index aca388156..bc1301645 100644 --- a/app/src/main/java/com/pikolive/app/family/view/dialog/FamilyTransferDialog.java +++ b/app/src/main/java/com/pikolive/app/family/view/dialog/FamilyTransferDialog.java @@ -13,9 +13,9 @@ import android.widget.TextView; import androidx.annotation.NonNull; import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.family.bean.FamilyInfo; -import com.yizhuan.xchat_android_core.family.bean.FamilyMemberInfo; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.family.bean.FamilyInfo; +import com.pikolive.core.family.bean.FamilyMemberInfo; import com.pikolive.library.utils.FormatUtils; import com.pikolive.library.utils.ImeUtil; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/main/java/com/pikolive/app/family/view/fragment/FamilyAttentionFragment.java b/app/src/main/java/com/pikolive/app/family/view/fragment/FamilyAttentionFragment.java index e687d53e5..dea8a383d 100644 --- a/app/src/main/java/com/pikolive/app/family/view/fragment/FamilyAttentionFragment.java +++ b/app/src/main/java/com/pikolive/app/family/view/fragment/FamilyAttentionFragment.java @@ -15,8 +15,8 @@ import com.pikolive.app.base.BaseMvpFragment; import com.pikolive.app.family.presenter.FamilyAttentionPresenter; import com.pikolive.app.family.view.activity.FamilySelectFriendActivity; import com.pikolive.app.family.view.adapter.FamilyAttentionListAdapter; -import com.yizhuan.xchat_android_core.user.bean.AttentionInfo; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.pikolive.core.user.bean.AttentionInfo; +import com.pikolive.core.user.bean.UserInfo; import com.pikolive.library.base.factory.CreatePresenter; import com.pikolive.library.utils.ListUtils; diff --git a/app/src/main/java/com/pikolive/app/family/view/fragment/FamilyFansListFragment.java b/app/src/main/java/com/pikolive/app/family/view/fragment/FamilyFansListFragment.java index d4b415e91..4dd58f95d 100644 --- a/app/src/main/java/com/pikolive/app/family/view/fragment/FamilyFansListFragment.java +++ b/app/src/main/java/com/pikolive/app/family/view/fragment/FamilyFansListFragment.java @@ -15,9 +15,9 @@ import com.pikolive.app.family.contract.viewinterface.IFamilyFansListFragmentVie import com.pikolive.app.family.presenter.FamilyFansListPresenter; import com.pikolive.app.family.view.activity.FamilySelectFriendActivity; import com.pikolive.app.family.view.adapter.FamilyFansViewAdapter; -import com.yizhuan.xchat_android_core.user.bean.FansInfo; -import com.yizhuan.xchat_android_core.user.bean.FansListInfo; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.pikolive.core.user.bean.FansInfo; +import com.pikolive.core.user.bean.FansListInfo; +import com.pikolive.core.user.bean.UserInfo; import com.pikolive.library.base.factory.CreatePresenter; import com.pikolive.library.utils.ListUtils; diff --git a/app/src/main/java/com/pikolive/app/family/view/fragment/FamilyFriendListFragment.java b/app/src/main/java/com/pikolive/app/family/view/fragment/FamilyFriendListFragment.java index b9ceb1e8f..c3b953716 100644 --- a/app/src/main/java/com/pikolive/app/family/view/fragment/FamilyFriendListFragment.java +++ b/app/src/main/java/com/pikolive/app/family/view/fragment/FamilyFriendListFragment.java @@ -15,7 +15,7 @@ import com.pikolive.app.family.contract.viewinterface.IFamilyFriendListFragmentV import com.pikolive.app.family.presenter.FamilyFriendListPresenter; import com.pikolive.app.family.view.activity.FamilySelectFriendActivity; import com.pikolive.app.family.view.adapter.FamilyFriendListAdapter; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.pikolive.core.user.bean.UserInfo; import com.pikolive.library.base.factory.CreatePresenter; import com.pikolive.library.utils.ListUtils; diff --git a/app/src/main/java/com/pikolive/app/fansteam/FansTeamJoinActivity.kt b/app/src/main/java/com/pikolive/app/fansteam/FansTeamJoinActivity.kt index 8b63a4d01..6facd1108 100644 --- a/app/src/main/java/com/pikolive/app/fansteam/FansTeamJoinActivity.kt +++ b/app/src/main/java/com/pikolive/app/fansteam/FansTeamJoinActivity.kt @@ -11,12 +11,12 @@ import com.pikolive.app.base.BaseViewBindingActivity import com.yizhuan.erban.databinding.ActivityFansTeamJoinBinding import com.pikolive.app.ui.utils.load import com.pikolive.app.ui.webview.DialogWebViewActivity -import com.yizhuan.xchat_android_core.UriProvider -import com.yizhuan.xchat_android_core.gift.GiftModel -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager -import com.yizhuan.xchat_android_core.utils.net.handleBeanData -import com.yizhuan.xchat_android_core.utils.subAndReplaceDot -import com.yizhuan.xchat_android_core.utils.toast +import com.pikolive.core.gift.GiftModel +import com.pikolive.core.manager.AvRoomDataManager +import com.pikolive.core.utils.net.handleBeanData +import com.pikolive.core.utils.subAndReplaceDot +import com.pikolive.core.utils.toast +import com.pikolive.core2.UriProvider import com.pikolive.library.utils.ResUtil class FansTeamJoinActivity : BaseViewBindingActivity() { @@ -46,7 +46,8 @@ class FansTeamJoinActivity : BaseViewBindingActivity() { @@ -59,7 +59,8 @@ class FansTeamJoinedActivity : BaseViewBindingActivity { diff --git a/app/src/main/java/com/pikolive/app/headline/HeadLineFragment.java b/app/src/main/java/com/pikolive/app/headline/HeadLineFragment.java index fb488eb62..d6bffc404 100644 --- a/app/src/main/java/com/pikolive/app/headline/HeadLineFragment.java +++ b/app/src/main/java/com/pikolive/app/headline/HeadLineFragment.java @@ -4,7 +4,7 @@ import android.os.Bundle; import com.yizhuan.erban.R; import com.pikolive.app.ui.webview.CommonWebViewFragment; -import com.yizhuan.xchat_android_core.UriProvider; +import com.pikolive.core2.UriProvider; import com.pikolive.library.annatation.ActLayoutRes; @ActLayoutRes(R.layout.fragment_common_web_view) diff --git a/app/src/main/java/com/pikolive/app/headline/MyHeadLineFragment.java b/app/src/main/java/com/pikolive/app/headline/MyHeadLineFragment.java index ad2457aa0..5001d0259 100644 --- a/app/src/main/java/com/pikolive/app/headline/MyHeadLineFragment.java +++ b/app/src/main/java/com/pikolive/app/headline/MyHeadLineFragment.java @@ -4,7 +4,7 @@ import android.os.Bundle; import com.yizhuan.erban.R; import com.pikolive.app.ui.webview.CommonWebViewFragment; -import com.yizhuan.xchat_android_core.UriProvider; +import com.pikolive.core2.UriProvider; import com.pikolive.library.annatation.ActLayoutRes; @ActLayoutRes(R.layout.fragment_common_web_view) diff --git a/app/src/main/java/com/pikolive/app/home/HomeViewModel.kt b/app/src/main/java/com/pikolive/app/home/HomeViewModel.kt index 109715051..f1b3bbbdb 100644 --- a/app/src/main/java/com/pikolive/app/home/HomeViewModel.kt +++ b/app/src/main/java/com/pikolive/app/home/HomeViewModel.kt @@ -3,12 +3,12 @@ package com.pikolive.app.home import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import com.pikolive.app.base.BaseViewModel -import com.yizhuan.xchat_android_core.bean.response.ListResult -import com.yizhuan.xchat_android_core.home.bean.* -import com.yizhuan.xchat_android_core.home.model.HomeModel -import com.yizhuan.xchat_android_core.room.bean.AnchorInfo -import com.yizhuan.xchat_android_core.user.bean.UserInfo -import com.yizhuan.xchat_android_core.utils.toast +import com.pikolive.core.bean.response.ListResult +import com.pikolive.core2.home.bean.* +import com.pikolive.core2.home.model.HomeModel +import com.pikolive.core.room.bean.AnchorInfo +import com.pikolive.core.user.bean.UserInfo +import com.pikolive.core.utils.toast import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.async diff --git a/app/src/main/java/com/pikolive/app/home/MeViewModel.kt b/app/src/main/java/com/pikolive/app/home/MeViewModel.kt index f00def4a3..df513425a 100644 --- a/app/src/main/java/com/pikolive/app/home/MeViewModel.kt +++ b/app/src/main/java/com/pikolive/app/home/MeViewModel.kt @@ -2,10 +2,9 @@ package com.pikolive.app.home import androidx.lifecycle.MutableLiveData import com.pikolive.app.base.BaseViewModel -import com.yizhuan.xchat_android_core.home.bean.BannerInfo -import com.yizhuan.xchat_android_core.home.model.HomeModel -import com.yizhuan.xchat_android_core.room.bean.MeCenterInfo -import com.yizhuan.xchat_android_core.user.bean.DiamondGiveHistoryInfo +import com.pikolive.core2.home.model.HomeModel +import com.pikolive.core.room.bean.MeCenterInfo +import com.pikolive.core2.home.bean.BannerInfo class MeViewModel : BaseViewModel() { diff --git a/app/src/main/java/com/pikolive/app/home/RoomCommonViewModel.kt b/app/src/main/java/com/pikolive/app/home/RoomCommonViewModel.kt index a2d639328..9649e4f3c 100644 --- a/app/src/main/java/com/pikolive/app/home/RoomCommonViewModel.kt +++ b/app/src/main/java/com/pikolive/app/home/RoomCommonViewModel.kt @@ -3,10 +3,10 @@ package com.pikolive.app.home import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import com.pikolive.app.base.BaseViewModel -import com.yizhuan.xchat_android_core.bean.response.ListResult -import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo -import com.yizhuan.xchat_android_core.home.model.HomeModel -import com.yizhuan.xchat_android_core.utils.toast +import com.pikolive.core.bean.response.ListResult +import com.pikolive.core2.home.model.HomeModel +import com.pikolive.core.utils.toast +import com.pikolive.core2.home.bean.HomeRoomInfo class RoomCommonViewModel : BaseViewModel() { diff --git a/app/src/main/java/com/pikolive/app/home/RoomSingleViewModel.kt b/app/src/main/java/com/pikolive/app/home/RoomSingleViewModel.kt index f2c521091..1192e0481 100644 --- a/app/src/main/java/com/pikolive/app/home/RoomSingleViewModel.kt +++ b/app/src/main/java/com/pikolive/app/home/RoomSingleViewModel.kt @@ -3,9 +3,9 @@ package com.pikolive.app.home import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import com.pikolive.app.base.BaseViewModel -import com.yizhuan.xchat_android_core.bean.response.ListResult -import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo -import com.yizhuan.xchat_android_core.home.model.HomeModel +import com.pikolive.core.bean.response.ListResult +import com.pikolive.core2.home.bean.HomeRoomInfo +import com.pikolive.core2.home.model.HomeModel class RoomSingleViewModel : BaseViewModel() { diff --git a/app/src/main/java/com/pikolive/app/home/activity/CollectionRoomActivity.java b/app/src/main/java/com/pikolive/app/home/activity/CollectionRoomActivity.java index 67f29daa1..837ea4004 100644 --- a/app/src/main/java/com/pikolive/app/home/activity/CollectionRoomActivity.java +++ b/app/src/main/java/com/pikolive/app/home/activity/CollectionRoomActivity.java @@ -14,9 +14,9 @@ import com.yizhuan.erban.R; import com.pikolive.app.avroom.activity.AVRoomActivity; import com.pikolive.app.base.BaseViewBindingActivity; import com.yizhuan.erban.databinding.ActivityCollectionRoomBinding; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo; -import com.yizhuan.xchat_android_core.home.model.CollectionRoomModel; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core2.home.bean.HomeRoomInfo; +import com.pikolive.core2.home.model.CollectionRoomModel; import com.pikolive.library.utils.ListUtils; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/main/java/com/pikolive/app/home/activity/CommunityNoticeAct.java b/app/src/main/java/com/pikolive/app/home/activity/CommunityNoticeAct.java index ad1c40dae..dfeba2aaf 100644 --- a/app/src/main/java/com/pikolive/app/home/activity/CommunityNoticeAct.java +++ b/app/src/main/java/com/pikolive/app/home/activity/CommunityNoticeAct.java @@ -19,8 +19,8 @@ import com.pikolive.app.base.BaseMvpActivity; import com.pikolive.app.base.TitleBar; import com.yizhuan.erban.community.dynamic.view.DynamicDetailActivity; import com.pikolive.app.ui.user.activity.UserInfoActivity; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.community.bean.CommunityNoticeInfo; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.community.bean.CommunityNoticeInfo; import com.pikolive.library.base.factory.CreatePresenter; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/main/java/com/pikolive/app/home/activity/NewUserListActivity.java b/app/src/main/java/com/pikolive/app/home/activity/NewUserListActivity.java index 4307199f0..7df41666b 100644 --- a/app/src/main/java/com/pikolive/app/home/activity/NewUserListActivity.java +++ b/app/src/main/java/com/pikolive/app/home/activity/NewUserListActivity.java @@ -16,7 +16,7 @@ import com.yizhuan.erban.R; import com.pikolive.app.base.BaseMvpActivity; import com.pikolive.app.common.util.Utils; import com.pikolive.app.ui.widget.recyclerview.decoration.SpacingDecoration; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.pikolive.core.user.bean.UserInfo; import com.pikolive.library.base.factory.CreatePresenter; import com.pikolive.library.utils.ListUtils; diff --git a/app/src/main/java/com/pikolive/app/home/activity/RoomHistoryListActivity.kt b/app/src/main/java/com/pikolive/app/home/activity/RoomHistoryListActivity.kt index 77577a3cf..7c5f43e54 100644 --- a/app/src/main/java/com/pikolive/app/home/activity/RoomHistoryListActivity.kt +++ b/app/src/main/java/com/pikolive/app/home/activity/RoomHistoryListActivity.kt @@ -14,8 +14,8 @@ import com.pikolive.app.common.EmptyViewHelper import com.yizhuan.erban.databinding.ActivityRoomHistoryListBinding import com.pikolive.app.home.adapter.RoomHistoryListAdapter import com.pikolive.app.ui.utils.RVDelegate -import com.yizhuan.xchat_android_core.bean.RoomHistoryInfo -import com.yizhuan.xchat_android_core.user.UserModel +import com.pikolive.core.bean.RoomHistoryInfo +import com.pikolive.core.user.UserModel import com.pikolive.library.annatation.ActLayoutRes import com.pikolive.library.utils.ResUtil import com.pikolive.library.utils.SingleToastUtil diff --git a/app/src/main/java/com/pikolive/app/home/activity/VisitorListActivity.kt b/app/src/main/java/com/pikolive/app/home/activity/VisitorListActivity.kt index 0e294b29c..5821b8206 100644 --- a/app/src/main/java/com/pikolive/app/home/activity/VisitorListActivity.kt +++ b/app/src/main/java/com/pikolive/app/home/activity/VisitorListActivity.kt @@ -11,9 +11,9 @@ import com.pikolive.app.common.EmptyViewHelper import com.yizhuan.erban.databinding.ActivityVisitorListBinding import com.pikolive.app.home.adapter.VisitorListAdapter import com.pikolive.app.ui.utils.RVDelegate -import com.yizhuan.xchat_android_core.home.bean.VisitorInfo -import com.yizhuan.xchat_android_core.home.event.VisitorUnreadCountEvent -import com.yizhuan.xchat_android_core.user.UserModel +import com.pikolive.core.user.UserModel +import com.pikolive.core2.home.bean.VisitorInfo +import com.pikolive.core2.home.event.VisitorUnreadCountEvent import com.pikolive.library.annatation.ActLayoutRes import com.pikolive.library.utils.ResUtil import org.greenrobot.eventbus.EventBus @@ -36,7 +36,11 @@ class VisitorListActivity : BaseViewBindingActivity( @SuppressLint("CheckResult") override fun init() { - EventBus.getDefault().postSticky(VisitorUnreadCountEvent(0)) + EventBus.getDefault().postSticky( + VisitorUnreadCountEvent( + 0 + ) + ) initTitleBar(ResUtil.getString(R.string.home_activity_visitorlistactivity_01)) rvDelegate = RVDelegate.Builder() .setRefreshLayout(binding.swipeRefresh) diff --git a/app/src/main/java/com/pikolive/app/home/adapter/BannerAdapter.java b/app/src/main/java/com/pikolive/app/home/adapter/BannerAdapter.java index 9baff46a8..72cf3245e 100644 --- a/app/src/main/java/com/pikolive/app/home/adapter/BannerAdapter.java +++ b/app/src/main/java/com/pikolive/app/home/adapter/BannerAdapter.java @@ -10,7 +10,7 @@ import com.yizhuan.erban.R; import com.pikolive.app.ui.utils.ImageLoadUtils; import com.pikolive.app.ui.widget.rollviewpager.adapter.StaticPagerAdapter; import com.pikolive.app.utils.CommonJumpHelper; -import com.yizhuan.xchat_android_core.home.bean.BannerInfo; +import com.pikolive.core2.home.bean.BannerInfo; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/home/adapter/CollectionRoomAdapter.java b/app/src/main/java/com/pikolive/app/home/adapter/CollectionRoomAdapter.java index a247656ae..20b3dc287 100644 --- a/app/src/main/java/com/pikolive/app/home/adapter/CollectionRoomAdapter.java +++ b/app/src/main/java/com/pikolive/app/home/adapter/CollectionRoomAdapter.java @@ -6,7 +6,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; import com.yizhuan.erban.R; import com.pikolive.app.ui.utils.ImageLoadUtilsV2; -import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo; +import com.pikolive.core2.home.bean.HomeRoomInfo; /** * Created by yudi diff --git a/app/src/main/java/com/pikolive/app/home/adapter/CommunityNoticeAdapter.java b/app/src/main/java/com/pikolive/app/home/adapter/CommunityNoticeAdapter.java index 89ad3d970..cff2cbe2e 100644 --- a/app/src/main/java/com/pikolive/app/home/adapter/CommunityNoticeAdapter.java +++ b/app/src/main/java/com/pikolive/app/home/adapter/CommunityNoticeAdapter.java @@ -8,9 +8,9 @@ import com.yizhuan.erban.R; import com.pikolive.app.common.widget.CircleImageView; import com.pikolive.app.common.widget.RectRoundImageView; import com.pikolive.app.ui.utils.ImageLoadUtilsV2; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.community.bean.CommunityNoticeInfo; -import com.yizhuan.xchat_android_core.community.bean.DynamicMedia; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.community.bean.CommunityNoticeInfo; +import com.pikolive.core.community.bean.DynamicMedia; import com.pikolive.library.utils.TimeUtils; public class CommunityNoticeAdapter extends BaseQuickAdapter { diff --git a/app/src/main/java/com/pikolive/app/home/adapter/FindNewUserListAdapter.java b/app/src/main/java/com/pikolive/app/home/adapter/FindNewUserListAdapter.java index 0690d9bb9..9f28b82be 100644 --- a/app/src/main/java/com/pikolive/app/home/adapter/FindNewUserListAdapter.java +++ b/app/src/main/java/com/pikolive/app/home/adapter/FindNewUserListAdapter.java @@ -11,7 +11,7 @@ import com.chad.library.adapter.base.BaseViewHolder; import com.netease.nim.uikit.support.glide.GlideApp; import com.yizhuan.erban.R; import com.pikolive.app.ui.user.activity.UserInfoActivity; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.pikolive.core.user.bean.UserInfo; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/home/adapter/HomeBannerAdapter.kt b/app/src/main/java/com/pikolive/app/home/adapter/HomeBannerAdapter.kt index f32cbcbc6..60b444101 100644 --- a/app/src/main/java/com/pikolive/app/home/adapter/HomeBannerAdapter.kt +++ b/app/src/main/java/com/pikolive/app/home/adapter/HomeBannerAdapter.kt @@ -2,7 +2,7 @@ package com.pikolive.app.home.adapter import com.yizhuan.erban.R import com.pikolive.app.ui.utils.ImageLoadUtilsV2 -import com.yizhuan.xchat_android_core.home.bean.BannerInfo +import com.pikolive.core2.home.bean.BannerInfo import com.zhpan.bannerview.BaseBannerAdapter import com.zhpan.bannerview.BaseViewHolder diff --git a/app/src/main/java/com/pikolive/app/home/adapter/HomeChatAdapter.kt b/app/src/main/java/com/pikolive/app/home/adapter/HomeChatAdapter.kt index 1dc13ca4c..d27d72166 100644 --- a/app/src/main/java/com/pikolive/app/home/adapter/HomeChatAdapter.kt +++ b/app/src/main/java/com/pikolive/app/home/adapter/HomeChatAdapter.kt @@ -8,8 +8,8 @@ import com.opensource.svgaplayer.SVGAImageView import com.yizhuan.erban.R import com.pikolive.app.ui.utils.ImageLoadUtilsV2 import com.pikolive.app.ui.utils.loadFromAssets -import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo -import com.yizhuan.xchat_android_core.utils.subAndReplaceDot +import com.pikolive.core.utils.subAndReplaceDot +import com.pikolive.core2.home.bean.HomeRoomInfo /** * create by lvzebiao @2019/11/13 diff --git a/app/src/main/java/com/pikolive/app/home/adapter/HomeConcernsAdapter.java b/app/src/main/java/com/pikolive/app/home/adapter/HomeConcernsAdapter.java index 91238fcb9..a9eb23846 100644 --- a/app/src/main/java/com/pikolive/app/home/adapter/HomeConcernsAdapter.java +++ b/app/src/main/java/com/pikolive/app/home/adapter/HomeConcernsAdapter.java @@ -11,8 +11,8 @@ import com.pikolive.app.avroom.activity.AVRoomActivity; import com.pikolive.app.common.widget.CircleImageView; import com.pikolive.app.ui.user.activity.UserInfoActivity; import com.pikolive.app.ui.utils.ImageLoadUtilsV2; -import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo; -import com.yizhuan.xchat_android_core.utils.StringExtensionKt; +import com.pikolive.core2.home.bean.HomeRoomInfo; +import com.pikolive.core.utils.StringExtensionKt; public class HomeConcernsAdapter extends BaseQuickAdapter { diff --git a/app/src/main/java/com/pikolive/app/home/adapter/HomeHotAdapter.kt b/app/src/main/java/com/pikolive/app/home/adapter/HomeHotAdapter.kt index d94192d2a..02295aef1 100644 --- a/app/src/main/java/com/pikolive/app/home/adapter/HomeHotAdapter.kt +++ b/app/src/main/java/com/pikolive/app/home/adapter/HomeHotAdapter.kt @@ -11,8 +11,8 @@ import com.yizhuan.erban.R import com.pikolive.app.ui.utils.ImageLoadUtilsV2 import com.pikolive.app.ui.utils.load import com.pikolive.app.ui.utils.loadFromAssets -import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo -import com.yizhuan.xchat_android_core.utils.TextUtils +import com.pikolive.core.utils.TextUtils +import com.pikolive.core2.home.bean.HomeRoomInfo /** * create by lvzebiao @2019/11/13 diff --git a/app/src/main/java/com/pikolive/app/home/adapter/HomeLiveTopAdapter.kt b/app/src/main/java/com/pikolive/app/home/adapter/HomeLiveTopAdapter.kt index b78a1ef0d..3a1f684b7 100644 --- a/app/src/main/java/com/pikolive/app/home/adapter/HomeLiveTopAdapter.kt +++ b/app/src/main/java/com/pikolive/app/home/adapter/HomeLiveTopAdapter.kt @@ -6,7 +6,7 @@ import com.chad.library.adapter.base.BaseViewHolder import com.yizhuan.erban.R import com.pikolive.app.avroom.activity.AVRoomActivity import com.pikolive.app.ui.utils.load -import com.yizhuan.xchat_android_core.room.bean.HomeLiveTopInfo +import com.pikolive.core.room.bean.HomeLiveTopInfo class HomeLiveTopAdapter : diff --git a/app/src/main/java/com/pikolive/app/home/adapter/HomePlayAdapter.kt b/app/src/main/java/com/pikolive/app/home/adapter/HomePlayAdapter.kt index 9a3384492..92b09e908 100644 --- a/app/src/main/java/com/pikolive/app/home/adapter/HomePlayAdapter.kt +++ b/app/src/main/java/com/pikolive/app/home/adapter/HomePlayAdapter.kt @@ -13,9 +13,9 @@ import com.yizhuan.erban.R import com.pikolive.app.home.helper.BannerHelper import com.pikolive.app.ui.utils.ImageLoadUtilsV2 import com.pikolive.app.ui.utils.load -import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo -import com.yizhuan.xchat_android_core.utils.TextUtils -import com.yizhuan.xchat_android_core.utils.ifNullOrEmpty +import com.pikolive.core.utils.TextUtils +import com.pikolive.core.utils.ifNullOrEmpty +import com.pikolive.core2.home.bean.HomeRoomInfo import com.pikolive.library.utils.ResUtil /** diff --git a/app/src/main/java/com/pikolive/app/home/adapter/HomeRoomFragmentAdapter.java b/app/src/main/java/com/pikolive/app/home/adapter/HomeRoomFragmentAdapter.java index c046a26d9..2db31a0cf 100644 --- a/app/src/main/java/com/pikolive/app/home/adapter/HomeRoomFragmentAdapter.java +++ b/app/src/main/java/com/pikolive/app/home/adapter/HomeRoomFragmentAdapter.java @@ -13,7 +13,7 @@ import com.netease.nim.uikit.support.glide.GlideApp; import com.yizhuan.erban.R; import com.pikolive.app.avroom.activity.AVRoomActivity; import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.home.bean.HomeTabMapInfo; +import com.pikolive.core2.home.bean.HomeTabMapInfo; /** *

首页热门adapter

diff --git a/app/src/main/java/com/pikolive/app/home/adapter/HomeSingleAnchorAdapter.kt b/app/src/main/java/com/pikolive/app/home/adapter/HomeSingleAnchorAdapter.kt index a547e9869..1a8902248 100644 --- a/app/src/main/java/com/pikolive/app/home/adapter/HomeSingleAnchorAdapter.kt +++ b/app/src/main/java/com/pikolive/app/home/adapter/HomeSingleAnchorAdapter.kt @@ -7,12 +7,11 @@ import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder import com.opensource.svgaplayer.SVGAImageView import com.yizhuan.erban.R -import com.pikolive.app.avroom.activity.AVRoomActivity import com.pikolive.app.ui.utils.ImageLoadUtilsV2 import com.pikolive.app.ui.utils.load import com.pikolive.app.ui.utils.loadFromAssets -import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo -import com.yizhuan.xchat_android_core.utils.TextUtils +import com.pikolive.core.utils.TextUtils +import com.pikolive.core2.home.bean.HomeRoomInfo /** * create by lvzebiao @2019/11/13 diff --git a/app/src/main/java/com/pikolive/app/home/adapter/HomeTopAdapter.java b/app/src/main/java/com/pikolive/app/home/adapter/HomeTopAdapter.java index e9ff24572..3df5c77f5 100644 --- a/app/src/main/java/com/pikolive/app/home/adapter/HomeTopAdapter.java +++ b/app/src/main/java/com/pikolive/app/home/adapter/HomeTopAdapter.java @@ -7,7 +7,7 @@ import android.widget.ImageView; import com.netease.nim.uikit.support.glide.GlideApp; import com.yizhuan.erban.R; import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.home.bean.HomeTabMapInfo; +import com.pikolive.core2.home.bean.HomeTabMapInfo; import com.pikolive.library.common.application.BaseApp; import com.zhpan.bannerview.BaseBannerAdapter; import com.zhpan.bannerview.BaseViewHolder; diff --git a/app/src/main/java/com/pikolive/app/home/adapter/MeCenterAdapter.kt b/app/src/main/java/com/pikolive/app/home/adapter/MeCenterAdapter.kt index 3a2a08866..205c23395 100644 --- a/app/src/main/java/com/pikolive/app/home/adapter/MeCenterAdapter.kt +++ b/app/src/main/java/com/pikolive/app/home/adapter/MeCenterAdapter.kt @@ -6,7 +6,7 @@ import com.chad.library.adapter.base.BaseViewHolder import com.yizhuan.erban.R import com.pikolive.app.ui.im.RouterHandler import com.pikolive.app.ui.utils.load -import com.yizhuan.xchat_android_core.room.bean.MeCenterInfo +import com.pikolive.core.room.bean.MeCenterInfo class MeCenterAdapter : diff --git a/app/src/main/java/com/pikolive/app/home/adapter/MeGameAdapter.kt b/app/src/main/java/com/pikolive/app/home/adapter/MeGameAdapter.kt index 4e7cfb13d..668242dc9 100644 --- a/app/src/main/java/com/pikolive/app/home/adapter/MeGameAdapter.kt +++ b/app/src/main/java/com/pikolive/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.yizhuan.erban.R import com.pikolive.app.ui.utils.load -import com.yizhuan.xchat_android_core.room.game.GameInfo +import com.pikolive.core.room.game.GameInfo class MeGameAdapter : diff --git a/app/src/main/java/com/pikolive/app/home/adapter/MoreSingleAnchorAdapter.kt b/app/src/main/java/com/pikolive/app/home/adapter/MoreSingleAnchorAdapter.kt index f7f5cce97..05202038a 100644 --- a/app/src/main/java/com/pikolive/app/home/adapter/MoreSingleAnchorAdapter.kt +++ b/app/src/main/java/com/pikolive/app/home/adapter/MoreSingleAnchorAdapter.kt @@ -6,11 +6,10 @@ import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder import com.opensource.svgaplayer.SVGAImageView import com.yizhuan.erban.R -import com.pikolive.app.avroom.activity.AVRoomActivity import com.pikolive.app.ui.utils.load import com.pikolive.app.ui.utils.loadFromAssets -import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo -import com.yizhuan.xchat_android_core.utils.TextUtils +import com.pikolive.core.utils.TextUtils +import com.pikolive.core2.home.bean.HomeRoomInfo /** * create by lvzebiao @2019/11/13 diff --git a/app/src/main/java/com/pikolive/app/home/adapter/RoomActAdapter.java b/app/src/main/java/com/pikolive/app/home/adapter/RoomActAdapter.java index 7a1591efb..e9557bec4 100644 --- a/app/src/main/java/com/pikolive/app/home/adapter/RoomActAdapter.java +++ b/app/src/main/java/com/pikolive/app/home/adapter/RoomActAdapter.java @@ -15,8 +15,8 @@ import com.pikolive.app.treasurefairy.HomeFairyActivity; import com.pikolive.app.ui.utils.ImageLoadUtils; import com.pikolive.app.ui.widget.rollviewpager.adapter.StaticPagerAdapter; import com.pikolive.app.utils.CommonJumpHelper; -import com.yizhuan.xchat_android_core.home.bean.BannerInfo; -import com.yizhuan.xchat_android_core.room.model.AvRoomModel; +import com.pikolive.core2.home.bean.BannerInfo; +import com.pikolive.core.room.model.AvRoomModel; import com.pikolive.library.utils.config.BasicConfig; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/home/adapter/RoomCommonAdapter.kt b/app/src/main/java/com/pikolive/app/home/adapter/RoomCommonAdapter.kt index b7c2bd278..babdc8b9b 100644 --- a/app/src/main/java/com/pikolive/app/home/adapter/RoomCommonAdapter.kt +++ b/app/src/main/java/com/pikolive/app/home/adapter/RoomCommonAdapter.kt @@ -1,14 +1,13 @@ package com.pikolive.app.home.adapter import android.widget.ImageView -import androidx.core.view.isGone import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder import com.yizhuan.erban.R import com.pikolive.app.ui.utils.ImageLoadUtilsV2 import com.pikolive.app.ui.utils.load -import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo -import com.yizhuan.xchat_android_core.utils.TextUtils +import com.pikolive.core.utils.TextUtils +import com.pikolive.core2.home.bean.HomeRoomInfo class RoomCommonAdapter : BaseQuickAdapter(R.layout.item_room_common) { diff --git a/app/src/main/java/com/pikolive/app/home/adapter/RoomGameAdapter.kt b/app/src/main/java/com/pikolive/app/home/adapter/RoomGameAdapter.kt index 51ae2be36..3584919b3 100644 --- a/app/src/main/java/com/pikolive/app/home/adapter/RoomGameAdapter.kt +++ b/app/src/main/java/com/pikolive/app/home/adapter/RoomGameAdapter.kt @@ -10,7 +10,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder import com.yizhuan.erban.R import com.pikolive.app.ui.utils.load -import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo +import com.pikolive.core2.home.bean.HomeRoomInfo import com.pikolive.library.utils.ResUtil diff --git a/app/src/main/java/com/pikolive/app/home/adapter/RoomHistoryListAdapter.kt b/app/src/main/java/com/pikolive/app/home/adapter/RoomHistoryListAdapter.kt index 49f7213c9..a8f4fb624 100644 --- a/app/src/main/java/com/pikolive/app/home/adapter/RoomHistoryListAdapter.kt +++ b/app/src/main/java/com/pikolive/app/home/adapter/RoomHistoryListAdapter.kt @@ -5,7 +5,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder import com.yizhuan.erban.R import com.pikolive.app.ui.utils.load -import com.yizhuan.xchat_android_core.bean.RoomHistoryInfo +import com.pikolive.core.bean.RoomHistoryInfo import com.pikolive.library.utils.TimeUtils diff --git a/app/src/main/java/com/pikolive/app/home/adapter/RoomHotAdapter.kt b/app/src/main/java/com/pikolive/app/home/adapter/RoomHotAdapter.kt index ee81706fd..2f6b10cf3 100644 --- a/app/src/main/java/com/pikolive/app/home/adapter/RoomHotAdapter.kt +++ b/app/src/main/java/com/pikolive/app/home/adapter/RoomHotAdapter.kt @@ -5,11 +5,10 @@ import androidx.core.view.isGone import com.chad.library.adapter.base.BaseMultiItemQuickAdapter import com.chad.library.adapter.base.BaseViewHolder import com.yizhuan.erban.R -import com.pikolive.app.avroom.activity.AVRoomActivity import com.pikolive.app.home.helper.BannerHelper import com.pikolive.app.ui.utils.load -import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo -import com.yizhuan.xchat_android_core.utils.TextUtils +import com.pikolive.core.utils.TextUtils +import com.pikolive.core2.home.bean.HomeRoomInfo class RoomHotAdapter : BaseMultiItemQuickAdapter(null) { diff --git a/app/src/main/java/com/pikolive/app/home/adapter/RoomLikeAdapter.kt b/app/src/main/java/com/pikolive/app/home/adapter/RoomLikeAdapter.kt index 1d291f50f..96b755368 100644 --- a/app/src/main/java/com/pikolive/app/home/adapter/RoomLikeAdapter.kt +++ b/app/src/main/java/com/pikolive/app/home/adapter/RoomLikeAdapter.kt @@ -5,11 +5,10 @@ import androidx.core.view.isGone import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder import com.yizhuan.erban.R -import com.pikolive.app.avroom.activity.AVRoomActivity import com.pikolive.app.ui.utils.ImageLoadUtilsV2 import com.pikolive.app.ui.utils.load -import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo -import com.yizhuan.xchat_android_core.utils.TextUtils +import com.pikolive.core.utils.TextUtils +import com.pikolive.core2.home.bean.HomeRoomInfo class RoomLikeAdapter : BaseQuickAdapter(R.layout.item_room_like) { diff --git a/app/src/main/java/com/pikolive/app/home/adapter/RoomNewFriendsAdapter.kt b/app/src/main/java/com/pikolive/app/home/adapter/RoomNewFriendsAdapter.kt index 5d3677da4..034f7be84 100644 --- a/app/src/main/java/com/pikolive/app/home/adapter/RoomNewFriendsAdapter.kt +++ b/app/src/main/java/com/pikolive/app/home/adapter/RoomNewFriendsAdapter.kt @@ -23,12 +23,12 @@ import com.pikolive.app.ui.utils.ImageLoadUtils import com.pikolive.app.ui.utils.loadAvatar import com.pikolive.app.ui.utils.loadFromAssets import com.pikolive.app.view.GenderAgeTextView -import com.yizhuan.xchat_android_core.Constants -import com.yizhuan.xchat_android_core.manager.AudioEngineManager -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager -import com.yizhuan.xchat_android_core.user.bean.UserInfo -import com.yizhuan.xchat_android_core.utils.StarUtils -import com.yizhuan.xchat_android_core.utils.ifNullOrEmpty +import com.pikolive.core.Constants +import com.pikolive.core.manager.AvRoomDataManager +import com.pikolive.core.user.bean.UserInfo +import com.pikolive.core.utils.StarUtils +import com.pikolive.core.utils.ifNullOrEmpty +import com.pikolive.core2.manager.AudioEngineManager import com.pikolive.library.common.widget.LinesFlexBoxLayoutManager import com.pikolive.library.utils.ListUtils import com.pikolive.library.utils.SingleToastUtil @@ -199,7 +199,8 @@ class RoomNewFriendsAdapter : isMute = AudioEngineManager.get().isMute AudioEngineManager.get().isRemoteMute = true //設置靜音 AudioEngineManager.get().isMute = true //不能説話 - AudioEngineManager.get().setRole(Constants.CLIENT_ROLE_AUDIENCE) + AudioEngineManager.get().setRole( + Constants.CLIENT_ROLE_AUDIENCE) } AudioPlayerHelper.get().playInThread(item.userVoice, object : OnPlayListener { diff --git a/app/src/main/java/com/pikolive/app/home/adapter/VisitorListAdapter.java b/app/src/main/java/com/pikolive/app/home/adapter/VisitorListAdapter.java index ed122c93e..00750a0b4 100644 --- a/app/src/main/java/com/pikolive/app/home/adapter/VisitorListAdapter.java +++ b/app/src/main/java/com/pikolive/app/home/adapter/VisitorListAdapter.java @@ -6,7 +6,7 @@ import com.yizhuan.erban.R; import com.pikolive.app.ui.im.avtivity.NimP2PMessageActivity; import com.pikolive.app.ui.user.activity.UserInfoActivity; import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.home.bean.VisitorInfo; +import com.pikolive.core2.home.bean.VisitorInfo; import com.pikolive.library.utils.ResUtil; import org.jetbrains.annotations.NotNull; diff --git a/app/src/main/java/com/pikolive/app/home/dialog/HelloMessageDialog.kt b/app/src/main/java/com/pikolive/app/home/dialog/HelloMessageDialog.kt index 55d242054..f032da9c6 100644 --- a/app/src/main/java/com/pikolive/app/home/dialog/HelloMessageDialog.kt +++ b/app/src/main/java/com/pikolive/app/home/dialog/HelloMessageDialog.kt @@ -11,7 +11,7 @@ import com.pikolive.app.base.BaseDialog import com.yizhuan.erban.databinding.DialogHelloMessageBinding import com.pikolive.app.ui.utils.load import com.yizhuan.tutu.room_chat.activity.RoomMsgActivity -import com.yizhuan.xchat_android_core.channel_page.bean.HelloMessageInfo +import com.pikolive.core.channel_page.bean.HelloMessageInfo import com.pikolive.library.utils.ResUtil class HelloMessageDialog : BaseDialog() { diff --git a/app/src/main/java/com/pikolive/app/home/dialog/NewUserHelloDialog.kt b/app/src/main/java/com/pikolive/app/home/dialog/NewUserHelloDialog.kt index 64f228440..3311dfd6c 100644 --- a/app/src/main/java/com/pikolive/app/home/dialog/NewUserHelloDialog.kt +++ b/app/src/main/java/com/pikolive/app/home/dialog/NewUserHelloDialog.kt @@ -7,8 +7,8 @@ import com.pikolive.app.avroom.activity.AVRoomActivity import com.pikolive.app.base.BaseDialog import com.yizhuan.erban.databinding.DialogNewUserHelloBinding import com.pikolive.app.ui.utils.load -import com.yizhuan.xchat_android_core.channel_page.bean.NewUserHelloInfo -import com.yizhuan.xchat_android_core.utils.subAndReplaceDot +import com.pikolive.core.channel_page.bean.NewUserHelloInfo +import com.pikolive.core.utils.subAndReplaceDot class NewUserHelloDialog : BaseDialog() { diff --git a/app/src/main/java/com/pikolive/app/home/dialog/ProtocolUpdateDialog.java b/app/src/main/java/com/pikolive/app/home/dialog/ProtocolUpdateDialog.java index 1e33262ca..717aadc8f 100644 --- a/app/src/main/java/com/pikolive/app/home/dialog/ProtocolUpdateDialog.java +++ b/app/src/main/java/com/pikolive/app/home/dialog/ProtocolUpdateDialog.java @@ -23,8 +23,8 @@ import com.pikolive.app.base.BaseSdDialog; import com.pikolive.app.common.widget.OriginalDrawStatusClickSpan; import com.pikolive.app.ui.webview.CommonWebViewActivity; import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.xchat_android_core.user.bean.ProtocolInfo; -import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; +import com.pikolive.core.user.bean.ProtocolInfo; +import com.pikolive.core.utils.SharedPreferenceUtils; /** * 家长模式 提醒框 diff --git a/app/src/main/java/com/pikolive/app/home/dialog/RecommendRoomDialog.kt b/app/src/main/java/com/pikolive/app/home/dialog/RecommendRoomDialog.kt index 34c179bf0..cbc1ac63e 100644 --- a/app/src/main/java/com/pikolive/app/home/dialog/RecommendRoomDialog.kt +++ b/app/src/main/java/com/pikolive/app/home/dialog/RecommendRoomDialog.kt @@ -2,11 +2,10 @@ package com.pikolive.app.home.dialog import android.annotation.SuppressLint import android.os.Bundle -import com.pikolive.app.avroom.activity.AVRoomActivity import com.pikolive.app.base.BaseDialog import com.yizhuan.erban.databinding.DialogRecommendRoomBinding import com.pikolive.app.ui.utils.ImageLoadUtils -import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo +import com.pikolive.core2.home.bean.HomeRoomInfo class RecommendRoomDialog : BaseDialog() { diff --git a/app/src/main/java/com/pikolive/app/home/fragment/AccompanyFragment.kt b/app/src/main/java/com/pikolive/app/home/fragment/AccompanyFragment.kt index 4b076a2f8..9e73209bb 100644 --- a/app/src/main/java/com/pikolive/app/home/fragment/AccompanyFragment.kt +++ b/app/src/main/java/com/pikolive/app/home/fragment/AccompanyFragment.kt @@ -17,12 +17,12 @@ import com.pikolive.app.home.adapter.HomeChatAdapter import com.pikolive.app.home.adapter.RoomNewFriendsAdapter import com.pikolive.app.home.helper.OpenRoomHelper import com.pikolive.app.ui.utils.RVDelegate -import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo -import com.yizhuan.xchat_android_core.home.event.RefreshHomeDataEvent -import com.yizhuan.xchat_android_core.room.event.RoomShieldEvent -import com.yizhuan.xchat_android_core.user.UserModel -import com.yizhuan.xchat_android_core.user.bean.UserInfo -import com.yizhuan.xchat_android_core.user.event.LoginUserInfoUpdateEvent +import com.pikolive.core.room.event.RoomShieldEvent +import com.pikolive.core.user.UserModel +import com.pikolive.core.user.bean.UserInfo +import com.pikolive.core.user.event.LoginUserInfoUpdateEvent +import com.pikolive.core2.home.bean.HomeRoomInfo +import com.pikolive.core2.home.event.RefreshHomeDataEvent import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode diff --git a/app/src/main/java/com/pikolive/app/home/fragment/AttentionFragment.java b/app/src/main/java/com/pikolive/app/home/fragment/AttentionFragment.java index eece470a2..34b01ef95 100644 --- a/app/src/main/java/com/pikolive/app/home/fragment/AttentionFragment.java +++ b/app/src/main/java/com/pikolive/app/home/fragment/AttentionFragment.java @@ -23,12 +23,12 @@ import com.pikolive.app.friend.view.SelectFriendActivity; import com.pikolive.app.ui.relation.adapter.AttentionListAdapter; import com.pikolive.app.ui.user.activity.UserInfoActivity; import com.yizhuan.tutu.room_chat.activity.NimRoomP2PMessageActivity; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.praise.event.PraiseEvent; -import com.yizhuan.xchat_android_core.user.AttentionModel; -import com.yizhuan.xchat_android_core.user.bean.AttentionInfo; -import com.yizhuan.xchat_android_core.user.event.LoginUserInfoUpdateEvent; +import com.pikolive.core.Constants; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.praise.event.PraiseEvent; +import com.pikolive.core.user.AttentionModel; +import com.pikolive.core.user.bean.AttentionInfo; +import com.pikolive.core.user.event.LoginUserInfoUpdateEvent; import com.pikolive.library.utils.ListUtils; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/main/java/com/pikolive/app/home/fragment/ContactsListFragment.kt b/app/src/main/java/com/pikolive/app/home/fragment/ContactsListFragment.kt index 9d7f170dc..9a6197e6a 100644 --- a/app/src/main/java/com/pikolive/app/home/fragment/ContactsListFragment.kt +++ b/app/src/main/java/com/pikolive/app/home/fragment/ContactsListFragment.kt @@ -18,7 +18,7 @@ import com.pikolive.app.ui.user.adapter.UserInfoIndicatorAdapter import com.pikolive.app.ui.user.adapter.UserInfoPagerAdapter import com.pikolive.app.ui.widget.magicindicator.ViewPagerHelper import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator -import com.yizhuan.xchat_android_core.Constants +import com.pikolive.core.Constants import com.pikolive.library.utils.ResUtil import org.greenrobot.eventbus.EventBus diff --git a/app/src/main/java/com/pikolive/app/home/fragment/HomeFragment.kt b/app/src/main/java/com/pikolive/app/home/fragment/HomeFragment.kt index d34f58a01..b8588012d 100644 --- a/app/src/main/java/com/pikolive/app/home/fragment/HomeFragment.kt +++ b/app/src/main/java/com/pikolive/app/home/fragment/HomeFragment.kt @@ -25,10 +25,10 @@ import com.pikolive.app.ui.widget.magicindicator.ViewPagerHelper import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator import com.pikolive.app.utils.CommonJumpHelper -import com.yizhuan.xchat_android_core.DemoCache -import com.yizhuan.xchat_android_core.UriProvider -import com.yizhuan.xchat_android_core.home.bean.BannerInfo -import com.yizhuan.xchat_android_core.home.bean.HomeTagInfo +import com.pikolive.core.DemoCache +import com.pikolive.core2.UriProvider +import com.pikolive.core2.home.bean.BannerInfo +import com.pikolive.core2.home.bean.HomeTagInfo import com.pikolive.library.utils.ListUtils import com.pikolive.library.utils.ResUtil import com.zhpan.bannerview.BannerViewPager diff --git a/app/src/main/java/com/pikolive/app/home/fragment/HomeTabHomeFragment.java b/app/src/main/java/com/pikolive/app/home/fragment/HomeTabHomeFragment.java index 0a03a4314..deed984e9 100644 --- a/app/src/main/java/com/pikolive/app/home/fragment/HomeTabHomeFragment.java +++ b/app/src/main/java/com/pikolive/app/home/fragment/HomeTabHomeFragment.java @@ -14,11 +14,11 @@ import com.pikolive.app.application.ReportManager; import com.pikolive.app.avroom.activity.AVRoomActivity; import com.pikolive.app.base.BaseFragment; import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.xchat_android_core.home.bean.HomeTabMapInfo; -import com.yizhuan.xchat_android_core.home.event.RefreshHomeDataEvent; -import com.yizhuan.xchat_android_core.home.model.GameHomeModel; -import com.yizhuan.xchat_android_core.room.event.RoomShieldEvent; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core2.home.bean.HomeTabMapInfo; +import com.pikolive.core2.home.event.RefreshHomeDataEvent; +import com.pikolive.core2.home.model.GameHomeModel; +import com.pikolive.core.room.event.RoomShieldEvent; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.utils.ListUtils; import com.zhpan.bannerview.BannerViewPager; diff --git a/app/src/main/java/com/pikolive/app/home/fragment/MeFragment.kt b/app/src/main/java/com/pikolive/app/home/fragment/MeFragment.kt index cbc2695ee..9d40544bc 100644 --- a/app/src/main/java/com/pikolive/app/home/fragment/MeFragment.kt +++ b/app/src/main/java/com/pikolive/app/home/fragment/MeFragment.kt @@ -17,6 +17,7 @@ import com.yizhuan.erban.R import com.pikolive.app.UIHelper import com.pikolive.app.application.IReportConstants import com.pikolive.app.application.ReportManager +import com.pikolive.app.avroom.fragment.RoomRankDialogUtils import com.pikolive.app.base.BaseActivity import com.pikolive.app.base.BaseFragment import com.pikolive.app.base.list.LineColorDecoration @@ -40,24 +41,24 @@ import com.pikolive.app.ui.utils.load import com.pikolive.app.ui.webview.CommonWebViewActivity import com.pikolive.app.vip.VipMainActivity import com.pikolive.app.vip.VipViewModel -import com.yizhuan.xchat_android_core.UriProvider -import com.yizhuan.xchat_android_core.auth.AuthModel -import com.yizhuan.xchat_android_core.initial.InitialModel -import com.yizhuan.xchat_android_core.level.UserLevelVo -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager -import com.yizhuan.xchat_android_core.manager.RelationShipEvent -import com.yizhuan.xchat_android_core.module_hall.hall.HallModel -import com.yizhuan.xchat_android_core.module_hall.hall.bean.ClanAndHallInfo -import com.yizhuan.xchat_android_core.pay.PayModel -import com.yizhuan.xchat_android_core.pay.event.GetWalletInfoEvent -import com.yizhuan.xchat_android_core.pay.event.UpdateWalletInfoEvent -import com.yizhuan.xchat_android_core.room.bean.MeCenterInfo -import com.yizhuan.xchat_android_core.room.bean.RoomInfo -import com.yizhuan.xchat_android_core.user.UserModel -import com.yizhuan.xchat_android_core.user.bean.UserInfo -import com.yizhuan.xchat_android_core.user.event.LoginUserInfoUpdateEvent -import com.yizhuan.xchat_android_core.utils.Logger -import com.yizhuan.xchat_android_core.utils.StarUtils +import com.pikolive.core.auth.AuthModel +import com.pikolive.core.initial.InitialModel +import com.pikolive.core.level.UserLevelVo +import com.pikolive.core.manager.RelationShipEvent +import com.pikolive.core.module_hall.hall.HallModel +import com.pikolive.core.module_hall.hall.bean.ClanAndHallInfo +import com.pikolive.core.pay.PayModel +import com.pikolive.core.pay.event.GetWalletInfoEvent +import com.pikolive.core.pay.event.UpdateWalletInfoEvent +import com.pikolive.core.room.bean.MeCenterInfo +import com.pikolive.core.room.bean.RoomInfo +import com.pikolive.core.user.UserModel +import com.pikolive.core.user.bean.UserInfo +import com.pikolive.core.user.event.LoginUserInfoUpdateEvent +import com.pikolive.core.utils.Logger +import com.pikolive.core.utils.StarUtils +import com.pikolive.core2.UriProvider +import com.pikolive.core2.manager.IMNetEaseManager import com.pikolive.library.common.util.DeviceUtil import com.pikolive.library.utils.FormatUtils import org.greenrobot.eventbus.EventBus @@ -142,7 +143,7 @@ class MeFragment : BaseFragment(), View.OnClickListener { mBinding.flVipSeek.isVisible = true mBinding.ivVipIcon.load(it.vipIcon) mBinding.tvVipDesc.text = - "${getString(R.string.me_short)}${com.pikolive.app.avroom.fragment.RoomRankDialogUtils.getRoomRankValueText(it.levelUpScore - it.currScore)}${ + "${getString(R.string.me_short)}${RoomRankDialogUtils.getRoomRankValueText(it.levelUpScore - it.currScore)}${ getString(R.string.me_power_value_escalation) }" mBinding.tvVipName.text = it.vipName diff --git a/app/src/main/java/com/pikolive/app/home/fragment/PartyFragment.kt b/app/src/main/java/com/pikolive/app/home/fragment/PartyFragment.kt index 0d17d4d8f..d55fe1742 100644 --- a/app/src/main/java/com/pikolive/app/home/fragment/PartyFragment.kt +++ b/app/src/main/java/com/pikolive/app/home/fragment/PartyFragment.kt @@ -15,8 +15,8 @@ import com.pikolive.app.home.HomeViewModel import com.pikolive.app.home.adapter.PartyMagicIndicatorAdapter import com.pikolive.app.ui.widget.magicindicator.ViewPagerHelper import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator -import com.yizhuan.xchat_android_core.home.bean.HomeTagInfo -import com.yizhuan.xchat_android_core.home.event.RefreshHomeDataEvent +import com.pikolive.core2.home.bean.HomeTagInfo +import com.pikolive.core2.home.event.RefreshHomeDataEvent import com.pikolive.library.utils.ResUtil import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe diff --git a/app/src/main/java/com/pikolive/app/home/fragment/RecommendFragment.kt b/app/src/main/java/com/pikolive/app/home/fragment/RecommendFragment.kt index 2fb41d8a1..8044174b7 100644 --- a/app/src/main/java/com/pikolive/app/home/fragment/RecommendFragment.kt +++ b/app/src/main/java/com/pikolive/app/home/fragment/RecommendFragment.kt @@ -13,9 +13,9 @@ import com.yizhuan.erban.databinding.FragmentRecommendBinding import com.pikolive.app.home.HomeViewModel import com.pikolive.app.home.adapter.HomeHotAdapter import com.pikolive.app.ui.utils.RVDelegate -import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo -import com.yizhuan.xchat_android_core.home.event.RefreshHomeDataEvent -import com.yizhuan.xchat_android_core.room.event.RoomShieldEvent +import com.pikolive.core.room.event.RoomShieldEvent +import com.pikolive.core2.home.bean.HomeRoomInfo +import com.pikolive.core2.home.event.RefreshHomeDataEvent import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode diff --git a/app/src/main/java/com/pikolive/app/home/fragment/RoomCommonFragment.kt b/app/src/main/java/com/pikolive/app/home/fragment/RoomCommonFragment.kt index 3fb81efc3..e029393be 100644 --- a/app/src/main/java/com/pikolive/app/home/fragment/RoomCommonFragment.kt +++ b/app/src/main/java/com/pikolive/app/home/fragment/RoomCommonFragment.kt @@ -11,9 +11,9 @@ import com.yizhuan.erban.databinding.FragmentRoomCommonBinding import com.pikolive.app.home.RoomCommonViewModel import com.pikolive.app.home.adapter.RoomCommonAdapter import com.pikolive.app.ui.utils.RVDelegate -import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo -import com.yizhuan.xchat_android_core.home.event.RefreshHomeDataEvent -import com.yizhuan.xchat_android_core.room.event.RoomShieldEvent +import com.pikolive.core.room.event.RoomShieldEvent +import com.pikolive.core2.home.bean.HomeRoomInfo +import com.pikolive.core2.home.event.RefreshHomeDataEvent import com.pikolive.library.utils.ResUtil import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe diff --git a/app/src/main/java/com/pikolive/app/home/fragment/RoomGameFragment.kt b/app/src/main/java/com/pikolive/app/home/fragment/RoomGameFragment.kt index ebe601d7d..254581c86 100644 --- a/app/src/main/java/com/pikolive/app/home/fragment/RoomGameFragment.kt +++ b/app/src/main/java/com/pikolive/app/home/fragment/RoomGameFragment.kt @@ -10,9 +10,9 @@ import com.yizhuan.erban.databinding.FragmentRoomGameBinding import com.pikolive.app.home.HomeViewModel import com.pikolive.app.home.adapter.RoomGameAdapter import com.pikolive.app.ui.utils.RVDelegate -import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo -import com.yizhuan.xchat_android_core.home.event.RefreshHomeDataEvent -import com.yizhuan.xchat_android_core.room.event.RoomShieldEvent +import com.pikolive.core.room.event.RoomShieldEvent +import com.pikolive.core2.home.bean.HomeRoomInfo +import com.pikolive.core2.home.event.RefreshHomeDataEvent import com.pikolive.library.utils.ResUtil import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe diff --git a/app/src/main/java/com/pikolive/app/home/fragment/RoomLikeFragment.kt b/app/src/main/java/com/pikolive/app/home/fragment/RoomLikeFragment.kt index df2e1fb58..0a90a1c0b 100644 --- a/app/src/main/java/com/pikolive/app/home/fragment/RoomLikeFragment.kt +++ b/app/src/main/java/com/pikolive/app/home/fragment/RoomLikeFragment.kt @@ -16,9 +16,9 @@ import com.pikolive.app.home.adapter.HomeConcernsAdapter import com.pikolive.app.home.adapter.RoomLikeAdapter import com.pikolive.app.ui.relation.AttentionListActivity import com.pikolive.app.ui.utils.RVDelegate -import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo -import com.yizhuan.xchat_android_core.home.event.RefreshHomeDataEvent -import com.yizhuan.xchat_android_core.room.event.RoomShieldEvent +import com.pikolive.core.room.event.RoomShieldEvent +import com.pikolive.core2.home.bean.HomeRoomInfo +import com.pikolive.core2.home.event.RefreshHomeDataEvent import com.pikolive.library.utils.ResUtil import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe diff --git a/app/src/main/java/com/pikolive/app/home/helper/BannerHelper.kt b/app/src/main/java/com/pikolive/app/home/helper/BannerHelper.kt index cfcb4f08d..f9c60cfc9 100644 --- a/app/src/main/java/com/pikolive/app/home/helper/BannerHelper.kt +++ b/app/src/main/java/com/pikolive/app/home/helper/BannerHelper.kt @@ -10,7 +10,7 @@ import com.pikolive.app.home.adapter.BannerAdapter import com.pikolive.app.ui.widget.rollviewpager.RollPagerView import com.pikolive.app.ui.widget.rollviewpager.Util import com.pikolive.app.ui.widget.rollviewpager.hintview.ColorPointHintView -import com.yizhuan.xchat_android_core.home.bean.BannerInfo +import com.pikolive.core2.home.bean.BannerInfo import com.pikolive.library.utils.ListUtils class BannerHelper { diff --git a/app/src/main/java/com/pikolive/app/home/helper/LoadPageDataHelper.java b/app/src/main/java/com/pikolive/app/home/helper/LoadPageDataHelper.java index 2e8ed41c0..187f95cf7 100644 --- a/app/src/main/java/com/pikolive/app/home/helper/LoadPageDataHelper.java +++ b/app/src/main/java/com/pikolive/app/home/helper/LoadPageDataHelper.java @@ -1,7 +1,7 @@ package com.pikolive.app.home.helper; import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.Constants; +import com.pikolive.core.Constants; import com.pikolive.library.utils.ResUtil; import io.reactivex.Single; diff --git a/app/src/main/java/com/pikolive/app/home/helper/OpenRoomHelper.java b/app/src/main/java/com/pikolive/app/home/helper/OpenRoomHelper.java index c172cf33d..1f7fb187f 100644 --- a/app/src/main/java/com/pikolive/app/home/helper/OpenRoomHelper.java +++ b/app/src/main/java/com/pikolive/app/home/helper/OpenRoomHelper.java @@ -1,8 +1,8 @@ package com.pikolive.app.home.helper; -import static com.yizhuan.xchat_android_core.certification.CertificationModel.CER_TYPE_FORCE; -import static com.yizhuan.xchat_android_core.certification.CertificationModel.CER_TYPE_GUIDE; -import static com.yizhuan.xchat_android_core.certification.CertificationModel.CER_TYPE_NONE; +import static com.pikolive.core.certification.CertificationModel.CER_TYPE_FORCE; +import static com.pikolive.core.certification.CertificationModel.CER_TYPE_GUIDE; +import static com.pikolive.core.certification.CertificationModel.CER_TYPE_NONE; import android.annotation.SuppressLint; import android.text.Spannable; @@ -20,18 +20,18 @@ import com.pikolive.app.avroom.dialog.CreateRoomDialog; import com.pikolive.app.base.BaseActivity; import com.pikolive.app.common.widget.dialog.DialogManager; import com.pikolive.app.ui.webview.CommonWebViewActivity; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.certification.CertificationModel; -import com.yizhuan.xchat_android_core.patriarch.exception.PmRoomLimitException; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.room.model.AvRoomModel; -import com.yizhuan.xchat_android_core.room.model.RoomSettingModel; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; -import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core2.UriProvider; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.certification.CertificationModel; +import com.pikolive.core.patriarch.exception.PmRoomLimitException; +import com.pikolive.core.room.bean.RoomInfo; +import com.pikolive.core.room.model.AvRoomModel; +import com.pikolive.core.room.model.RoomSettingModel; +import com.pikolive.core.user.UserModel; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.utils.net.BeanObserver; +import com.pikolive.core.utils.net.DontWarnObserver; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.utils.ResUtil; import com.pikolive.library.utils.SingleToastUtil; diff --git a/app/src/main/java/com/pikolive/app/home/presenter/CommunityNoticePresenter.java b/app/src/main/java/com/pikolive/app/home/presenter/CommunityNoticePresenter.java index 9ee10ea98..fe2d6494e 100644 --- a/app/src/main/java/com/pikolive/app/home/presenter/CommunityNoticePresenter.java +++ b/app/src/main/java/com/pikolive/app/home/presenter/CommunityNoticePresenter.java @@ -5,9 +5,9 @@ import android.annotation.SuppressLint; import com.yizhuan.erban.R; import com.pikolive.app.base.BaseMvpPresenter; import com.pikolive.app.home.view.ICommunityNoticeAct; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.community.bean.CommunityNoticeInfo; -import com.yizhuan.xchat_android_core.home.model.CommunityNoticeModel; +import com.pikolive.core.Constants; +import com.pikolive.core.community.bean.CommunityNoticeInfo; +import com.pikolive.core2.home.model.CommunityNoticeModel; import com.pikolive.library.utils.ResUtil; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/home/presenter/MainFragmentPresenter.java b/app/src/main/java/com/pikolive/app/home/presenter/MainFragmentPresenter.java index be91927af..3c245af3a 100644 --- a/app/src/main/java/com/pikolive/app/home/presenter/MainFragmentPresenter.java +++ b/app/src/main/java/com/pikolive/app/home/presenter/MainFragmentPresenter.java @@ -6,8 +6,8 @@ import androidx.annotation.Nullable; import com.pikolive.app.base.BaseMvpPresenter; import com.pikolive.app.home.view.IMainFragmentView; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.room.model.AvRoomModel; +import com.pikolive.core.room.bean.RoomInfo; +import com.pikolive.core.room.model.AvRoomModel; import com.pikolive.library.net.rxnet.callback.CallBack; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/main/java/com/pikolive/app/home/presenter/MainPresenter.java b/app/src/main/java/com/pikolive/app/home/presenter/MainPresenter.java index 4fb28a225..27325df0d 100644 --- a/app/src/main/java/com/pikolive/app/home/presenter/MainPresenter.java +++ b/app/src/main/java/com/pikolive/app/home/presenter/MainPresenter.java @@ -2,8 +2,8 @@ package com.pikolive.app.home.presenter; import com.pikolive.app.base.BaseMvpPresenter; import com.pikolive.app.home.view.IMainView; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.room.model.AvRoomModel; +import com.pikolive.core.room.bean.RoomInfo; +import com.pikolive.core.room.model.AvRoomModel; import com.pikolive.library.net.rxnet.callback.CallBack; /** diff --git a/app/src/main/java/com/pikolive/app/home/presenter/NewUserListPresenter.java b/app/src/main/java/com/pikolive/app/home/presenter/NewUserListPresenter.java index 1a3440d7b..f222a7c62 100644 --- a/app/src/main/java/com/pikolive/app/home/presenter/NewUserListPresenter.java +++ b/app/src/main/java/com/pikolive/app/home/presenter/NewUserListPresenter.java @@ -3,9 +3,9 @@ package com.pikolive.app.home.presenter; import com.pikolive.app.base.BaseMvpPresenter; import com.pikolive.app.home.helper.LoadPageDataHelper; import com.pikolive.app.home.view.INewUserListActivityView; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.home.model.HomeModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.pikolive.core.Constants; +import com.pikolive.core2.home.model.HomeModel; +import com.pikolive.core.user.bean.UserInfo; import com.pikolive.library.base.PresenterEvent; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/home/view/ICommunityNoticeAct.java b/app/src/main/java/com/pikolive/app/home/view/ICommunityNoticeAct.java index 0afb3a048..5f9f04213 100644 --- a/app/src/main/java/com/pikolive/app/home/view/ICommunityNoticeAct.java +++ b/app/src/main/java/com/pikolive/app/home/view/ICommunityNoticeAct.java @@ -1,6 +1,6 @@ package com.pikolive.app.home.view; -import com.yizhuan.xchat_android_core.community.bean.CommunityNoticeInfo; +import com.pikolive.core.community.bean.CommunityNoticeInfo; import com.pikolive.library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/home/view/IFamilyHomeActivityView.java b/app/src/main/java/com/pikolive/app/home/view/IFamilyHomeActivityView.java index bc80078a2..090a369a8 100644 --- a/app/src/main/java/com/pikolive/app/home/view/IFamilyHomeActivityView.java +++ b/app/src/main/java/com/pikolive/app/home/view/IFamilyHomeActivityView.java @@ -1,6 +1,6 @@ package com.pikolive.app.home.view; -import com.yizhuan.xchat_android_core.family.bean.FamilyInfo; +import com.pikolive.core.family.bean.FamilyInfo; import com.pikolive.library.base.IMvpBaseView; /** diff --git a/app/src/main/java/com/pikolive/app/home/view/IMainFragmentView.java b/app/src/main/java/com/pikolive/app/home/view/IMainFragmentView.java index fd280d8ec..062a3aaf7 100644 --- a/app/src/main/java/com/pikolive/app/home/view/IMainFragmentView.java +++ b/app/src/main/java/com/pikolive/app/home/view/IMainFragmentView.java @@ -1,6 +1,6 @@ package com.pikolive.app.home.view; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; +import com.pikolive.core.room.bean.RoomInfo; import com.pikolive.library.base.IMvpBaseView; /** diff --git a/app/src/main/java/com/pikolive/app/home/view/IMainView.java b/app/src/main/java/com/pikolive/app/home/view/IMainView.java index 3a5987cdf..f7b299f98 100644 --- a/app/src/main/java/com/pikolive/app/home/view/IMainView.java +++ b/app/src/main/java/com/pikolive/app/home/view/IMainView.java @@ -1,6 +1,6 @@ package com.pikolive.app.home.view; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; +import com.pikolive.core.room.bean.RoomInfo; import com.pikolive.library.base.IMvpBaseView; /** diff --git a/app/src/main/java/com/pikolive/app/home/widget/AnchorCardView.kt b/app/src/main/java/com/pikolive/app/home/widget/AnchorCardView.kt index 6fd72d997..eb0440ef4 100644 --- a/app/src/main/java/com/pikolive/app/home/widget/AnchorCardView.kt +++ b/app/src/main/java/com/pikolive/app/home/widget/AnchorCardView.kt @@ -26,10 +26,10 @@ import com.pikolive.app.ui.user.activity.UserInfoActivity import com.pikolive.app.ui.user.decorationsend.UserInfoSkillDecoration import com.pikolive.app.ui.utils.load import com.pikolive.app.ui.utils.loadAvatar -import com.yizhuan.xchat_android_core.room.bean.AnchorInfo -import com.yizhuan.xchat_android_core.user.bean.UserInfo -import com.yizhuan.xchat_android_core.user.bean.UserInfoSkillEntity -import com.yizhuan.xchat_android_core.utils.subAndReplaceDot +import com.pikolive.core.room.bean.AnchorInfo +import com.pikolive.core.user.bean.UserInfo +import com.pikolive.core.user.bean.UserInfoSkillEntity +import com.pikolive.core.utils.subAndReplaceDot import com.pikolive.library.utils.ListUtils import com.pikolive.library.utils.SingleToastUtil import io.reactivex.Observable diff --git a/app/src/main/java/com/pikolive/app/luckymoney/adapter/LuckyMoneyMemberListAdapter.java b/app/src/main/java/com/pikolive/app/luckymoney/adapter/LuckyMoneyMemberListAdapter.java index cf0742964..5f56e56c3 100644 --- a/app/src/main/java/com/pikolive/app/luckymoney/adapter/LuckyMoneyMemberListAdapter.java +++ b/app/src/main/java/com/pikolive/app/luckymoney/adapter/LuckyMoneyMemberListAdapter.java @@ -10,8 +10,8 @@ import com.yizhuan.erban.R; import com.pikolive.app.bindadapter.BaseAdapter; import com.pikolive.app.bindadapter.BindingViewHolder; import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.family.model.FamilyModel; -import com.yizhuan.xchat_android_core.luckymoney.LuckyMoneyUserInfo; +import com.pikolive.core.family.model.FamilyModel; +import com.pikolive.core.luckymoney.LuckyMoneyUserInfo; import java.text.SimpleDateFormat; import java.util.Date; diff --git a/app/src/main/java/com/pikolive/app/luckymoney/dialog/LuckyMoneyDialog.java b/app/src/main/java/com/pikolive/app/luckymoney/dialog/LuckyMoneyDialog.java index 22799b82a..120a65861 100644 --- a/app/src/main/java/com/pikolive/app/luckymoney/dialog/LuckyMoneyDialog.java +++ b/app/src/main/java/com/pikolive/app/luckymoney/dialog/LuckyMoneyDialog.java @@ -19,16 +19,16 @@ import com.pikolive.app.luckymoney.view.LuckyMoneyDetailActivity; import com.yizhuan.erban.R; import com.pikolive.app.team.viewmodel.TeamVM; import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.family.bean.FamilyInfo; -import com.yizhuan.xchat_android_core.family.model.FamilyModel; -import com.yizhuan.xchat_android_core.luckymoney.LuckyMoneyInfo; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.share.bean.SessionType; -import com.yizhuan.xchat_android_core.team.bean.TeamEvent; -import com.yizhuan.xchat_android_core.team.model.TeamModel; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.family.bean.FamilyInfo; +import com.pikolive.core.family.model.FamilyModel; +import com.pikolive.core.luckymoney.LuckyMoneyInfo; +import com.pikolive.core2.manager.IMNetEaseManager; +import com.pikolive.core.share.bean.SessionType; +import com.pikolive.core.team.bean.TeamEvent; +import com.pikolive.core.team.model.TeamModel; +import com.pikolive.core.user.UserModel; +import com.pikolive.core.user.bean.UserInfo; import com.pikolive.library.rxbus.RxBus; import com.pikolive.library.utils.SingleToastUtil; diff --git a/app/src/main/java/com/pikolive/app/luckymoney/view/LuckyMoneyCreationActivity.java b/app/src/main/java/com/pikolive/app/luckymoney/view/LuckyMoneyCreationActivity.java index 629e32cb2..a590b2357 100644 --- a/app/src/main/java/com/pikolive/app/luckymoney/view/LuckyMoneyCreationActivity.java +++ b/app/src/main/java/com/pikolive/app/luckymoney/view/LuckyMoneyCreationActivity.java @@ -22,18 +22,18 @@ import com.yizhuan.erban.databinding.ActivityLuckyMoneyCreationBinding; import com.pikolive.app.team.viewmodel.TeamVM; import com.pikolive.app.ui.pay.ChargeActivity; import com.pikolive.app.ui.webview.CommonWebViewActivity; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.family.bean.FamilyInfo; -import com.yizhuan.xchat_android_core.family.model.FamilyModel; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.share.bean.SessionType; -import com.yizhuan.xchat_android_core.team.bean.TeamInfo; -import com.yizhuan.xchat_android_core.team.model.TeamModel; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.utils.net.BalanceNotEnoughExeption; +import com.pikolive.core.Constants; +import com.pikolive.core2.UriProvider; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.family.bean.FamilyInfo; +import com.pikolive.core.family.model.FamilyModel; +import com.pikolive.core2.manager.IMNetEaseManager; +import com.pikolive.core.share.bean.SessionType; +import com.pikolive.core.team.bean.TeamInfo; +import com.pikolive.core.team.model.TeamModel; +import com.pikolive.core.user.UserModel; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.utils.net.BalanceNotEnoughExeption; import com.pikolive.library.annatation.ActLayoutRes; import com.pikolive.library.common.util.DeviceUtil; import com.pikolive.library.utils.AppMetaDataUtil; diff --git a/app/src/main/java/com/pikolive/app/luckymoney/view/LuckyMoneyDetailActivity.java b/app/src/main/java/com/pikolive/app/luckymoney/view/LuckyMoneyDetailActivity.java index bdfc1dd81..5585f968a 100644 --- a/app/src/main/java/com/pikolive/app/luckymoney/view/LuckyMoneyDetailActivity.java +++ b/app/src/main/java/com/pikolive/app/luckymoney/view/LuckyMoneyDetailActivity.java @@ -14,12 +14,12 @@ import com.yizhuan.erban.databinding.ActivityLuckyMoneyDetailBinding; import com.pikolive.app.luckymoney.adapter.LuckyMoneyMemberListAdapter; import com.pikolive.app.team.viewmodel.TeamVM; import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.family.bean.FamilyInfo; -import com.yizhuan.xchat_android_core.family.model.FamilyModel; -import com.yizhuan.xchat_android_core.luckymoney.LuckyMoneyInfo; -import com.yizhuan.xchat_android_core.luckymoney.LuckyMoneyUserInfo; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.pikolive.core.family.bean.FamilyInfo; +import com.pikolive.core.family.model.FamilyModel; +import com.pikolive.core.luckymoney.LuckyMoneyInfo; +import com.pikolive.core.luckymoney.LuckyMoneyUserInfo; +import com.pikolive.core.user.UserModel; +import com.pikolive.core.user.bean.UserInfo; import com.pikolive.library.annatation.ActLayoutRes; import com.pikolive.library.utils.FormatUtils; import com.pikolive.library.utils.ListUtils; diff --git a/app/src/main/java/com/pikolive/app/luckymoney/viewholder/LuckyMoneyMsgViewHolder.java b/app/src/main/java/com/pikolive/app/luckymoney/viewholder/LuckyMoneyMsgViewHolder.java index da630f90b..28096f496 100644 --- a/app/src/main/java/com/pikolive/app/luckymoney/viewholder/LuckyMoneyMsgViewHolder.java +++ b/app/src/main/java/com/pikolive/app/luckymoney/viewholder/LuckyMoneyMsgViewHolder.java @@ -13,11 +13,11 @@ import com.netease.nimlib.sdk.team.model.Team; import com.pikolive.app.luckymoney.view.LuckyMoneyDetailActivity; import com.yizhuan.erban.R; import com.pikolive.app.luckymoney.dialog.LuckyMoneyDialog; -import com.yizhuan.xchat_android_core.im.custom.bean.LuckyMoneyAttachment; -import com.yizhuan.xchat_android_core.luckymoney.LuckyMoneyInfo; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.team.bean.TeamInfo; -import com.yizhuan.xchat_android_core.team.model.TeamModel; +import com.pikolive.core.im.custom.bean.LuckyMoneyAttachment; +import com.pikolive.core.luckymoney.LuckyMoneyInfo; +import com.pikolive.core2.manager.IMNetEaseManager; +import com.pikolive.core.team.bean.TeamInfo; +import com.pikolive.core.team.model.TeamModel; import com.pikolive.library.utils.ResUtil; import com.pikolive.library.utils.SingleToastUtil; diff --git a/app/src/main/java/com/pikolive/app/luckymoney/viewholder/LuckyMoneyTipsViewHolder.java b/app/src/main/java/com/pikolive/app/luckymoney/viewholder/LuckyMoneyTipsViewHolder.java index fe89411f0..8e7871b20 100644 --- a/app/src/main/java/com/pikolive/app/luckymoney/viewholder/LuckyMoneyTipsViewHolder.java +++ b/app/src/main/java/com/pikolive/app/luckymoney/viewholder/LuckyMoneyTipsViewHolder.java @@ -11,9 +11,9 @@ import androidx.core.content.ContextCompat; import com.netease.nim.uikit.business.session.viewholder.MsgViewHolderBase; import com.netease.nim.uikit.common.ui.recyclerview.adapter.BaseMultiItemFetchLoadAdapter; import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.im.custom.bean.LuckyMoneyTipsAttachment; -import com.yizhuan.xchat_android_core.luckymoney.LuckyMoneyInfo; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.im.custom.bean.LuckyMoneyTipsAttachment; +import com.pikolive.core.luckymoney.LuckyMoneyInfo; import com.pikolive.library.utils.ResUtil; import java.util.Objects; diff --git a/app/src/main/java/com/pikolive/app/main/helper/NoticationsUiHelper.java b/app/src/main/java/com/pikolive/app/main/helper/NoticationsUiHelper.java index b7e374a51..09f05c949 100644 --- a/app/src/main/java/com/pikolive/app/main/helper/NoticationsUiHelper.java +++ b/app/src/main/java/com/pikolive/app/main/helper/NoticationsUiHelper.java @@ -11,9 +11,9 @@ import androidx.core.app.ActivityCompat; import com.yizhuan.erban.R; import com.pikolive.app.common.widget.dialog.DialogManager; import com.pikolive.app.utils.NotificationsUtils; -import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; -import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.utils.SharedPreferenceUtils; +import com.pikolive.core.utils.net.DontWarnObserver; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.utils.ResUtil; import com.pikolive.library.utils.TimeUtils; diff --git a/app/src/main/java/com/pikolive/app/module/IRoomNewbieMessageView.java b/app/src/main/java/com/pikolive/app/module/IRoomNewbieMessageView.java index 5553d90ba..19183e585 100644 --- a/app/src/main/java/com/pikolive/app/module/IRoomNewbieMessageView.java +++ b/app/src/main/java/com/pikolive/app/module/IRoomNewbieMessageView.java @@ -1,6 +1,6 @@ package com.pikolive.app.module; -import com.yizhuan.xchat_android_core.bean.RoomNewbieMessageInfo; +import com.pikolive.core.bean.RoomNewbieMessageInfo; import com.pikolive.library.base.IMvpBaseView; public interface IRoomNewbieMessageView extends IMvpBaseView { diff --git a/app/src/main/java/com/pikolive/app/module/IRoomNewbieView.java b/app/src/main/java/com/pikolive/app/module/IRoomNewbieView.java index 8ac061fe0..0e4f972a5 100644 --- a/app/src/main/java/com/pikolive/app/module/IRoomNewbieView.java +++ b/app/src/main/java/com/pikolive/app/module/IRoomNewbieView.java @@ -1,6 +1,6 @@ package com.pikolive.app.module; -import com.yizhuan.xchat_android_core.bean.RoomNewbieInfo; +import com.pikolive.core.bean.RoomNewbieInfo; import com.pikolive.library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/module/RoomNewbieModel.java b/app/src/main/java/com/pikolive/app/module/RoomNewbieModel.java index 4db685ba2..d3c88bf55 100644 --- a/app/src/main/java/com/pikolive/app/module/RoomNewbieModel.java +++ b/app/src/main/java/com/pikolive/app/module/RoomNewbieModel.java @@ -1,11 +1,11 @@ package com.pikolive.app.module; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.bean.RoomNewbieInfo; -import com.yizhuan.xchat_android_core.bean.RoomNewbieMessageInfo; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.community.CommunityConstant; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.bean.RoomNewbieInfo; +import com.pikolive.core.bean.RoomNewbieMessageInfo; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.community.CommunityConstant; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.net.rxnet.RxNet; import org.json.JSONObject; diff --git a/app/src/main/java/com/pikolive/app/monsterhunting/MonsterEscapeDialog.java b/app/src/main/java/com/pikolive/app/monsterhunting/MonsterEscapeDialog.java index 74577d967..796efe938 100644 --- a/app/src/main/java/com/pikolive/app/monsterhunting/MonsterEscapeDialog.java +++ b/app/src/main/java/com/pikolive/app/monsterhunting/MonsterEscapeDialog.java @@ -17,8 +17,8 @@ import androidx.fragment.app.FragmentManager; import com.yizhuan.erban.R; import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterInfo; -import com.yizhuan.xchat_android_core.monsterhunting.manager.MonsterDataManager; +import com.pikolive.core.monsterhunting.bean.MonsterInfo; +import com.pikolive.core.monsterhunting.manager.MonsterDataManager; /** * Created by MadisonRong on 03/04/2018. diff --git a/app/src/main/java/com/pikolive/app/monsterhunting/MonsterHuntingAnimationManager.java b/app/src/main/java/com/pikolive/app/monsterhunting/MonsterHuntingAnimationManager.java index cbb24e7fd..9c76f6c03 100644 --- a/app/src/main/java/com/pikolive/app/monsterhunting/MonsterHuntingAnimationManager.java +++ b/app/src/main/java/com/pikolive/app/monsterhunting/MonsterHuntingAnimationManager.java @@ -9,9 +9,9 @@ import android.widget.RelativeLayout; import android.widget.TextView; import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.monsterhunting.SimpleAnimationListener; -import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterEvent; +import com.pikolive.core2.manager.IMNetEaseManager; +import com.pikolive.core.monsterhunting.SimpleAnimationListener; +import com.pikolive.core.monsterhunting.bean.MonsterEvent; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.processors.PublishProcessor; diff --git a/app/src/main/java/com/pikolive/app/monsterhunting/MonsterHuntingRewardDialog.java b/app/src/main/java/com/pikolive/app/monsterhunting/MonsterHuntingRewardDialog.java index f83f3e7bc..f81820407 100644 --- a/app/src/main/java/com/pikolive/app/monsterhunting/MonsterHuntingRewardDialog.java +++ b/app/src/main/java/com/pikolive/app/monsterhunting/MonsterHuntingRewardDialog.java @@ -22,12 +22,12 @@ import androidx.recyclerview.widget.RecyclerView; import com.yizhuan.erban.R; import com.pikolive.app.UIHelper; import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterHunter; -import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterHuntingResult; -import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterHuntingReward; -import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterInfo; -import com.yizhuan.xchat_android_core.monsterhunting.manager.MonsterDataManager; -import com.yizhuan.xchat_android_core.monsterhunting.model.MonsterHuntingModel; +import com.pikolive.core.monsterhunting.bean.MonsterHunter; +import com.pikolive.core.monsterhunting.bean.MonsterHuntingResult; +import com.pikolive.core.monsterhunting.bean.MonsterHuntingReward; +import com.pikolive.core.monsterhunting.bean.MonsterInfo; +import com.pikolive.core.monsterhunting.manager.MonsterDataManager; +import com.pikolive.core.monsterhunting.model.MonsterHuntingModel; import com.pikolive.library.utils.SingleToastUtil; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/monsterhunting/MonsterHuntingRewardsAdapter.java b/app/src/main/java/com/pikolive/app/monsterhunting/MonsterHuntingRewardsAdapter.java index 532e1e61d..673b1ca63 100644 --- a/app/src/main/java/com/pikolive/app/monsterhunting/MonsterHuntingRewardsAdapter.java +++ b/app/src/main/java/com/pikolive/app/monsterhunting/MonsterHuntingRewardsAdapter.java @@ -12,7 +12,7 @@ import androidx.recyclerview.widget.RecyclerView; import com.yizhuan.erban.R; import com.pikolive.app.ui.utils.ImageLoadUtils; import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterHuntingReward; +import com.pikolive.core.monsterhunting.bean.MonsterHuntingReward; import com.pikolive.library.adapters.BaseListRecyclerViewAdapter; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/main/java/com/pikolive/app/monsterhunting/MonsterHuntingSvgaManager.java b/app/src/main/java/com/pikolive/app/monsterhunting/MonsterHuntingSvgaManager.java index 93d2b3943..5c7c14b05 100644 --- a/app/src/main/java/com/pikolive/app/monsterhunting/MonsterHuntingSvgaManager.java +++ b/app/src/main/java/com/pikolive/app/monsterhunting/MonsterHuntingSvgaManager.java @@ -11,7 +11,7 @@ import com.opensource.svgaplayer.SVGAParser; import com.opensource.svgaplayer.SVGAVideoEntity; import com.pikolive.app.common.svga.SimpleSvgaCallback; import com.pikolive.app.common.svga.SimpleSvgaParseCompletion; -import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterEvent; +import com.pikolive.core.monsterhunting.bean.MonsterEvent; import java.net.MalformedURLException; import java.net.URL; diff --git a/app/src/main/java/com/pikolive/app/monsterhunting/bean/AttackMonsterResultInfo.java b/app/src/main/java/com/pikolive/app/monsterhunting/bean/AttackMonsterResultInfo.java index e5f230a3f..ef31e8941 100644 --- a/app/src/main/java/com/pikolive/app/monsterhunting/bean/AttackMonsterResultInfo.java +++ b/app/src/main/java/com/pikolive/app/monsterhunting/bean/AttackMonsterResultInfo.java @@ -3,7 +3,7 @@ package com.pikolive.app.monsterhunting.bean; import androidx.databinding.BaseObservable; -import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterAttackInfo; +import com.pikolive.core.monsterhunting.bean.MonsterAttackInfo; public class AttackMonsterResultInfo extends BaseObservable{ diff --git a/app/src/main/java/com/pikolive/app/monsterhunting/bean/UpdateMyGoldInfo.java b/app/src/main/java/com/pikolive/app/monsterhunting/bean/UpdateMyGoldInfo.java index 7d5843776..0320bbf01 100644 --- a/app/src/main/java/com/pikolive/app/monsterhunting/bean/UpdateMyGoldInfo.java +++ b/app/src/main/java/com/pikolive/app/monsterhunting/bean/UpdateMyGoldInfo.java @@ -2,7 +2,7 @@ package com.pikolive.app.monsterhunting.bean; import androidx.databinding.BaseObservable; -import com.yizhuan.xchat_android_core.pay.bean.WalletInfo; +import com.pikolive.core.pay.bean.WalletInfo; public class UpdateMyGoldInfo extends BaseObservable { diff --git a/app/src/main/java/com/pikolive/app/other/activity/SplashActivity.java b/app/src/main/java/com/pikolive/app/other/activity/SplashActivity.java index f336e46ea..5081114f7 100644 --- a/app/src/main/java/com/pikolive/app/other/activity/SplashActivity.java +++ b/app/src/main/java/com/pikolive/app/other/activity/SplashActivity.java @@ -20,13 +20,13 @@ import com.yizhuan.erban.R; import com.yizhuan.erban.databinding.ActivitySplashBinding; import com.pikolive.app.other.SplashBitmapTransformation; import com.pikolive.app.ui.login.LoginActivity; -import com.yizhuan.xchat_android_core.DemoCache; -import com.yizhuan.xchat_android_core.auth.entity.AccountInfo; -import com.yizhuan.xchat_android_core.channel_page.model.ChannelPageModel; -import com.yizhuan.xchat_android_core.initial.InitialModel; -import com.yizhuan.xchat_android_core.initial.SplashComponent; -import com.yizhuan.xchat_android_core.utils.OaidUtil; -import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; +import com.pikolive.core.DemoCache; +import com.pikolive.core.auth.entity.AccountInfo; +import com.pikolive.core.channel_page.model.ChannelPageModel; +import com.pikolive.core.initial.InitialModel; +import com.pikolive.core.initial.SplashComponent; +import com.pikolive.core.utils.OaidUtil; +import com.pikolive.core.utils.SharedPreferenceUtils; import com.pikolive.library.common.util.DeviceUtil; /** diff --git a/app/src/main/java/com/pikolive/app/other/dialog/PrivacyAgreementDialog.java b/app/src/main/java/com/pikolive/app/other/dialog/PrivacyAgreementDialog.java index 610daed16..70a23861b 100644 --- a/app/src/main/java/com/pikolive/app/other/dialog/PrivacyAgreementDialog.java +++ b/app/src/main/java/com/pikolive/app/other/dialog/PrivacyAgreementDialog.java @@ -24,7 +24,7 @@ import com.pikolive.app.application.ReportManager; import com.pikolive.app.common.widget.OriginalDrawStatusClickSpan; import com.pikolive.app.ui.webview.SimpleWebViewActivity; import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.xchat_android_core.UriProvider; +import com.pikolive.core2.UriProvider; import com.pikolive.library.utils.ScreenUtils; import java.util.HashMap; diff --git a/app/src/main/java/com/pikolive/app/other/view/ISplashView.java b/app/src/main/java/com/pikolive/app/other/view/ISplashView.java index 970f2d8dd..b555e4738 100644 --- a/app/src/main/java/com/pikolive/app/other/view/ISplashView.java +++ b/app/src/main/java/com/pikolive/app/other/view/ISplashView.java @@ -1,6 +1,6 @@ package com.pikolive.app.other.view; -import com.yizhuan.xchat_android_core.home.bean.TabInfo; +import com.pikolive.core2.home.bean.TabInfo; import com.pikolive.library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/pay/GiveGoldModel.kt b/app/src/main/java/com/pikolive/app/pay/GiveGoldModel.kt index 24bac006e..315506fc3 100644 --- a/app/src/main/java/com/pikolive/app/pay/GiveGoldModel.kt +++ b/app/src/main/java/com/pikolive/app/pay/GiveGoldModel.kt @@ -2,11 +2,11 @@ package com.pikolive.app.pay import androidx.lifecycle.MutableLiveData import com.pikolive.app.base.BaseViewModel -import com.yizhuan.xchat_android_core.bean.response.ListResult -import com.yizhuan.xchat_android_core.home.model.HomeModel -import com.yizhuan.xchat_android_core.user.bean.DiamondGiveHistoryInfo -import com.yizhuan.xchat_android_core.user.bean.SearchUserInfo -import com.yizhuan.xchat_android_core.utils.toast +import com.pikolive.core.bean.response.ListResult +import com.pikolive.core2.home.model.HomeModel +import com.pikolive.core.user.bean.DiamondGiveHistoryInfo +import com.pikolive.core.user.bean.SearchUserInfo +import com.pikolive.core.utils.toast class GiveGoldModel : BaseViewModel() { diff --git a/app/src/main/java/com/pikolive/app/pay/activity/GiveGoldActivity.kt b/app/src/main/java/com/pikolive/app/pay/activity/GiveGoldActivity.kt index 191ae293f..0dd7c9af7 100644 --- a/app/src/main/java/com/pikolive/app/pay/activity/GiveGoldActivity.kt +++ b/app/src/main/java/com/pikolive/app/pay/activity/GiveGoldActivity.kt @@ -17,8 +17,8 @@ import com.yizhuan.erban.databinding.ActivityGiveGoldBinding import com.pikolive.app.pay.GiveGoldModel import com.pikolive.app.pay.adapter.LatelyGiveAdapter import com.pikolive.app.ui.utils.RVDelegate -import com.yizhuan.xchat_android_core.gift.GiftModel -import com.yizhuan.xchat_android_core.user.bean.DiamondGiveHistoryInfo +import com.pikolive.core.gift.GiftModel +import com.pikolive.core.user.bean.DiamondGiveHistoryInfo import com.pikolive.library.utils.ResUtil /** diff --git a/app/src/main/java/com/pikolive/app/pay/activity/GiveGoldDetailActivity.kt b/app/src/main/java/com/pikolive/app/pay/activity/GiveGoldDetailActivity.kt index 6bccfa84b..3027df490 100644 --- a/app/src/main/java/com/pikolive/app/pay/activity/GiveGoldDetailActivity.kt +++ b/app/src/main/java/com/pikolive/app/pay/activity/GiveGoldDetailActivity.kt @@ -18,8 +18,8 @@ import com.pikolive.app.ui.user.adapter.UserInfoPagerAdapter import com.pikolive.app.ui.widget.magicindicator.MagicIndicator import com.pikolive.app.ui.widget.magicindicator.ViewPagerHelper import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator -import com.yizhuan.xchat_android_core.initial.InitialModel -import com.yizhuan.xchat_android_core.user.UserModel +import com.pikolive.core.initial.InitialModel +import com.pikolive.core.user.UserModel import com.pikolive.library.utils.ResUtil /** diff --git a/app/src/main/java/com/pikolive/app/pay/activity/GiveGoldSearchActivity.kt b/app/src/main/java/com/pikolive/app/pay/activity/GiveGoldSearchActivity.kt index 017492e41..f7953c044 100644 --- a/app/src/main/java/com/pikolive/app/pay/activity/GiveGoldSearchActivity.kt +++ b/app/src/main/java/com/pikolive/app/pay/activity/GiveGoldSearchActivity.kt @@ -16,9 +16,9 @@ import com.pikolive.app.base.BaseActivity import com.pikolive.app.common.EmptyViewHelper import com.pikolive.app.pay.adapter.GiveSearchAdapter import com.pikolive.app.ui.utils.RVDelegate -import com.yizhuan.xchat_android_core.room.bean.SearchRoomInfo -import com.yizhuan.xchat_android_core.room.model.AvRoomModel -import com.yizhuan.xchat_android_core.utils.net.RxHelper +import com.pikolive.core.room.bean.SearchRoomInfo +import com.pikolive.core.room.model.AvRoomModel +import com.pikolive.core.utils.net.RxHelper import com.pikolive.library.utils.ResUtil class GiveGoldSearchActivity : BaseActivity(), TextWatcher { diff --git a/app/src/main/java/com/pikolive/app/pay/activity/GiveGoldToUserActivity.kt b/app/src/main/java/com/pikolive/app/pay/activity/GiveGoldToUserActivity.kt index a80f42225..7a37eda93 100644 --- a/app/src/main/java/com/pikolive/app/pay/activity/GiveGoldToUserActivity.kt +++ b/app/src/main/java/com/pikolive/app/pay/activity/GiveGoldToUserActivity.kt @@ -32,13 +32,13 @@ import com.pikolive.app.ui.widget.dialog.CommonTipDialog import com.pikolive.app.ui.widget.dialog.GiveDiamondTipDialog import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil import com.pikolive.app.ui.widget.recyclerview.decoration.GridSpacingItemNewDecoration -import com.yizhuan.xchat_android_core.DemoCache -import com.yizhuan.xchat_android_core.gift.GiftModel -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo -import com.yizhuan.xchat_android_core.initial.InitialModel -import com.yizhuan.xchat_android_core.pay.PayModel -import com.yizhuan.xchat_android_core.user.UserModel -import com.yizhuan.xchat_android_core.user.bean.SearchUserInfo +import com.pikolive.core.DemoCache +import com.pikolive.core.gift.GiftModel +import com.pikolive.core.gift.bean.GiftInfo +import com.pikolive.core.initial.InitialModel +import com.pikolive.core.pay.PayModel +import com.pikolive.core.user.UserModel +import com.pikolive.core.user.bean.SearchUserInfo import com.pikolive.library.utils.ResUtil class GiveGoldToUserActivity : BaseViewBindingActivity(), diff --git a/app/src/main/java/com/pikolive/app/pay/adapter/ChargeAdapter.java b/app/src/main/java/com/pikolive/app/pay/adapter/ChargeAdapter.java index 55e550df1..e1285aa51 100644 --- a/app/src/main/java/com/pikolive/app/pay/adapter/ChargeAdapter.java +++ b/app/src/main/java/com/pikolive/app/pay/adapter/ChargeAdapter.java @@ -5,7 +5,7 @@ import android.text.TextUtils; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.pay.bean.ChargeBean; +import com.pikolive.core.pay.bean.ChargeBean; /** diff --git a/app/src/main/java/com/pikolive/app/pay/adapter/GiveDiamondDetailAdapter.kt b/app/src/main/java/com/pikolive/app/pay/adapter/GiveDiamondDetailAdapter.kt index 6ca8c3f53..e23dd3417 100644 --- a/app/src/main/java/com/pikolive/app/pay/adapter/GiveDiamondDetailAdapter.kt +++ b/app/src/main/java/com/pikolive/app/pay/adapter/GiveDiamondDetailAdapter.kt @@ -5,7 +5,7 @@ import android.widget.TextView import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder import com.yizhuan.erban.R -import com.yizhuan.xchat_android_core.user.bean.DiamondGiveHistoryInfo +import com.pikolive.core.user.bean.DiamondGiveHistoryInfo import com.pikolive.library.utils.TimeUtils diff --git a/app/src/main/java/com/pikolive/app/pay/adapter/GiveGiftAdapter.java b/app/src/main/java/com/pikolive/app/pay/adapter/GiveGiftAdapter.java index 45d1d9544..7e7cbf1db 100644 --- a/app/src/main/java/com/pikolive/app/pay/adapter/GiveGiftAdapter.java +++ b/app/src/main/java/com/pikolive/app/pay/adapter/GiveGiftAdapter.java @@ -7,7 +7,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; import com.yizhuan.erban.R; import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo; +import com.pikolive.core.gift.bean.GiftInfo; /** * 赠送礼物 diff --git a/app/src/main/java/com/pikolive/app/pay/adapter/GiveGiftDetailAdapter.kt b/app/src/main/java/com/pikolive/app/pay/adapter/GiveGiftDetailAdapter.kt index f08d6914f..9fab15798 100644 --- a/app/src/main/java/com/pikolive/app/pay/adapter/GiveGiftDetailAdapter.kt +++ b/app/src/main/java/com/pikolive/app/pay/adapter/GiveGiftDetailAdapter.kt @@ -6,7 +6,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder import com.yizhuan.erban.R import com.pikolive.app.ui.utils.ImageLoadUtils -import com.yizhuan.xchat_android_core.user.bean.DiamondGiveHistoryInfo +import com.pikolive.core.user.bean.DiamondGiveHistoryInfo import com.pikolive.library.utils.TimeUtils diff --git a/app/src/main/java/com/pikolive/app/pay/adapter/GiveSearchAdapter.kt b/app/src/main/java/com/pikolive/app/pay/adapter/GiveSearchAdapter.kt index 57059d5b6..ab0849547 100644 --- a/app/src/main/java/com/pikolive/app/pay/adapter/GiveSearchAdapter.kt +++ b/app/src/main/java/com/pikolive/app/pay/adapter/GiveSearchAdapter.kt @@ -6,7 +6,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder import com.yizhuan.erban.R import com.pikolive.app.ui.utils.ImageLoadUtils -import com.yizhuan.xchat_android_core.room.bean.SearchRoomInfo +import com.pikolive.core.room.bean.SearchRoomInfo class GiveSearchAdapter : diff --git a/app/src/main/java/com/pikolive/app/pay/adapter/LatelyGiveAdapter.kt b/app/src/main/java/com/pikolive/app/pay/adapter/LatelyGiveAdapter.kt index c5e7242f6..2908130e7 100644 --- a/app/src/main/java/com/pikolive/app/pay/adapter/LatelyGiveAdapter.kt +++ b/app/src/main/java/com/pikolive/app/pay/adapter/LatelyGiveAdapter.kt @@ -6,7 +6,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder import com.yizhuan.erban.R import com.pikolive.app.ui.utils.ImageLoadUtils -import com.yizhuan.xchat_android_core.user.bean.DiamondGiveHistoryInfo +import com.pikolive.core.user.bean.DiamondGiveHistoryInfo class LatelyGiveAdapter : diff --git a/app/src/main/java/com/pikolive/app/pay/fragment/GiveDiamondFragment.kt b/app/src/main/java/com/pikolive/app/pay/fragment/GiveDiamondFragment.kt index 6b532334d..666c069c6 100644 --- a/app/src/main/java/com/pikolive/app/pay/fragment/GiveDiamondFragment.kt +++ b/app/src/main/java/com/pikolive/app/pay/fragment/GiveDiamondFragment.kt @@ -11,7 +11,7 @@ import com.yizhuan.erban.databinding.FragmentGiveDiamondBinding import com.pikolive.app.pay.GiveGoldModel import com.pikolive.app.pay.adapter.GiveDiamondDetailAdapter import com.pikolive.app.ui.utils.RVDelegate -import com.yizhuan.xchat_android_core.user.bean.DiamondGiveHistoryInfo +import com.pikolive.core.user.bean.DiamondGiveHistoryInfo import com.pikolive.library.utils.ResUtil class GiveDiamondFragment : BaseViewBindingFragment() { diff --git a/app/src/main/java/com/pikolive/app/pay/fragment/GiveGiftFragment.kt b/app/src/main/java/com/pikolive/app/pay/fragment/GiveGiftFragment.kt index 7d9fd882b..6dc331612 100644 --- a/app/src/main/java/com/pikolive/app/pay/fragment/GiveGiftFragment.kt +++ b/app/src/main/java/com/pikolive/app/pay/fragment/GiveGiftFragment.kt @@ -11,7 +11,7 @@ import com.yizhuan.erban.databinding.FragmentGiveGiftBinding import com.pikolive.app.pay.GiveGoldModel import com.pikolive.app.pay.adapter.GiveGiftDetailAdapter import com.pikolive.app.ui.utils.RVDelegate -import com.yizhuan.xchat_android_core.user.bean.DiamondGiveHistoryInfo +import com.pikolive.core.user.bean.DiamondGiveHistoryInfo import com.pikolive.library.utils.ResUtil class GiveGiftFragment : BaseViewBindingFragment() { diff --git a/app/src/main/java/com/pikolive/app/pay/presenter/ChargePresenter.java b/app/src/main/java/com/pikolive/app/pay/presenter/ChargePresenter.java index 70963357b..5c3b20927 100644 --- a/app/src/main/java/com/pikolive/app/pay/presenter/ChargePresenter.java +++ b/app/src/main/java/com/pikolive/app/pay/presenter/ChargePresenter.java @@ -4,7 +4,7 @@ import android.annotation.SuppressLint; import com.hjq.toast.ToastUtils; import com.pikolive.app.pay.view.IChargeView; -import com.yizhuan.xchat_android_core.pay.PayModel; +import com.pikolive.core.pay.PayModel; import com.pikolive.library.base.PresenterEvent; import com.pikolive.library.utils.ListUtils; diff --git a/app/src/main/java/com/pikolive/app/pay/presenter/PayPresenter.java b/app/src/main/java/com/pikolive/app/pay/presenter/PayPresenter.java index 109b5e533..f31ab0d25 100644 --- a/app/src/main/java/com/pikolive/app/pay/presenter/PayPresenter.java +++ b/app/src/main/java/com/pikolive/app/pay/presenter/PayPresenter.java @@ -4,8 +4,8 @@ import android.annotation.SuppressLint; import com.pikolive.app.pay.view.IPayView; import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.pay.PayModel; -import com.yizhuan.xchat_android_core.pay.bean.WalletInfo; +import com.pikolive.core.pay.PayModel; +import com.pikolive.core.pay.bean.WalletInfo; import com.pikolive.library.base.factory.AbstractMvpPresenter; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/main/java/com/pikolive/app/pay/view/IChargeView.java b/app/src/main/java/com/pikolive/app/pay/view/IChargeView.java index a6a262553..6875e583e 100644 --- a/app/src/main/java/com/pikolive/app/pay/view/IChargeView.java +++ b/app/src/main/java/com/pikolive/app/pay/view/IChargeView.java @@ -1,7 +1,7 @@ package com.pikolive.app.pay.view; -import com.yizhuan.xchat_android_core.pay.bean.Banner; +import com.pikolive.core.pay.bean.Banner; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/pay/view/IPayView.java b/app/src/main/java/com/pikolive/app/pay/view/IPayView.java index 91de017cf..0fa5f7f00 100644 --- a/app/src/main/java/com/pikolive/app/pay/view/IPayView.java +++ b/app/src/main/java/com/pikolive/app/pay/view/IPayView.java @@ -1,7 +1,7 @@ package com.pikolive.app.pay.view; -import com.yizhuan.xchat_android_core.pay.bean.WalletInfo; +import com.pikolive.core.pay.bean.WalletInfo; import com.pikolive.library.base.IMvpBaseView; /** diff --git a/app/src/main/java/com/pikolive/app/radish/activity/RadishRecordActivity.java b/app/src/main/java/com/pikolive/app/radish/activity/RadishRecordActivity.java index bcef35183..54692ce2b 100644 --- a/app/src/main/java/com/pikolive/app/radish/activity/RadishRecordActivity.java +++ b/app/src/main/java/com/pikolive/app/radish/activity/RadishRecordActivity.java @@ -25,8 +25,8 @@ import com.pikolive.app.ui.webview.CommonWebViewActivity; import com.pikolive.app.ui.widget.magicindicator.MagicIndicator; import com.pikolive.app.ui.widget.magicindicator.ViewPagerHelper; import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.radish.RadishWalletInfo; +import com.pikolive.core2.UriProvider; +import com.pikolive.core.radish.RadishWalletInfo; import com.pikolive.library.base.factory.CreatePresenter; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/main/java/com/pikolive/app/radish/adapter/RadishRecordAdapter.java b/app/src/main/java/com/pikolive/app/radish/adapter/RadishRecordAdapter.java index dd972d5c0..e13f79edf 100644 --- a/app/src/main/java/com/pikolive/app/radish/adapter/RadishRecordAdapter.java +++ b/app/src/main/java/com/pikolive/app/radish/adapter/RadishRecordAdapter.java @@ -7,8 +7,8 @@ import androidx.core.content.ContextCompat; import com.chad.library.adapter.base.BaseViewHolder; import com.yizhuan.erban.R; import com.pikolive.app.bills.adapter.BillBaseAdapter; -import com.yizhuan.xchat_android_core.bills.bean.BillItemEntity; -import com.yizhuan.xchat_android_core.bills.bean.RadishRecordInfo; +import com.pikolive.core.bills.bean.BillItemEntity; +import com.pikolive.core.bills.bean.RadishRecordInfo; import com.pikolive.library.utils.TimeUtils; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/radish/helper/PrizeAnimUiHelper.java b/app/src/main/java/com/pikolive/app/radish/helper/PrizeAnimUiHelper.java index b643b0567..75db430d6 100644 --- a/app/src/main/java/com/pikolive/app/radish/helper/PrizeAnimUiHelper.java +++ b/app/src/main/java/com/pikolive/app/radish/helper/PrizeAnimUiHelper.java @@ -15,11 +15,11 @@ import com.yizhuan.erban.R; import com.pikolive.app.common.widget.dialog.DialogManager; import com.pikolive.app.ui.utils.ImageLoadUtils; import com.pikolive.app.ui.widget.ShareDialog; -import com.yizhuan.xchat_android_core.radish.signin.SignInModel; -import com.yizhuan.xchat_android_core.radish.task.bean.PrizeAnim; -import com.yizhuan.xchat_android_core.share.ShareModel; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.radish.signin.SignInModel; +import com.pikolive.core.radish.task.bean.PrizeAnim; +import com.pikolive.core.share.ShareModel; +import com.pikolive.core.utils.net.BeanObserver; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.utils.ResUtil; import com.pikolive.library.utils.SingleToastUtil; diff --git a/app/src/main/java/com/pikolive/app/radish/presenter/RadishRecordFrgPresenter.java b/app/src/main/java/com/pikolive/app/radish/presenter/RadishRecordFrgPresenter.java index 03a0a9340..b7fc6e8e7 100644 --- a/app/src/main/java/com/pikolive/app/radish/presenter/RadishRecordFrgPresenter.java +++ b/app/src/main/java/com/pikolive/app/radish/presenter/RadishRecordFrgPresenter.java @@ -2,8 +2,8 @@ package com.pikolive.app.radish.presenter; import com.pikolive.app.base.BaseMvpPresenter; import com.pikolive.app.radish.view.IRadishRecordFrgView; -import com.yizhuan.xchat_android_core.radish.RadishModel; -import com.yizhuan.xchat_android_core.radish.RadishRecordResult; +import com.pikolive.core.radish.RadishModel; +import com.pikolive.core.radish.RadishRecordResult; import io.reactivex.SingleObserver; import io.reactivex.disposables.Disposable; diff --git a/app/src/main/java/com/pikolive/app/radish/presenter/RadishRecordPresenter.java b/app/src/main/java/com/pikolive/app/radish/presenter/RadishRecordPresenter.java index 5810917f3..26acbfb9a 100644 --- a/app/src/main/java/com/pikolive/app/radish/presenter/RadishRecordPresenter.java +++ b/app/src/main/java/com/pikolive/app/radish/presenter/RadishRecordPresenter.java @@ -2,7 +2,7 @@ package com.pikolive.app.radish.presenter; import com.pikolive.app.base.BaseMvpPresenter; import com.pikolive.app.radish.view.IRadishRecordView; -import com.yizhuan.xchat_android_core.radish.RadishModel; +import com.pikolive.core.radish.RadishModel; import java.math.RoundingMode; import java.text.DecimalFormat; diff --git a/app/src/main/java/com/pikolive/app/radish/signin/SignDialogTimeManager.java b/app/src/main/java/com/pikolive/app/radish/signin/SignDialogTimeManager.java index 2e86b8f7f..c8adc07e3 100644 --- a/app/src/main/java/com/pikolive/app/radish/signin/SignDialogTimeManager.java +++ b/app/src/main/java/com/pikolive/app/radish/signin/SignDialogTimeManager.java @@ -9,13 +9,13 @@ import com.pikolive.app.guide.GuideActivity; import com.pikolive.app.other.activity.SplashActivity; import com.pikolive.app.radish.signin.view.SignInDialog; import com.pikolive.app.ui.login.AddUserInfoActivity; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.radish.signin.SignInModel; -import com.yizhuan.xchat_android_core.radish.signin.bean.SignDetailInfo; -import com.yizhuan.xchat_android_core.utils.ActivityUtil; -import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.radish.signin.SignInModel; +import com.pikolive.core.radish.signin.bean.SignDetailInfo; +import com.pikolive.core.utils.ActivityUtil; +import com.pikolive.core.utils.SharedPreferenceUtils; +import com.pikolive.core.utils.net.BeanObserver; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.utils.UIUtils; import java.util.Calendar; diff --git a/app/src/main/java/com/pikolive/app/radish/signin/SignInActivity.java b/app/src/main/java/com/pikolive/app/radish/signin/SignInActivity.java index b50227220..02afc1ac3 100644 --- a/app/src/main/java/com/pikolive/app/radish/signin/SignInActivity.java +++ b/app/src/main/java/com/pikolive/app/radish/signin/SignInActivity.java @@ -36,21 +36,21 @@ import com.pikolive.app.ui.widget.marqueeview.BetterMarqueeView; import com.pikolive.app.utils.CertificateHelper; import com.pikolive.app.utils.NumberFormatUtil; import com.pikolive.app.utils.SpannableBuilder; -import com.yizhuan.xchat_android_core.radish.signin.SignInModel; -import com.yizhuan.xchat_android_core.radish.signin.bean.DrawNoticeInfo; -import com.yizhuan.xchat_android_core.radish.signin.bean.ReceiveTotalRewardInfo; -import com.yizhuan.xchat_android_core.radish.signin.bean.ReplenishSignInfo; -import com.yizhuan.xchat_android_core.radish.signin.bean.RewardNoticeInfo; -import com.yizhuan.xchat_android_core.radish.signin.bean.RsPlatformType; -import com.yizhuan.xchat_android_core.radish.signin.bean.SignDetailInfo; -import com.yizhuan.xchat_android_core.radish.signin.bean.SignDrawInfo; -import com.yizhuan.xchat_android_core.radish.signin.bean.SignInfo; -import com.yizhuan.xchat_android_core.radish.task.bean.PrizeAnim; -import com.yizhuan.xchat_android_core.share.ShareModel; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; -import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; -import com.yizhuan.xchat_android_core.utils.net.RadishNotEnoughException; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.radish.signin.SignInModel; +import com.pikolive.core.radish.signin.bean.DrawNoticeInfo; +import com.pikolive.core.radish.signin.bean.ReceiveTotalRewardInfo; +import com.pikolive.core.radish.signin.bean.ReplenishSignInfo; +import com.pikolive.core.radish.signin.bean.RewardNoticeInfo; +import com.pikolive.core.radish.signin.bean.RsPlatformType; +import com.pikolive.core.radish.signin.bean.SignDetailInfo; +import com.pikolive.core.radish.signin.bean.SignDrawInfo; +import com.pikolive.core.radish.signin.bean.SignInfo; +import com.pikolive.core.radish.task.bean.PrizeAnim; +import com.pikolive.core.share.ShareModel; +import com.pikolive.core.utils.net.BeanObserver; +import com.pikolive.core.utils.net.DontWarnObserver; +import com.pikolive.core.utils.net.RadishNotEnoughException; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.base.factory.CreatePresenter; import com.pikolive.library.utils.ListUtils; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/main/java/com/pikolive/app/radish/signin/adpter/RewardListAdapter.java b/app/src/main/java/com/pikolive/app/radish/signin/adpter/RewardListAdapter.java index a9eaad052..417d9d0a4 100644 --- a/app/src/main/java/com/pikolive/app/radish/signin/adpter/RewardListAdapter.java +++ b/app/src/main/java/com/pikolive/app/radish/signin/adpter/RewardListAdapter.java @@ -11,7 +11,7 @@ import com.chad.library.adapter.base.BaseViewHolder; import com.yizhuan.erban.R; import com.pikolive.app.ui.utils.ImageLoadUtils; import com.pikolive.app.ui.widget.RedPointView; -import com.yizhuan.xchat_android_core.radish.signin.bean.RewardNoticeInfo; +import com.pikolive.core.radish.signin.bean.RewardNoticeInfo; import com.pikolive.library.utils.ResUtil; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/radish/signin/adpter/RewardTotalNoticeAdapter.java b/app/src/main/java/com/pikolive/app/radish/signin/adpter/RewardTotalNoticeAdapter.java index b23132291..16cc59fbb 100644 --- a/app/src/main/java/com/pikolive/app/radish/signin/adpter/RewardTotalNoticeAdapter.java +++ b/app/src/main/java/com/pikolive/app/radish/signin/adpter/RewardTotalNoticeAdapter.java @@ -9,8 +9,8 @@ import androidx.core.content.ContextCompat; import com.coorchice.library.SuperTextView; import com.yizhuan.erban.R; import com.pikolive.app.radish.signin.view.RewardProgressView; -import com.yizhuan.xchat_android_core.radish.signin.bean.RewardNoticeInfo; -import com.yizhuan.xchat_android_core.radish.signin.bean.SignDetailInfo; +import com.pikolive.core.radish.signin.bean.RewardNoticeInfo; +import com.pikolive.core.radish.signin.bean.SignDetailInfo; import com.pikolive.library.utils.ResUtil; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/radish/signin/presenter/SignInPresenter.java b/app/src/main/java/com/pikolive/app/radish/signin/presenter/SignInPresenter.java index f4aeb0a59..d3c9f1201 100644 --- a/app/src/main/java/com/pikolive/app/radish/signin/presenter/SignInPresenter.java +++ b/app/src/main/java/com/pikolive/app/radish/signin/presenter/SignInPresenter.java @@ -2,15 +2,15 @@ package com.pikolive.app.radish.signin.presenter; import com.pikolive.app.base.BaseMvpPresenter; import com.pikolive.app.radish.signin.view.ISignInView; -import com.yizhuan.xchat_android_core.radish.signin.ISignInModel; -import com.yizhuan.xchat_android_core.radish.signin.SignInModel; -import com.yizhuan.xchat_android_core.radish.signin.bean.DrawNoticeInfo; -import com.yizhuan.xchat_android_core.radish.signin.bean.ReceiveTotalRewardInfo; -import com.yizhuan.xchat_android_core.radish.signin.bean.RewardNoticeInfo; -import com.yizhuan.xchat_android_core.radish.signin.bean.SignDetailInfo; -import com.yizhuan.xchat_android_core.radish.signin.bean.SignDrawInfo; -import com.yizhuan.xchat_android_core.radish.signin.bean.SignInfo; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; +import com.pikolive.core.radish.signin.ISignInModel; +import com.pikolive.core.radish.signin.SignInModel; +import com.pikolive.core.radish.signin.bean.DrawNoticeInfo; +import com.pikolive.core.radish.signin.bean.ReceiveTotalRewardInfo; +import com.pikolive.core.radish.signin.bean.RewardNoticeInfo; +import com.pikolive.core.radish.signin.bean.SignDetailInfo; +import com.pikolive.core.radish.signin.bean.SignDrawInfo; +import com.pikolive.core.radish.signin.bean.SignInfo; +import com.pikolive.core.utils.net.BeanObserver; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/radish/signin/view/CarveUpGoldAdapter.java b/app/src/main/java/com/pikolive/app/radish/signin/view/CarveUpGoldAdapter.java index 8ab3d905e..581e41d8e 100644 --- a/app/src/main/java/com/pikolive/app/radish/signin/view/CarveUpGoldAdapter.java +++ b/app/src/main/java/com/pikolive/app/radish/signin/view/CarveUpGoldAdapter.java @@ -12,7 +12,7 @@ import androidx.core.content.ContextCompat; import com.yizhuan.erban.R; import com.pikolive.app.ui.widget.marqueeview.BetterMarqueeView; -import com.yizhuan.xchat_android_core.radish.signin.bean.DrawNoticeInfo; +import com.pikolive.core.radish.signin.bean.DrawNoticeInfo; import com.pikolive.library.utils.ResUtil; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/radish/signin/view/ISignInView.java b/app/src/main/java/com/pikolive/app/radish/signin/view/ISignInView.java index dc9df01b4..ce315aa0f 100644 --- a/app/src/main/java/com/pikolive/app/radish/signin/view/ISignInView.java +++ b/app/src/main/java/com/pikolive/app/radish/signin/view/ISignInView.java @@ -1,10 +1,10 @@ package com.pikolive.app.radish.signin.view; -import com.yizhuan.xchat_android_core.radish.signin.bean.DrawNoticeInfo; -import com.yizhuan.xchat_android_core.radish.signin.bean.ReceiveTotalRewardInfo; -import com.yizhuan.xchat_android_core.radish.signin.bean.RewardNoticeInfo; -import com.yizhuan.xchat_android_core.radish.signin.bean.SignDetailInfo; -import com.yizhuan.xchat_android_core.radish.signin.bean.SignDrawInfo; +import com.pikolive.core.radish.signin.bean.DrawNoticeInfo; +import com.pikolive.core.radish.signin.bean.ReceiveTotalRewardInfo; +import com.pikolive.core.radish.signin.bean.RewardNoticeInfo; +import com.pikolive.core.radish.signin.bean.SignDetailInfo; +import com.pikolive.core.radish.signin.bean.SignDrawInfo; import com.pikolive.library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/radish/signin/view/RuleDialog.java b/app/src/main/java/com/pikolive/app/radish/signin/view/RuleDialog.java index 3087b81e4..8477f9206 100644 --- a/app/src/main/java/com/pikolive/app/radish/signin/view/RuleDialog.java +++ b/app/src/main/java/com/pikolive/app/radish/signin/view/RuleDialog.java @@ -8,7 +8,7 @@ import android.webkit.WebViewClient; import com.yizhuan.erban.R; import com.yizhuan.erban.databinding.DialogRuleBinding; import com.yizhuan.erban.treasure_box.widget.dialog.BaseBindingDialog; -import com.yizhuan.xchat_android_core.UriProvider; +import com.pikolive.core2.UriProvider; import com.pikolive.library.annatation.ActLayoutRes; @ActLayoutRes(R.layout.dialog_rule) diff --git a/app/src/main/java/com/pikolive/app/radish/signin/view/SignInDialog.java b/app/src/main/java/com/pikolive/app/radish/signin/view/SignInDialog.java index 9020488d6..a16a0be5b 100644 --- a/app/src/main/java/com/pikolive/app/radish/signin/view/SignInDialog.java +++ b/app/src/main/java/com/pikolive/app/radish/signin/view/SignInDialog.java @@ -17,12 +17,12 @@ import androidx.appcompat.app.AppCompatDialog; import com.yizhuan.erban.R; import com.pikolive.app.radish.signin.SignInActivity; import com.pikolive.app.utils.NumberFormatUtil; -import com.yizhuan.xchat_android_core.radish.signin.ISignInModel; -import com.yizhuan.xchat_android_core.radish.signin.SignInModel; -import com.yizhuan.xchat_android_core.radish.signin.bean.SignDetailInfo; -import com.yizhuan.xchat_android_core.radish.signin.bean.SignInfo; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.radish.signin.ISignInModel; +import com.pikolive.core.radish.signin.SignInModel; +import com.pikolive.core.radish.signin.bean.SignDetailInfo; +import com.pikolive.core.radish.signin.bean.SignInfo; +import com.pikolive.core.utils.net.BeanObserver; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.utils.ResUtil; import com.pikolive.library.utils.SingleToastUtil; import com.yy.mobile.rollingtextview.CharOrder; diff --git a/app/src/main/java/com/pikolive/app/radish/task/activity/TaskCenterActivity.java b/app/src/main/java/com/pikolive/app/radish/task/activity/TaskCenterActivity.java index fa03a6f14..44b5e18dc 100644 --- a/app/src/main/java/com/pikolive/app/radish/task/activity/TaskCenterActivity.java +++ b/app/src/main/java/com/pikolive/app/radish/task/activity/TaskCenterActivity.java @@ -22,9 +22,9 @@ import com.pikolive.app.radish.widget.TaskCenterNavAdapter; import com.pikolive.app.ui.widget.magicindicator.MagicIndicator; import com.pikolive.app.ui.widget.magicindicator.ViewPagerHelper; import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; -import com.yizhuan.xchat_android_core.radish.task.bean.PrizeAnim; -import com.yizhuan.xchat_android_core.radish.task.bean.TaskInfo; -import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; +import com.pikolive.core.radish.task.bean.PrizeAnim; +import com.pikolive.core.radish.task.bean.TaskInfo; +import com.pikolive.core.utils.SharedPreferenceUtils; import com.pikolive.library.base.factory.CreatePresenter; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/main/java/com/pikolive/app/radish/task/adpter/TaskCenterAdapter.java b/app/src/main/java/com/pikolive/app/radish/task/adpter/TaskCenterAdapter.java index fee6fbbd3..9cb2ab399 100644 --- a/app/src/main/java/com/pikolive/app/radish/task/adpter/TaskCenterAdapter.java +++ b/app/src/main/java/com/pikolive/app/radish/task/adpter/TaskCenterAdapter.java @@ -10,7 +10,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; import com.yizhuan.erban.R; import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.radish.task.bean.TaskInfo; +import com.pikolive.core.radish.task.bean.TaskInfo; /** * create by lvzebiao @2019/3/26 diff --git a/app/src/main/java/com/pikolive/app/radish/task/fragment/TaskCenterFragment.java b/app/src/main/java/com/pikolive/app/radish/task/fragment/TaskCenterFragment.java index a289a2e57..0f098574c 100644 --- a/app/src/main/java/com/pikolive/app/radish/task/fragment/TaskCenterFragment.java +++ b/app/src/main/java/com/pikolive/app/radish/task/fragment/TaskCenterFragment.java @@ -20,12 +20,12 @@ import com.pikolive.app.radish.task.view.ITaskCenterViewFrg; import com.pikolive.app.ui.im.RouterHandler; import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil; import com.pikolive.app.ui.widget.recyclerview.decoration.HorizontalDecoration; -import com.yizhuan.xchat_android_constants.XChatConstants; -import com.yizhuan.xchat_android_core.radish.task.ITaskModel; -import com.yizhuan.xchat_android_core.radish.task.TaskModel; -import com.yizhuan.xchat_android_core.radish.task.bean.TaskInfo; -import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core2.XChatConstants; +import com.pikolive.core.radish.task.ITaskModel; +import com.pikolive.core.radish.task.TaskModel; +import com.pikolive.core.radish.task.bean.TaskInfo; +import com.pikolive.core.utils.net.DontWarnObserver; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.base.factory.CreatePresenter; import com.pikolive.library.utils.SingleToastUtil; diff --git a/app/src/main/java/com/pikolive/app/radish/task/view/ITaskCenterView.java b/app/src/main/java/com/pikolive/app/radish/task/view/ITaskCenterView.java index 0d3058d33..489132667 100644 --- a/app/src/main/java/com/pikolive/app/radish/task/view/ITaskCenterView.java +++ b/app/src/main/java/com/pikolive/app/radish/task/view/ITaskCenterView.java @@ -1,6 +1,6 @@ package com.pikolive.app.radish.task.view; -import com.yizhuan.xchat_android_core.radish.task.bean.TaskInfo; +import com.pikolive.core.radish.task.bean.TaskInfo; import com.pikolive.library.base.IMvpBaseView; /** diff --git a/app/src/main/java/com/pikolive/app/radish/view/IRadishRecordFrgView.java b/app/src/main/java/com/pikolive/app/radish/view/IRadishRecordFrgView.java index 99b246e15..ec58ae5a7 100644 --- a/app/src/main/java/com/pikolive/app/radish/view/IRadishRecordFrgView.java +++ b/app/src/main/java/com/pikolive/app/radish/view/IRadishRecordFrgView.java @@ -1,6 +1,6 @@ package com.pikolive.app.radish.view; -import com.yizhuan.xchat_android_core.bills.bean.RadishRecordListInfo; +import com.pikolive.core.bills.bean.RadishRecordListInfo; import com.pikolive.library.base.IMvpBaseView; public interface IRadishRecordFrgView extends IMvpBaseView { diff --git a/app/src/main/java/com/pikolive/app/radish/wallet/RadishWalletManager.java b/app/src/main/java/com/pikolive/app/radish/wallet/RadishWalletManager.java index ce33de364..2eb95a313 100644 --- a/app/src/main/java/com/pikolive/app/radish/wallet/RadishWalletManager.java +++ b/app/src/main/java/com/pikolive/app/radish/wallet/RadishWalletManager.java @@ -4,9 +4,9 @@ import androidx.lifecycle.LifecycleOwner; import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.Observer; -import com.yizhuan.xchat_android_core.radish.RadishModel; -import com.yizhuan.xchat_android_core.radish.RadishWalletInfo; -import com.yizhuan.xchat_android_core.radish.event.RadishWalletInfoUpdateEvent; +import com.pikolive.core.radish.RadishModel; +import com.pikolive.core.radish.RadishWalletInfo; +import com.pikolive.core.radish.event.RadishWalletInfoUpdateEvent; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/com/pikolive/app/reciever/IncomingCallReceiver.java b/app/src/main/java/com/pikolive/app/reciever/IncomingCallReceiver.java index f91810456..213c80076 100644 --- a/app/src/main/java/com/pikolive/app/reciever/IncomingCallReceiver.java +++ b/app/src/main/java/com/pikolive/app/reciever/IncomingCallReceiver.java @@ -1,11 +1,11 @@ -package com.yizhuan.erban.reciever; +package com.pikolive.app.reciever; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.telephony.TelephonyManager; -import com.yizhuan.xchat_android_core.im.state.PhoneCallStateModel; +import com.pikolive.core.im.state.PhoneCallStateModel; /** * Created by zhouxiangfeng on 2017/5/31. diff --git a/app/src/main/java/com/pikolive/app/reciever/NotificationClickReceiver.java b/app/src/main/java/com/pikolive/app/reciever/NotificationClickReceiver.java index 4f942a48d..c0f0f0935 100644 --- a/app/src/main/java/com/pikolive/app/reciever/NotificationClickReceiver.java +++ b/app/src/main/java/com/pikolive/app/reciever/NotificationClickReceiver.java @@ -1,12 +1,12 @@ -package com.yizhuan.erban.reciever; +package com.pikolive.app.reciever; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import com.pikolive.app.avroom.activity.AVRoomActivity; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core.room.bean.RoomInfo; /** * Created by chenran on 2017/11/16. diff --git a/app/src/main/java/com/pikolive/app/reciever/OnePixelReceiver.java b/app/src/main/java/com/pikolive/app/reciever/OnePixelReceiver.java index 04c942903..1302c5591 100644 --- a/app/src/main/java/com/pikolive/app/reciever/OnePixelReceiver.java +++ b/app/src/main/java/com/pikolive/app/reciever/OnePixelReceiver.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.reciever; +package com.pikolive.app.reciever; import android.content.BroadcastReceiver; import android.content.Context; diff --git a/app/src/main/java/com/pikolive/app/relation/cp/CpDataManager.java b/app/src/main/java/com/pikolive/app/relation/cp/CpDataManager.java index 748403554..ba2b12009 100644 --- a/app/src/main/java/com/pikolive/app/relation/cp/CpDataManager.java +++ b/app/src/main/java/com/pikolive/app/relation/cp/CpDataManager.java @@ -1,7 +1,7 @@ -package com.yizhuan.erban.relation.cp; +package com.pikolive.app.relation.cp; -import com.yizhuan.xchat_android_core.relation.cp.CpInviteInfo; +import com.pikolive.core.relation.cp.CpInviteInfo; public class CpDataManager { diff --git a/app/src/main/java/com/pikolive/app/relation/cp/CpDataParser.kt b/app/src/main/java/com/pikolive/app/relation/cp/CpDataParser.kt index d7db16851..3ab5d22e5 100644 --- a/app/src/main/java/com/pikolive/app/relation/cp/CpDataParser.kt +++ b/app/src/main/java/com/pikolive/app/relation/cp/CpDataParser.kt @@ -1,7 +1,7 @@ -package com.yizhuan.erban.relation.cp +package com.pikolive.app.relation.cp -import com.yizhuan.xchat_android_core.relation.cp.CpInviteDetailEntity -import com.yizhuan.xchat_android_core.relation.cp.CpInviteInfo +import com.pikolive.core.relation.cp.CpInviteDetailEntity +import com.pikolive.core.relation.cp.CpInviteInfo object CpDataParser { fun inviteMsg2cpDetailEntity(msgEntity: CpInviteInfo) = CpInviteDetailEntity( diff --git a/app/src/main/java/com/pikolive/app/relation/cp/CpViewHelper.kt b/app/src/main/java/com/pikolive/app/relation/cp/CpViewHelper.kt index 85bdf51de..f773fe6de 100644 --- a/app/src/main/java/com/pikolive/app/relation/cp/CpViewHelper.kt +++ b/app/src/main/java/com/pikolive/app/relation/cp/CpViewHelper.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.relation.cp +package com.pikolive.app.relation.cp import android.content.Context import android.graphics.Color diff --git a/app/src/main/java/com/pikolive/app/relation/cp/activity/CpHomeActivity.kt b/app/src/main/java/com/pikolive/app/relation/cp/activity/CpHomeActivity.kt index 97b110800..f4d08af5d 100644 --- a/app/src/main/java/com/pikolive/app/relation/cp/activity/CpHomeActivity.kt +++ b/app/src/main/java/com/pikolive/app/relation/cp/activity/CpHomeActivity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.relation.cp.activity +package com.pikolive.app.relation.cp.activity import android.content.Context import android.content.Intent @@ -9,13 +9,13 @@ import com.netease.nim.uikit.StatusBarUtil import com.yizhuan.erban.R import com.pikolive.app.base.BaseBindingActivity import com.pikolive.app.base.TitleBar +import com.pikolive.app.relation.cp.viewmodel.CpViewModel +import com.pikolive.app.relation.cp.widget.RelationCpCardView.Companion.PAGE_TYPE_SELF_CP import com.yizhuan.erban.databinding.ActivityCpHomeBinding -import com.yizhuan.erban.relation.cp.viewmodel.CpViewModel -import com.yizhuan.erban.relation.cp.widget.RelationCpCardView.Companion.PAGE_TYPE_SELF_CP import com.pikolive.app.ui.relation.FansListActivity import com.pikolive.app.ui.user.activity.UserInfoActivity -import com.yizhuan.xchat_android_core.auth.AuthModel -import com.yizhuan.xchat_android_core.relation.cp.CpBindUnbindEvent +import com.pikolive.core.auth.AuthModel +import com.pikolive.core.relation.cp.CpBindUnbindEvent import com.pikolive.library.annatation.ActLayoutRes import com.pikolive.library.utils.ResUtil import org.greenrobot.eventbus.EventBus diff --git a/app/src/main/java/com/pikolive/app/relation/cp/activity/CpInviteRecordActivity.kt b/app/src/main/java/com/pikolive/app/relation/cp/activity/CpInviteRecordActivity.kt index 2337d3fe4..52ff43cc1 100644 --- a/app/src/main/java/com/pikolive/app/relation/cp/activity/CpInviteRecordActivity.kt +++ b/app/src/main/java/com/pikolive/app/relation/cp/activity/CpInviteRecordActivity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.relation.cp.activity +package com.pikolive.app.relation.cp.activity import android.content.Context import android.content.Intent @@ -10,16 +10,16 @@ import com.yizhuan.erban.R import com.pikolive.app.base.BaseBindingActivity import com.pikolive.app.common.EmptyViewHelper import com.yizhuan.erban.databinding.ActivityCpInviteRecordBinding -import com.yizhuan.erban.relation.cp.CpDataManager -import com.yizhuan.erban.relation.cp.CpViewHelper -import com.yizhuan.erban.relation.cp.adapter.InviteRecordAdapter -import com.yizhuan.erban.relation.cp.dialog.CpInviteReplyConfirmDialog -import com.yizhuan.erban.relation.cp.dialog.CpInviteReplyDialog -import com.yizhuan.erban.relation.cp.viewmodel.CpViewModel +import com.pikolive.app.relation.cp.CpDataManager +import com.pikolive.app.relation.cp.CpViewHelper +import com.pikolive.app.relation.cp.adapter.InviteRecordAdapter +import com.pikolive.app.relation.cp.dialog.CpInviteReplyConfirmDialog +import com.pikolive.app.relation.cp.dialog.CpInviteReplyDialog +import com.pikolive.app.relation.cp.viewmodel.CpViewModel import com.pikolive.app.ui.widget.dialog.CommonTipDialog -import com.yizhuan.xchat_android_core.relation.cp.CpBindUnbindEvent -import com.yizhuan.xchat_android_core.relation.cp.CpInviteDetailEntity -import com.yizhuan.xchat_android_core.relation.cp.UserCpListEntity +import com.pikolive.core.relation.cp.CpBindUnbindEvent +import com.pikolive.core.relation.cp.CpInviteDetailEntity +import com.pikolive.core.relation.cp.UserCpListEntity import com.pikolive.library.annatation.ActLayoutRes import com.pikolive.library.utils.ResUtil import org.greenrobot.eventbus.EventBus diff --git a/app/src/main/java/com/pikolive/app/relation/cp/activity/CpTaskActivity.kt b/app/src/main/java/com/pikolive/app/relation/cp/activity/CpTaskActivity.kt index 621be6bb6..234a113b0 100644 --- a/app/src/main/java/com/pikolive/app/relation/cp/activity/CpTaskActivity.kt +++ b/app/src/main/java/com/pikolive/app/relation/cp/activity/CpTaskActivity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.relation.cp.activity +package com.pikolive.app.relation.cp.activity import android.content.Context import android.content.Intent @@ -10,18 +10,18 @@ import com.netease.nim.uikit.common.util.sys.ScreenUtil import com.yizhuan.erban.R import com.pikolive.app.base.BaseBindingActivity import com.yizhuan.erban.databinding.ActivityCpTaskBinding -import com.yizhuan.erban.relation.cp.adapter.CpTaskIndicatorAdapter -import com.yizhuan.erban.relation.cp.adapter.TaskPagerAdapter -import com.yizhuan.erban.relation.cp.fragment.CpTaskFragment -import com.yizhuan.erban.relation.cp.viewmodel.CpViewModel -import com.yizhuan.erban.relation.cp.widget.CpTaskDescriptionView -import com.yizhuan.erban.relation.extention.visibility +import com.pikolive.app.relation.cp.adapter.CpTaskIndicatorAdapter +import com.pikolive.app.relation.cp.adapter.TaskPagerAdapter +import com.pikolive.app.relation.cp.fragment.CpTaskFragment +import com.pikolive.app.relation.cp.viewmodel.CpViewModel +import com.pikolive.app.relation.cp.widget.CpTaskDescriptionView +import com.pikolive.app.relation.extention.visibility import com.pikolive.app.ui.utils.ImageLoadUtilsV2 import com.pikolive.app.ui.widget.OnPageSelectedListener import com.pikolive.app.ui.widget.magicindicator.ViewPagerHelper import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator -import com.yizhuan.xchat_android_core.auth.AuthModel -import com.yizhuan.xchat_android_core.relation.cp.CpTaskEntity +import com.pikolive.core.auth.AuthModel +import com.pikolive.core.relation.cp.CpTaskEntity import com.pikolive.library.annatation.ActLayoutRes import com.pikolive.library.utils.ResUtil diff --git a/app/src/main/java/com/pikolive/app/relation/cp/adapter/CpTaskAdapter.kt b/app/src/main/java/com/pikolive/app/relation/cp/adapter/CpTaskAdapter.kt index 9f4d0f94c..72250a108 100644 --- a/app/src/main/java/com/pikolive/app/relation/cp/adapter/CpTaskAdapter.kt +++ b/app/src/main/java/com/pikolive/app/relation/cp/adapter/CpTaskAdapter.kt @@ -1,10 +1,10 @@ -package com.yizhuan.erban.relation.cp.adapter +package com.pikolive.app.relation.cp.adapter import android.widget.TextView import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder import com.yizhuan.erban.R -import com.yizhuan.xchat_android_core.relation.cp.Task +import com.pikolive.core.relation.cp.Task import com.pikolive.library.utils.ResUtil class CpTaskAdapter : BaseQuickAdapter(R.layout.item_cp_task) { diff --git a/app/src/main/java/com/pikolive/app/relation/cp/adapter/CpTaskIndicatorAdapter.java b/app/src/main/java/com/pikolive/app/relation/cp/adapter/CpTaskIndicatorAdapter.java index 27ed1018e..28930de03 100644 --- a/app/src/main/java/com/pikolive/app/relation/cp/adapter/CpTaskIndicatorAdapter.java +++ b/app/src/main/java/com/pikolive/app/relation/cp/adapter/CpTaskIndicatorAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.relation.cp.adapter; +package com.pikolive.app.relation.cp.adapter; import android.content.Context; import android.view.LayoutInflater; diff --git a/app/src/main/java/com/pikolive/app/relation/cp/adapter/DeclarationRecommondAdapter.kt b/app/src/main/java/com/pikolive/app/relation/cp/adapter/DeclarationRecommondAdapter.kt index 56221fdd3..b22a796c5 100644 --- a/app/src/main/java/com/pikolive/app/relation/cp/adapter/DeclarationRecommondAdapter.kt +++ b/app/src/main/java/com/pikolive/app/relation/cp/adapter/DeclarationRecommondAdapter.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.relation.cp.adapter +package com.pikolive.app.relation.cp.adapter import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder diff --git a/app/src/main/java/com/pikolive/app/relation/cp/adapter/InviteRecordAdapter.kt b/app/src/main/java/com/pikolive/app/relation/cp/adapter/InviteRecordAdapter.kt index 413cd10f0..d738f25f7 100644 --- a/app/src/main/java/com/pikolive/app/relation/cp/adapter/InviteRecordAdapter.kt +++ b/app/src/main/java/com/pikolive/app/relation/cp/adapter/InviteRecordAdapter.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.relation.cp.adapter +package com.pikolive.app.relation.cp.adapter import android.content.Context import android.widget.ImageView @@ -7,7 +7,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder import com.yizhuan.erban.R import com.pikolive.app.ui.utils.ImageLoadUtilsV2 -import com.yizhuan.xchat_android_core.relation.cp.UserCpListEntity +import com.pikolive.core.relation.cp.UserCpListEntity class InviteRecordAdapter(private val context: Context) : diff --git a/app/src/main/java/com/pikolive/app/relation/cp/adapter/TaskPagerAdapter.kt b/app/src/main/java/com/pikolive/app/relation/cp/adapter/TaskPagerAdapter.kt index 3a77ea3fc..45ca6819f 100644 --- a/app/src/main/java/com/pikolive/app/relation/cp/adapter/TaskPagerAdapter.kt +++ b/app/src/main/java/com/pikolive/app/relation/cp/adapter/TaskPagerAdapter.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.relation.cp.adapter +package com.pikolive.app.relation.cp.adapter import android.annotation.SuppressLint import androidx.fragment.app.FragmentManager diff --git a/app/src/main/java/com/pikolive/app/relation/cp/dialog/CpGlobalDialog.kt b/app/src/main/java/com/pikolive/app/relation/cp/dialog/CpGlobalDialog.kt index cc29a16ca..462e9fb09 100644 --- a/app/src/main/java/com/pikolive/app/relation/cp/dialog/CpGlobalDialog.kt +++ b/app/src/main/java/com/pikolive/app/relation/cp/dialog/CpGlobalDialog.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.relation.cp.dialog +package com.pikolive.app.relation.cp.dialog import android.content.Context import android.view.Gravity @@ -7,11 +7,11 @@ import android.view.WindowManager import com.netease.nim.uikit.common.util.sys.ScreenUtil import com.yizhuan.erban.R import com.yizhuan.erban.databinding.DialogCpGlobalBinding -import com.yizhuan.erban.relation.cp.CpDataManager -import com.yizhuan.erban.relation.cp.activity.CpInviteRecordActivity +import com.pikolive.app.relation.cp.CpDataManager +import com.pikolive.app.relation.cp.activity.CpInviteRecordActivity import com.yizhuan.erban.treasure_box.widget.dialog.BaseBindingDialog import com.pikolive.app.ui.utils.ImageLoadUtilsV2 -import com.yizhuan.xchat_android_core.relation.cp.CpInviteInfo +import com.pikolive.core.relation.cp.CpInviteInfo import com.pikolive.library.annatation.ActLayoutRes import io.reactivex.Observable import io.reactivex.Observer diff --git a/app/src/main/java/com/pikolive/app/relation/cp/dialog/CpInvitePageDialog.kt b/app/src/main/java/com/pikolive/app/relation/cp/dialog/CpInvitePageDialog.kt index 4706976bb..29ae32683 100644 --- a/app/src/main/java/com/pikolive/app/relation/cp/dialog/CpInvitePageDialog.kt +++ b/app/src/main/java/com/pikolive/app/relation/cp/dialog/CpInvitePageDialog.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.relation.cp.dialog +package com.pikolive.app.relation.cp.dialog import android.content.Context import android.graphics.Color @@ -7,12 +7,12 @@ import android.view.View import com.netease.nim.uikit.common.util.sys.ScreenUtil import com.yizhuan.erban.R import com.yizhuan.erban.databinding.DialogCpInviteBinding -import com.yizhuan.erban.relation.cp.CpViewHelper -import com.yizhuan.erban.relation.cp.adapter.DeclarationRecommendAdapter +import com.pikolive.app.relation.cp.CpViewHelper +import com.pikolive.app.relation.cp.adapter.DeclarationRecommendAdapter import com.yizhuan.erban.treasure_box.widget.dialog.BaseBindingDialog import com.pikolive.app.ui.utils.ImageLoadUtilsV2 import com.pikolive.app.ui.widget.LinearLayoutManagerWrapper -import com.yizhuan.xchat_android_core.relation.cp.CpInvitePageEntity +import com.pikolive.core.relation.cp.CpInvitePageEntity import com.pikolive.library.annatation.ActLayoutRes import com.pikolive.library.utils.ScreenUtils diff --git a/app/src/main/java/com/pikolive/app/relation/cp/dialog/CpInviteReplyConfirmDialog.kt b/app/src/main/java/com/pikolive/app/relation/cp/dialog/CpInviteReplyConfirmDialog.kt index e8a588083..c111133b6 100644 --- a/app/src/main/java/com/pikolive/app/relation/cp/dialog/CpInviteReplyConfirmDialog.kt +++ b/app/src/main/java/com/pikolive/app/relation/cp/dialog/CpInviteReplyConfirmDialog.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.relation.cp.dialog +package com.pikolive.app.relation.cp.dialog import android.content.Context import android.text.SpannableStringBuilder diff --git a/app/src/main/java/com/pikolive/app/relation/cp/dialog/CpInviteReplyDialog.kt b/app/src/main/java/com/pikolive/app/relation/cp/dialog/CpInviteReplyDialog.kt index 01f1c00fd..fcc14b996 100644 --- a/app/src/main/java/com/pikolive/app/relation/cp/dialog/CpInviteReplyDialog.kt +++ b/app/src/main/java/com/pikolive/app/relation/cp/dialog/CpInviteReplyDialog.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.relation.cp.dialog +package com.pikolive.app.relation.cp.dialog import android.content.Context import android.graphics.Color @@ -6,12 +6,12 @@ import android.view.View import com.netease.nim.uikit.common.util.sys.ScreenUtil import com.yizhuan.erban.R import com.yizhuan.erban.databinding.DialogCpInviteReplyBinding -import com.yizhuan.erban.relation.cp.CpViewHelper -import com.yizhuan.erban.relation.cp.CpViewHelper.getColorSpan -import com.yizhuan.erban.relation.extention.toTimeString +import com.pikolive.app.relation.cp.CpViewHelper +import com.pikolive.app.relation.cp.CpViewHelper.getColorSpan +import com.pikolive.app.relation.extention.toTimeString import com.yizhuan.erban.treasure_box.widget.dialog.BaseBindingDialog import com.pikolive.app.ui.utils.ImageLoadUtilsV2 -import com.yizhuan.xchat_android_core.relation.cp.CpInviteDetailEntity +import com.pikolive.core.relation.cp.CpInviteDetailEntity import com.pikolive.library.annatation.ActLayoutRes import io.reactivex.Observable import io.reactivex.Observer diff --git a/app/src/main/java/com/pikolive/app/relation/cp/dialog/CpMpDialog.kt b/app/src/main/java/com/pikolive/app/relation/cp/dialog/CpMpDialog.kt index 3b80343a2..5f249c31e 100644 --- a/app/src/main/java/com/pikolive/app/relation/cp/dialog/CpMpDialog.kt +++ b/app/src/main/java/com/pikolive/app/relation/cp/dialog/CpMpDialog.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.relation.cp.dialog +package com.pikolive.app.relation.cp.dialog import android.content.Context import android.text.Editable diff --git a/app/src/main/java/com/pikolive/app/relation/cp/fragment/CpTaskFragment.kt b/app/src/main/java/com/pikolive/app/relation/cp/fragment/CpTaskFragment.kt index b56dcb4ce..7712ef080 100644 --- a/app/src/main/java/com/pikolive/app/relation/cp/fragment/CpTaskFragment.kt +++ b/app/src/main/java/com/pikolive/app/relation/cp/fragment/CpTaskFragment.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.relation.cp.fragment +package com.pikolive.app.relation.cp.fragment import android.os.Bundle import androidx.fragment.app.activityViewModels @@ -6,8 +6,8 @@ import androidx.recyclerview.widget.LinearLayoutManager import com.yizhuan.erban.R import com.pikolive.app.base.BaseBindingFragment import com.yizhuan.erban.databinding.FragmentCpTaskBinding -import com.yizhuan.erban.relation.cp.adapter.CpTaskAdapter -import com.yizhuan.erban.relation.cp.viewmodel.CpViewModel +import com.pikolive.app.relation.cp.adapter.CpTaskAdapter +import com.pikolive.app.relation.cp.viewmodel.CpViewModel import com.pikolive.library.annatation.ActLayoutRes @ActLayoutRes(R.layout.fragment_cp_task) diff --git a/app/src/main/java/com/pikolive/app/relation/cp/fragment/UserInfoCpFragment.kt b/app/src/main/java/com/pikolive/app/relation/cp/fragment/UserInfoCpFragment.kt index a06048e8b..9db8a36bb 100644 --- a/app/src/main/java/com/pikolive/app/relation/cp/fragment/UserInfoCpFragment.kt +++ b/app/src/main/java/com/pikolive/app/relation/cp/fragment/UserInfoCpFragment.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.relation.cp.fragment +package com.pikolive.app.relation.cp.fragment import android.os.Bundle import android.view.Gravity @@ -12,14 +12,14 @@ import com.opensource.svgaplayer.SVGAVideoEntity import com.yizhuan.erban.R import com.pikolive.app.base.BaseViewBindingFragment import com.yizhuan.erban.databinding.FragmentUserinfoCpBinding -import com.yizhuan.erban.relation.cp.viewmodel.CpViewModel -import com.yizhuan.erban.relation.cp.widget.RelationCpCardView +import com.pikolive.app.relation.cp.viewmodel.CpViewModel +import com.pikolive.app.relation.cp.widget.RelationCpCardView import com.pikolive.app.ui.im.friend.FriendFragmentCpDelegate import com.pikolive.app.ui.relation.FansListActivity import com.pikolive.app.ui.utils.ImageLoadUtils -import com.yizhuan.xchat_android_core.auth.AuthModel -import com.yizhuan.xchat_android_core.noble.NobleResourceType -import com.yizhuan.xchat_android_core.noble.NobleUtil +import com.pikolive.core.auth.AuthModel +import com.pikolive.core.noble.NobleResourceType +import com.pikolive.core.noble.NobleUtil import com.pikolive.library.annatation.ActLayoutRes import java.io.File import java.net.URL diff --git a/app/src/main/java/com/pikolive/app/relation/cp/model/Api.kt b/app/src/main/java/com/pikolive/app/relation/cp/model/Api.kt index c624832d8..a27b30a22 100644 --- a/app/src/main/java/com/pikolive/app/relation/cp/model/Api.kt +++ b/app/src/main/java/com/pikolive/app/relation/cp/model/Api.kt @@ -1,7 +1,7 @@ -package com.yizhuan.erban.relation.cp.model +package com.pikolive.app.relation.cp.model -import com.yizhuan.xchat_android_core.bean.response.ServiceResult -import com.yizhuan.xchat_android_core.relation.cp.* +import com.pikolive.core.bean.response.ServiceResult +import com.pikolive.core.relation.cp.* import retrofit2.http.* interface Api { diff --git a/app/src/main/java/com/pikolive/app/relation/cp/model/CpModel.kt b/app/src/main/java/com/pikolive/app/relation/cp/model/CpModel.kt index b699ba2e3..72d4b599c 100644 --- a/app/src/main/java/com/pikolive/app/relation/cp/model/CpModel.kt +++ b/app/src/main/java/com/pikolive/app/relation/cp/model/CpModel.kt @@ -1,8 +1,8 @@ -package com.yizhuan.erban.relation.cp.model +package com.pikolive.app.relation.cp.model -import com.yizhuan.xchat_android_core.base.BaseModel -import com.yizhuan.xchat_android_core.relation.cp.* -import com.yizhuan.xchat_android_core.utils.net.launchRequest +import com.pikolive.core.base.BaseModel +import com.pikolive.core.relation.cp.* +import com.pikolive.core.utils.net.launchRequest import com.pikolive.library.net.rxnet.RxNet object CpModel : BaseModel() { diff --git a/app/src/main/java/com/pikolive/app/relation/cp/viewmodel/CpViewModel.kt b/app/src/main/java/com/pikolive/app/relation/cp/viewmodel/CpViewModel.kt index 138cf2991..ce6716ee6 100644 --- a/app/src/main/java/com/pikolive/app/relation/cp/viewmodel/CpViewModel.kt +++ b/app/src/main/java/com/pikolive/app/relation/cp/viewmodel/CpViewModel.kt @@ -1,14 +1,14 @@ -package com.yizhuan.erban.relation.cp.viewmodel +package com.pikolive.app.relation.cp.viewmodel import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import com.yizhuan.erban.R import com.pikolive.app.base.BaseViewModel -import com.yizhuan.erban.relation.cp.model.CpModel -import com.yizhuan.xchat_android_core.relation.cp.* -import com.yizhuan.xchat_android_core.utils.net.BalanceNotEnoughExeption -import com.yizhuan.xchat_android_core.utils.net.ServerException -import com.yizhuan.xchat_android_core.utils.toast +import com.pikolive.app.relation.cp.model.CpModel +import com.pikolive.core.relation.cp.* +import com.pikolive.core.utils.net.BalanceNotEnoughExeption +import com.pikolive.core.utils.net.ServerException +import com.pikolive.core.utils.toast import com.pikolive.library.utils.ResUtil import org.greenrobot.eventbus.EventBus diff --git a/app/src/main/java/com/pikolive/app/relation/cp/widget/CpTaskDescriptionView.kt b/app/src/main/java/com/pikolive/app/relation/cp/widget/CpTaskDescriptionView.kt index 41d606a15..93f7a2b7f 100644 --- a/app/src/main/java/com/pikolive/app/relation/cp/widget/CpTaskDescriptionView.kt +++ b/app/src/main/java/com/pikolive/app/relation/cp/widget/CpTaskDescriptionView.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.relation.cp.widget +package com.pikolive.app.relation.cp.widget import android.content.Context import android.graphics.Color diff --git a/app/src/main/java/com/pikolive/app/relation/cp/widget/RelationCpCardView.kt b/app/src/main/java/com/pikolive/app/relation/cp/widget/RelationCpCardView.kt index 5dff3dc9f..20641fb24 100644 --- a/app/src/main/java/com/pikolive/app/relation/cp/widget/RelationCpCardView.kt +++ b/app/src/main/java/com/pikolive/app/relation/cp/widget/RelationCpCardView.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.relation.cp.widget +package com.pikolive.app.relation.cp.widget import android.content.Context import android.graphics.Color @@ -12,10 +12,10 @@ import androidx.databinding.DataBindingUtil import com.netease.nim.uikit.common.util.sys.ScreenUtil import com.yizhuan.erban.R import com.yizhuan.erban.databinding.LayoutCpCardBinding -import com.yizhuan.erban.relation.extention.visibility +import com.pikolive.app.relation.extention.visibility import com.pikolive.app.ui.utils.ImageLoadUtils -import com.yizhuan.xchat_android_core.relation.cp.CpInvitePageEntity -import com.yizhuan.xchat_android_core.relation.cp.CpRelation +import com.pikolive.core.relation.cp.CpInvitePageEntity +import com.pikolive.core.relation.cp.CpRelation import com.pikolive.library.utils.ResUtil class RelationCpCardView(context: Context, attr: AttributeSet?, def: Int) : diff --git a/app/src/main/java/com/pikolive/app/relation/extention/RelationExtention.kt b/app/src/main/java/com/pikolive/app/relation/extention/RelationExtention.kt index 5d74cce90..b7287279b 100644 --- a/app/src/main/java/com/pikolive/app/relation/extention/RelationExtention.kt +++ b/app/src/main/java/com/pikolive/app/relation/extention/RelationExtention.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.relation.extention +package com.pikolive.app.relation.extention import android.view.View diff --git a/app/src/main/java/com/pikolive/app/service/DaemonService.java b/app/src/main/java/com/pikolive/app/service/DaemonService.java index a403cef12..9307dd405 100644 --- a/app/src/main/java/com/pikolive/app/service/DaemonService.java +++ b/app/src/main/java/com/pikolive/app/service/DaemonService.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.service; +package com.pikolive.app.service; import android.app.Notification; import android.app.NotificationChannel; @@ -13,9 +13,9 @@ import android.os.IBinder; import androidx.annotation.Nullable; import com.yizhuan.erban.R; -import com.yizhuan.erban.reciever.NotificationClickReceiver; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; +import com.pikolive.app.reciever.NotificationClickReceiver; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core.room.bean.RoomInfo; import com.pikolive.library.utils.ResUtil; /** diff --git a/app/src/main/java/com/pikolive/app/share/Holder.java b/app/src/main/java/com/pikolive/app/share/Holder.java index c1c447e3b..2de4e959c 100644 --- a/app/src/main/java/com/pikolive/app/share/Holder.java +++ b/app/src/main/java/com/pikolive/app/share/Holder.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.share; +package com.pikolive.app.share; /** * Created by MadisonRong on 08/06/2018. diff --git a/app/src/main/java/com/pikolive/app/share/viewholder/InAppSharingMsgViewHolder.java b/app/src/main/java/com/pikolive/app/share/viewholder/InAppSharingMsgViewHolder.java index 149b311d9..6d2f0facc 100644 --- a/app/src/main/java/com/pikolive/app/share/viewholder/InAppSharingMsgViewHolder.java +++ b/app/src/main/java/com/pikolive/app/share/viewholder/InAppSharingMsgViewHolder.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.share.viewholder; +package com.pikolive.app.share.viewholder; import android.graphics.Color; import android.view.View; @@ -10,15 +10,15 @@ import com.netease.nim.uikit.common.ui.recyclerview.adapter.BaseMultiItemFetchLo import com.yizhuan.erban.R; import com.pikolive.app.ui.im.RouterHandler; import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.InAppSharingFamilyAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.InAppSharingMiniWorldAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.InAppSharingRoomAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.InAppSharingTeamAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.RouterType; -import com.yizhuan.xchat_android_core.share.bean.InAppSharingInfo; -import com.yizhuan.xchat_android_core.share.bean.InAppSharingTeamInfo; -import com.yizhuan.xchat_android_core.team.bean.TeamInfo; +import com.pikolive.core.im.custom.bean.CustomAttachment; +import com.pikolive.core.im.custom.bean.InAppSharingFamilyAttachment; +import com.pikolive.core.im.custom.bean.InAppSharingMiniWorldAttachment; +import com.pikolive.core.im.custom.bean.InAppSharingRoomAttachment; +import com.pikolive.core.im.custom.bean.InAppSharingTeamAttachment; +import com.pikolive.core.im.custom.bean.RouterType; +import com.pikolive.core.share.bean.InAppSharingInfo; +import com.pikolive.core.share.bean.InAppSharingTeamInfo; +import com.pikolive.core.team.bean.TeamInfo; /** * Created by MadisonRong on 08/06/2018. diff --git a/app/src/main/java/com/pikolive/app/skill/SKillDataParser.kt b/app/src/main/java/com/pikolive/app/skill/SKillDataParser.kt index afef25815..ba88cc5f7 100644 --- a/app/src/main/java/com/pikolive/app/skill/SKillDataParser.kt +++ b/app/src/main/java/com/pikolive/app/skill/SKillDataParser.kt @@ -1,10 +1,10 @@ -package com.yizhuan.erban.skill +package com.pikolive.app.skill -import com.yizhuan.erban.skill.widget.ItemAttribute -import com.yizhuan.erban.skill.widget.ItemEventListener -import com.yizhuan.erban.skill.widget.SkillAttribute -import com.yizhuan.erban.skill.widget.SkillItem -import com.yizhuan.xchat_android_core.skill.entity.* +import com.pikolive.app.skill.widget.ItemAttribute +import com.pikolive.app.skill.widget.ItemEventListener +import com.pikolive.app.skill.widget.SkillAttribute +import com.pikolive.app.skill.widget.SkillItem +import com.pikolive.core.skill.entity.* object SKillDataParser { private fun parseItemRecordToAttribute( diff --git a/app/src/main/java/com/pikolive/app/skill/SkillDataDelegate.kt b/app/src/main/java/com/pikolive/app/skill/SkillDataDelegate.kt index e67d091da..6a715b5a2 100644 --- a/app/src/main/java/com/pikolive/app/skill/SkillDataDelegate.kt +++ b/app/src/main/java/com/pikolive/app/skill/SkillDataDelegate.kt @@ -1,19 +1,19 @@ -package com.yizhuan.erban.skill +package com.pikolive.app.skill import android.annotation.SuppressLint import com.yizhuan.erban.R import com.pikolive.app.base.BaseActivity -import com.yizhuan.erban.skill.dialog.SkillSelectionDialog -import com.yizhuan.erban.skill.repository.SkillDataManager -import com.yizhuan.erban.skill.repository.SkillModel -import com.yizhuan.erban.skill.widget.* -import com.yizhuan.xchat_android_core.file.FileModel -import com.yizhuan.xchat_android_core.skill.entity.PropRefEntity -import com.yizhuan.xchat_android_core.skill.entity.PropsEntity -import com.yizhuan.xchat_android_core.skill.entity.SkillPostServerEntity -import com.yizhuan.xchat_android_core.skill.entity.SkillPropertyEntity -import com.yizhuan.xchat_android_core.skill.event.SkillEvent -import com.yizhuan.xchat_android_core.utils.toast +import com.pikolive.app.skill.dialog.SkillSelectionDialog +import com.pikolive.app.skill.repository.SkillDataManager +import com.pikolive.app.skill.repository.SkillModel +import com.pikolive.app.skill.widget.* +import com.pikolive.core.file.FileModel +import com.pikolive.core.skill.entity.PropRefEntity +import com.pikolive.core.skill.entity.PropsEntity +import com.pikolive.core.skill.entity.SkillPostServerEntity +import com.pikolive.core.skill.entity.SkillPropertyEntity +import com.pikolive.core.skill.event.SkillEvent +import com.pikolive.core.utils.toast import com.pikolive.library.utils.ResUtil import org.greenrobot.eventbus.EventBus import java.io.File diff --git a/app/src/main/java/com/pikolive/app/skill/activity/AddSkillActivity.kt b/app/src/main/java/com/pikolive/app/skill/activity/AddSkillActivity.kt index 084bef7f9..a86581329 100644 --- a/app/src/main/java/com/pikolive/app/skill/activity/AddSkillActivity.kt +++ b/app/src/main/java/com/pikolive/app/skill/activity/AddSkillActivity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.skill.activity +package com.pikolive.app.skill.activity import android.Manifest import android.annotation.SuppressLint @@ -9,10 +9,10 @@ import com.netease.nim.uikit.StatusBarUtil import com.yizhuan.erban.R import com.pikolive.app.base.BaseBindingActivity import com.yizhuan.erban.databinding.ActivitySkillEditBinding -import com.yizhuan.erban.skill.repository.SkillDataManager -import com.yizhuan.erban.skill.repository.SkillModel -import com.yizhuan.erban.skill.widget.CARD_TYPE_AUDIO -import com.yizhuan.xchat_android_core.skill.entity.SkillPropertyEntity +import com.pikolive.app.skill.repository.SkillDataManager +import com.pikolive.app.skill.repository.SkillModel +import com.pikolive.app.skill.widget.CARD_TYPE_AUDIO +import com.pikolive.core.skill.entity.SkillPropertyEntity import com.pikolive.library.annatation.ActLayoutRes import com.pikolive.library.utils.ResUtil diff --git a/app/src/main/java/com/pikolive/app/skill/activity/EditSkillActivity.kt b/app/src/main/java/com/pikolive/app/skill/activity/EditSkillActivity.kt index 3c792b34f..bf6354414 100644 --- a/app/src/main/java/com/pikolive/app/skill/activity/EditSkillActivity.kt +++ b/app/src/main/java/com/pikolive/app/skill/activity/EditSkillActivity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.skill.activity +package com.pikolive.app.skill.activity import android.annotation.SuppressLint import android.content.Context @@ -8,7 +8,7 @@ import com.netease.nim.uikit.StatusBarUtil import com.yizhuan.erban.R import com.pikolive.app.base.BaseBindingActivity import com.yizhuan.erban.databinding.ActivitySkillEditBinding -import com.yizhuan.erban.skill.repository.SkillModel +import com.pikolive.app.skill.repository.SkillModel import com.pikolive.app.ui.widget.dialog.CommonTipDialog import com.pikolive.library.annatation.ActLayoutRes diff --git a/app/src/main/java/com/pikolive/app/skill/activity/SkillDetailActivity.kt b/app/src/main/java/com/pikolive/app/skill/activity/SkillDetailActivity.kt index 03c226de3..a50ae4783 100644 --- a/app/src/main/java/com/pikolive/app/skill/activity/SkillDetailActivity.kt +++ b/app/src/main/java/com/pikolive/app/skill/activity/SkillDetailActivity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.skill.activity +package com.pikolive.app.skill.activity import android.annotation.SuppressLint import android.content.Context @@ -8,7 +8,7 @@ import com.netease.nim.uikit.StatusBarUtil import com.yizhuan.erban.R import com.pikolive.app.base.BaseBindingActivity import com.yizhuan.erban.databinding.ActivitySkillEditBinding -import com.yizhuan.erban.skill.repository.SkillModel +import com.pikolive.app.skill.repository.SkillModel import com.pikolive.library.annatation.ActLayoutRes /** diff --git a/app/src/main/java/com/pikolive/app/skill/activity/SkillEditableDelegate.kt b/app/src/main/java/com/pikolive/app/skill/activity/SkillEditableDelegate.kt index ab7b4e2c3..7ef2c64b6 100644 --- a/app/src/main/java/com/pikolive/app/skill/activity/SkillEditableDelegate.kt +++ b/app/src/main/java/com/pikolive/app/skill/activity/SkillEditableDelegate.kt @@ -1,13 +1,13 @@ -package com.yizhuan.erban.skill.activity +package com.pikolive.app.skill.activity import com.yizhuan.erban.R import com.pikolive.app.base.BaseBindingActivity import com.yizhuan.erban.databinding.ActivitySkillEditBinding -import com.yizhuan.erban.skill.SKillDataParser -import com.yizhuan.erban.skill.SkillDataDelegate +import com.pikolive.app.skill.SKillDataParser +import com.pikolive.app.skill.SkillDataDelegate import com.pikolive.app.ui.widget.dialog.CommonTipDialog -import com.yizhuan.xchat_android_core.skill.entity.SkillPropertyEntity -import com.yizhuan.xchat_android_core.skill.entity.SkillRecordEntity +import com.pikolive.core.skill.entity.SkillPropertyEntity +import com.pikolive.core.skill.entity.SkillRecordEntity import com.pikolive.library.utils.ResUtil /** diff --git a/app/src/main/java/com/pikolive/app/skill/activity/SkillHomeActivity.kt b/app/src/main/java/com/pikolive/app/skill/activity/SkillHomeActivity.kt index 55819b253..d2626d0fb 100644 --- a/app/src/main/java/com/pikolive/app/skill/activity/SkillHomeActivity.kt +++ b/app/src/main/java/com/pikolive/app/skill/activity/SkillHomeActivity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.skill.activity +package com.pikolive.app.skill.activity import android.annotation.SuppressLint import android.content.Context @@ -14,14 +14,14 @@ import com.yizhuan.erban.R import com.pikolive.app.base.BaseBindingActivity import com.pikolive.app.common.EmptyViewHelper import com.yizhuan.erban.databinding.ActivitySkillHomeBinding -import com.yizhuan.erban.skill.adapter.MineSkillCardAdapter -import com.yizhuan.erban.skill.decoration.SkillLinearVerticalDecoration -import com.yizhuan.erban.skill.dialog.AddSkillCardDialog -import com.yizhuan.erban.skill.repository.SkillDataManager -import com.yizhuan.erban.skill.repository.SkillModel -import com.yizhuan.erban.skill.widget.CARD_TYPE_AUDIO +import com.pikolive.app.skill.adapter.MineSkillCardAdapter +import com.pikolive.app.skill.decoration.SkillLinearVerticalDecoration +import com.pikolive.app.skill.dialog.AddSkillCardDialog +import com.pikolive.app.skill.repository.SkillDataManager +import com.pikolive.app.skill.repository.SkillModel +import com.pikolive.app.skill.widget.CARD_TYPE_AUDIO import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil -import com.yizhuan.xchat_android_core.skill.event.SkillEvent +import com.pikolive.core.skill.event.SkillEvent import com.pikolive.library.annatation.ActLayoutRes import com.pikolive.library.utils.ResUtil import org.greenrobot.eventbus.EventBus diff --git a/app/src/main/java/com/pikolive/app/skill/adapter/AddSkillCardAdapter.kt b/app/src/main/java/com/pikolive/app/skill/adapter/AddSkillCardAdapter.kt index aa76676a3..e3a9f466b 100644 --- a/app/src/main/java/com/pikolive/app/skill/adapter/AddSkillCardAdapter.kt +++ b/app/src/main/java/com/pikolive/app/skill/adapter/AddSkillCardAdapter.kt @@ -1,11 +1,11 @@ -package com.yizhuan.erban.skill.adapter +package com.pikolive.app.skill.adapter import android.text.TextUtils import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder import com.yizhuan.erban.R import com.pikolive.app.ui.utils.ImageLoadUtilsV2 -import com.yizhuan.xchat_android_core.skill.entity.SkillTypeEntity +import com.pikolive.core.skill.entity.SkillTypeEntity class AddSkillCardAdapter : BaseQuickAdapter(R.layout.item_add_skill_select_card) { diff --git a/app/src/main/java/com/pikolive/app/skill/adapter/MineSkillCardAdapter.kt b/app/src/main/java/com/pikolive/app/skill/adapter/MineSkillCardAdapter.kt index b12626688..2f6ddec5d 100644 --- a/app/src/main/java/com/pikolive/app/skill/adapter/MineSkillCardAdapter.kt +++ b/app/src/main/java/com/pikolive/app/skill/adapter/MineSkillCardAdapter.kt @@ -1,14 +1,14 @@ -package com.yizhuan.erban.skill.adapter +package com.pikolive.app.skill.adapter import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder import com.yizhuan.erban.R import com.pikolive.app.base.BaseActivity -import com.yizhuan.erban.skill.SKillDataParser -import com.yizhuan.erban.skill.SkillDataDelegate -import com.yizhuan.erban.skill.widget.CARD_TYPE_AUDIO -import com.yizhuan.erban.skill.widget.SkillCardView -import com.yizhuan.xchat_android_core.skill.entity.SkillRecordEntity +import com.pikolive.app.skill.SKillDataParser +import com.pikolive.app.skill.SkillDataDelegate +import com.pikolive.app.skill.widget.CARD_TYPE_AUDIO +import com.pikolive.app.skill.widget.SkillCardView +import com.pikolive.core.skill.entity.SkillRecordEntity /** * 用户所有技能卡 显示 diff --git a/app/src/main/java/com/pikolive/app/skill/adapter/SkillSelectionAdapter.kt b/app/src/main/java/com/pikolive/app/skill/adapter/SkillSelectionAdapter.kt index 09aac69e0..2123a8277 100644 --- a/app/src/main/java/com/pikolive/app/skill/adapter/SkillSelectionAdapter.kt +++ b/app/src/main/java/com/pikolive/app/skill/adapter/SkillSelectionAdapter.kt @@ -1,13 +1,13 @@ -package com.yizhuan.erban.skill.adapter +package com.pikolive.app.skill.adapter import android.content.Context import android.graphics.Color import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder import com.yizhuan.erban.R -import com.yizhuan.erban.skill.widget.ItemAttribute -import com.yizhuan.xchat_android_core.skill.entity.PropDictVo -import com.yizhuan.xchat_android_core.utils.toast +import com.pikolive.app.skill.widget.ItemAttribute +import com.pikolive.core.skill.entity.PropDictVo +import com.pikolive.core.utils.toast class SkillSelectionAdapter( diff --git a/app/src/main/java/com/pikolive/app/skill/decoration/SkillGridDecoration.kt b/app/src/main/java/com/pikolive/app/skill/decoration/SkillGridDecoration.kt index 52eb5c6e5..b81ec917c 100644 --- a/app/src/main/java/com/pikolive/app/skill/decoration/SkillGridDecoration.kt +++ b/app/src/main/java/com/pikolive/app/skill/decoration/SkillGridDecoration.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.skill.decoration +package com.pikolive.app.skill.decoration import android.content.Context import android.graphics.Rect diff --git a/app/src/main/java/com/pikolive/app/skill/decoration/SkillLinearVerticalDecoration.kt b/app/src/main/java/com/pikolive/app/skill/decoration/SkillLinearVerticalDecoration.kt index 3cec8b761..122f579f0 100644 --- a/app/src/main/java/com/pikolive/app/skill/decoration/SkillLinearVerticalDecoration.kt +++ b/app/src/main/java/com/pikolive/app/skill/decoration/SkillLinearVerticalDecoration.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.skill.decoration +package com.pikolive.app.skill.decoration import android.content.Context import android.graphics.Rect diff --git a/app/src/main/java/com/pikolive/app/skill/dialog/AddSkillCardDialog.kt b/app/src/main/java/com/pikolive/app/skill/dialog/AddSkillCardDialog.kt index 0f8daf128..33fb9e7d5 100644 --- a/app/src/main/java/com/pikolive/app/skill/dialog/AddSkillCardDialog.kt +++ b/app/src/main/java/com/pikolive/app/skill/dialog/AddSkillCardDialog.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.skill.dialog +package com.pikolive.app.skill.dialog import android.content.Context import android.view.Gravity @@ -6,11 +6,11 @@ import android.view.View import androidx.recyclerview.widget.GridLayoutManager import com.yizhuan.erban.R import com.yizhuan.erban.databinding.DialogAddSkillItemBinding -import com.yizhuan.erban.skill.adapter.AddSkillCardAdapter -import com.yizhuan.erban.skill.decoration.SkillGridDecoration +import com.pikolive.app.skill.adapter.AddSkillCardAdapter +import com.pikolive.app.skill.decoration.SkillGridDecoration import com.yizhuan.erban.treasure_box.widget.dialog.BaseBindingDialog import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil -import com.yizhuan.xchat_android_core.skill.entity.SkillTypeEntity +import com.pikolive.core.skill.entity.SkillTypeEntity import com.pikolive.library.annatation.ActLayoutRes @ActLayoutRes(R.layout.dialog_add_skill_item) diff --git a/app/src/main/java/com/pikolive/app/skill/dialog/SkillSelectionDialog.kt b/app/src/main/java/com/pikolive/app/skill/dialog/SkillSelectionDialog.kt index b5a082f45..5f48ed798 100644 --- a/app/src/main/java/com/pikolive/app/skill/dialog/SkillSelectionDialog.kt +++ b/app/src/main/java/com/pikolive/app/skill/dialog/SkillSelectionDialog.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.skill.dialog +package com.pikolive.app.skill.dialog import android.content.Context import android.view.Gravity @@ -6,12 +6,12 @@ import android.view.View import androidx.recyclerview.widget.GridLayoutManager import com.yizhuan.erban.R import com.yizhuan.erban.databinding.DialogAddSkillItemBinding -import com.yizhuan.erban.skill.adapter.SkillSelectionAdapter -import com.yizhuan.erban.skill.decoration.SkillGridDecoration +import com.pikolive.app.skill.adapter.SkillSelectionAdapter +import com.pikolive.app.skill.decoration.SkillGridDecoration import com.yizhuan.erban.treasure_box.widget.dialog.BaseBindingDialog import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil -import com.yizhuan.xchat_android_core.skill.entity.PropDictVo -import com.yizhuan.xchat_android_core.skill.entity.PropsEntity +import com.pikolive.core.skill.entity.PropDictVo +import com.pikolive.core.skill.entity.PropsEntity import com.pikolive.library.annatation.ActLayoutRes @ActLayoutRes(R.layout.dialog_add_skill_item) diff --git a/app/src/main/java/com/pikolive/app/skill/repository/Api.kt b/app/src/main/java/com/pikolive/app/skill/repository/Api.kt index 2da4861ca..945daf807 100644 --- a/app/src/main/java/com/pikolive/app/skill/repository/Api.kt +++ b/app/src/main/java/com/pikolive/app/skill/repository/Api.kt @@ -1,11 +1,11 @@ -package com.yizhuan.erban.skill.repository +package com.pikolive.app.skill.repository import com.google.gson.JsonElement -import com.yizhuan.xchat_android_core.bean.response.ServiceResult -import com.yizhuan.xchat_android_core.skill.entity.SkillPropertyEntity -import com.yizhuan.xchat_android_core.skill.entity.SkillRecordEntity -import com.yizhuan.xchat_android_core.skill.entity.SkillTypeEntity -import com.yizhuan.xchat_android_core.user.bean.UserInfoSkillEntity +import com.pikolive.core.bean.response.ServiceResult +import com.pikolive.core.skill.entity.SkillPropertyEntity +import com.pikolive.core.skill.entity.SkillRecordEntity +import com.pikolive.core.skill.entity.SkillTypeEntity +import com.pikolive.core.user.bean.UserInfoSkillEntity import io.reactivex.Single import okhttp3.RequestBody import retrofit2.http.* diff --git a/app/src/main/java/com/pikolive/app/skill/repository/ISkillModel.kt b/app/src/main/java/com/pikolive/app/skill/repository/ISkillModel.kt index 374dca068..88d80561b 100644 --- a/app/src/main/java/com/pikolive/app/skill/repository/ISkillModel.kt +++ b/app/src/main/java/com/pikolive/app/skill/repository/ISkillModel.kt @@ -1,10 +1,10 @@ -package com.yizhuan.erban.skill.repository +package com.pikolive.app.skill.repository -import com.yizhuan.xchat_android_core.skill.entity.SkillPostServerEntity -import com.yizhuan.xchat_android_core.skill.entity.SkillPropertyEntity -import com.yizhuan.xchat_android_core.skill.entity.SkillRecordEntity -import com.yizhuan.xchat_android_core.skill.entity.SkillTypeEntity -import com.yizhuan.xchat_android_core.user.bean.UserInfoSkillEntity +import com.pikolive.core.skill.entity.SkillPostServerEntity +import com.pikolive.core.skill.entity.SkillPropertyEntity +import com.pikolive.core.skill.entity.SkillRecordEntity +import com.pikolive.core.skill.entity.SkillTypeEntity +import com.pikolive.core.user.bean.UserInfoSkillEntity import io.reactivex.Single diff --git a/app/src/main/java/com/pikolive/app/skill/repository/SkillDataManager.java b/app/src/main/java/com/pikolive/app/skill/repository/SkillDataManager.java index d40e57768..a70236f49 100644 --- a/app/src/main/java/com/pikolive/app/skill/repository/SkillDataManager.java +++ b/app/src/main/java/com/pikolive/app/skill/repository/SkillDataManager.java @@ -1,9 +1,9 @@ -package com.yizhuan.erban.skill.repository; +package com.pikolive.app.skill.repository; import android.util.SparseArray; -import com.yizhuan.xchat_android_core.skill.entity.SkillPropertyEntity; +import com.pikolive.core.skill.entity.SkillPropertyEntity; public class SkillDataManager { private static final class Helper { diff --git a/app/src/main/java/com/pikolive/app/skill/repository/SkillModel.kt b/app/src/main/java/com/pikolive/app/skill/repository/SkillModel.kt index ffcf0afde..33269745d 100644 --- a/app/src/main/java/com/pikolive/app/skill/repository/SkillModel.kt +++ b/app/src/main/java/com/pikolive/app/skill/repository/SkillModel.kt @@ -1,13 +1,13 @@ -package com.yizhuan.erban.skill.repository +package com.pikolive.app.skill.repository import com.google.gson.Gson -import com.yizhuan.xchat_android_core.base.BaseModel -import com.yizhuan.xchat_android_core.skill.entity.SkillPostServerEntity -import com.yizhuan.xchat_android_core.skill.entity.SkillPropertyEntity -import com.yizhuan.xchat_android_core.skill.entity.SkillRecordEntity -import com.yizhuan.xchat_android_core.skill.entity.SkillTypeEntity -import com.yizhuan.xchat_android_core.user.bean.UserInfoSkillEntity -import com.yizhuan.xchat_android_core.utils.net.RxHelper +import com.pikolive.core.base.BaseModel +import com.pikolive.core.skill.entity.SkillPostServerEntity +import com.pikolive.core.skill.entity.SkillPropertyEntity +import com.pikolive.core.skill.entity.SkillRecordEntity +import com.pikolive.core.skill.entity.SkillTypeEntity +import com.pikolive.core.user.bean.UserInfoSkillEntity +import com.pikolive.core.utils.net.RxHelper import com.pikolive.library.net.rxnet.RxNet import io.reactivex.Single import okhttp3.MediaType.Companion.toMediaType diff --git a/app/src/main/java/com/pikolive/app/skill/widget/EditItem.kt b/app/src/main/java/com/pikolive/app/skill/widget/EditItem.kt index 9a0786fc2..99fa7a265 100644 --- a/app/src/main/java/com/pikolive/app/skill/widget/EditItem.kt +++ b/app/src/main/java/com/pikolive/app/skill/widget/EditItem.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.skill.widget +package com.pikolive.app.skill.widget import android.content.Context import android.view.LayoutInflater @@ -6,8 +6,8 @@ import android.view.View import android.widget.EditText import android.widget.TextView import com.yizhuan.erban.R -import com.yizhuan.xchat_android_core.skill.entity.PropRefEntity -import com.yizhuan.xchat_android_core.utils.TextUtils +import com.pikolive.core.skill.entity.PropRefEntity +import com.pikolive.core.utils.TextUtils class EditItem(private val itemAttr: ItemAttribute) : SkillItem { private lateinit var contentView: EditText diff --git a/app/src/main/java/com/pikolive/app/skill/widget/ItemAttribute.kt b/app/src/main/java/com/pikolive/app/skill/widget/ItemAttribute.kt index bf1ca0017..d3fb90a98 100644 --- a/app/src/main/java/com/pikolive/app/skill/widget/ItemAttribute.kt +++ b/app/src/main/java/com/pikolive/app/skill/widget/ItemAttribute.kt @@ -1,6 +1,6 @@ -package com.yizhuan.erban.skill.widget +package com.pikolive.app.skill.widget -import com.yizhuan.xchat_android_core.skill.entity.PropRefEntity +import com.pikolive.core.skill.entity.PropRefEntity import java.io.File data class ItemAttribute( diff --git a/app/src/main/java/com/pikolive/app/skill/widget/RecordDurationItem.kt b/app/src/main/java/com/pikolive/app/skill/widget/RecordDurationItem.kt index e377af1f6..cf68aaefa 100644 --- a/app/src/main/java/com/pikolive/app/skill/widget/RecordDurationItem.kt +++ b/app/src/main/java/com/pikolive/app/skill/widget/RecordDurationItem.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.skill.widget +package com.pikolive.app.skill.widget import android.content.Context import android.view.View diff --git a/app/src/main/java/com/pikolive/app/skill/widget/RecordIResourceItem.kt b/app/src/main/java/com/pikolive/app/skill/widget/RecordIResourceItem.kt index 165e723d1..9e864f5d6 100644 --- a/app/src/main/java/com/pikolive/app/skill/widget/RecordIResourceItem.kt +++ b/app/src/main/java/com/pikolive/app/skill/widget/RecordIResourceItem.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.skill.widget +package com.pikolive.app.skill.widget import android.content.Context import android.view.LayoutInflater @@ -10,8 +10,8 @@ import com.pikolive.app.audio.helper.AudioPlayerHelper import com.pikolive.app.audio.helper.OnPlayListener import com.yizhuan.erban.databinding.LayoutSkillAudioBinding import com.pikolive.app.ui.widget.dialog.CommonTipDialog -import com.yizhuan.xchat_android_core.utils.TextUtils -import com.yizhuan.xchat_android_core.utils.toast +import com.pikolive.core.utils.TextUtils +import com.pikolive.core.utils.toast import com.pikolive.library.utils.ResUtil import java.io.File diff --git a/app/src/main/java/com/pikolive/app/skill/widget/SelectionItem.kt b/app/src/main/java/com/pikolive/app/skill/widget/SelectionItem.kt index 96e2b60e7..9153cee65 100644 --- a/app/src/main/java/com/pikolive/app/skill/widget/SelectionItem.kt +++ b/app/src/main/java/com/pikolive/app/skill/widget/SelectionItem.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.skill.widget +package com.pikolive.app.skill.widget import android.content.Context import android.view.LayoutInflater @@ -6,7 +6,7 @@ import android.view.View import android.widget.TextView import androidx.constraintlayout.widget.ConstraintLayout import com.yizhuan.erban.R -import com.yizhuan.xchat_android_core.utils.TextUtils +import com.pikolive.core.utils.TextUtils class SelectionItem(private val itemAttr: ItemAttribute) : SkillItem { private lateinit var contentView: TextView diff --git a/app/src/main/java/com/pikolive/app/skill/widget/SkillAttribute.kt b/app/src/main/java/com/pikolive/app/skill/widget/SkillAttribute.kt index 5d04bb4b9..c2fdb658c 100644 --- a/app/src/main/java/com/pikolive/app/skill/widget/SkillAttribute.kt +++ b/app/src/main/java/com/pikolive/app/skill/widget/SkillAttribute.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.skill.widget +package com.pikolive.app.skill.widget const val CARD_TYPE_GAME = 1 const val CARD_TYPE_ART = 2 diff --git a/app/src/main/java/com/pikolive/app/skill/widget/SkillCardView.kt b/app/src/main/java/com/pikolive/app/skill/widget/SkillCardView.kt index 9fd7f1af3..e768402d3 100644 --- a/app/src/main/java/com/pikolive/app/skill/widget/SkillCardView.kt +++ b/app/src/main/java/com/pikolive/app/skill/widget/SkillCardView.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.skill.widget +package com.pikolive.app.skill.widget import android.content.Context import android.text.TextUtils diff --git a/app/src/main/java/com/pikolive/app/skill/widget/SkillItem.kt b/app/src/main/java/com/pikolive/app/skill/widget/SkillItem.kt index cddd20be0..db88a445f 100644 --- a/app/src/main/java/com/pikolive/app/skill/widget/SkillItem.kt +++ b/app/src/main/java/com/pikolive/app/skill/widget/SkillItem.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.skill.widget +package com.pikolive.app.skill.widget import android.content.Context import android.view.View diff --git a/app/src/main/java/com/pikolive/app/skill/widget/SkillItemHelper.kt b/app/src/main/java/com/pikolive/app/skill/widget/SkillItemHelper.kt index e1ae450b5..21c5fd758 100644 --- a/app/src/main/java/com/pikolive/app/skill/widget/SkillItemHelper.kt +++ b/app/src/main/java/com/pikolive/app/skill/widget/SkillItemHelper.kt @@ -1,12 +1,12 @@ -package com.yizhuan.erban.skill.widget +package com.pikolive.app.skill.widget import android.graphics.Color import android.text.SpannableStringBuilder import android.text.style.ForegroundColorSpan import android.widget.EditText import android.widget.TextView -import com.yizhuan.erban.skill.widget.ItemAttribute.Companion.STATE_AUDIO -import com.yizhuan.erban.skill.widget.ItemAttribute.Companion.STATE_DURATION +import com.pikolive.app.skill.widget.ItemAttribute.Companion.STATE_AUDIO +import com.pikolive.app.skill.widget.ItemAttribute.Companion.STATE_DURATION object SkillItemHelper { /** diff --git a/app/src/main/java/com/pikolive/app/skill/widget/TimerRecorderView.kt b/app/src/main/java/com/pikolive/app/skill/widget/TimerRecorderView.kt index 717b3a231..6b4e66f50 100644 --- a/app/src/main/java/com/pikolive/app/skill/widget/TimerRecorderView.kt +++ b/app/src/main/java/com/pikolive/app/skill/widget/TimerRecorderView.kt @@ -1,4 +1,4 @@ -package com.yizhuan.erban.skill.widget +package com.pikolive.app.skill.widget import android.animation.ValueAnimator import android.content.Context diff --git a/app/src/main/java/com/pikolive/app/sys/ErbanSysMsgViewModel.java b/app/src/main/java/com/pikolive/app/sys/ErbanSysMsgViewModel.java index 625b616a7..2046442d6 100644 --- a/app/src/main/java/com/pikolive/app/sys/ErbanSysMsgViewModel.java +++ b/app/src/main/java/com/pikolive/app/sys/ErbanSysMsgViewModel.java @@ -1,9 +1,9 @@ package com.pikolive.app.sys; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.msg.sys.ApproveMsgInfo; -import com.yizhuan.xchat_android_core.msg.sys.ErbanSysMsgModel; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.msg.sys.ApproveMsgInfo; +import com.pikolive.core.msg.sys.ErbanSysMsgModel; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.net.rxnet.RxNet; import java.util.Map; diff --git a/app/src/main/java/com/pikolive/app/team/adapter/AddTeamMemberAdapter.java b/app/src/main/java/com/pikolive/app/team/adapter/AddTeamMemberAdapter.java index d41ff6c8c..5e5110257 100644 --- a/app/src/main/java/com/pikolive/app/team/adapter/AddTeamMemberAdapter.java +++ b/app/src/main/java/com/pikolive/app/team/adapter/AddTeamMemberAdapter.java @@ -8,7 +8,7 @@ import com.yizhuan.erban.BR; import com.yizhuan.erban.R; import com.pikolive.app.bindadapter.BaseAdapter; import com.pikolive.app.bindadapter.BindingViewHolder; -import com.yizhuan.xchat_android_core.family.bean.FamilyMemberInfo; +import com.pikolive.core.family.bean.FamilyMemberInfo; /** * Created by MadisonRong on 29/05/2018. diff --git a/app/src/main/java/com/pikolive/app/team/adapter/TeamListAdapter.java b/app/src/main/java/com/pikolive/app/team/adapter/TeamListAdapter.java index 4013b3267..99a95c21e 100644 --- a/app/src/main/java/com/pikolive/app/team/adapter/TeamListAdapter.java +++ b/app/src/main/java/com/pikolive/app/team/adapter/TeamListAdapter.java @@ -10,7 +10,7 @@ import com.pikolive.app.bindadapter.BaseAdapter; import com.pikolive.app.bindadapter.BindingViewHolder; import com.pikolive.app.friend.action.AbstractSelectFriendAction; import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.team.bean.TeamInfo; +import com.pikolive.core.team.bean.TeamInfo; /** * Created by MadisonRong on 11/06/2018. diff --git a/app/src/main/java/com/pikolive/app/team/adapter/TeamMemberListAdapter.java b/app/src/main/java/com/pikolive/app/team/adapter/TeamMemberListAdapter.java index b5db703e0..b26f0be84 100644 --- a/app/src/main/java/com/pikolive/app/team/adapter/TeamMemberListAdapter.java +++ b/app/src/main/java/com/pikolive/app/team/adapter/TeamMemberListAdapter.java @@ -17,9 +17,9 @@ import com.yizhuan.erban.R; import com.pikolive.app.bindadapter.BaseAdapter; import com.pikolive.app.bindadapter.BindingViewHolder; import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.level.UserLevelVo; -import com.yizhuan.xchat_android_core.team.bean.TeamMemberInfo; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.level.UserLevelVo; +import com.pikolive.core.team.bean.TeamMemberInfo; /** * Created by MadisonRong on 30/05/2018. diff --git a/app/src/main/java/com/pikolive/app/team/adapter/TeamWeeklyBillAdapter.java b/app/src/main/java/com/pikolive/app/team/adapter/TeamWeeklyBillAdapter.java index e01ce601c..194212310 100644 --- a/app/src/main/java/com/pikolive/app/team/adapter/TeamWeeklyBillAdapter.java +++ b/app/src/main/java/com/pikolive/app/team/adapter/TeamWeeklyBillAdapter.java @@ -11,8 +11,8 @@ import com.pikolive.app.bindadapter.BaseAdapter; import com.pikolive.app.bindadapter.BindingViewHolder; import com.pikolive.app.common.widget.CircleImageView; import com.pikolive.app.ui.widget.UserInfoDialog; -import com.yizhuan.xchat_android_core.family.model.FamilyModel; -import com.yizhuan.xchat_android_core.team.bean.TeamTransactionRecordInfo; +import com.pikolive.core.family.model.FamilyModel; +import com.pikolive.core.team.bean.TeamTransactionRecordInfo; import com.pikolive.library.utils.FormatUtils; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/main/java/com/pikolive/app/team/view/AddMemberActivity.java b/app/src/main/java/com/pikolive/app/team/view/AddMemberActivity.java index bb49aa201..e613a3d13 100644 --- a/app/src/main/java/com/pikolive/app/team/view/AddMemberActivity.java +++ b/app/src/main/java/com/pikolive/app/team/view/AddMemberActivity.java @@ -14,8 +14,8 @@ import com.yizhuan.erban.R; import com.pikolive.app.base.BaseBindingActivity; import com.yizhuan.erban.databinding.ActivityAddTeamMemberBinding; import com.pikolive.app.team.viewmodel.FamilyMemberVM; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.family.bean.FamilyMemberInfo; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.family.bean.FamilyMemberInfo; import com.pikolive.library.annatation.ActLayoutRes; import com.pikolive.library.utils.ListUtils; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/main/java/com/pikolive/app/team/view/AddMemberSearchActivity.java b/app/src/main/java/com/pikolive/app/team/view/AddMemberSearchActivity.java index 3bd54bb7f..1e2235f64 100644 --- a/app/src/main/java/com/pikolive/app/team/view/AddMemberSearchActivity.java +++ b/app/src/main/java/com/pikolive/app/team/view/AddMemberSearchActivity.java @@ -16,8 +16,8 @@ import com.yizhuan.erban.R; import com.pikolive.app.base.BaseBindingActivity; import com.yizhuan.erban.databinding.ActivityAddTeamMemberSearchListBinding; import com.pikolive.app.team.viewmodel.FamilyMemberVM; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.family.bean.FamilyMemberInfo; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.family.bean.FamilyMemberInfo; import com.pikolive.library.annatation.ActLayoutRes; import com.pikolive.library.utils.ListUtils; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/main/java/com/pikolive/app/team/view/CreateTeamMessageActivity.java b/app/src/main/java/com/pikolive/app/team/view/CreateTeamMessageActivity.java index 4028796ad..22e29370a 100644 --- a/app/src/main/java/com/pikolive/app/team/view/CreateTeamMessageActivity.java +++ b/app/src/main/java/com/pikolive/app/team/view/CreateTeamMessageActivity.java @@ -14,9 +14,9 @@ import com.yizhuan.erban.R; import com.pikolive.app.base.BaseBindingTakePhotoActivity; import com.yizhuan.erban.databinding.ActivityCreateTeamMessageBinding; import com.pikolive.app.utils.KeyBoardUtils; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.family.bean.FamilyMemberInfo; -import com.yizhuan.xchat_android_core.family.model.FamilyModel; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.family.bean.FamilyMemberInfo; +import com.pikolive.core.family.model.FamilyModel; import com.pikolive.library.annatation.ActLayoutRes; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/main/java/com/pikolive/app/team/view/NimTeamManagementActivity.java b/app/src/main/java/com/pikolive/app/team/view/NimTeamManagementActivity.java index 2ec27ec36..f410689d3 100644 --- a/app/src/main/java/com/pikolive/app/team/view/NimTeamManagementActivity.java +++ b/app/src/main/java/com/pikolive/app/team/view/NimTeamManagementActivity.java @@ -16,16 +16,16 @@ import com.yizhuan.erban.databinding.ActivityTeamManagementBinding; import com.pikolive.app.friend.view.SelectFriendActivity; import com.pikolive.app.ui.widget.ButtonItem; import com.pikolive.app.ui.widget.ShareDialog; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.family.bean.FamilyInfo; -import com.yizhuan.xchat_android_core.family.model.FamilyModel; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.share.ShareModel; -import com.yizhuan.xchat_android_core.share.bean.SessionType; -import com.yizhuan.xchat_android_core.team.bean.TeamEvent; -import com.yizhuan.xchat_android_core.team.bean.TeamInfo; -import com.yizhuan.xchat_android_core.team.bean.TeamMemberInfo; -import com.yizhuan.xchat_android_core.team.model.TeamModel; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.family.bean.FamilyInfo; +import com.pikolive.core.family.model.FamilyModel; +import com.pikolive.core2.manager.IMNetEaseManager; +import com.pikolive.core.share.ShareModel; +import com.pikolive.core.share.bean.SessionType; +import com.pikolive.core.team.bean.TeamEvent; +import com.pikolive.core.team.bean.TeamInfo; +import com.pikolive.core.team.bean.TeamMemberInfo; +import com.pikolive.core.team.model.TeamModel; import com.pikolive.library.annatation.ActLayoutRes; import com.pikolive.library.rxbus.RxBus; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/main/java/com/pikolive/app/team/view/NimTeamMessageActivity.java b/app/src/main/java/com/pikolive/app/team/view/NimTeamMessageActivity.java index a41ae1dd5..a01a691b6 100644 --- a/app/src/main/java/com/pikolive/app/team/view/NimTeamMessageActivity.java +++ b/app/src/main/java/com/pikolive/app/team/view/NimTeamMessageActivity.java @@ -36,15 +36,15 @@ import com.pikolive.app.ui.im.actions.FamilyGameAction; import com.pikolive.app.ui.im.actions.LuckyMoneyAction; import com.pikolive.app.ui.im.avtivity.BaseMessageActivity; import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.family.bean.FamilyInfo; -import com.yizhuan.xchat_android_core.family.model.FamilyModel; -import com.yizhuan.xchat_android_core.initial.InitialModel; -import com.yizhuan.xchat_android_core.initial.bean.InitInfo; -import com.yizhuan.xchat_android_core.level.UserLevelVo; -import com.yizhuan.xchat_android_core.team.bean.TeamEvent; -import com.yizhuan.xchat_android_core.team.model.TeamModel; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.pikolive.core.family.bean.FamilyInfo; +import com.pikolive.core.family.model.FamilyModel; +import com.pikolive.core.initial.InitialModel; +import com.pikolive.core.initial.bean.InitInfo; +import com.pikolive.core.level.UserLevelVo; +import com.pikolive.core.team.bean.TeamEvent; +import com.pikolive.core.team.model.TeamModel; +import com.pikolive.core.user.UserModel; +import com.pikolive.core.user.bean.UserInfo; import com.pikolive.library.rxbus.RxBus; import com.pikolive.library.utils.ResUtil; import com.pikolive.library.utils.SingleToastUtil; diff --git a/app/src/main/java/com/pikolive/app/team/view/NimTeamMessageFragment.java b/app/src/main/java/com/pikolive/app/team/view/NimTeamMessageFragment.java index 9a36146d6..f46760de0 100644 --- a/app/src/main/java/com/pikolive/app/team/view/NimTeamMessageFragment.java +++ b/app/src/main/java/com/pikolive/app/team/view/NimTeamMessageFragment.java @@ -17,8 +17,8 @@ import com.netease.nimlib.sdk.team.model.Team; import com.netease.nimlib.sdk.team.model.TeamMember; import com.tbruyelle.rxpermissions2.RxPermissions; import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.manager.IMMessageManager; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.manager.IMMessageManager; import com.pikolive.library.utils.SingleToastUtil; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/com/pikolive/app/team/view/TeamListFragment.java b/app/src/main/java/com/pikolive/app/team/view/TeamListFragment.java index 1b8d5659e..39c73124b 100644 --- a/app/src/main/java/com/pikolive/app/team/view/TeamListFragment.java +++ b/app/src/main/java/com/pikolive/app/team/view/TeamListFragment.java @@ -12,7 +12,7 @@ import com.pikolive.app.friend.action.AbstractSelectFriendAction; import com.pikolive.app.friend.view.SelectFriendActivity; import com.pikolive.app.team.adapter.TeamListAdapter; import com.pikolive.app.team.viewmodel.TeamVM; -import com.yizhuan.xchat_android_core.team.bean.TeamInfo; +import com.pikolive.core.team.bean.TeamInfo; import com.pikolive.library.annatation.ActLayoutRes; import com.pikolive.library.utils.ListUtils; diff --git a/app/src/main/java/com/pikolive/app/team/view/TeamMemberListActivity.java b/app/src/main/java/com/pikolive/app/team/view/TeamMemberListActivity.java index ba578a3a3..d58446e5b 100644 --- a/app/src/main/java/com/pikolive/app/team/view/TeamMemberListActivity.java +++ b/app/src/main/java/com/pikolive/app/team/view/TeamMemberListActivity.java @@ -21,10 +21,10 @@ import com.pikolive.app.team.adapter.TeamMemberListAdapter; import com.pikolive.app.team.bean.NimTeamMember; import com.pikolive.app.team.event.TeamMemberUpdateEvent; import com.pikolive.app.team.viewmodel.TeamVM; -import com.yizhuan.xchat_android_core.family.bean.FamilyMemberInfo; -import com.yizhuan.xchat_android_core.team.bean.TeamInfo; -import com.yizhuan.xchat_android_core.team.bean.TeamMemberInfo; -import com.yizhuan.xchat_android_core.team.model.TeamModel; +import com.pikolive.core.family.bean.FamilyMemberInfo; +import com.pikolive.core.team.bean.TeamInfo; +import com.pikolive.core.team.bean.TeamMemberInfo; +import com.pikolive.core.team.model.TeamModel; import com.pikolive.library.annatation.ActLayoutRes; import com.pikolive.library.rxbus.RxBusHelper; import com.pikolive.library.utils.ListUtils; diff --git a/app/src/main/java/com/pikolive/app/team/view/TeamMemberSearchListActivity.java b/app/src/main/java/com/pikolive/app/team/view/TeamMemberSearchListActivity.java index 3dc51dd30..69248e744 100644 --- a/app/src/main/java/com/pikolive/app/team/view/TeamMemberSearchListActivity.java +++ b/app/src/main/java/com/pikolive/app/team/view/TeamMemberSearchListActivity.java @@ -22,9 +22,9 @@ import com.yizhuan.erban.databinding.ActivityTeamMemberSearchListBinding; import com.pikolive.app.team.adapter.TeamMemberListAdapter; import com.pikolive.app.team.bean.NimTeamMember; import com.pikolive.app.team.viewmodel.TeamVM; -import com.yizhuan.xchat_android_core.team.bean.TeamInfo; -import com.yizhuan.xchat_android_core.team.bean.TeamMemberInfo; -import com.yizhuan.xchat_android_core.team.model.TeamModel; +import com.pikolive.core.team.bean.TeamInfo; +import com.pikolive.core.team.bean.TeamMemberInfo; +import com.pikolive.core.team.model.TeamModel; import com.pikolive.library.annatation.ActLayoutRes; import com.pikolive.library.rxbus.RxBusHelper; import com.pikolive.library.utils.ListUtils; diff --git a/app/src/main/java/com/pikolive/app/team/view/TeamWeeklyBillActivity.java b/app/src/main/java/com/pikolive/app/team/view/TeamWeeklyBillActivity.java index 23b408121..5d7e63a9a 100644 --- a/app/src/main/java/com/pikolive/app/team/view/TeamWeeklyBillActivity.java +++ b/app/src/main/java/com/pikolive/app/team/view/TeamWeeklyBillActivity.java @@ -18,8 +18,8 @@ import com.yizhuan.erban.R; import com.pikolive.app.base.BaseBindingActivity; import com.yizhuan.erban.databinding.ActivityTeamWeeklyBillBinding; import com.pikolive.app.team.viewmodel.TeamVM; -import com.yizhuan.xchat_android_core.family.model.FamilyModel; -import com.yizhuan.xchat_android_core.team.bean.TeamTransactionRecordInfo; +import com.pikolive.core.family.model.FamilyModel; +import com.pikolive.core.team.bean.TeamTransactionRecordInfo; import com.pikolive.library.annatation.ActLayoutRes; import com.pikolive.library.utils.FormatUtils; import com.pikolive.library.utils.ListUtils; diff --git a/app/src/main/java/com/pikolive/app/team/view/TeamWeeklyBillSearchActivity.java b/app/src/main/java/com/pikolive/app/team/view/TeamWeeklyBillSearchActivity.java index 3e08faec1..6fed92d9b 100644 --- a/app/src/main/java/com/pikolive/app/team/view/TeamWeeklyBillSearchActivity.java +++ b/app/src/main/java/com/pikolive/app/team/view/TeamWeeklyBillSearchActivity.java @@ -19,7 +19,7 @@ import com.yizhuan.erban.R; import com.pikolive.app.base.BaseBindingActivity; import com.yizhuan.erban.databinding.ActivityTeamWeeklyBillSearchBinding; import com.pikolive.app.team.viewmodel.TeamVM; -import com.yizhuan.xchat_android_core.team.bean.TeamTransactionRecordInfo; +import com.pikolive.core.team.bean.TeamTransactionRecordInfo; import com.pikolive.library.annatation.ActLayoutRes; import com.pikolive.library.utils.ListUtils; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/main/java/com/pikolive/app/team/view/UpdateTeamNameActivity.java b/app/src/main/java/com/pikolive/app/team/view/UpdateTeamNameActivity.java index fadab4147..6baec3965 100644 --- a/app/src/main/java/com/pikolive/app/team/view/UpdateTeamNameActivity.java +++ b/app/src/main/java/com/pikolive/app/team/view/UpdateTeamNameActivity.java @@ -14,8 +14,8 @@ import com.pikolive.app.base.BaseBindingActivity; import com.pikolive.app.base.TitleBar; import com.yizhuan.erban.databinding.ActivityUpdateTeamNameBinding; import com.pikolive.app.team.viewmodel.TeamVM; -import com.yizhuan.xchat_android_core.team.bean.TeamInfo; -import com.yizhuan.xchat_android_core.team.model.TeamModel; +import com.pikolive.core.team.bean.TeamInfo; +import com.pikolive.core.team.model.TeamModel; import com.pikolive.library.annatation.ActLayoutRes; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/main/java/com/pikolive/app/team/viewmodel/FamilyMemberVM.java b/app/src/main/java/com/pikolive/app/team/viewmodel/FamilyMemberVM.java index 330f2d2bc..1327a7c60 100644 --- a/app/src/main/java/com/pikolive/app/team/viewmodel/FamilyMemberVM.java +++ b/app/src/main/java/com/pikolive/app/team/viewmodel/FamilyMemberVM.java @@ -1,8 +1,8 @@ package com.pikolive.app.team.viewmodel; import com.pikolive.app.base.BaseVM; -import com.yizhuan.xchat_android_core.family.bean.response.memberList.RespFamilymember; -import com.yizhuan.xchat_android_core.family.model.FamilyModel; +import com.pikolive.core.family.bean.response.memberList.RespFamilymember; +import com.pikolive.core.family.model.FamilyModel; import io.reactivex.Single; diff --git a/app/src/main/java/com/pikolive/app/team/viewmodel/TeamVM.java b/app/src/main/java/com/pikolive/app/team/viewmodel/TeamVM.java index 9d198d686..4f3356bd1 100644 --- a/app/src/main/java/com/pikolive/app/team/viewmodel/TeamVM.java +++ b/app/src/main/java/com/pikolive/app/team/viewmodel/TeamVM.java @@ -1,14 +1,14 @@ package com.pikolive.app.team.viewmodel; import com.pikolive.app.base.BaseVM; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.luckymoney.LuckyMoneyInfo; -import com.yizhuan.xchat_android_core.luckymoney.LuckyMoneyRecordsInfo; -import com.yizhuan.xchat_android_core.team.bean.RespTeamMemberInfo; -import com.yizhuan.xchat_android_core.team.bean.TeamInfo; -import com.yizhuan.xchat_android_core.team.bean.TeamMemberInfo; -import com.yizhuan.xchat_android_core.team.bean.TeamTransactionInfo; -import com.yizhuan.xchat_android_core.team.model.TeamModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.luckymoney.LuckyMoneyInfo; +import com.pikolive.core.luckymoney.LuckyMoneyRecordsInfo; +import com.pikolive.core.team.bean.RespTeamMemberInfo; +import com.pikolive.core.team.bean.TeamInfo; +import com.pikolive.core.team.bean.TeamMemberInfo; +import com.pikolive.core.team.bean.TeamTransactionInfo; +import com.pikolive.core.team.model.TeamModel; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/treasurefairy/FairyViewModel.kt b/app/src/main/java/com/pikolive/app/treasurefairy/FairyViewModel.kt index 8df8c3602..8dd67f28d 100644 --- a/app/src/main/java/com/pikolive/app/treasurefairy/FairyViewModel.kt +++ b/app/src/main/java/com/pikolive/app/treasurefairy/FairyViewModel.kt @@ -8,23 +8,23 @@ import com.pikolive.app.base.BaseViewModel import com.pikolive.app.base.Event import com.pikolive.app.treasurefairy.event.UpdateDataEvent import com.pikolive.app.treasurefairy.view.MyFairyItemView -import com.yizhuan.xchat_android_core.bean.response.ListResult -import com.yizhuan.xchat_android_core.gift.bean.SimpleUserInfo -import com.yizhuan.xchat_android_core.treasurefairy.Compound -import com.yizhuan.xchat_android_core.treasurefairy.DrawInfo -import com.yizhuan.xchat_android_core.treasurefairy.ExchangeGiftInfo -import com.yizhuan.xchat_android_core.treasurefairy.FairyInfo -import com.yizhuan.xchat_android_core.treasurefairy.FairyResolveParam -import com.yizhuan.xchat_android_core.treasurefairy.FairyTestParam -import com.yizhuan.xchat_android_core.treasurefairy.ForestInfo -import com.yizhuan.xchat_android_core.treasurefairy.MyFairyInfo -import com.yizhuan.xchat_android_core.treasurefairy.PrizeInfo -import com.yizhuan.xchat_android_core.treasurefairy.ResolveInfo -import com.yizhuan.xchat_android_core.treasurefairy.SendFairyInfo -import com.yizhuan.xchat_android_core.treasurefairy.TestFairyRecordInfo -import com.yizhuan.xchat_android_core.treasurefairy.TreasureFairyModel -import com.yizhuan.xchat_android_core.utils.net.ServerException -import com.yizhuan.xchat_android_core.utils.toast +import com.pikolive.core.bean.response.ListResult +import com.pikolive.core.gift.bean.SimpleUserInfo +import com.pikolive.core2.treasurefairy.Compound +import com.pikolive.core2.treasurefairy.DrawInfo +import com.pikolive.core2.treasurefairy.ExchangeGiftInfo +import com.pikolive.core2.treasurefairy.FairyInfo +import com.pikolive.core2.treasurefairy.FairyResolveParam +import com.pikolive.core2.treasurefairy.FairyTestParam +import com.pikolive.core2.treasurefairy.ForestInfo +import com.pikolive.core2.treasurefairy.MyFairyInfo +import com.pikolive.core2.treasurefairy.PrizeInfo +import com.pikolive.core2.treasurefairy.ResolveInfo +import com.pikolive.core2.treasurefairy.SendFairyInfo +import com.pikolive.core2.treasurefairy.TestFairyRecordInfo +import com.pikolive.core2.treasurefairy.TreasureFairyModel +import com.pikolive.core.utils.net.ServerException +import com.pikolive.core.utils.toast import org.greenrobot.eventbus.EventBus class FairyViewModel : BaseViewModel() { diff --git a/app/src/main/java/com/pikolive/app/treasurefairy/HomeFairyActivity.kt b/app/src/main/java/com/pikolive/app/treasurefairy/HomeFairyActivity.kt index c98895a01..b3421a431 100644 --- a/app/src/main/java/com/pikolive/app/treasurefairy/HomeFairyActivity.kt +++ b/app/src/main/java/com/pikolive/app/treasurefairy/HomeFairyActivity.kt @@ -31,17 +31,17 @@ import com.pikolive.app.treasurefairy.view.CustomDrawable import com.pikolive.app.ui.webview.FairyDialogWebViewActivity import com.pikolive.app.utils.KeyBoardUtils import com.pikolive.app.utils.SpannableBuilder -import com.yizhuan.xchat_android_core.UriProvider -import com.yizhuan.xchat_android_core.auth.AuthModel -import com.yizhuan.xchat_android_core.bean.BaseProtocol -import com.yizhuan.xchat_android_core.gift.bean.LuckyBagNoticeInfo -import com.yizhuan.xchat_android_core.im.custom.bean.* -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager -import com.yizhuan.xchat_android_core.manager.RoomEvent -import com.yizhuan.xchat_android_core.treasurefairy.DrawInfo -import com.yizhuan.xchat_android_core.treasurefairy.FairyMsgInfoBean -import com.yizhuan.xchat_android_core.treasurefairy.PrizeInfo +import com.pikolive.core.auth.AuthModel +import com.pikolive.core.bean.BaseProtocol +import com.pikolive.core.gift.bean.LuckyBagNoticeInfo +import com.pikolive.core.im.custom.bean.* +import com.pikolive.core.manager.AvRoomDataManager +import com.pikolive.core.manager.RoomEvent +import com.pikolive.core2.UriProvider +import com.pikolive.core2.manager.IMNetEaseManager +import com.pikolive.core2.treasurefairy.DrawInfo +import com.pikolive.core2.treasurefairy.FairyMsgInfoBean +import com.pikolive.core2.treasurefairy.PrizeInfo import com.pikolive.library.common.SpConstants import com.pikolive.library.common.util.SPUtils import com.pikolive.library.utils.FormatUtils @@ -474,10 +474,11 @@ class HomeFairyActivity : BaseViewBindingActivity if (baseProtocol.second == CustomAttachment.CUSTOM_MSG_SUB_BOX_ALL_ROOM_NOTIFY_BY_SVGA) { - val roomBoxPrizeAttachment = RoomBoxPrizeAttachment( - CustomAttachment.CUSTOM_MSG_BOX, - CustomAttachment.CUSTOM_MSG_SUB_BOX_ALL_ROOM_NOTIFY_BY_SVGA - ) + val roomBoxPrizeAttachment = + RoomBoxPrizeAttachment( + CustomAttachment.CUSTOM_MSG_BOX, + CustomAttachment.CUSTOM_MSG_SUB_BOX_ALL_ROOM_NOTIFY_BY_SVGA + ) val roomBoxPrizeBean = JSON.parseObject( baseProtocol.data.toString(), RoomBoxPrizeInfo::class.java @@ -514,10 +515,11 @@ class HomeFairyActivity : BaseViewBindingActivity if (baseProtocol.second == CustomAttachment.CUSTOM_MSG_LUCKY_SEA_GIFT_SERVER_ALL) { - val attachment = RoomLuckySeaAttachment( - CustomAttachment.CUSTOM_MSG_LUCKY_SEA, - CustomAttachment.CUSTOM_MSG_LUCKY_SEA_GIFT_SERVER_ALL - ) + val attachment = + RoomLuckySeaAttachment( + CustomAttachment.CUSTOM_MSG_LUCKY_SEA, + CustomAttachment.CUSTOM_MSG_LUCKY_SEA_GIFT_SERVER_ALL + ) attachment.setRoomLuckySeaMsgBean( JSON.parseObject( baseProtocol.data.toString(), @@ -535,7 +537,9 @@ class HomeFairyActivity : BaseViewBindingActivity if (baseProtocol.second == CustomAttachment.CUSTOM_MSG_LUCKY_GIFT_SERVER_NOTIFY || baseProtocol.second == CustomAttachment.CUSTOM_MSG_LUCKY_GIFT_SERVER_ALL) { val attachment = - RoomReceivedLuckyGiftAttachment(CustomAttachment.CUSTOM_MSG_LUCKY_GIFT_SERVER_NOTIFY) + RoomReceivedLuckyGiftAttachment( + CustomAttachment.CUSTOM_MSG_LUCKY_GIFT_SERVER_NOTIFY + ) attachment.luckyBagNoticeInfo = JSON.parseObject( baseProtocol.data.toString(), LuckyBagNoticeInfo::class.java @@ -549,10 +553,11 @@ class HomeFairyActivity : BaseViewBindingActivity if (baseProtocol.second == CustomAttachment.CUSTOM_MSG_SUB_DRAW_GIFT_L5) { - val attachment = FairyMsgAttachment( - CustomAttachment.CUSTOM_MSG_FAIRY, - CustomAttachment.CUSTOM_MSG_SUB_DRAW_GIFT_L5 - ) + val attachment = + FairyMsgAttachment( + CustomAttachment.CUSTOM_MSG_FAIRY, + CustomAttachment.CUSTOM_MSG_SUB_DRAW_GIFT_L5 + ) attachment.fairyMsgInfo = JSON.parseObject( baseProtocol.data.toString(), FairyMsgInfoBean::class.java diff --git a/app/src/main/java/com/pikolive/app/treasurefairy/adapter/ExchangeDebrisAdapter.kt b/app/src/main/java/com/pikolive/app/treasurefairy/adapter/ExchangeDebrisAdapter.kt index 85388e258..0879d79d3 100644 --- a/app/src/main/java/com/pikolive/app/treasurefairy/adapter/ExchangeDebrisAdapter.kt +++ b/app/src/main/java/com/pikolive/app/treasurefairy/adapter/ExchangeDebrisAdapter.kt @@ -4,7 +4,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder import com.yizhuan.erban.R import com.pikolive.app.ui.utils.ImageLoadUtilsV2 -import com.yizhuan.xchat_android_core.treasurefairy.ExchangeGiftInfo +import com.pikolive.core2.treasurefairy.ExchangeGiftInfo class ExchangeDebrisAdapter : BaseQuickAdapter(R.layout.treasure_fairy_item_exchange_debris) { diff --git a/app/src/main/java/com/pikolive/app/treasurefairy/adapter/ExchangeDebrisRecordAdapter.kt b/app/src/main/java/com/pikolive/app/treasurefairy/adapter/ExchangeDebrisRecordAdapter.kt index 18f68d40a..5f2d0d06f 100644 --- a/app/src/main/java/com/pikolive/app/treasurefairy/adapter/ExchangeDebrisRecordAdapter.kt +++ b/app/src/main/java/com/pikolive/app/treasurefairy/adapter/ExchangeDebrisRecordAdapter.kt @@ -3,7 +3,7 @@ package com.pikolive.app.treasurefairy.adapter import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder import com.yizhuan.erban.R -import com.yizhuan.xchat_android_core.treasurefairy.ExchangeGiftInfo +import com.pikolive.core2.treasurefairy.ExchangeGiftInfo import java.text.SimpleDateFormat import java.util.* diff --git a/app/src/main/java/com/pikolive/app/treasurefairy/adapter/ExchangeFairyRecordAdapter.kt b/app/src/main/java/com/pikolive/app/treasurefairy/adapter/ExchangeFairyRecordAdapter.kt index 98473aa39..fac3b43a3 100644 --- a/app/src/main/java/com/pikolive/app/treasurefairy/adapter/ExchangeFairyRecordAdapter.kt +++ b/app/src/main/java/com/pikolive/app/treasurefairy/adapter/ExchangeFairyRecordAdapter.kt @@ -3,7 +3,7 @@ package com.pikolive.app.treasurefairy.adapter import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder import com.yizhuan.erban.R -import com.yizhuan.xchat_android_core.treasurefairy.ExchangeGiftInfo +import com.pikolive.core2.treasurefairy.ExchangeGiftInfo import java.text.SimpleDateFormat import java.util.* diff --git a/app/src/main/java/com/pikolive/app/treasurefairy/adapter/ExchangeFairyResultAdapter.kt b/app/src/main/java/com/pikolive/app/treasurefairy/adapter/ExchangeFairyResultAdapter.kt index ba3599ce6..c0b9d4002 100644 --- a/app/src/main/java/com/pikolive/app/treasurefairy/adapter/ExchangeFairyResultAdapter.kt +++ b/app/src/main/java/com/pikolive/app/treasurefairy/adapter/ExchangeFairyResultAdapter.kt @@ -4,7 +4,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder import com.yizhuan.erban.R import com.pikolive.app.ui.utils.ImageLoadUtilsV2 -import com.yizhuan.xchat_android_core.treasurefairy.ExchangeGiftInfo +import com.pikolive.core2.treasurefairy.ExchangeGiftInfo class ExchangeFairyResultAdapter : BaseQuickAdapter(R.layout.treasure_fairy_item_forest_prize_single) { diff --git a/app/src/main/java/com/pikolive/app/treasurefairy/adapter/ExchangeSummonAdapter.kt b/app/src/main/java/com/pikolive/app/treasurefairy/adapter/ExchangeSummonAdapter.kt index ff267f13a..c5a844cf4 100644 --- a/app/src/main/java/com/pikolive/app/treasurefairy/adapter/ExchangeSummonAdapter.kt +++ b/app/src/main/java/com/pikolive/app/treasurefairy/adapter/ExchangeSummonAdapter.kt @@ -5,8 +5,8 @@ import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder import com.yizhuan.erban.R import com.pikolive.app.ui.utils.ImageLoadUtilsV2 -import com.yizhuan.xchat_android_core.treasurefairy.ExchangeGiftInfo -import com.yizhuan.xchat_android_core.treasurefairy.PropItemInfo +import com.pikolive.core2.treasurefairy.ExchangeGiftInfo +import com.pikolive.core2.treasurefairy.PropItemInfo class ExchangeSummonAdapter : BaseQuickAdapter(R.layout.treasure_fairy_item_exchange_summon) { diff --git a/app/src/main/java/com/pikolive/app/treasurefairy/adapter/ForestPrizeAdapter.kt b/app/src/main/java/com/pikolive/app/treasurefairy/adapter/ForestPrizeAdapter.kt index bb2c4ebee..bc431f0f0 100644 --- a/app/src/main/java/com/pikolive/app/treasurefairy/adapter/ForestPrizeAdapter.kt +++ b/app/src/main/java/com/pikolive/app/treasurefairy/adapter/ForestPrizeAdapter.kt @@ -5,7 +5,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder import com.yizhuan.erban.R import com.pikolive.app.ui.utils.load -import com.yizhuan.xchat_android_core.treasurefairy.PrizeInfo +import com.pikolive.core2.treasurefairy.PrizeInfo class ForestPrizeAdapter(val isSingle: Boolean = false) : BaseQuickAdapter( diff --git a/app/src/main/java/com/pikolive/app/treasurefairy/adapter/ForestPrizesChildAdapter.kt b/app/src/main/java/com/pikolive/app/treasurefairy/adapter/ForestPrizesChildAdapter.kt index c88de9024..0d9fff6f2 100644 --- a/app/src/main/java/com/pikolive/app/treasurefairy/adapter/ForestPrizesChildAdapter.kt +++ b/app/src/main/java/com/pikolive/app/treasurefairy/adapter/ForestPrizesChildAdapter.kt @@ -5,7 +5,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder import com.yizhuan.erban.R import com.pikolive.app.ui.utils.load -import com.yizhuan.xchat_android_core.treasurefairy.PrizeInfo +import com.pikolive.core2.treasurefairy.PrizeInfo class ForestPrizesChildAdapter : BaseQuickAdapter(R.layout.treasure_fairy_item_forest_prizes_child) { diff --git a/app/src/main/java/com/pikolive/app/treasurefairy/adapter/ForestPrizesRecordAdapter.kt b/app/src/main/java/com/pikolive/app/treasurefairy/adapter/ForestPrizesRecordAdapter.kt index d28dcead6..da11f806e 100644 --- a/app/src/main/java/com/pikolive/app/treasurefairy/adapter/ForestPrizesRecordAdapter.kt +++ b/app/src/main/java/com/pikolive/app/treasurefairy/adapter/ForestPrizesRecordAdapter.kt @@ -3,7 +3,7 @@ package com.pikolive.app.treasurefairy.adapter import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder import com.yizhuan.erban.R -import com.yizhuan.xchat_android_core.treasurefairy.PrizeInfo +import com.pikolive.core2.treasurefairy.PrizeInfo import java.text.SimpleDateFormat import java.util.* diff --git a/app/src/main/java/com/pikolive/app/treasurefairy/adapter/HomePrizeAdapter.kt b/app/src/main/java/com/pikolive/app/treasurefairy/adapter/HomePrizeAdapter.kt index 1e4c5701e..41a13b715 100644 --- a/app/src/main/java/com/pikolive/app/treasurefairy/adapter/HomePrizeAdapter.kt +++ b/app/src/main/java/com/pikolive/app/treasurefairy/adapter/HomePrizeAdapter.kt @@ -5,7 +5,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder import com.yizhuan.erban.R import com.pikolive.app.ui.utils.load -import com.yizhuan.xchat_android_core.treasurefairy.PrizeInfo +import com.pikolive.core2.treasurefairy.PrizeInfo class HomePrizeAdapter(val isSingle: Boolean = false) : BaseQuickAdapter( diff --git a/app/src/main/java/com/pikolive/app/treasurefairy/adapter/MyFairyFriendsAdapter.kt b/app/src/main/java/com/pikolive/app/treasurefairy/adapter/MyFairyFriendsAdapter.kt index b0510a547..d61623a7e 100644 --- a/app/src/main/java/com/pikolive/app/treasurefairy/adapter/MyFairyFriendsAdapter.kt +++ b/app/src/main/java/com/pikolive/app/treasurefairy/adapter/MyFairyFriendsAdapter.kt @@ -5,8 +5,8 @@ import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder import com.yizhuan.erban.R import com.pikolive.app.ui.utils.load -import com.yizhuan.xchat_android_core.gift.bean.SimpleUserInfo -import com.yizhuan.xchat_android_core.utils.ifNullOrEmpty +import com.pikolive.core.gift.bean.SimpleUserInfo +import com.pikolive.core.utils.ifNullOrEmpty class MyFairyFriendsAdapter : BaseQuickAdapter(R.layout.treasure_fairy_item_my_fairy_friend) { diff --git a/app/src/main/java/com/pikolive/app/treasurefairy/adapter/MyFairyRecordAdapter.kt b/app/src/main/java/com/pikolive/app/treasurefairy/adapter/MyFairyRecordAdapter.kt index 7ea88e06b..211804ff2 100644 --- a/app/src/main/java/com/pikolive/app/treasurefairy/adapter/MyFairyRecordAdapter.kt +++ b/app/src/main/java/com/pikolive/app/treasurefairy/adapter/MyFairyRecordAdapter.kt @@ -5,7 +5,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder import com.yizhuan.erban.R import com.pikolive.app.ui.utils.load -import com.yizhuan.xchat_android_core.treasurefairy.SendFairyInfo +import com.pikolive.core2.treasurefairy.SendFairyInfo import java.text.SimpleDateFormat import java.util.* diff --git a/app/src/main/java/com/pikolive/app/treasurefairy/adapter/ResolveFairyAdapter.kt b/app/src/main/java/com/pikolive/app/treasurefairy/adapter/ResolveFairyAdapter.kt index 000bc9687..cb4ebc341 100644 --- a/app/src/main/java/com/pikolive/app/treasurefairy/adapter/ResolveFairyAdapter.kt +++ b/app/src/main/java/com/pikolive/app/treasurefairy/adapter/ResolveFairyAdapter.kt @@ -5,7 +5,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder import com.yizhuan.erban.R import com.pikolive.app.ui.utils.load -import com.yizhuan.xchat_android_core.treasurefairy.FairyInfo +import com.pikolive.core2.treasurefairy.FairyInfo import java.util.* class ResolveFairyAdapter : diff --git a/app/src/main/java/com/pikolive/app/treasurefairy/adapter/ResolveFairyResultAdapter.kt b/app/src/main/java/com/pikolive/app/treasurefairy/adapter/ResolveFairyResultAdapter.kt index 30cc11381..5a7562319 100644 --- a/app/src/main/java/com/pikolive/app/treasurefairy/adapter/ResolveFairyResultAdapter.kt +++ b/app/src/main/java/com/pikolive/app/treasurefairy/adapter/ResolveFairyResultAdapter.kt @@ -3,7 +3,7 @@ package com.pikolive.app.treasurefairy.adapter import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder import com.yizhuan.erban.R -import com.yizhuan.xchat_android_core.treasurefairy.ResolveInfo +import com.pikolive.core2.treasurefairy.ResolveInfo class ResolveFairyResultAdapter : BaseQuickAdapter(R.layout.treasure_fairy_item_forest_prize_single_resolve) { diff --git a/app/src/main/java/com/pikolive/app/treasurefairy/adapter/TestFairyAdapter.kt b/app/src/main/java/com/pikolive/app/treasurefairy/adapter/TestFairyAdapter.kt index b70f592c0..51ae860c1 100644 --- a/app/src/main/java/com/pikolive/app/treasurefairy/adapter/TestFairyAdapter.kt +++ b/app/src/main/java/com/pikolive/app/treasurefairy/adapter/TestFairyAdapter.kt @@ -5,7 +5,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder import com.yizhuan.erban.R import com.pikolive.app.ui.utils.load -import com.yizhuan.xchat_android_core.treasurefairy.FairyInfo +import com.pikolive.core2.treasurefairy.FairyInfo import java.util.* class TestFairyAdapter : diff --git a/app/src/main/java/com/pikolive/app/treasurefairy/adapter/TestFairyRecordAdapter.kt b/app/src/main/java/com/pikolive/app/treasurefairy/adapter/TestFairyRecordAdapter.kt index f9c116e15..d039cd339 100644 --- a/app/src/main/java/com/pikolive/app/treasurefairy/adapter/TestFairyRecordAdapter.kt +++ b/app/src/main/java/com/pikolive/app/treasurefairy/adapter/TestFairyRecordAdapter.kt @@ -3,7 +3,7 @@ package com.pikolive.app.treasurefairy.adapter import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder import com.yizhuan.erban.R -import com.yizhuan.xchat_android_core.treasurefairy.TestFairyRecordInfo +import com.pikolive.core2.treasurefairy.TestFairyRecordInfo import java.text.SimpleDateFormat import java.util.* diff --git a/app/src/main/java/com/pikolive/app/treasurefairy/adapter/TestFairyResultAdapter.kt b/app/src/main/java/com/pikolive/app/treasurefairy/adapter/TestFairyResultAdapter.kt index 9919e4e65..78afe86e6 100644 --- a/app/src/main/java/com/pikolive/app/treasurefairy/adapter/TestFairyResultAdapter.kt +++ b/app/src/main/java/com/pikolive/app/treasurefairy/adapter/TestFairyResultAdapter.kt @@ -5,7 +5,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder import com.yizhuan.erban.R import com.pikolive.app.ui.utils.load -import com.yizhuan.xchat_android_core.treasurefairy.FairyInfo +import com.pikolive.core2.treasurefairy.FairyInfo class TestFairyResultAdapter : BaseQuickAdapter(R.layout.treasure_fairy_item_forest_prize_single) { diff --git a/app/src/main/java/com/pikolive/app/treasurefairy/dialog/ExchangeFairyResultDialog.kt b/app/src/main/java/com/pikolive/app/treasurefairy/dialog/ExchangeFairyResultDialog.kt index 68489665e..53804cc35 100644 --- a/app/src/main/java/com/pikolive/app/treasurefairy/dialog/ExchangeFairyResultDialog.kt +++ b/app/src/main/java/com/pikolive/app/treasurefairy/dialog/ExchangeFairyResultDialog.kt @@ -11,7 +11,7 @@ import com.yizhuan.erban.databinding.TreasureFairyDialogTestFairyResultBinding import com.pikolive.app.treasurefairy.FairyViewModel import com.pikolive.app.treasurefairy.adapter.ExchangeFairyResultAdapter import com.pikolive.app.ui.utils.RVDelegate -import com.yizhuan.xchat_android_core.treasurefairy.ExchangeGiftInfo +import com.pikolive.core2.treasurefairy.ExchangeGiftInfo class ExchangeFairyResultDialog : BaseDialog() { diff --git a/app/src/main/java/com/pikolive/app/treasurefairy/dialog/FairyBuyDebrisDialog.kt b/app/src/main/java/com/pikolive/app/treasurefairy/dialog/FairyBuyDebrisDialog.kt index ad4864a0c..e9169aab6 100644 --- a/app/src/main/java/com/pikolive/app/treasurefairy/dialog/FairyBuyDebrisDialog.kt +++ b/app/src/main/java/com/pikolive/app/treasurefairy/dialog/FairyBuyDebrisDialog.kt @@ -9,8 +9,8 @@ import com.yizhuan.erban.R import com.pikolive.app.base.BaseDialog import com.yizhuan.erban.databinding.TreasureFairyDialogBuyDebrisBinding import com.pikolive.app.treasurefairy.FairyViewModel -import com.yizhuan.xchat_android_core.auth.AuthModel -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager +import com.pikolive.core.auth.AuthModel +import com.pikolive.core.manager.AvRoomDataManager import com.pikolive.library.common.SpConstants import com.pikolive.library.common.util.SPUtils diff --git a/app/src/main/java/com/pikolive/app/treasurefairy/dialog/FairyBuyDebrisModifyQuantityDialog.kt b/app/src/main/java/com/pikolive/app/treasurefairy/dialog/FairyBuyDebrisModifyQuantityDialog.kt index 22b51ab2b..89ae498b1 100644 --- a/app/src/main/java/com/pikolive/app/treasurefairy/dialog/FairyBuyDebrisModifyQuantityDialog.kt +++ b/app/src/main/java/com/pikolive/app/treasurefairy/dialog/FairyBuyDebrisModifyQuantityDialog.kt @@ -11,9 +11,9 @@ import com.pikolive.app.base.BaseDialog import com.yizhuan.erban.databinding.TreasureFairyDialogBuyDebrisModifyQuantityBinding import com.yizhuan.erban.treasure_box.activity.TreasureBoxActivity import com.pikolive.app.treasurefairy.FairyViewModel -import com.yizhuan.xchat_android_core.auth.AuthModel -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager -import com.yizhuan.xchat_android_core.utils.StringUtils +import com.pikolive.core.auth.AuthModel +import com.pikolive.core.manager.AvRoomDataManager +import com.pikolive.core.utils.StringUtils import com.pikolive.library.utils.SingleToastUtil /** diff --git a/app/src/main/java/com/pikolive/app/treasurefairy/dialog/ForestFairyDialog.kt b/app/src/main/java/com/pikolive/app/treasurefairy/dialog/ForestFairyDialog.kt index 0452dc548..cf4bd3ce3 100644 --- a/app/src/main/java/com/pikolive/app/treasurefairy/dialog/ForestFairyDialog.kt +++ b/app/src/main/java/com/pikolive/app/treasurefairy/dialog/ForestFairyDialog.kt @@ -11,9 +11,9 @@ import com.pikolive.app.base.BaseDialog import com.yizhuan.erban.databinding.TreasureFairyDialogForestBinding import com.pikolive.app.treasurefairy.FairyViewModel import com.pikolive.app.ui.utils.loadAvatar -import com.yizhuan.xchat_android_core.utils.subAndReplaceDot -import com.yizhuan.xchat_android_core.utils.toIntOrDef -import com.yizhuan.xchat_android_core.utils.toast +import com.pikolive.core.utils.subAndReplaceDot +import com.pikolive.core.utils.toIntOrDef +import com.pikolive.core.utils.toast class ForestFairyDialog : BaseDialog() { diff --git a/app/src/main/java/com/pikolive/app/treasurefairy/dialog/ForestPrizeDialog.kt b/app/src/main/java/com/pikolive/app/treasurefairy/dialog/ForestPrizeDialog.kt index b271d1ea9..1d251c330 100644 --- a/app/src/main/java/com/pikolive/app/treasurefairy/dialog/ForestPrizeDialog.kt +++ b/app/src/main/java/com/pikolive/app/treasurefairy/dialog/ForestPrizeDialog.kt @@ -15,7 +15,7 @@ import com.yizhuan.erban.databinding.TreasureFairyDialogForestPrizeBinding import com.pikolive.app.treasurefairy.FairyViewModel import com.pikolive.app.treasurefairy.adapter.ForestPrizeAdapter import com.pikolive.app.ui.utils.RVDelegate -import com.yizhuan.xchat_android_core.treasurefairy.PrizeInfo +import com.pikolive.core2.treasurefairy.PrizeInfo class ForestPrizeDialog : BaseDialog() { diff --git a/app/src/main/java/com/pikolive/app/treasurefairy/dialog/HomeMorePopupWindow.kt b/app/src/main/java/com/pikolive/app/treasurefairy/dialog/HomeMorePopupWindow.kt index 6d3fb998b..480c9eb26 100644 --- a/app/src/main/java/com/pikolive/app/treasurefairy/dialog/HomeMorePopupWindow.kt +++ b/app/src/main/java/com/pikolive/app/treasurefairy/dialog/HomeMorePopupWindow.kt @@ -5,7 +5,7 @@ import android.graphics.Color import android.view.View import com.yizhuan.erban.R import com.pikolive.app.ui.webview.FairyDialogWebViewActivity -import com.yizhuan.xchat_android_core.UriProvider +import com.pikolive.core2.UriProvider import razerdp.basepopup.BasePopupWindow class HomeMorePopupWindow(private val context: Context) : BasePopupWindow(context) { diff --git a/app/src/main/java/com/pikolive/app/treasurefairy/dialog/HomePrizeDialog.kt b/app/src/main/java/com/pikolive/app/treasurefairy/dialog/HomePrizeDialog.kt index e7953a9a4..f1c3f55ad 100644 --- a/app/src/main/java/com/pikolive/app/treasurefairy/dialog/HomePrizeDialog.kt +++ b/app/src/main/java/com/pikolive/app/treasurefairy/dialog/HomePrizeDialog.kt @@ -12,7 +12,7 @@ import com.yizhuan.erban.databinding.TreasureFairyDialogHomePrizeBinding import com.pikolive.app.treasurefairy.FairyViewModel import com.pikolive.app.treasurefairy.adapter.HomePrizeAdapter import com.pikolive.app.ui.utils.RVDelegate -import com.yizhuan.xchat_android_core.treasurefairy.PrizeInfo +import com.pikolive.core2.treasurefairy.PrizeInfo class HomePrizeDialog : BaseDialog() { diff --git a/app/src/main/java/com/pikolive/app/treasurefairy/dialog/MyFairyDialog.kt b/app/src/main/java/com/pikolive/app/treasurefairy/dialog/MyFairyDialog.kt index 8c3c330fe..f8d65e406 100644 --- a/app/src/main/java/com/pikolive/app/treasurefairy/dialog/MyFairyDialog.kt +++ b/app/src/main/java/com/pikolive/app/treasurefairy/dialog/MyFairyDialog.kt @@ -14,7 +14,7 @@ import com.pikolive.app.treasurefairy.FairyViewModel import com.pikolive.app.treasurefairy.event.UpdateDataEvent import com.pikolive.app.treasurefairy.fragment.MyFairyFragment import com.pikolive.app.treasurefairy.view.MyFairyItemView -import com.yizhuan.xchat_android_core.DemoCache +import com.pikolive.core.DemoCache import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode diff --git a/app/src/main/java/com/pikolive/app/treasurefairy/dialog/MyFairyRecordDialog.kt b/app/src/main/java/com/pikolive/app/treasurefairy/dialog/MyFairyRecordDialog.kt index 6d0205320..fac4a3772 100644 --- a/app/src/main/java/com/pikolive/app/treasurefairy/dialog/MyFairyRecordDialog.kt +++ b/app/src/main/java/com/pikolive/app/treasurefairy/dialog/MyFairyRecordDialog.kt @@ -13,7 +13,7 @@ import com.yizhuan.erban.databinding.TreasureFairyDialogMyFairyRecordBinding import com.pikolive.app.treasurefairy.FairyViewModel import com.pikolive.app.treasurefairy.adapter.MyFairyRecordAdapter import com.pikolive.app.ui.utils.RVDelegate -import com.yizhuan.xchat_android_core.treasurefairy.SendFairyInfo +import com.pikolive.core2.treasurefairy.SendFairyInfo class MyFairyRecordDialog : BaseDialog() { diff --git a/app/src/main/java/com/pikolive/app/treasurefairy/dialog/MyFairySearchFriendsDialog.kt b/app/src/main/java/com/pikolive/app/treasurefairy/dialog/MyFairySearchFriendsDialog.kt index 3768d7f07..4a277f05e 100644 --- a/app/src/main/java/com/pikolive/app/treasurefairy/dialog/MyFairySearchFriendsDialog.kt +++ b/app/src/main/java/com/pikolive/app/treasurefairy/dialog/MyFairySearchFriendsDialog.kt @@ -12,8 +12,8 @@ import com.yizhuan.erban.databinding.TreasureFairyDialogMyFairySearchFriendBindi import com.pikolive.app.treasurefairy.FairyViewModel import com.pikolive.app.treasurefairy.adapter.MyFairyFriendsAdapter import com.pikolive.app.ui.utils.RVDelegate -import com.yizhuan.xchat_android_core.gift.bean.SimpleUserInfo -import com.yizhuan.xchat_android_core.treasurefairy.FairyInfo +import com.pikolive.core.gift.bean.SimpleUserInfo +import com.pikolive.core2.treasurefairy.FairyInfo class MyFairySearchFriendsDialog : BaseDialog() { diff --git a/app/src/main/java/com/pikolive/app/treasurefairy/dialog/MyFairySendDialog.kt b/app/src/main/java/com/pikolive/app/treasurefairy/dialog/MyFairySendDialog.kt index 9d98e2191..dd91e598d 100644 --- a/app/src/main/java/com/pikolive/app/treasurefairy/dialog/MyFairySendDialog.kt +++ b/app/src/main/java/com/pikolive/app/treasurefairy/dialog/MyFairySendDialog.kt @@ -13,8 +13,8 @@ import com.yizhuan.erban.databinding.TreasureFairyDialogMyFairySendBinding import com.pikolive.app.treasurefairy.FairyViewModel import com.pikolive.app.ui.utils.load import com.pikolive.app.utils.SpannableBuilder -import com.yizhuan.xchat_android_core.gift.bean.SimpleUserInfo -import com.yizhuan.xchat_android_core.treasurefairy.FairyInfo +import com.pikolive.core.gift.bean.SimpleUserInfo +import com.pikolive.core2.treasurefairy.FairyInfo import com.pikolive.library.common.util.ClickUtils.clickWithTrigger class MyFairySendDialog : BaseDialog() { diff --git a/app/src/main/java/com/pikolive/app/treasurefairy/dialog/ResolveFairyResultDialog.kt b/app/src/main/java/com/pikolive/app/treasurefairy/dialog/ResolveFairyResultDialog.kt index ca5c4de8e..97f025e4f 100644 --- a/app/src/main/java/com/pikolive/app/treasurefairy/dialog/ResolveFairyResultDialog.kt +++ b/app/src/main/java/com/pikolive/app/treasurefairy/dialog/ResolveFairyResultDialog.kt @@ -11,7 +11,7 @@ import com.yizhuan.erban.databinding.TreasureFairyDialogResolveFairyResultBindin import com.pikolive.app.treasurefairy.FairyViewModel import com.pikolive.app.treasurefairy.adapter.ResolveFairyResultAdapter import com.pikolive.app.ui.utils.RVDelegate -import com.yizhuan.xchat_android_core.treasurefairy.ResolveInfo +import com.pikolive.core2.treasurefairy.ResolveInfo class ResolveFairyResultDialog : BaseDialog() { diff --git a/app/src/main/java/com/pikolive/app/treasurefairy/dialog/TestFairyRecordDialog.kt b/app/src/main/java/com/pikolive/app/treasurefairy/dialog/TestFairyRecordDialog.kt index 111ac0d41..7f902f3d0 100644 --- a/app/src/main/java/com/pikolive/app/treasurefairy/dialog/TestFairyRecordDialog.kt +++ b/app/src/main/java/com/pikolive/app/treasurefairy/dialog/TestFairyRecordDialog.kt @@ -12,7 +12,7 @@ import com.yizhuan.erban.databinding.TreasureFairyDialogTestFairyRecordBinding import com.pikolive.app.treasurefairy.FairyViewModel import com.pikolive.app.treasurefairy.adapter.TestFairyRecordAdapter import com.pikolive.app.ui.utils.RVDelegate -import com.yizhuan.xchat_android_core.treasurefairy.TestFairyRecordInfo +import com.pikolive.core2.treasurefairy.TestFairyRecordInfo class TestFairyRecordDialog : BaseDialog() { diff --git a/app/src/main/java/com/pikolive/app/treasurefairy/dialog/TestFairyResultDialog.kt b/app/src/main/java/com/pikolive/app/treasurefairy/dialog/TestFairyResultDialog.kt index c2f27dd82..89fa764b6 100644 --- a/app/src/main/java/com/pikolive/app/treasurefairy/dialog/TestFairyResultDialog.kt +++ b/app/src/main/java/com/pikolive/app/treasurefairy/dialog/TestFairyResultDialog.kt @@ -11,7 +11,7 @@ import com.yizhuan.erban.databinding.TreasureFairyDialogTestFairyResultBinding import com.pikolive.app.treasurefairy.FairyViewModel import com.pikolive.app.treasurefairy.adapter.TestFairyResultAdapter import com.pikolive.app.ui.utils.RVDelegate -import com.yizhuan.xchat_android_core.treasurefairy.FairyInfo +import com.pikolive.core2.treasurefairy.FairyInfo class TestFairyResultDialog : BaseDialog() { diff --git a/app/src/main/java/com/pikolive/app/treasurefairy/fragment/ExchangeDebrisFragment.kt b/app/src/main/java/com/pikolive/app/treasurefairy/fragment/ExchangeDebrisFragment.kt index 1c334b183..594ff4267 100644 --- a/app/src/main/java/com/pikolive/app/treasurefairy/fragment/ExchangeDebrisFragment.kt +++ b/app/src/main/java/com/pikolive/app/treasurefairy/fragment/ExchangeDebrisFragment.kt @@ -14,10 +14,10 @@ import com.pikolive.app.treasurefairy.FairyViewModel import com.pikolive.app.treasurefairy.adapter.ExchangeDebrisAdapter import com.pikolive.app.ui.utils.RVDelegate import com.pikolive.app.ui.utils.loadAvatar -import com.yizhuan.xchat_android_core.treasurefairy.ExchangeGiftInfo -import com.yizhuan.xchat_android_core.user.UserModel -import com.yizhuan.xchat_android_core.utils.subAndReplaceDot -import com.yizhuan.xchat_android_core.utils.toast +import com.pikolive.core2.treasurefairy.ExchangeGiftInfo +import com.pikolive.core.user.UserModel +import com.pikolive.core.utils.subAndReplaceDot +import com.pikolive.core.utils.toast class ExchangeDebrisFragment : BaseViewBindingFragment() { diff --git a/app/src/main/java/com/pikolive/app/treasurefairy/fragment/ExchangeDebrisRecordFragment.kt b/app/src/main/java/com/pikolive/app/treasurefairy/fragment/ExchangeDebrisRecordFragment.kt index ccbee285f..7d902e718 100644 --- a/app/src/main/java/com/pikolive/app/treasurefairy/fragment/ExchangeDebrisRecordFragment.kt +++ b/app/src/main/java/com/pikolive/app/treasurefairy/fragment/ExchangeDebrisRecordFragment.kt @@ -11,7 +11,7 @@ import com.yizhuan.erban.databinding.TreasureFairyFragmentExchangeRecordDebrisBi import com.pikolive.app.treasurefairy.FairyViewModel import com.pikolive.app.treasurefairy.adapter.ExchangeDebrisRecordAdapter import com.pikolive.app.ui.utils.RVDelegate -import com.yizhuan.xchat_android_core.treasurefairy.ExchangeGiftInfo +import com.pikolive.core2.treasurefairy.ExchangeGiftInfo class ExchangeDebrisRecordFragment : BaseViewBindingFragment() { diff --git a/app/src/main/java/com/pikolive/app/treasurefairy/fragment/ExchangeFairyFragment.kt b/app/src/main/java/com/pikolive/app/treasurefairy/fragment/ExchangeFairyFragment.kt index f2cd6bf9d..44314fe89 100644 --- a/app/src/main/java/com/pikolive/app/treasurefairy/fragment/ExchangeFairyFragment.kt +++ b/app/src/main/java/com/pikolive/app/treasurefairy/fragment/ExchangeFairyFragment.kt @@ -11,8 +11,8 @@ import com.pikolive.app.treasurefairy.FairyViewModel import com.pikolive.app.treasurefairy.dialog.ExchangeFairyResultDialog import com.pikolive.app.treasurefairy.view.MyFairyItemView import com.pikolive.app.ui.utils.load -import com.yizhuan.xchat_android_core.treasurefairy.ExchangeGiftInfo -import com.yizhuan.xchat_android_core.treasurefairy.MyFairyInfo +import com.pikolive.core2.treasurefairy.ExchangeGiftInfo +import com.pikolive.core2.treasurefairy.MyFairyInfo class ExchangeFairyFragment : BaseViewBindingFragment() { diff --git a/app/src/main/java/com/pikolive/app/treasurefairy/fragment/ExchangeFairyRecordFragment.kt b/app/src/main/java/com/pikolive/app/treasurefairy/fragment/ExchangeFairyRecordFragment.kt index 332226d45..be5d0c5f2 100644 --- a/app/src/main/java/com/pikolive/app/treasurefairy/fragment/ExchangeFairyRecordFragment.kt +++ b/app/src/main/java/com/pikolive/app/treasurefairy/fragment/ExchangeFairyRecordFragment.kt @@ -11,7 +11,7 @@ import com.yizhuan.erban.databinding.TreasureFairyFragmentExchangeRecordFairyBin import com.pikolive.app.treasurefairy.FairyViewModel import com.pikolive.app.treasurefairy.adapter.ExchangeFairyRecordAdapter import com.pikolive.app.ui.utils.RVDelegate -import com.yizhuan.xchat_android_core.treasurefairy.ExchangeGiftInfo +import com.pikolive.core2.treasurefairy.ExchangeGiftInfo class ExchangeFairyRecordFragment : BaseViewBindingFragment() { diff --git a/app/src/main/java/com/pikolive/app/treasurefairy/fragment/ExchangeSummonFragment.kt b/app/src/main/java/com/pikolive/app/treasurefairy/fragment/ExchangeSummonFragment.kt index f47a27a37..575505b4a 100644 --- a/app/src/main/java/com/pikolive/app/treasurefairy/fragment/ExchangeSummonFragment.kt +++ b/app/src/main/java/com/pikolive/app/treasurefairy/fragment/ExchangeSummonFragment.kt @@ -16,11 +16,11 @@ import com.pikolive.app.treasurefairy.adapter.ExchangeSummonAdapter import com.pikolive.app.ui.utils.ImageLoadUtilsV2 import com.pikolive.app.ui.utils.RVDelegate import com.pikolive.app.ui.utils.loadAvatar -import com.yizhuan.xchat_android_core.treasurefairy.ExchangeGiftInfo -import com.yizhuan.xchat_android_core.treasurefairy.FairyInfo -import com.yizhuan.xchat_android_core.user.UserModel -import com.yizhuan.xchat_android_core.utils.subAndReplaceDot -import com.yizhuan.xchat_android_core.utils.toast +import com.pikolive.core2.treasurefairy.ExchangeGiftInfo +import com.pikolive.core2.treasurefairy.FairyInfo +import com.pikolive.core.user.UserModel +import com.pikolive.core.utils.subAndReplaceDot +import com.pikolive.core.utils.toast class ExchangeSummonFragment : BaseViewBindingFragment() { diff --git a/app/src/main/java/com/pikolive/app/treasurefairy/fragment/ForestPrizesChildFragment.kt b/app/src/main/java/com/pikolive/app/treasurefairy/fragment/ForestPrizesChildFragment.kt index 6d8a6cb54..61b419ab9 100644 --- a/app/src/main/java/com/pikolive/app/treasurefairy/fragment/ForestPrizesChildFragment.kt +++ b/app/src/main/java/com/pikolive/app/treasurefairy/fragment/ForestPrizesChildFragment.kt @@ -12,7 +12,7 @@ import com.yizhuan.erban.databinding.TreasureFairyFragmentForestPrizesChildBindi import com.pikolive.app.treasurefairy.FairyViewModel import com.pikolive.app.treasurefairy.adapter.ForestPrizesChildAdapter import com.pikolive.app.ui.utils.RVDelegate -import com.yizhuan.xchat_android_core.treasurefairy.PrizeInfo +import com.pikolive.core2.treasurefairy.PrizeInfo class ForestPrizesChildFragment : BaseViewBindingFragment() { diff --git a/app/src/main/java/com/pikolive/app/treasurefairy/fragment/ForestRecordFragment.kt b/app/src/main/java/com/pikolive/app/treasurefairy/fragment/ForestRecordFragment.kt index 618b1b71a..2736addaa 100644 --- a/app/src/main/java/com/pikolive/app/treasurefairy/fragment/ForestRecordFragment.kt +++ b/app/src/main/java/com/pikolive/app/treasurefairy/fragment/ForestRecordFragment.kt @@ -11,7 +11,7 @@ import com.yizhuan.erban.databinding.TreasureFairyFragmentForestRecordBinding import com.pikolive.app.treasurefairy.FairyViewModel import com.pikolive.app.treasurefairy.adapter.ForestPrizesRecordAdapter import com.pikolive.app.ui.utils.RVDelegate -import com.yizhuan.xchat_android_core.treasurefairy.PrizeInfo +import com.pikolive.core2.treasurefairy.PrizeInfo class ForestRecordFragment : BaseViewBindingFragment() { diff --git a/app/src/main/java/com/pikolive/app/treasurefairy/fragment/TestFairyFragment.kt b/app/src/main/java/com/pikolive/app/treasurefairy/fragment/TestFairyFragment.kt index d60d60972..8514935c6 100644 --- a/app/src/main/java/com/pikolive/app/treasurefairy/fragment/TestFairyFragment.kt +++ b/app/src/main/java/com/pikolive/app/treasurefairy/fragment/TestFairyFragment.kt @@ -19,7 +19,7 @@ import com.pikolive.app.treasurefairy.dialog.TestFairyResultDialog import com.pikolive.app.treasurefairy.view.MyFairyItemView import com.pikolive.app.ui.utils.RVDelegate import com.pikolive.app.ui.utils.load -import com.yizhuan.xchat_android_core.treasurefairy.FairyInfo +import com.pikolive.core2.treasurefairy.FairyInfo class TestFairyFragment : BaseViewBindingFragment() { diff --git a/app/src/main/java/com/pikolive/app/treasurefairy/view/ExchangeItemView.kt b/app/src/main/java/com/pikolive/app/treasurefairy/view/ExchangeItemView.kt index 29a7adae7..f3135d2c5 100644 --- a/app/src/main/java/com/pikolive/app/treasurefairy/view/ExchangeItemView.kt +++ b/app/src/main/java/com/pikolive/app/treasurefairy/view/ExchangeItemView.kt @@ -8,7 +8,7 @@ import androidx.constraintlayout.widget.ConstraintLayout import com.yizhuan.erban.R import com.yizhuan.erban.databinding.TreasureFairyItemExchangeBinding import com.pikolive.app.ui.utils.load -import com.yizhuan.xchat_android_core.treasurefairy.FairyInfo +import com.pikolive.core2.treasurefairy.FairyInfo class ExchangeItemView @JvmOverloads constructor( context: Context, diff --git a/app/src/main/java/com/pikolive/app/treasurefairy/view/HomeItemView.kt b/app/src/main/java/com/pikolive/app/treasurefairy/view/HomeItemView.kt index 59d5bcbd8..ea4e48076 100644 --- a/app/src/main/java/com/pikolive/app/treasurefairy/view/HomeItemView.kt +++ b/app/src/main/java/com/pikolive/app/treasurefairy/view/HomeItemView.kt @@ -7,7 +7,7 @@ import androidx.annotation.Nullable import com.yizhuan.erban.R import com.yizhuan.erban.databinding.TreasureFairyItemHomeBinding import com.pikolive.app.ui.utils.load -import com.yizhuan.xchat_android_core.treasurefairy.PrizeInfo +import com.pikolive.core2.treasurefairy.PrizeInfo class HomeItemView @JvmOverloads constructor( context: Context, diff --git a/app/src/main/java/com/pikolive/app/treasurefairy/view/MyFairyItemView.kt b/app/src/main/java/com/pikolive/app/treasurefairy/view/MyFairyItemView.kt index b028b4d4f..2246c1908 100644 --- a/app/src/main/java/com/pikolive/app/treasurefairy/view/MyFairyItemView.kt +++ b/app/src/main/java/com/pikolive/app/treasurefairy/view/MyFairyItemView.kt @@ -12,7 +12,7 @@ import androidx.core.view.isVisible import com.yizhuan.erban.R import com.yizhuan.erban.databinding.TreasureFairyItemMyFairyBaseBinding import com.pikolive.app.ui.utils.load -import com.yizhuan.xchat_android_core.treasurefairy.FairyInfo +import com.pikolive.core2.treasurefairy.FairyInfo class MyFairyItemView @JvmOverloads constructor( context: Context, diff --git a/app/src/main/java/com/pikolive/app/ui/adapter/StarWeekAdapter.java b/app/src/main/java/com/pikolive/app/ui/adapter/StarWeekAdapter.java index 717b992a8..25b1fc065 100644 --- a/app/src/main/java/com/pikolive/app/ui/adapter/StarWeekAdapter.java +++ b/app/src/main/java/com/pikolive/app/ui/adapter/StarWeekAdapter.java @@ -6,9 +6,9 @@ import androidx.constraintlayout.widget.ConstraintLayout; import com.yizhuan.erban.R; import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.gift.bean.SimpleUserInfo; -import com.yizhuan.xchat_android_core.room.anotherroompk.ShowUserInfoDialogEvent; -import com.yizhuan.xchat_android_core.utils.TextUtils; +import com.pikolive.core.gift.bean.SimpleUserInfo; +import com.pikolive.core.room.anotherroompk.ShowUserInfoDialogEvent; +import com.pikolive.core.utils.TextUtils; import com.pikolive.library.common.application.BaseApp; import com.pikolive.library.utils.ResUtil; import com.zhpan.bannerview.BaseBannerAdapter; diff --git a/app/src/main/java/com/pikolive/app/ui/anim/AnimFactory.java b/app/src/main/java/com/pikolive/app/ui/anim/AnimFactory.java index 1f575dcb4..f761d6574 100644 --- a/app/src/main/java/com/pikolive/app/ui/anim/AnimFactory.java +++ b/app/src/main/java/com/pikolive/app/ui/anim/AnimFactory.java @@ -8,9 +8,9 @@ import android.util.Log; import com.netease.nim.uikit.common.util.log.LogUtil; import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.room.face.DynamicFaceModel; -import com.yizhuan.xchat_android_core.room.face.FaceInfo; -import com.yizhuan.xchat_android_core.room.face.FaceReceiveInfo; +import com.pikolive.core.room.face.DynamicFaceModel; +import com.pikolive.core.room.face.FaceInfo; +import com.pikolive.core.room.face.FaceReceiveInfo; import com.pikolive.library.threadmgr.ThreadPoolManager; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/main/java/com/pikolive/app/ui/gift/callback/OnGiftDialogBtnClickListenerWrapper.java b/app/src/main/java/com/pikolive/app/ui/gift/callback/OnGiftDialogBtnClickListenerWrapper.java index 9fe077abf..b871d834d 100644 --- a/app/src/main/java/com/pikolive/app/ui/gift/callback/OnGiftDialogBtnClickListenerWrapper.java +++ b/app/src/main/java/com/pikolive/app/ui/gift/callback/OnGiftDialogBtnClickListenerWrapper.java @@ -2,8 +2,8 @@ package com.pikolive.app.ui.gift.callback; import com.pikolive.app.ui.widget.GiftDialog; import com.pikolive.app.ui.widget.GiftDialog; -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo; -import com.yizhuan.xchat_android_core.room.queue.bean.MicMemberInfo; +import com.pikolive.core.gift.bean.GiftInfo; +import com.pikolive.core.room.queue.bean.MicMemberInfo; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/ui/gift/dialog/GiftGridView.java b/app/src/main/java/com/pikolive/app/ui/gift/dialog/GiftGridView.java index c2d0134d3..910b2079e 100644 --- a/app/src/main/java/com/pikolive/app/ui/gift/dialog/GiftGridView.java +++ b/app/src/main/java/com/pikolive/app/ui/gift/dialog/GiftGridView.java @@ -14,8 +14,8 @@ import androidx.viewpager.widget.PagerAdapter; import androidx.viewpager.widget.ViewPager; import com.yizhuan.erban.BR; -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo; -import com.yizhuan.xchat_android_core.magic.bean.MagicInfo; +import com.pikolive.core.gift.bean.GiftInfo; +import com.pikolive.core.magic.bean.MagicInfo; import com.pikolive.library.bindinglist.IItem; import com.pikolive.library.bindinglist.MultiTypeAdapter; import com.pikolive.library.utils.ListUtils; diff --git a/app/src/main/java/com/pikolive/app/ui/gift/dialog/GiftInfoVm.java b/app/src/main/java/com/pikolive/app/ui/gift/dialog/GiftInfoVm.java index 8a2beb7be..b98dd742a 100644 --- a/app/src/main/java/com/pikolive/app/ui/gift/dialog/GiftInfoVm.java +++ b/app/src/main/java/com/pikolive/app/ui/gift/dialog/GiftInfoVm.java @@ -8,8 +8,8 @@ import androidx.databinding.ObservableField; import com.yizhuan.erban.R; import com.pikolive.app.vip.util.VipHelper; -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo; -import com.yizhuan.xchat_android_core.gift.bean.SimpleVipInfo; +import com.pikolive.core.gift.bean.GiftInfo; +import com.pikolive.core.gift.bean.SimpleVipInfo; import com.pikolive.library.bindinglist.BaseItem; import com.pikolive.library.utils.TimeUtils; diff --git a/app/src/main/java/com/pikolive/app/ui/gift/widget/GiftFrameLayout.java b/app/src/main/java/com/pikolive/app/ui/gift/widget/GiftFrameLayout.java index 0c96261f5..245fdcbf6 100644 --- a/app/src/main/java/com/pikolive/app/ui/gift/widget/GiftFrameLayout.java +++ b/app/src/main/java/com/pikolive/app/ui/gift/widget/GiftFrameLayout.java @@ -147,9 +147,9 @@ public class GiftFrameLayout extends RelativeLayout implements Handler.Callback mGift = gift; if (mGift.isCurrentStart()) { - mGiftCount = gift.getGiftCount() + mGift.getHitCombo(); + mGiftCount = getGiftCount() + mGift.getHitCombo(); } else { - mGiftCount = gift.getGiftCount(); + mGiftCount = getGiftCount(); } if (!TextUtils.isEmpty(gift.getSendUserName())) { anim_nickname.setText(gift.getSendUserName()); diff --git a/app/src/main/java/com/pikolive/app/ui/im/GreetPresenter.java b/app/src/main/java/com/pikolive/app/ui/im/GreetPresenter.java index 8ab924125..f23bc5f66 100644 --- a/app/src/main/java/com/pikolive/app/ui/im/GreetPresenter.java +++ b/app/src/main/java/com/pikolive/app/ui/im/GreetPresenter.java @@ -1,8 +1,8 @@ package com.pikolive.app.ui.im; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.im.GreetModel; -import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.im.GreetModel; +import com.pikolive.core.utils.SharedPreferenceUtils; import io.reactivex.Single; import io.reactivex.SingleSource; diff --git a/app/src/main/java/com/pikolive/app/ui/im/ImInitHelper.java b/app/src/main/java/com/pikolive/app/ui/im/ImInitHelper.java index dcaf7863b..e5338609d 100644 --- a/app/src/main/java/com/pikolive/app/ui/im/ImInitHelper.java +++ b/app/src/main/java/com/pikolive/app/ui/im/ImInitHelper.java @@ -34,58 +34,40 @@ import com.pikolive.app.luckymoney.viewholder.LuckyMoneyTipsViewHolder; import com.yizhuan.erban.module_hall.HallDataManager; import com.yizhuan.erban.module_hall.im.msgholder.ClanMsgViewHolder; import com.yizhuan.erban.public_chat_hall.msg.viewholder.MsgViewHolderAitMe; -import com.yizhuan.erban.share.viewholder.InAppSharingMsgViewHolder; -import com.pikolive.app.ui.im.actions.GiftAction; +import com.pikolive.app.share.viewholder.InAppSharingMsgViewHolder; import com.pikolive.app.ui.im.avtivity.NimP2PMessageActivity; -import com.pikolive.app.ui.im.chat.MsgViewHolderAudioParty; -import com.pikolive.app.ui.im.chat.MsgViewHolderChatHint; -import com.pikolive.app.ui.im.chat.MsgViewHolderContent; -import com.pikolive.app.ui.im.chat.MsgViewHolderFairy; -import com.pikolive.app.ui.im.chat.MsgViewHolderGift; -import com.pikolive.app.ui.im.chat.MsgViewHolderHello; -import com.pikolive.app.ui.im.chat.MsgViewHolderLevel; -import com.pikolive.app.ui.im.chat.MsgViewHolderLottery; -import com.pikolive.app.ui.im.chat.MsgViewHolderOnline; -import com.pikolive.app.ui.im.chat.MsgViewHolderP2PContactRecharge; -import com.pikolive.app.ui.im.chat.MsgViewHolderRedPackage; -import com.pikolive.app.ui.im.chat.MsgViewHolderRedPacket; -import com.pikolive.app.ui.im.chat.MsgViewHolderSkill; -import com.pikolive.app.ui.im.chat.MsgViewHolderText; -import com.pikolive.app.ui.im.chat.SignInNoticeMsgViewHolder; -import com.pikolive.app.ui.im.chat.SysMsgV2ViewHolder; -import com.pikolive.app.ui.im.chat.SysMsgViewHolder; import com.pikolive.app.ui.user.activity.UserInfoActivity; -import com.yizhuan.xchat_android_core.community.attachment.DynamicSysAttachment; -import com.yizhuan.xchat_android_core.community.im.WorldDynamicAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.AssistantAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.CarAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.CarveUpGoldThirdLevelAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.ChatHintAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.CpInviteAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.FairySendAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.GiftAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.InAppSharingFamilyAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.InAppSharingMiniWorldAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.InAppSharingRoomAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.InAppSharingTeamAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.LevelUpAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.LotteryAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.LuckyMoneyAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.LuckyMoneyTipsAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.NewbieHelloAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.NobleAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.NoticeAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.OpenRoomNotiAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.OpenSignInAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.P2PContactRechargeAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.RedPackageAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.RedPacketAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.SkillMsgAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.SysMsgAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.SysMsgV2Attachment; -import com.yizhuan.xchat_android_core.miniworld.bean.OpenAudioPartyAttachment; -import com.yizhuan.xchat_android_core.module_hall.im.ClanAttachment; -import com.yizhuan.xchat_android_core.public_chat_hall.attachment.AitMeAttachment; +import com.pikolive.core.community.attachment.DynamicSysAttachment; +import com.pikolive.core.community.im.WorldDynamicAttachment; +import com.pikolive.core.im.custom.bean.AssistantAttachment; +import com.pikolive.core.im.custom.bean.CarAttachment; +import com.pikolive.core.im.custom.bean.CarveUpGoldThirdLevelAttachment; +import com.pikolive.core.im.custom.bean.ChatHintAttachment; +import com.pikolive.core.im.custom.bean.CpInviteAttachment; +import com.pikolive.core.im.custom.bean.FairySendAttachment; +import com.pikolive.core.im.custom.bean.GiftAttachment; +import com.pikolive.core.im.custom.bean.InAppSharingFamilyAttachment; +import com.pikolive.core.im.custom.bean.InAppSharingMiniWorldAttachment; +import com.pikolive.core.im.custom.bean.InAppSharingRoomAttachment; +import com.pikolive.core.im.custom.bean.InAppSharingTeamAttachment; +import com.pikolive.core.im.custom.bean.LevelUpAttachment; +import com.pikolive.core.im.custom.bean.LotteryAttachment; +import com.pikolive.core.im.custom.bean.LuckyMoneyAttachment; +import com.pikolive.core.im.custom.bean.LuckyMoneyTipsAttachment; +import com.pikolive.core.im.custom.bean.NewbieHelloAttachment; +import com.pikolive.core.im.custom.bean.NobleAttachment; +import com.pikolive.core.im.custom.bean.NoticeAttachment; +import com.pikolive.core.im.custom.bean.OpenRoomNotiAttachment; +import com.pikolive.core.im.custom.bean.OpenSignInAttachment; +import com.pikolive.core.im.custom.bean.P2PContactRechargeAttachment; +import com.pikolive.core.im.custom.bean.RedPackageAttachment; +import com.pikolive.core.im.custom.bean.RedPacketAttachment; +import com.pikolive.core.im.custom.bean.SkillMsgAttachment; +import com.pikolive.core.im.custom.bean.SysMsgAttachment; +import com.pikolive.core.im.custom.bean.SysMsgV2Attachment; +import com.pikolive.core.miniworld.bean.OpenAudioPartyAttachment; +import com.pikolive.core.module_hall.im.ClanAttachment; +import com.pikolive.core.public_chat_hall.attachment.AitMeAttachment; import java.util.ArrayList; diff --git a/app/src/main/java/com/pikolive/app/ui/im/MessageListPanelEx.java b/app/src/main/java/com/pikolive/app/ui/im/MessageListPanelEx.java index dbecaea11..ffe649159 100644 --- a/app/src/main/java/com/pikolive/app/ui/im/MessageListPanelEx.java +++ b/app/src/main/java/com/pikolive/app/ui/im/MessageListPanelEx.java @@ -69,9 +69,9 @@ import com.netease.nimlib.sdk.robot.model.RobotMsgType; import com.netease.nimlib.sdk.team.constant.TeamMemberType; import com.netease.nimlib.sdk.team.model.TeamMember; import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.module_hall.im.HallAttachment; -import com.yizhuan.xchat_android_core.module_hall.im.HallImMsgInfo; -import com.yizhuan.xchat_android_core.room.event.MessageSizeEvent; +import com.pikolive.core.module_hall.im.HallAttachment; +import com.pikolive.core.module_hall.im.HallImMsgInfo; +import com.pikolive.core.room.event.MessageSizeEvent; import com.pikolive.library.utils.ResUtil; import com.pikolive.library.utils.SingleToastUtil; diff --git a/app/src/main/java/com/pikolive/app/ui/im/RouterHandler.java b/app/src/main/java/com/pikolive/app/ui/im/RouterHandler.java index eec0b9dee..b18bdc72d 100644 --- a/app/src/main/java/com/pikolive/app/ui/im/RouterHandler.java +++ b/app/src/main/java/com/pikolive/app/ui/im/RouterHandler.java @@ -34,9 +34,9 @@ import com.yizhuan.erban.module_hall.hall.activity.ModuleHallActivity; import com.yizhuan.erban.public_chat_hall.activity.PublicChatHallHomeActivity; import com.pikolive.app.radish.signin.SignInActivity; import com.pikolive.app.radish.task.activity.TaskCenterActivity; -import com.yizhuan.erban.relation.cp.activity.CpHomeActivity; -import com.yizhuan.erban.relation.cp.activity.CpInviteRecordActivity; -import com.yizhuan.erban.relation.cp.activity.CpTaskActivity; +import com.pikolive.app.relation.cp.activity.CpHomeActivity; +import com.pikolive.app.relation.cp.activity.CpInviteRecordActivity; +import com.pikolive.app.relation.cp.activity.CpTaskActivity; import com.pikolive.app.team.view.NimTeamMessageActivity; import com.pikolive.app.ui.login.BindPhoneActivity; import com.pikolive.app.ui.login.ShowBindPhoneActivity; @@ -44,20 +44,20 @@ import com.pikolive.app.ui.user.activity.UserInfoActivity; import com.pikolive.app.ui.withdraw.BinderAlipayActivity; import com.pikolive.app.vip.VipMainActivity; import com.yizhuan.tutu.mentoring_relationship.activity.MentoringRelationshipActivity; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.DemoCache; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.community.event.SquareTaskEvent; -import com.yizhuan.xchat_android_core.im.custom.bean.RouterType; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.module_hall.hall.HallModel; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.HallInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.room.model.AvRoomModel; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_core.withdraw.WithdrawModel; +import com.pikolive.core.Constants; +import com.pikolive.core.DemoCache; +import com.pikolive.core2.UriProvider; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.community.event.SquareTaskEvent; +import com.pikolive.core.im.custom.bean.RouterType; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core.module_hall.hall.HallModel; +import com.pikolive.core.module_hall.hall.bean.HallInfo; +import com.pikolive.core.room.bean.RoomInfo; +import com.pikolive.core.room.model.AvRoomModel; +import com.pikolive.core.utils.net.BeanObserver; +import com.pikolive.core.utils.net.RxHelper; +import com.pikolive.core.withdraw.WithdrawModel; import com.pikolive.library.common.util.DeviceUtil; import com.pikolive.library.net.rxnet.callback.CallBack; import com.pikolive.library.utils.AppMetaDataUtil; diff --git a/app/src/main/java/com/pikolive/app/ui/im/actions/ChatterBoxAction.java b/app/src/main/java/com/pikolive/app/ui/im/actions/ChatterBoxAction.java index d48fbc43d..c7eba2d6b 100644 --- a/app/src/main/java/com/pikolive/app/ui/im/actions/ChatterBoxAction.java +++ b/app/src/main/java/com/pikolive/app/ui/im/actions/ChatterBoxAction.java @@ -5,8 +5,8 @@ import android.os.Handler; import com.netease.nim.uikit.business.session.actions.BaseAction; import com.yizhuan.erban.R; import com.pikolive.app.ui.widget.higuide.TuTuGuideHelper; -import com.yizhuan.xchat_android_core.im.chatterbox.ChatterBoxHelper; -import com.yizhuan.xchat_android_core.im.chatterbox.HideInputEvent; +import com.pikolive.core.im.chatterbox.ChatterBoxHelper; +import com.pikolive.core.im.chatterbox.HideInputEvent; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/main/java/com/pikolive/app/ui/im/actions/GiftAction.java b/app/src/main/java/com/pikolive/app/ui/im/actions/GiftAction.java index a885cf8e6..eca7fb0cd 100644 --- a/app/src/main/java/com/pikolive/app/ui/im/actions/GiftAction.java +++ b/app/src/main/java/com/pikolive/app/ui/im/actions/GiftAction.java @@ -7,11 +7,11 @@ import com.netease.nim.uikit.business.session.helper.MessageListPanelHelper; import com.yizhuan.erban.R; import com.pikolive.app.common.widget.dialog.DialogManager; import com.pikolive.app.ui.widget.GiftDialog; -import com.yizhuan.xchat_android_core.gift.GiftModel; -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo; -import com.yizhuan.xchat_android_core.gift.toolbox.GiftToolbox; -import com.yizhuan.xchat_android_core.room.queue.bean.MicMemberInfo; -import com.yizhuan.xchat_android_core.utils.net.VipLevelNotEnoughException; +import com.pikolive.core.gift.GiftModel; +import com.pikolive.core.gift.bean.GiftInfo; +import com.pikolive.core.gift.toolbox.GiftToolbox; +import com.pikolive.core.room.queue.bean.MicMemberInfo; +import com.pikolive.core.utils.net.VipLevelNotEnoughException; import com.pikolive.library.utils.ResUtil; import java.util.ArrayList; diff --git a/app/src/main/java/com/pikolive/app/ui/im/avtivity/AddBlackListActivity.java b/app/src/main/java/com/pikolive/app/ui/im/avtivity/AddBlackListActivity.java index a4a55c88a..489a7a179 100644 --- a/app/src/main/java/com/pikolive/app/ui/im/avtivity/AddBlackListActivity.java +++ b/app/src/main/java/com/pikolive/app/ui/im/avtivity/AddBlackListActivity.java @@ -19,8 +19,8 @@ import com.pikolive.app.UIHelper; import com.pikolive.app.base.BaseMvpActivity; import com.pikolive.app.common.widget.dialog.DialogManager; import com.pikolive.app.utils.RegexUtil; -import com.yizhuan.xchat_android_constants.XChatConstants; -import com.yizhuan.xchat_android_core.user.UserModel; +import com.pikolive.core2.XChatConstants; +import com.pikolive.core.user.UserModel; import com.pikolive.library.base.factory.CreatePresenter; import com.pikolive.library.utils.JavaUtil; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/main/java/com/pikolive/app/ui/im/avtivity/NimP2PMessageActivity.java b/app/src/main/java/com/pikolive/app/ui/im/avtivity/NimP2PMessageActivity.java index 0d97394ce..92c44f7e9 100644 --- a/app/src/main/java/com/pikolive/app/ui/im/avtivity/NimP2PMessageActivity.java +++ b/app/src/main/java/com/pikolive/app/ui/im/avtivity/NimP2PMessageActivity.java @@ -41,23 +41,23 @@ import com.yizhuan.erban.R; import com.pikolive.app.avroom.activity.AVRoomActivity; import com.pikolive.app.common.widget.CustomImageSpan; import com.yizhuan.tutu.mentoring_relationship.dialog.BuildMentoringRelationshipSuccessDialog; -import com.yizhuan.xchat_android_core.audio.event.VoiceShakeHeartEvent; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.im.friend.IMFriendModel; -import com.yizhuan.xchat_android_core.initial.InitialModel; -import com.yizhuan.xchat_android_core.initial.bean.InitInfo; -import com.yizhuan.xchat_android_core.level.UserLevelVo; -import com.yizhuan.xchat_android_core.mentoring_relationship.event.MentoringSuccessEvent; -import com.yizhuan.xchat_android_core.noble.NobleUtil; -import com.yizhuan.xchat_android_core.praise.PraiseModel; -import com.yizhuan.xchat_android_core.praise.event.IsLikedEvent; -import com.yizhuan.xchat_android_core.praise.event.PraiseEvent; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserDetailInfo; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.utils.StringExtensionKt; -import com.yizhuan.xchat_android_core.utils.SystemUidUtil; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; +import com.pikolive.core.audio.event.VoiceShakeHeartEvent; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.im.friend.IMFriendModel; +import com.pikolive.core.initial.InitialModel; +import com.pikolive.core.initial.bean.InitInfo; +import com.pikolive.core.level.UserLevelVo; +import com.pikolive.core.mentoring_relationship.event.MentoringSuccessEvent; +import com.pikolive.core.noble.NobleUtil; +import com.pikolive.core.praise.PraiseModel; +import com.pikolive.core.praise.event.IsLikedEvent; +import com.pikolive.core.praise.event.PraiseEvent; +import com.pikolive.core.user.UserModel; +import com.pikolive.core.user.bean.UserDetailInfo; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.utils.StringExtensionKt; +import com.pikolive.core.utils.SystemUidUtil; +import com.pikolive.core.utils.net.BeanObserver; import com.pikolive.library.utils.ListUtils; import com.pikolive.library.utils.ResUtil; import com.pikolive.library.utils.SingleToastUtil; diff --git a/app/src/main/java/com/pikolive/app/ui/im/chat/MVHChatterBoxStart.java b/app/src/main/java/com/pikolive/app/ui/im/chat/MVHChatterBoxStart.java index 7bf7d6f64..19a771c9e 100644 --- a/app/src/main/java/com/pikolive/app/ui/im/chat/MVHChatterBoxStart.java +++ b/app/src/main/java/com/pikolive/app/ui/im/chat/MVHChatterBoxStart.java @@ -14,12 +14,12 @@ import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum; import com.netease.nimlib.sdk.msg.model.CustomMessageConfig; import com.netease.nimlib.sdk.msg.model.IMMessage; import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.im.chatterbox.ChatterBoxModel; -import com.yizhuan.xchat_android_core.im.chatterbox.TopicBoxItemInfo; -import com.yizhuan.xchat_android_core.im.custom.bean.ChatterBoxAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.DiceThrowAttachment; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.im.chatterbox.ChatterBoxModel; +import com.pikolive.core.im.chatterbox.TopicBoxItemInfo; +import com.pikolive.core.im.custom.bean.ChatterBoxAttachment; +import com.pikolive.core.im.custom.bean.DiceThrowAttachment; +import com.pikolive.core2.manager.IMNetEaseManager; import com.pikolive.library.utils.ResUtil; import java.util.HashMap; diff --git a/app/src/main/java/com/pikolive/app/ui/im/chat/MsgViewHolderAudioParty.java b/app/src/main/java/com/pikolive/app/ui/im/chat/MsgViewHolderAudioParty.java index ee0162465..e4046985d 100644 --- a/app/src/main/java/com/pikolive/app/ui/im/chat/MsgViewHolderAudioParty.java +++ b/app/src/main/java/com/pikolive/app/ui/im/chat/MsgViewHolderAudioParty.java @@ -10,9 +10,9 @@ import com.netease.nim.uikit.business.session.viewholder.MsgViewHolderBase; import com.netease.nim.uikit.common.ui.recyclerview.adapter.BaseMultiItemFetchLoadAdapter; import com.yizhuan.erban.R; import com.pikolive.app.avroom.activity.AVRoomActivity; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.miniworld.bean.OpenAudioPartyAttachment; -import com.yizhuan.xchat_android_core.miniworld.model.MiniWorldHelper; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.miniworld.bean.OpenAudioPartyAttachment; +import com.pikolive.core.miniworld.model.MiniWorldHelper; import com.pikolive.library.utils.ResUtil; import com.pikolive.library.utils.SingleToastUtil; diff --git a/app/src/main/java/com/pikolive/app/ui/im/chat/MsgViewHolderChatHint.java b/app/src/main/java/com/pikolive/app/ui/im/chat/MsgViewHolderChatHint.java index 623b381b0..95c449f89 100644 --- a/app/src/main/java/com/pikolive/app/ui/im/chat/MsgViewHolderChatHint.java +++ b/app/src/main/java/com/pikolive/app/ui/im/chat/MsgViewHolderChatHint.java @@ -16,8 +16,8 @@ import com.netease.nim.uikit.common.ui.recyclerview.adapter.BaseMultiItemFetchLo import com.yizhuan.erban.R; import com.pikolive.app.common.widget.OriginalDrawStatusClickSpan; import com.pikolive.app.ui.webview.SimpleWebViewActivity; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.im.custom.bean.ChatHintAttachment; +import com.pikolive.core2.UriProvider; +import com.pikolive.core.im.custom.bean.ChatHintAttachment; import com.pikolive.library.utils.ResUtil; public class MsgViewHolderChatHint extends MsgViewHolderBase { diff --git a/app/src/main/java/com/pikolive/app/ui/im/chat/MsgViewHolderContent.java b/app/src/main/java/com/pikolive/app/ui/im/chat/MsgViewHolderContent.java index 2674d037f..7a8423929 100644 --- a/app/src/main/java/com/pikolive/app/ui/im/chat/MsgViewHolderContent.java +++ b/app/src/main/java/com/pikolive/app/ui/im/chat/MsgViewHolderContent.java @@ -12,7 +12,7 @@ import com.pikolive.app.ui.webview.CommonWebViewActivity; import com.yizhuan.erban.R; import com.pikolive.app.ui.utils.ImageLoadUtils; import com.pikolive.app.ui.webview.CommonWebViewActivity; -import com.yizhuan.xchat_android_core.im.custom.bean.NoticeAttachment; +import com.pikolive.core.im.custom.bean.NoticeAttachment; /** * Created by chenran on 2017/9/21. diff --git a/app/src/main/java/com/pikolive/app/ui/im/chat/MsgViewHolderFairy.java b/app/src/main/java/com/pikolive/app/ui/im/chat/MsgViewHolderFairy.java index 857ef9525..20e85f4ca 100644 --- a/app/src/main/java/com/pikolive/app/ui/im/chat/MsgViewHolderFairy.java +++ b/app/src/main/java/com/pikolive/app/ui/im/chat/MsgViewHolderFairy.java @@ -10,12 +10,12 @@ import com.netease.nim.uikit.common.ui.recyclerview.adapter.BaseMultiItemFetchLo import com.yizhuan.erban.R; import com.pikolive.app.treasurefairy.dialog.MyFairySendDialog; import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.gift.bean.SimpleUserInfo; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.FairySendAttachment; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.treasurefairy.FairyInfo; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.gift.bean.SimpleUserInfo; +import com.pikolive.core.im.custom.bean.CustomAttachment; +import com.pikolive.core.im.custom.bean.FairySendAttachment; +import com.pikolive.core2.manager.IMNetEaseManager; +import com.pikolive.core2.treasurefairy.FairyInfo; import java.util.HashMap; import java.util.Map; diff --git a/app/src/main/java/com/pikolive/app/ui/im/chat/MsgViewHolderGift.java b/app/src/main/java/com/pikolive/app/ui/im/chat/MsgViewHolderGift.java index f116400e3..a074947e1 100644 --- a/app/src/main/java/com/pikolive/app/ui/im/chat/MsgViewHolderGift.java +++ b/app/src/main/java/com/pikolive/app/ui/im/chat/MsgViewHolderGift.java @@ -10,10 +10,10 @@ import com.netease.nim.uikit.business.session.viewholder.MsgViewHolderBase; import com.netease.nim.uikit.common.ui.recyclerview.adapter.BaseMultiItemFetchLoadAdapter; import com.yizhuan.erban.R; import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.gift.GiftModel; -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo; -import com.yizhuan.xchat_android_core.im.custom.bean.GiftAttachment; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.gift.GiftModel; +import com.pikolive.core.gift.bean.GiftInfo; +import com.pikolive.core.im.custom.bean.GiftAttachment; import com.pikolive.library.utils.ResUtil; /** diff --git a/app/src/main/java/com/pikolive/app/ui/im/chat/MsgViewHolderHello.java b/app/src/main/java/com/pikolive/app/ui/im/chat/MsgViewHolderHello.java index ee0ac4dce..68bc19b0e 100644 --- a/app/src/main/java/com/pikolive/app/ui/im/chat/MsgViewHolderHello.java +++ b/app/src/main/java/com/pikolive/app/ui/im/chat/MsgViewHolderHello.java @@ -8,10 +8,10 @@ import com.netease.nim.uikit.business.session.viewholder.MsgViewHolderBase; import com.netease.nim.uikit.common.ui.recyclerview.adapter.BaseMultiItemFetchLoadAdapter; import com.yizhuan.erban.R; import com.pikolive.app.avroom.activity.AVRoomActivity; -import com.yizhuan.xchat_android_core.im.custom.bean.NewbieHelloAttachment; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.room.model.AvRoomModel; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.im.custom.bean.NewbieHelloAttachment; +import com.pikolive.core.room.bean.RoomInfo; +import com.pikolive.core.room.model.AvRoomModel; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.utils.ResUtil; import com.pikolive.library.utils.SingleToastUtil; diff --git a/app/src/main/java/com/pikolive/app/ui/im/chat/MsgViewHolderLevel.java b/app/src/main/java/com/pikolive/app/ui/im/chat/MsgViewHolderLevel.java index a4e075f9a..15648f0f0 100644 --- a/app/src/main/java/com/pikolive/app/ui/im/chat/MsgViewHolderLevel.java +++ b/app/src/main/java/com/pikolive/app/ui/im/chat/MsgViewHolderLevel.java @@ -8,9 +8,9 @@ import com.netease.nim.uikit.business.session.viewholder.MsgViewHolderBase; import com.netease.nim.uikit.common.ui.recyclerview.adapter.BaseMultiItemFetchLoadAdapter; import com.pikolive.app.ui.webview.CommonWebViewActivity; import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.LevelUpAttachment; +import com.pikolive.core2.UriProvider; +import com.pikolive.core.im.custom.bean.CustomAttachment; +import com.pikolive.core.im.custom.bean.LevelUpAttachment; import com.pikolive.library.utils.ResUtil; /** diff --git a/app/src/main/java/com/pikolive/app/ui/im/chat/MsgViewHolderLottery.java b/app/src/main/java/com/pikolive/app/ui/im/chat/MsgViewHolderLottery.java index ec4e0bf89..8cd3b3504 100644 --- a/app/src/main/java/com/pikolive/app/ui/im/chat/MsgViewHolderLottery.java +++ b/app/src/main/java/com/pikolive/app/ui/im/chat/MsgViewHolderLottery.java @@ -7,7 +7,7 @@ import com.netease.nim.uikit.business.session.viewholder.MsgViewHolderBase; import com.netease.nim.uikit.common.ui.recyclerview.adapter.BaseMultiItemFetchLoadAdapter; import com.yizhuan.erban.R; import com.pikolive.app.ui.webview.CommonWebViewActivity; -import com.yizhuan.xchat_android_core.UriProvider; +import com.pikolive.core2.UriProvider; /** * Created by chenran on 2018/1/2. diff --git a/app/src/main/java/com/pikolive/app/ui/im/chat/MsgViewHolderOnline.java b/app/src/main/java/com/pikolive/app/ui/im/chat/MsgViewHolderOnline.java index 3602ed5f7..17ceed4b5 100644 --- a/app/src/main/java/com/pikolive/app/ui/im/chat/MsgViewHolderOnline.java +++ b/app/src/main/java/com/pikolive/app/ui/im/chat/MsgViewHolderOnline.java @@ -15,7 +15,7 @@ import com.netease.nimlib.sdk.uinfo.model.NimUserInfo; import com.yizhuan.erban.R; import com.pikolive.app.avroom.activity.AVRoomActivity; import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.im.custom.bean.OpenRoomNotiAttachment; +import com.pikolive.core.im.custom.bean.OpenRoomNotiAttachment; import com.pikolive.library.utils.ResUtil; /** diff --git a/app/src/main/java/com/pikolive/app/ui/im/chat/MsgViewHolderP2PContactRecharge.java b/app/src/main/java/com/pikolive/app/ui/im/chat/MsgViewHolderP2PContactRecharge.java index b4de8d85b..581361b7d 100644 --- a/app/src/main/java/com/pikolive/app/ui/im/chat/MsgViewHolderP2PContactRecharge.java +++ b/app/src/main/java/com/pikolive/app/ui/im/chat/MsgViewHolderP2PContactRecharge.java @@ -14,7 +14,7 @@ import com.netease.nim.uikit.common.ui.recyclerview.adapter.BaseMultiItemFetchLo import com.yizhuan.erban.R; import com.pikolive.app.common.widget.OriginalDrawStatusClickSpan; import com.pikolive.app.utils.ClipboardUtils; -import com.yizhuan.xchat_android_core.im.custom.bean.P2PContactRechargeAttachment; +import com.pikolive.core.im.custom.bean.P2PContactRechargeAttachment; import com.pikolive.library.utils.SingleToastUtil; /** diff --git a/app/src/main/java/com/pikolive/app/ui/im/chat/MsgViewHolderRedPackage.java b/app/src/main/java/com/pikolive/app/ui/im/chat/MsgViewHolderRedPackage.java index 1c564a9c8..9c384a019 100644 --- a/app/src/main/java/com/pikolive/app/ui/im/chat/MsgViewHolderRedPackage.java +++ b/app/src/main/java/com/pikolive/app/ui/im/chat/MsgViewHolderRedPackage.java @@ -9,11 +9,11 @@ import com.netease.nim.uikit.common.ui.recyclerview.adapter.BaseMultiItemFetchLo import com.yizhuan.erban.R; import com.pikolive.app.avroom.activity.AVRoomActivity; import com.pikolive.app.common.widget.dialog.DialogManager; -import com.yizhuan.xchat_android_core.DemoCache; -import com.yizhuan.xchat_android_core.im.custom.bean.RedPackageAttachment; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.redpackage.RedPackageNotifyInfo; -import com.yizhuan.xchat_android_core.utils.CurrentTimeUtils; +import com.pikolive.core.DemoCache; +import com.pikolive.core.im.custom.bean.RedPackageAttachment; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core.redpackage.RedPackageNotifyInfo; +import com.pikolive.core.utils.CurrentTimeUtils; import com.pikolive.library.utils.ResUtil; import java.util.Map; diff --git a/app/src/main/java/com/pikolive/app/ui/im/chat/MsgViewHolderRedPacket.java b/app/src/main/java/com/pikolive/app/ui/im/chat/MsgViewHolderRedPacket.java index be8a94753..6ec6673d2 100644 --- a/app/src/main/java/com/pikolive/app/ui/im/chat/MsgViewHolderRedPacket.java +++ b/app/src/main/java/com/pikolive/app/ui/im/chat/MsgViewHolderRedPacket.java @@ -7,7 +7,7 @@ import android.widget.TextView; import com.netease.nim.uikit.business.session.viewholder.MsgViewHolderBase; import com.netease.nim.uikit.common.ui.recyclerview.adapter.BaseMultiItemFetchLoadAdapter; import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.im.custom.bean.RedPacketAttachment; +import com.pikolive.core.im.custom.bean.RedPacketAttachment; import com.pikolive.library.utils.ResUtil; /** diff --git a/app/src/main/java/com/pikolive/app/ui/im/chat/MsgViewHolderSkill.java b/app/src/main/java/com/pikolive/app/ui/im/chat/MsgViewHolderSkill.java index fcc26c726..8896cb512 100644 --- a/app/src/main/java/com/pikolive/app/ui/im/chat/MsgViewHolderSkill.java +++ b/app/src/main/java/com/pikolive/app/ui/im/chat/MsgViewHolderSkill.java @@ -5,8 +5,8 @@ import com.netease.nim.uikit.business.session.viewholder.MsgViewHolderBase; import com.netease.nim.uikit.common.ui.recyclerview.adapter.BaseMultiItemFetchLoadAdapter; import com.netease.nimlib.sdk.msg.attachment.MsgAttachment; import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.im.custom.bean.SkillMsgAttachment; -import com.yizhuan.xchat_android_core.skill.entity.SkillNotifyEntity; +import com.pikolive.core.im.custom.bean.SkillMsgAttachment; +import com.pikolive.core.skill.entity.SkillNotifyEntity; /** *

文字消息holder

diff --git a/app/src/main/java/com/pikolive/app/ui/im/chat/MsgViewHolderText.java b/app/src/main/java/com/pikolive/app/ui/im/chat/MsgViewHolderText.java index f87852c6f..948b9d815 100644 --- a/app/src/main/java/com/pikolive/app/ui/im/chat/MsgViewHolderText.java +++ b/app/src/main/java/com/pikolive/app/ui/im/chat/MsgViewHolderText.java @@ -1,7 +1,7 @@ package com.pikolive.app.ui.im.chat; -import static com.yizhuan.xchat_android_core.UriProvider.IM_SERVER_URL; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MESS_SUB_CAR_EXPIRE; +import static com.pikolive.core2.UriProvider.IM_SERVER_URL; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MESS_SUB_CAR_EXPIRE; import android.text.style.ForegroundColorSpan; import android.view.View; @@ -15,18 +15,18 @@ import com.pikolive.app.decoration.view.MyDecorationActivity; import com.pikolive.app.ui.im.RouterHandler; import com.pikolive.app.ui.webview.CommonWebViewActivity; import com.pikolive.app.utils.SpannableBuilder; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.audio.bean.VoiceBottleSayHiInfo; -import com.yizhuan.xchat_android_core.audio.event.VoiceShakeHeartEvent; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.im.custom.bean.AssistantAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.CarAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.CarveUpGoldThirdLevelAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.CpInviteAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.NobleAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.VoiceBottleShakeHeartAttachment; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; +import com.pikolive.core2.UriProvider; +import com.pikolive.core.audio.bean.VoiceBottleSayHiInfo; +import com.pikolive.core.audio.event.VoiceShakeHeartEvent; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.im.custom.bean.AssistantAttachment; +import com.pikolive.core.im.custom.bean.CarAttachment; +import com.pikolive.core.im.custom.bean.CarveUpGoldThirdLevelAttachment; +import com.pikolive.core.im.custom.bean.CpInviteAttachment; +import com.pikolive.core.im.custom.bean.CustomAttachment; +import com.pikolive.core.im.custom.bean.NobleAttachment; +import com.pikolive.core.im.custom.bean.VoiceBottleShakeHeartAttachment; +import com.pikolive.core2.manager.IMNetEaseManager; import com.pikolive.library.utils.ResUtil; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/main/java/com/pikolive/app/ui/im/chat/SignInNoticeMsgViewHolder.java b/app/src/main/java/com/pikolive/app/ui/im/chat/SignInNoticeMsgViewHolder.java index 547c9b300..00c275428 100644 --- a/app/src/main/java/com/pikolive/app/ui/im/chat/SignInNoticeMsgViewHolder.java +++ b/app/src/main/java/com/pikolive/app/ui/im/chat/SignInNoticeMsgViewHolder.java @@ -7,7 +7,7 @@ import com.netease.nim.uikit.business.session.viewholder.MsgViewHolderBase; import com.netease.nim.uikit.common.ui.recyclerview.adapter.BaseMultiItemFetchLoadAdapter; import com.yizhuan.erban.R; import com.pikolive.app.radish.signin.SignInActivity; -import com.yizhuan.xchat_android_core.im.custom.bean.OpenSignInAttachment; +import com.pikolive.core.im.custom.bean.OpenSignInAttachment; /** * 签到提醒 diff --git a/app/src/main/java/com/pikolive/app/ui/im/chat/SysMsgV2ViewHolder.java b/app/src/main/java/com/pikolive/app/ui/im/chat/SysMsgV2ViewHolder.java index c03dd4943..cb31639eb 100644 --- a/app/src/main/java/com/pikolive/app/ui/im/chat/SysMsgV2ViewHolder.java +++ b/app/src/main/java/com/pikolive/app/ui/im/chat/SysMsgV2ViewHolder.java @@ -1,8 +1,8 @@ package com.pikolive.app.ui.im.chat; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_COMMON_SYSTEM_MSG_V2; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_COMMON_SYSTEM_MSG_V2_APPROVAL; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_COMMON_SYSTEM_MSG_V2_TEXT; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_COMMON_SYSTEM_MSG_V2; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_COMMON_SYSTEM_MSG_V2_APPROVAL; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_COMMON_SYSTEM_MSG_V2_TEXT; import android.graphics.Color; import android.text.SpannableStringBuilder; @@ -27,13 +27,13 @@ import com.netease.nimlib.sdk.msg.model.IMMessage; import com.yizhuan.erban.R; import com.pikolive.app.sys.ErbanSysMsgViewModel; import com.pikolive.app.ui.im.RouterHandler; -import com.yizhuan.xchat_android_core.im.custom.bean.SysMsgV2Attachment; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.msg.sys.ApproveMsgInfo; -import com.yizhuan.xchat_android_core.msg.sysv2.ErbanSysMsgV2Component; -import com.yizhuan.xchat_android_core.msg.sysv2.ErbanSysMsgV2Info; -import com.yizhuan.xchat_android_core.msg.sysv2.ErbanSysMsgV2Layout; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.im.custom.bean.SysMsgV2Attachment; +import com.pikolive.core2.manager.IMNetEaseManager; +import com.pikolive.core.msg.sys.ApproveMsgInfo; +import com.pikolive.core.msg.sysv2.ErbanSysMsgV2Component; +import com.pikolive.core.msg.sysv2.ErbanSysMsgV2Info; +import com.pikolive.core.msg.sysv2.ErbanSysMsgV2Layout; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.utils.SingleToastUtil; import com.pikolive.library.utils.SizeUtils; diff --git a/app/src/main/java/com/pikolive/app/ui/im/chat/SysMsgViewHolder.java b/app/src/main/java/com/pikolive/app/ui/im/chat/SysMsgViewHolder.java index c858cae4f..9c470c075 100644 --- a/app/src/main/java/com/pikolive/app/ui/im/chat/SysMsgViewHolder.java +++ b/app/src/main/java/com/pikolive/app/ui/im/chat/SysMsgViewHolder.java @@ -1,10 +1,10 @@ package com.pikolive.app.ui.im.chat; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_COMMON_SYSTEM_MSG; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEAD_SHIFT_OUT; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SHIFT_OUT; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_COMMON_SYSTEM_MSG_APPROVAL; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_COMMON_SYSTEM_MSG_TEXT; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_COMMON_SYSTEM_MSG; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEAD_SHIFT_OUT; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SHIFT_OUT; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_COMMON_SYSTEM_MSG_APPROVAL; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_COMMON_SYSTEM_MSG_TEXT; import android.graphics.Color; import android.text.SpannableStringBuilder; @@ -30,13 +30,13 @@ import com.yizhuan.erban.R; import com.yizhuan.erban.miniworld.activity.MiniWorldGuestPageActivity; import com.pikolive.app.sys.ErbanSysMsgViewModel; import com.pikolive.app.ui.im.RouterHandler; -import com.yizhuan.xchat_android_core.im.custom.bean.SysMsgAttachment; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.msg.sys.ApproveMsgInfo; -import com.yizhuan.xchat_android_core.msg.sys.ErbanSysMsgComponent; -import com.yizhuan.xchat_android_core.msg.sys.ErbanSysMsgInfo; -import com.yizhuan.xchat_android_core.msg.sys.ErbanSysMsgLayout; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.im.custom.bean.SysMsgAttachment; +import com.pikolive.core2.manager.IMNetEaseManager; +import com.pikolive.core.msg.sys.ApproveMsgInfo; +import com.pikolive.core.msg.sys.ErbanSysMsgComponent; +import com.pikolive.core.msg.sys.ErbanSysMsgInfo; +import com.pikolive.core.msg.sys.ErbanSysMsgLayout; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.utils.SingleToastUtil; import com.pikolive.library.utils.SizeUtils; diff --git a/app/src/main/java/com/pikolive/app/ui/im/fragment/MessageFragment.java b/app/src/main/java/com/pikolive/app/ui/im/fragment/MessageFragment.java index b5fb1c5c6..c34395c41 100644 --- a/app/src/main/java/com/pikolive/app/ui/im/fragment/MessageFragment.java +++ b/app/src/main/java/com/pikolive/app/ui/im/fragment/MessageFragment.java @@ -59,13 +59,13 @@ import com.tbruyelle.rxpermissions2.RxPermissions; import com.yizhuan.erban.R; import com.pikolive.app.common.widget.OriginalDrawStatusClickSpan; import com.pikolive.app.utils.PushMessageHandler; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.im.chatterbox.ChatterBoxHelper; -import com.yizhuan.xchat_android_core.im.chatterbox.HideInputEvent; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.ImTipAttachment; -import com.yizhuan.xchat_android_core.room.event.MessageSizeEvent; +import com.pikolive.core2.UriProvider; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.im.chatterbox.ChatterBoxHelper; +import com.pikolive.core.im.chatterbox.HideInputEvent; +import com.pikolive.core.im.custom.bean.CustomAttachment; +import com.pikolive.core.im.custom.bean.ImTipAttachment; +import com.pikolive.core.room.event.MessageSizeEvent; import com.pikolive.library.utils.ResUtil; import com.pikolive.library.utils.SingleToastUtil; import com.pikolive.library.utils.config.BasicConfig; diff --git a/app/src/main/java/com/pikolive/app/ui/im/friend/FriendFragmentCpDelegate.kt b/app/src/main/java/com/pikolive/app/ui/im/friend/FriendFragmentCpDelegate.kt index 8ed2d831a..bc4cceb15 100644 --- a/app/src/main/java/com/pikolive/app/ui/im/friend/FriendFragmentCpDelegate.kt +++ b/app/src/main/java/com/pikolive/app/ui/im/friend/FriendFragmentCpDelegate.kt @@ -5,15 +5,15 @@ import androidx.fragment.app.viewModels import com.yizhuan.erban.R import com.pikolive.app.base.BaseFragment import com.pikolive.app.common.widget.dialog.DialogManager -import com.yizhuan.erban.relation.cp.CpViewHelper -import com.yizhuan.erban.relation.cp.dialog.CpInvitePageDialog -import com.yizhuan.erban.relation.cp.viewmodel.CpViewModel +import com.pikolive.app.relation.cp.CpViewHelper +import com.pikolive.app.relation.cp.dialog.CpInvitePageDialog +import com.pikolive.app.relation.cp.viewmodel.CpViewModel import com.pikolive.app.ui.pay.ChargeActivity import com.pikolive.app.ui.webview.CommonWebViewActivity -import com.yizhuan.xchat_android_core.Constants -import com.yizhuan.xchat_android_core.UriProvider -import com.yizhuan.xchat_android_core.relation.cp.CpInvitePageEntity -import com.yizhuan.xchat_android_core.utils.toast +import com.pikolive.core.Constants +import com.pikolive.core.relation.cp.CpInvitePageEntity +import com.pikolive.core.utils.toast +import com.pikolive.core2.UriProvider import com.pikolive.library.common.util.DeviceUtil import com.pikolive.library.utils.AppMetaDataUtil diff --git a/app/src/main/java/com/pikolive/app/ui/im/friend/FriendListAdapter.java b/app/src/main/java/com/pikolive/app/ui/im/friend/FriendListAdapter.java index dff4d7a37..d25d45cd0 100644 --- a/app/src/main/java/com/pikolive/app/ui/im/friend/FriendListAdapter.java +++ b/app/src/main/java/com/pikolive/app/ui/im/friend/FriendListAdapter.java @@ -19,9 +19,9 @@ import com.pikolive.app.ui.widget.NobleAvatarView; import com.pikolive.app.view.GenderAgeTextView; import com.pikolive.app.vip.util.VipHelper; import com.yizhuan.tutu.room_chat.activity.NimRoomP2PMessageActivity; -import com.yizhuan.xchat_android_core.noble.NobleUtil; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.utils.StringExtensionKt; +import com.pikolive.core.noble.NobleUtil; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.utils.StringExtensionKt; import com.pikolive.library.utils.ResUtil; /** diff --git a/app/src/main/java/com/pikolive/app/ui/im/friend/FriendListFragment.java b/app/src/main/java/com/pikolive/app/ui/im/friend/FriendListFragment.java index 3163f5bb8..f19e7a11c 100644 --- a/app/src/main/java/com/pikolive/app/ui/im/friend/FriendListFragment.java +++ b/app/src/main/java/com/pikolive/app/ui/im/friend/FriendListFragment.java @@ -1,6 +1,6 @@ package com.pikolive.app.ui.im.friend; -import static com.yizhuan.xchat_android_core.Constants.IS_SEND; +import static com.pikolive.core.Constants.IS_SEND; import android.annotation.SuppressLint; import android.app.Activity; @@ -19,13 +19,13 @@ import com.pikolive.app.common.NoDataFragment; import com.pikolive.app.decoration.helper.DecorationHelper; import com.pikolive.app.friend.action.AbstractSelectFriendAction; import com.pikolive.app.friend.view.SelectFriendActivity; -import com.yizhuan.xchat_android_core.im.friend.IMFriendModel; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.manager.RelationShipEvent; -import com.yizhuan.xchat_android_core.relation.cp.CpBindUnbindEvent; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.user.event.LoginUserInfoUpdateEvent; +import com.pikolive.core.im.friend.IMFriendModel; +import com.pikolive.core2.manager.IMNetEaseManager; +import com.pikolive.core.manager.RelationShipEvent; +import com.pikolive.core.relation.cp.CpBindUnbindEvent; +import com.pikolive.core.user.UserModel; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.user.event.LoginUserInfoUpdateEvent; import com.pikolive.library.utils.ListUtils; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/main/java/com/pikolive/app/ui/im/friend/FriendListFragmentKotlin.kt b/app/src/main/java/com/pikolive/app/ui/im/friend/FriendListFragmentKotlin.kt index cc8cd7a27..a2a02b085 100644 --- a/app/src/main/java/com/pikolive/app/ui/im/friend/FriendListFragmentKotlin.kt +++ b/app/src/main/java/com/pikolive/app/ui/im/friend/FriendListFragmentKotlin.kt @@ -7,12 +7,12 @@ //import com.yizhuan.erban.base.BaseFragment //import com.yizhuan.erban.friend.action.AbstractSelectFriendAction //import com.yizhuan.erban.friend.view.SelectFriendActivity -//import com.yizhuan.xchat_android_core.Constants.IS_SEND -//import com.yizhuan.xchat_android_core.im.friend.IMFriendModel -//import com.yizhuan.xchat_android_core.manager.IMNetEaseManager -//import com.yizhuan.xchat_android_core.manager.RelationShipEvent -//import com.yizhuan.xchat_android_core.user.UserModel -//import com.yizhuan.xchat_android_core.user.bean.UserInfo +//import com.yizhuan.core.Constants.IS_SEND +//import com.yizhuan.core.im.friend.IMFriendModel +//import com.yizhuan.core.manager.IMNetEaseManager +//import com.yizhuan.core.manager.RelationShipEvent +//import com.pikolive.core.user.UserModel +//import com.pikolive.core.user.bean.UserInfo //import com.yizhuan.xchat_android_library.utils.ListUtils //import kotlinx.android.synthetic.main.fragment_fans_list.* //import org.greenrobot.eventbus.EventBus diff --git a/app/src/main/java/com/pikolive/app/ui/im/model/IMCustomModel.java b/app/src/main/java/com/pikolive/app/ui/im/model/IMCustomModel.java index 7357e35be..091056d8e 100644 --- a/app/src/main/java/com/pikolive/app/ui/im/model/IMCustomModel.java +++ b/app/src/main/java/com/pikolive/app/ui/im/model/IMCustomModel.java @@ -1,9 +1,9 @@ package com.pikolive.app.ui.im.model; -import com.yizhuan.xchat_android_core.bean.PrivateChatLimitInfo; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.manager.BaseMvpModel; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.bean.PrivateChatLimitInfo; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.manager.BaseMvpModel; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.net.rxnet.RxNet; import io.reactivex.Single; diff --git a/app/src/main/java/com/pikolive/app/ui/im/recent/RecentContactsFragment.java b/app/src/main/java/com/pikolive/app/ui/im/recent/RecentContactsFragment.java index e54b77d70..007e73182 100644 --- a/app/src/main/java/com/pikolive/app/ui/im/recent/RecentContactsFragment.java +++ b/app/src/main/java/com/pikolive/app/ui/im/recent/RecentContactsFragment.java @@ -45,8 +45,8 @@ import com.netease.nimlib.sdk.team.model.TeamMember; import com.pikolive.app.ui.im.recent.adapter.RecentContactAdapter; import com.yizhuan.erban.R; import com.pikolive.app.home.event.ContactTrashEvent; -import com.yizhuan.xchat_android_core.utils.CheckUtils; -import com.yizhuan.xchat_android_core.utils.SystemUidUtil; +import com.pikolive.core.utils.CheckUtils; +import com.pikolive.core.utils.SystemUidUtil; import com.pikolive.library.utils.ResUtil; import com.pikolive.library.utils.SingleToastUtil; diff --git a/app/src/main/java/com/pikolive/app/ui/im/recent/RecentListFragment.java b/app/src/main/java/com/pikolive/app/ui/im/recent/RecentListFragment.java index 588fcebda..d06565dd3 100644 --- a/app/src/main/java/com/pikolive/app/ui/im/recent/RecentListFragment.java +++ b/app/src/main/java/com/pikolive/app/ui/im/recent/RecentListFragment.java @@ -37,21 +37,21 @@ import com.yizhuan.tutu.room_chat.activity.NimHallTeamRoomMessageActivity; import com.yizhuan.tutu.room_chat.activity.NimRoomP2PMessageActivity; import com.yizhuan.tutu.room_chat.activity.NimTeamRoomMessageActivity; import com.yizhuan.tutu.room_chat.activity.RoomNewbieActivity; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.auth.event.LoginEvent; -import com.yizhuan.xchat_android_core.im.RefreshInRoomListEvent; -import com.yizhuan.xchat_android_core.initial.InitialModel; -import com.yizhuan.xchat_android_core.level.UserLevelVo; -import com.yizhuan.xchat_android_core.mentoring_relationship.bean.GrabApprenticesInfo; -import com.yizhuan.xchat_android_core.mentoring_relationship.event.GrabApprenticesDataEvent; -import com.yizhuan.xchat_android_core.mentoring_relationship.model.MentoringRelationshipModel; -import com.yizhuan.xchat_android_core.user.AttentionModel; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.AttentionInfo; -import com.yizhuan.xchat_android_core.user.bean.AttentionItem; -import com.yizhuan.xchat_android_core.user.event.LoadLoginUserInfoEvent; -import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.auth.event.LoginEvent; +import com.pikolive.core.im.RefreshInRoomListEvent; +import com.pikolive.core.initial.InitialModel; +import com.pikolive.core.level.UserLevelVo; +import com.pikolive.core.mentoring_relationship.bean.GrabApprenticesInfo; +import com.pikolive.core.mentoring_relationship.event.GrabApprenticesDataEvent; +import com.pikolive.core.mentoring_relationship.model.MentoringRelationshipModel; +import com.pikolive.core.user.AttentionModel; +import com.pikolive.core.user.UserModel; +import com.pikolive.core.user.bean.AttentionInfo; +import com.pikolive.core.user.bean.AttentionItem; +import com.pikolive.core.user.event.LoadLoginUserInfoEvent; +import com.pikolive.core.utils.SharedPreferenceUtils; +import com.pikolive.core.utils.net.BeanObserver; import com.pikolive.library.utils.CommonUtils; import com.pikolive.library.utils.ListUtils; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/main/java/com/pikolive/app/ui/im/recent/adapter/AttentionInRoomAdapter.java b/app/src/main/java/com/pikolive/app/ui/im/recent/adapter/AttentionInRoomAdapter.java index a18ba09b6..9f7375204 100644 --- a/app/src/main/java/com/pikolive/app/ui/im/recent/adapter/AttentionInRoomAdapter.java +++ b/app/src/main/java/com/pikolive/app/ui/im/recent/adapter/AttentionInRoomAdapter.java @@ -6,8 +6,8 @@ import com.yizhuan.erban.R; import com.pikolive.app.common.widget.CircleImageView; import com.pikolive.app.ui.utils.ImageLoadUtilsV2; import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.xchat_android_core.user.bean.AttentionInfo; -import com.yizhuan.xchat_android_core.user.bean.AttentionItem; +import com.pikolive.core.user.bean.AttentionInfo; +import com.pikolive.core.user.bean.AttentionItem; import java.util.ArrayList; diff --git a/app/src/main/java/com/pikolive/app/ui/im/recent/holder/CommonRecentViewHolder.java b/app/src/main/java/com/pikolive/app/ui/im/recent/holder/CommonRecentViewHolder.java index 9cbcee6c4..42d71a611 100644 --- a/app/src/main/java/com/pikolive/app/ui/im/recent/holder/CommonRecentViewHolder.java +++ b/app/src/main/java/com/pikolive/app/ui/im/recent/holder/CommonRecentViewHolder.java @@ -21,9 +21,9 @@ import com.netease.nimlib.sdk.msg.model.RecentContact; import com.yizhuan.erban.R; import com.pikolive.app.ui.utils.ImageLoadUtils; import com.pikolive.app.vip.util.VipHelper; -import com.yizhuan.xchat_android_core.level.UserLevelVo; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.utils.SystemUidUtil; +import com.pikolive.core.level.UserLevelVo; +import com.pikolive.core.user.UserModel; +import com.pikolive.core.utils.SystemUidUtil; /** * @author Administrator diff --git a/app/src/main/java/com/pikolive/app/ui/im/recent/holder/RecentViewHolder.java b/app/src/main/java/com/pikolive/app/ui/im/recent/holder/RecentViewHolder.java index 00122f497..e07df18a0 100644 --- a/app/src/main/java/com/pikolive/app/ui/im/recent/holder/RecentViewHolder.java +++ b/app/src/main/java/com/pikolive/app/ui/im/recent/holder/RecentViewHolder.java @@ -26,9 +26,8 @@ import com.netease.nimlib.sdk.team.model.Team; import com.pikolive.app.ui.im.recent.adapter.RecentContactAdapter; import com.yizhuan.erban.R; import com.pikolive.app.ui.im.recent.RecentContactsFragment; -import com.pikolive.app.ui.im.recent.adapter.RecentContactAdapter; import com.pikolive.app.view.GenderAgeTextView; -import com.yizhuan.xchat_android_core.helper.ImHelperUtils; +import com.pikolive.core2.helper.ImHelperUtils; public abstract class RecentViewHolder extends RecyclerViewHolder { diff --git a/app/src/main/java/com/pikolive/app/ui/im/recent/holder/TeamRecentViewHolder.java b/app/src/main/java/com/pikolive/app/ui/im/recent/holder/TeamRecentViewHolder.java index 9717b2e9c..4d4814146 100644 --- a/app/src/main/java/com/pikolive/app/ui/im/recent/holder/TeamRecentViewHolder.java +++ b/app/src/main/java/com/pikolive/app/ui/im/recent/holder/TeamRecentViewHolder.java @@ -28,8 +28,8 @@ import com.netease.nimlib.sdk.team.constant.TeamMessageNotifyTypeEnum; import com.netease.nimlib.sdk.team.model.Team; import com.yizhuan.erban.R; import com.pikolive.app.ui.im.recent.TeamExt; -import com.yizhuan.xchat_android_core.im.custom.bean.LuckyMoneyAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.LuckyMoneyTipsAttachment; +import com.pikolive.core.im.custom.bean.LuckyMoneyAttachment; +import com.pikolive.core.im.custom.bean.LuckyMoneyTipsAttachment; public class TeamRecentViewHolder extends RecentViewHolder { diff --git a/app/src/main/java/com/pikolive/app/ui/login/AreaCodeActivity.kt b/app/src/main/java/com/pikolive/app/ui/login/AreaCodeActivity.kt index 76dc67d7e..2f1fdf7fc 100644 --- a/app/src/main/java/com/pikolive/app/ui/login/AreaCodeActivity.kt +++ b/app/src/main/java/com/pikolive/app/ui/login/AreaCodeActivity.kt @@ -10,10 +10,10 @@ import com.trello.rxlifecycle3.android.ActivityEvent import com.yizhuan.erban.R import com.pikolive.app.base.BaseViewBindingActivity import com.yizhuan.erban.databinding.ActivityAreaCodeBinding -import com.yizhuan.xchat_android_core.auth.AuthModel -import com.yizhuan.xchat_android_core.auth.bean.AreaInfoBean -import com.yizhuan.xchat_android_core.utils.Logger -import com.yizhuan.xchat_android_core.utils.net.BeanObserver +import com.pikolive.core.auth.AuthModel +import com.pikolive.core.auth.bean.AreaInfoBean +import com.pikolive.core.utils.Logger +import com.pikolive.core.utils.net.BeanObserver /** * 区号 diff --git a/app/src/main/java/com/pikolive/app/ui/login/BindCodeActivity.java b/app/src/main/java/com/pikolive/app/ui/login/BindCodeActivity.java index 5acdfdbf7..a4bb97da4 100644 --- a/app/src/main/java/com/pikolive/app/ui/login/BindCodeActivity.java +++ b/app/src/main/java/com/pikolive/app/ui/login/BindCodeActivity.java @@ -17,10 +17,10 @@ import com.pikolive.app.ui.login.ui.CodeEditText; import com.trello.rxlifecycle3.android.ActivityEvent; import com.yizhuan.erban.R; import com.pikolive.app.base.BaseActivity; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.code.CodeType; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.event.NeedCompleteInfoEvent; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.code.CodeType; +import com.pikolive.core.user.UserModel; +import com.pikolive.core.user.event.NeedCompleteInfoEvent; import com.pikolive.library.utils.ResUtil; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/main/java/com/pikolive/app/ui/login/BindPhoneActivity.kt b/app/src/main/java/com/pikolive/app/ui/login/BindPhoneActivity.kt index 887461636..b0b45e021 100644 --- a/app/src/main/java/com/pikolive/app/ui/login/BindPhoneActivity.kt +++ b/app/src/main/java/com/pikolive/app/ui/login/BindPhoneActivity.kt @@ -16,10 +16,10 @@ import com.trello.rxlifecycle3.android.ActivityEvent import com.yizhuan.erban.R import com.pikolive.app.base.BaseViewBindingActivity import com.yizhuan.erban.databinding.ActivityBindPhoneBinding -import com.yizhuan.xchat_android_core.auth.AuthModel -import com.yizhuan.xchat_android_core.code.CodeType -import com.yizhuan.xchat_android_core.user.UserModel -import com.yizhuan.xchat_android_core.user.bean.UserInfo +import com.pikolive.core.auth.AuthModel +import com.pikolive.core.code.CodeType +import com.pikolive.core.user.UserModel +import com.pikolive.core.user.bean.UserInfo import com.pikolive.library.utils.NetworkUtils import com.pikolive.library.utils.ResUtil import io.reactivex.SingleObserver diff --git a/app/src/main/java/com/pikolive/app/ui/login/LoginActivity.java b/app/src/main/java/com/pikolive/app/ui/login/LoginActivity.java index ee56dcd0b..bd98560a8 100644 --- a/app/src/main/java/com/pikolive/app/ui/login/LoginActivity.java +++ b/app/src/main/java/com/pikolive/app/ui/login/LoginActivity.java @@ -36,12 +36,12 @@ import com.pikolive.app.application.IReportConstants; import com.pikolive.app.application.ReportManager; import com.pikolive.app.base.BaseActivity; import com.pikolive.app.common.widget.OriginalDrawStatusClickSpan; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.DemoCache; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.auth.event.LoginEvent; -import com.yizhuan.xchat_android_core.auth.event.LoginReportEvent; +import com.pikolive.core.Constants; +import com.pikolive.core.DemoCache; +import com.pikolive.core2.UriProvider; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.auth.event.LoginEvent; +import com.pikolive.core.auth.event.LoginReportEvent; import com.pikolive.library.common.SpConstants; import com.pikolive.library.common.util.SPUtils; import com.pikolive.library.utils.AppMetaDataUtil; @@ -255,7 +255,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener case R.id.cs_facebook: //是否安装客户端 if (!DeviceUtils.isAppInstalled(this, PackageNameConstants.FACEBOOK_NAME)) { - SingleToastUtil.showToast(ResUtil.getString(com.yizhuan.xchat_android_core.R.string.xchat_android_core_auth_authmodel_03)); + SingleToastUtil.showToast(ResUtil.getString(R.string.xchat_android_core_auth_authmodel_03)); return; } LoginManager.getInstance().logOut(); diff --git a/app/src/main/java/com/pikolive/app/ui/login/LoginBoundAuthCodeActivity.kt b/app/src/main/java/com/pikolive/app/ui/login/LoginBoundAuthCodeActivity.kt index c5c9064c6..a05cc32c0 100644 --- a/app/src/main/java/com/pikolive/app/ui/login/LoginBoundAuthCodeActivity.kt +++ b/app/src/main/java/com/pikolive/app/ui/login/LoginBoundAuthCodeActivity.kt @@ -13,10 +13,10 @@ import com.trello.rxlifecycle3.android.ActivityEvent import com.yizhuan.erban.R import com.pikolive.app.base.BaseViewBindingActivity import com.yizhuan.erban.databinding.ActivityLoginBoundAuthCodeBinding -import com.yizhuan.xchat_android_core.auth.AuthModel -import com.yizhuan.xchat_android_core.user.event.NeedCompleteInfoEvent -import com.yizhuan.xchat_android_core.utils.TextUtils -import com.yizhuan.xchat_android_core.utils.net.BeanObserver +import com.pikolive.core.auth.AuthModel +import com.pikolive.core.user.event.NeedCompleteInfoEvent +import com.pikolive.core.utils.TextUtils +import com.pikolive.core.utils.net.BeanObserver import org.greenrobot.eventbus.EventBus /** diff --git a/app/src/main/java/com/pikolive/app/ui/login/LoginCodeActivity.kt b/app/src/main/java/com/pikolive/app/ui/login/LoginCodeActivity.kt index a65d81ba6..4c6687698 100644 --- a/app/src/main/java/com/pikolive/app/ui/login/LoginCodeActivity.kt +++ b/app/src/main/java/com/pikolive/app/ui/login/LoginCodeActivity.kt @@ -21,10 +21,10 @@ import com.pikolive.app.application.ReportManager import com.pikolive.app.base.BaseViewBindingActivity import com.yizhuan.erban.databinding.ActivityLoginCodeBinding import com.pikolive.app.ui.login.helper.LogoutHelper -import com.yizhuan.xchat_android_core.DemoCache -import com.yizhuan.xchat_android_core.auth.AuthModel -import com.yizhuan.xchat_android_core.auth.event.LoginEvent -import com.yizhuan.xchat_android_core.code.CodeType +import com.pikolive.core.DemoCache +import com.pikolive.core.auth.AuthModel +import com.pikolive.core.auth.event.LoginEvent +import com.pikolive.core.code.CodeType import com.pikolive.library.utils.ResUtil import io.reactivex.SingleObserver import io.reactivex.android.schedulers.AndroidSchedulers diff --git a/app/src/main/java/com/pikolive/app/ui/login/LoginPasswordActivity.java b/app/src/main/java/com/pikolive/app/ui/login/LoginPasswordActivity.java index eb67a704a..d365cfa75 100644 --- a/app/src/main/java/com/pikolive/app/ui/login/LoginPasswordActivity.java +++ b/app/src/main/java/com/pikolive/app/ui/login/LoginPasswordActivity.java @@ -27,10 +27,10 @@ import com.yizhuan.erban.R; import com.pikolive.app.application.IReportConstants; import com.pikolive.app.application.ReportManager; import com.pikolive.app.base.BaseActivity; -import com.yizhuan.xchat_android_core.DemoCache; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.auth.event.LoginEvent; -import com.yizhuan.xchat_android_core.code.CodeType; +import com.pikolive.core.DemoCache; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.auth.event.LoginEvent; +import com.pikolive.core.code.CodeType; import com.pikolive.library.common.SpConstants; import com.pikolive.library.common.util.SPUtils; import com.pikolive.library.utils.TextWatcherWrapper; diff --git a/app/src/main/java/com/pikolive/app/ui/login/LoginPhoneActivity.kt b/app/src/main/java/com/pikolive/app/ui/login/LoginPhoneActivity.kt index 803cc5791..e750adc71 100644 --- a/app/src/main/java/com/pikolive/app/ui/login/LoginPhoneActivity.kt +++ b/app/src/main/java/com/pikolive/app/ui/login/LoginPhoneActivity.kt @@ -13,9 +13,9 @@ import com.pikolive.app.NimMiddleActivity import com.yizhuan.erban.R import com.pikolive.app.base.BaseViewBindingActivity import com.yizhuan.erban.databinding.ActivityLoginPhoneBinding -import com.yizhuan.xchat_android_core.auth.AuthModel -import com.yizhuan.xchat_android_core.auth.event.LoginEvent -import com.yizhuan.xchat_android_core.code.CodeType +import com.pikolive.core.auth.AuthModel +import com.pikolive.core.auth.event.LoginEvent +import com.pikolive.core.code.CodeType import io.reactivex.SingleObserver import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.Disposable diff --git a/app/src/main/java/com/pikolive/app/ui/login/ModifyInfoActivity.java b/app/src/main/java/com/pikolive/app/ui/login/ModifyInfoActivity.java index a6e93ef25..ee6abc650 100644 --- a/app/src/main/java/com/pikolive/app/ui/login/ModifyInfoActivity.java +++ b/app/src/main/java/com/pikolive/app/ui/login/ModifyInfoActivity.java @@ -18,8 +18,8 @@ import com.netease.nim.uikit.StatusBarUtil; import com.yizhuan.erban.R; import com.pikolive.app.base.BaseActivity; import com.pikolive.app.base.TitleBar; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.pikolive.core.user.UserModel; +import com.pikolive.core.user.bean.UserInfo; import com.pikolive.library.utils.ResUtil; /** diff --git a/app/src/main/java/com/pikolive/app/ui/login/ShowBindPhoneActivity.kt b/app/src/main/java/com/pikolive/app/ui/login/ShowBindPhoneActivity.kt index 305c30aac..f3dc1f7b4 100644 --- a/app/src/main/java/com/pikolive/app/ui/login/ShowBindPhoneActivity.kt +++ b/app/src/main/java/com/pikolive/app/ui/login/ShowBindPhoneActivity.kt @@ -3,7 +3,7 @@ package com.pikolive.app.ui.login import android.annotation.SuppressLint import android.content.Context import com.yizhuan.erban.R -import com.yizhuan.xchat_android_core.user.UserModel +import com.pikolive.core.user.UserModel import com.netease.nim.uikit.StatusBarUtil import android.content.Intent import android.text.TextUtils diff --git a/app/src/main/java/com/pikolive/app/ui/login/fragment/AddUserInfoFragment.java b/app/src/main/java/com/pikolive/app/ui/login/fragment/AddUserInfoFragment.java index f9bf82d18..6e11c4cda 100644 --- a/app/src/main/java/com/pikolive/app/ui/login/fragment/AddUserInfoFragment.java +++ b/app/src/main/java/com/pikolive/app/ui/login/fragment/AddUserInfoFragment.java @@ -20,14 +20,14 @@ import com.pikolive.app.application.IReportConstants; import com.pikolive.app.application.ReportManager; import com.pikolive.app.base.BaseFragment; import com.pikolive.app.common.widget.dialog.DialogManager; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.auth.entity.ThirdUserInfo; -import com.yizhuan.xchat_android_core.initial.InitialModel; -import com.yizhuan.xchat_android_core.initial.bean.InitInfo; -import com.yizhuan.xchat_android_core.linked.LinkedModel; -import com.yizhuan.xchat_android_core.linked.bean.LinkedInfo; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.auth.entity.ThirdUserInfo; +import com.pikolive.core.initial.InitialModel; +import com.pikolive.core.initial.bean.InitInfo; +import com.pikolive.core.linked.LinkedModel; +import com.pikolive.core.linked.bean.LinkedInfo; +import com.pikolive.core.user.UserModel; +import com.pikolive.core.user.bean.UserInfo; import com.pikolive.library.utils.ResUtil; import io.reactivex.SingleObserver; diff --git a/app/src/main/java/com/pikolive/app/ui/login/helper/LogoutHelper.java b/app/src/main/java/com/pikolive/app/ui/login/helper/LogoutHelper.java index 4e9f70867..532a734bd 100644 --- a/app/src/main/java/com/pikolive/app/ui/login/helper/LogoutHelper.java +++ b/app/src/main/java/com/pikolive/app/ui/login/helper/LogoutHelper.java @@ -10,10 +10,10 @@ import androidx.core.content.ContextCompat; import com.appsflyer.internal.components.network.http.exceptions.HttpException; import com.yizhuan.erban.R; import com.pikolive.app.base.BaseActivity; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.auth.exception.AccountCancelException; -import com.yizhuan.xchat_android_core.auth.exception.BanAccountException; -import com.yizhuan.xchat_android_core.auth.exception.IsSuperAdminException; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.auth.exception.AccountCancelException; +import com.pikolive.core.auth.exception.BanAccountException; +import com.pikolive.core.auth.exception.IsSuperAdminException; import com.pikolive.library.net.rxnet.exception.ExceptionHandle; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/main/java/com/pikolive/app/ui/patriarch/PatriarchModeActivity.java b/app/src/main/java/com/pikolive/app/ui/patriarch/PatriarchModeActivity.java index fbcee3985..0917ac7fd 100644 --- a/app/src/main/java/com/pikolive/app/ui/patriarch/PatriarchModeActivity.java +++ b/app/src/main/java/com/pikolive/app/ui/patriarch/PatriarchModeActivity.java @@ -9,9 +9,9 @@ import com.pikolive.app.ui.webview.CommonWebViewActivity; import com.yizhuan.erban.R; import com.pikolive.app.base.BaseBindingActivity; import com.yizhuan.erban.databinding.ActivityPatriarchModeBinding; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.pikolive.core2.UriProvider; +import com.pikolive.core.user.UserModel; +import com.pikolive.core.user.bean.UserInfo; import com.pikolive.library.annatation.ActLayoutRes; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/main/java/com/pikolive/app/ui/patriarch/PatriarchPwdActivity.java b/app/src/main/java/com/pikolive/app/ui/patriarch/PatriarchPwdActivity.java index 7f31eaf2d..cd7b1ed94 100644 --- a/app/src/main/java/com/pikolive/app/ui/patriarch/PatriarchPwdActivity.java +++ b/app/src/main/java/com/pikolive/app/ui/patriarch/PatriarchPwdActivity.java @@ -12,8 +12,8 @@ import com.netease.nim.uikit.StatusBarUtil; import com.yizhuan.erban.R; import com.pikolive.app.base.BaseBindingActivity; import com.yizhuan.erban.databinding.ActivityPatriarchPwdBinding; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.pikolive.core.user.UserModel; +import com.pikolive.core.user.bean.UserInfo; import com.pikolive.library.annatation.ActLayoutRes; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/main/java/com/pikolive/app/ui/patriarch/help/LimitEnterRoomHelper.java b/app/src/main/java/com/pikolive/app/ui/patriarch/help/LimitEnterRoomHelper.java index 68a219587..84b096bcd 100644 --- a/app/src/main/java/com/pikolive/app/ui/patriarch/help/LimitEnterRoomHelper.java +++ b/app/src/main/java/com/pikolive/app/ui/patriarch/help/LimitEnterRoomHelper.java @@ -6,8 +6,8 @@ import android.text.TextUtils; import com.yizhuan.erban.R; import com.pikolive.app.common.widget.dialog.DialogManager; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.utils.ActivityUtil; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core.utils.ActivityUtil; import com.pikolive.library.utils.ResUtil; /** diff --git a/app/src/main/java/com/pikolive/app/ui/patriarch/help/PmDialogShowMrg.java b/app/src/main/java/com/pikolive/app/ui/patriarch/help/PmDialogShowMrg.java index 07d9c93bd..bdc042bae 100644 --- a/app/src/main/java/com/pikolive/app/ui/patriarch/help/PmDialogShowMrg.java +++ b/app/src/main/java/com/pikolive/app/ui/patriarch/help/PmDialogShowMrg.java @@ -5,14 +5,14 @@ import android.text.TextUtils; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.initial.InitialModel; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.utils.ActivityUtil; -import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; -import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.initial.InitialModel; +import com.pikolive.core.user.UserModel; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.utils.ActivityUtil; +import com.pikolive.core.utils.SharedPreferenceUtils; +import com.pikolive.core.utils.net.DontWarnObserver; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.utils.TimeUtils; import java.lang.ref.WeakReference; diff --git a/app/src/main/java/com/pikolive/app/ui/pay/ChargeActivity.java b/app/src/main/java/com/pikolive/app/ui/pay/ChargeActivity.java index c249e817a..bd0cdd307 100644 --- a/app/src/main/java/com/pikolive/app/ui/pay/ChargeActivity.java +++ b/app/src/main/java/com/pikolive/app/ui/pay/ChargeActivity.java @@ -1,6 +1,6 @@ package com.pikolive.app.ui.pay; -import static com.yizhuan.xchat_android_core.pay.PayModel.RECHARGE_LIMIT; +import static com.pikolive.core.pay.PayModel.RECHARGE_LIMIT; import android.annotation.SuppressLint; import android.app.Activity; @@ -41,15 +41,15 @@ import com.pikolive.app.pay.presenter.ChargePresenter; import com.pikolive.app.pay.view.IChargeView; import com.pikolive.app.ui.im.avtivity.NimP2PMessageActivity; import com.pikolive.app.ui.utils.ImageLoadUtilsV2; -import com.yizhuan.xchat_android_core.DemoCache; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.exception.FailReasonException; -import com.yizhuan.xchat_android_core.pay.PayModel; -import com.yizhuan.xchat_android_core.pay.bean.Banner; -import com.yizhuan.xchat_android_core.pay.bean.ChargeBean; -import com.yizhuan.xchat_android_core.pay.bean.WalletInfo; -import com.yizhuan.xchat_android_core.utils.net.IgnoreException; +import com.pikolive.core.DemoCache; +import com.pikolive.core2.UriProvider; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.exception.FailReasonException; +import com.pikolive.core.pay.PayModel; +import com.pikolive.core.pay.bean.Banner; +import com.pikolive.core.pay.bean.ChargeBean; +import com.pikolive.core.pay.bean.WalletInfo; +import com.pikolive.core.utils.net.IgnoreException; import com.pikolive.library.base.factory.CreatePresenter; import com.pikolive.library.utils.FormatUtils; import com.pikolive.library.utils.SingleToastUtil; diff --git a/app/src/main/java/com/pikolive/app/ui/pay/ChargeAdapter.java b/app/src/main/java/com/pikolive/app/ui/pay/ChargeAdapter.java index 92d196b1b..876d593cc 100644 --- a/app/src/main/java/com/pikolive/app/ui/pay/ChargeAdapter.java +++ b/app/src/main/java/com/pikolive/app/ui/pay/ChargeAdapter.java @@ -3,7 +3,7 @@ package com.pikolive.app.ui.pay; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.pay.bean.ChargeBean; +import com.pikolive.core.pay.bean.ChargeBean; import org.jetbrains.annotations.NotNull; diff --git a/app/src/main/java/com/pikolive/app/ui/radish/RadishRecordFragment.java b/app/src/main/java/com/pikolive/app/ui/radish/RadishRecordFragment.java index f8de70ff4..53dd67f28 100644 --- a/app/src/main/java/com/pikolive/app/ui/radish/RadishRecordFragment.java +++ b/app/src/main/java/com/pikolive/app/ui/radish/RadishRecordFragment.java @@ -14,10 +14,10 @@ import com.pikolive.app.bills.fragmemt.BaseBillsFragment; import com.pikolive.app.radish.adapter.RadishRecordAdapter; import com.pikolive.app.radish.presenter.RadishRecordFrgPresenter; import com.pikolive.app.radish.view.IRadishRecordFrgView; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.bills.bean.BillItemEntity; -import com.yizhuan.xchat_android_core.bills.bean.RadishRecordInfo; -import com.yizhuan.xchat_android_core.bills.bean.RadishRecordListInfo; +import com.pikolive.core.Constants; +import com.pikolive.core.bills.bean.BillItemEntity; +import com.pikolive.core.bills.bean.RadishRecordInfo; +import com.pikolive.core.bills.bean.RadishRecordListInfo; import com.pikolive.library.base.factory.CreatePresenter; import com.pikolive.library.utils.ListUtils; diff --git a/app/src/main/java/com/pikolive/app/ui/relation/AttentionListActivity.java b/app/src/main/java/com/pikolive/app/ui/relation/AttentionListActivity.java index 0890e5dd3..76185314f 100644 --- a/app/src/main/java/com/pikolive/app/ui/relation/AttentionListActivity.java +++ b/app/src/main/java/com/pikolive/app/ui/relation/AttentionListActivity.java @@ -20,11 +20,11 @@ import com.pikolive.app.base.BaseActivity; import com.pikolive.app.common.NoDataFragment; import com.pikolive.app.ui.relation.adapter.AttentionListAdapter; import com.pikolive.app.ui.user.activity.UserInfoActivity; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.praise.event.PraiseEvent; -import com.yizhuan.xchat_android_core.user.AttentionModel; -import com.yizhuan.xchat_android_core.user.bean.AttentionInfo; +import com.pikolive.core.Constants; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.praise.event.PraiseEvent; +import com.pikolive.core.user.AttentionModel; +import com.pikolive.core.user.bean.AttentionInfo; import com.pikolive.library.utils.ListUtils; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/main/java/com/pikolive/app/ui/relation/FansListActivity.kt b/app/src/main/java/com/pikolive/app/ui/relation/FansListActivity.kt index 55b73c2cc..0412aab7d 100644 --- a/app/src/main/java/com/pikolive/app/ui/relation/FansListActivity.kt +++ b/app/src/main/java/com/pikolive/app/ui/relation/FansListActivity.kt @@ -16,7 +16,7 @@ import com.pikolive.app.friend.action.AbstractSelectFriendAction import com.pikolive.app.home.fragment.AttentionFragment import com.pikolive.app.ui.im.friend.FriendListFragment import com.pikolive.app.ui.search.SearchActivity -import com.yizhuan.xchat_android_core.Constants +import com.pikolive.core.Constants /** * 粉丝列表 diff --git a/app/src/main/java/com/pikolive/app/ui/relation/FansListFragment.java b/app/src/main/java/com/pikolive/app/ui/relation/FansListFragment.java index fccd038ef..5ec50f038 100644 --- a/app/src/main/java/com/pikolive/app/ui/relation/FansListFragment.java +++ b/app/src/main/java/com/pikolive/app/ui/relation/FansListFragment.java @@ -21,16 +21,16 @@ import com.pikolive.app.friend.view.SelectFriendActivity; import com.pikolive.app.ui.relation.adapter.FansViewAdapter; import com.pikolive.app.ui.user.activity.UserInfoActivity; import com.yizhuan.tutu.room_chat.activity.NimRoomP2PMessageActivity; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.im.friend.IMFriendModel; -import com.yizhuan.xchat_android_core.praise.PraiseModel; -import com.yizhuan.xchat_android_core.praise.event.PraiseEvent; -import com.yizhuan.xchat_android_core.user.AttentionModel; -import com.yizhuan.xchat_android_core.user.bean.FansInfo; -import com.yizhuan.xchat_android_core.user.bean.FansListInfo; -import com.yizhuan.xchat_android_core.user.event.LoginUserInfoUpdateEvent; -import com.yizhuan.xchat_android_core.utils.SystemUidUtil; +import com.pikolive.core.Constants; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.im.friend.IMFriendModel; +import com.pikolive.core.praise.PraiseModel; +import com.pikolive.core.praise.event.PraiseEvent; +import com.pikolive.core.user.AttentionModel; +import com.pikolive.core.user.bean.FansInfo; +import com.pikolive.core.user.bean.FansListInfo; +import com.pikolive.core.user.event.LoginUserInfoUpdateEvent; +import com.pikolive.core.utils.SystemUidUtil; import com.pikolive.library.utils.ListUtils; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/main/java/com/pikolive/app/ui/relation/adapter/AttentionListAdapter.java b/app/src/main/java/com/pikolive/app/ui/relation/adapter/AttentionListAdapter.java index 7675f7903..b138d9a49 100644 --- a/app/src/main/java/com/pikolive/app/ui/relation/adapter/AttentionListAdapter.java +++ b/app/src/main/java/com/pikolive/app/ui/relation/adapter/AttentionListAdapter.java @@ -15,10 +15,10 @@ import com.pikolive.app.ui.utils.ImageLoadUtils; import com.pikolive.app.ui.widget.NobleAvatarView; import com.pikolive.app.view.GenderAgeTextView; import com.pikolive.app.vip.util.VipHelper; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.noble.NobleUtil; -import com.yizhuan.xchat_android_core.user.bean.AttentionInfo; -import com.yizhuan.xchat_android_core.utils.StringExtensionKt; +import com.pikolive.core.Constants; +import com.pikolive.core.noble.NobleUtil; +import com.pikolive.core.user.bean.AttentionInfo; +import com.pikolive.core.utils.StringExtensionKt; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/ui/relation/adapter/FansViewAdapter.java b/app/src/main/java/com/pikolive/app/ui/relation/adapter/FansViewAdapter.java index bb363d9cc..90b404baa 100644 --- a/app/src/main/java/com/pikolive/app/ui/relation/adapter/FansViewAdapter.java +++ b/app/src/main/java/com/pikolive/app/ui/relation/adapter/FansViewAdapter.java @@ -14,10 +14,10 @@ import com.yizhuan.erban.R; import com.pikolive.app.friend.action.AbstractSelectFriendAction; import com.pikolive.app.view.GenderAgeTextView; import com.pikolive.app.vip.util.VipHelper; -import com.yizhuan.xchat_android_core.im.friend.IMFriendModel; -import com.yizhuan.xchat_android_core.noble.NobleUtil; -import com.yizhuan.xchat_android_core.user.bean.FansInfo; -import com.yizhuan.xchat_android_core.utils.StringExtensionKt; +import com.pikolive.core.im.friend.IMFriendModel; +import com.pikolive.core.noble.NobleUtil; +import com.pikolive.core.user.bean.FansInfo; +import com.pikolive.core.utils.StringExtensionKt; import com.pikolive.library.utils.ResUtil; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/ui/search/RoomHistoryAdapter.java b/app/src/main/java/com/pikolive/app/ui/search/RoomHistoryAdapter.java index f665d2cd2..47d671c11 100644 --- a/app/src/main/java/com/pikolive/app/ui/search/RoomHistoryAdapter.java +++ b/app/src/main/java/com/pikolive/app/ui/search/RoomHistoryAdapter.java @@ -11,7 +11,7 @@ import com.yizhuan.erban.R; import com.pikolive.app.common.widget.CircleImageView; import com.pikolive.app.ui.utils.ImageLoadUtilsV2; import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.xchat_android_core.bean.RoomHistoryInfo; +import com.pikolive.core.bean.RoomHistoryInfo; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/ui/search/SearchActivity.java b/app/src/main/java/com/pikolive/app/ui/search/SearchActivity.java index fda52d2da..0b8ee59a2 100644 --- a/app/src/main/java/com/pikolive/app/ui/search/SearchActivity.java +++ b/app/src/main/java/com/pikolive/app/ui/search/SearchActivity.java @@ -39,18 +39,18 @@ import com.pikolive.app.decoration.helper.DecorationSaleType; import com.pikolive.app.friend.action.AbstractSelectFriendAction; import com.pikolive.app.friend.view.SelectFriendActivity; import com.pikolive.app.home.adapter.ContactsIndicatorAdapter; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.bean.RoomHistoryInfo; -import com.yizhuan.xchat_android_core.community.dynamic.DynamicModel; -import com.yizhuan.xchat_android_core.community.im.DynamicImMsg; -import com.yizhuan.xchat_android_core.community.im.WorldDynamicAttachment; -import com.yizhuan.xchat_android_core.decoration.car.bean.CarInfo; -import com.yizhuan.xchat_android_core.decoration.headwear.bean.HeadWearInfo; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.relation.cp.CpBindUnbindEvent; -import com.yizhuan.xchat_android_core.room.bean.SearchRoomInfo; -import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; -import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.bean.RoomHistoryInfo; +import com.pikolive.core.community.dynamic.DynamicModel; +import com.pikolive.core.community.im.DynamicImMsg; +import com.pikolive.core.community.im.WorldDynamicAttachment; +import com.pikolive.core.decoration.car.bean.CarInfo; +import com.pikolive.core.decoration.headwear.bean.HeadWearInfo; +import com.pikolive.core2.manager.IMNetEaseManager; +import com.pikolive.core.relation.cp.CpBindUnbindEvent; +import com.pikolive.core.room.bean.SearchRoomInfo; +import com.pikolive.core.utils.SharedPreferenceUtils; +import com.pikolive.core.utils.net.DontWarnObserver; import com.pikolive.library.base.factory.CreatePresenter; import com.pikolive.library.utils.ImeUtil; import com.pikolive.library.utils.JavaUtil; diff --git a/app/src/main/java/com/pikolive/app/ui/search/SearchAdapter.java b/app/src/main/java/com/pikolive/app/ui/search/SearchAdapter.java index d1857605c..9ddf70ea7 100644 --- a/app/src/main/java/com/pikolive/app/ui/search/SearchAdapter.java +++ b/app/src/main/java/com/pikolive/app/ui/search/SearchAdapter.java @@ -17,8 +17,8 @@ import com.pikolive.app.avroom.activity.AVRoomActivity; import com.pikolive.app.friend.action.AbstractSelectFriendAction; import com.pikolive.app.ui.user.activity.UserInfoActivity; import com.pikolive.app.utils.RegexUtil; -import com.yizhuan.xchat_android_core.room.bean.SearchRoomInfo; -import com.yizhuan.xchat_android_core.user.UserModel; +import com.pikolive.core.room.bean.SearchRoomInfo; +import com.pikolive.core.user.UserModel; import com.pikolive.library.utils.ResUtil; /** diff --git a/app/src/main/java/com/pikolive/app/ui/search/SearchDetailFragment.java b/app/src/main/java/com/pikolive/app/ui/search/SearchDetailFragment.java index 5c5d3f387..192c7b8a2 100644 --- a/app/src/main/java/com/pikolive/app/ui/search/SearchDetailFragment.java +++ b/app/src/main/java/com/pikolive/app/ui/search/SearchDetailFragment.java @@ -19,11 +19,11 @@ import com.pikolive.app.friend.action.AbstractSelectFriendAction; import com.yizhuan.erban.module_hall.HallDataManager; import com.yizhuan.erban.module_hall.hall.activity.HallSearchActivity; import com.pikolive.app.ui.im.avtivity.NimP2PMessageActivity; -import com.yizhuan.xchat_android_core.bean.RoomHistoryInfo; -import com.yizhuan.xchat_android_core.module_hall.hall.HallModel; -import com.yizhuan.xchat_android_core.room.bean.SearchRoomInfo; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.bean.RoomHistoryInfo; +import com.pikolive.core.module_hall.hall.HallModel; +import com.pikolive.core.room.bean.SearchRoomInfo; +import com.pikolive.core.utils.net.BeanObserver; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.base.factory.CreatePresenter; import com.pikolive.library.utils.JavaUtil; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/main/java/com/pikolive/app/ui/search/SearchHallActivity.java b/app/src/main/java/com/pikolive/app/ui/search/SearchHallActivity.java index dcbe9dbcc..5f1e4153c 100644 --- a/app/src/main/java/com/pikolive/app/ui/search/SearchHallActivity.java +++ b/app/src/main/java/com/pikolive/app/ui/search/SearchHallActivity.java @@ -29,8 +29,8 @@ import com.pikolive.app.common.ViewPagerAdapter; import com.pikolive.app.friend.action.AbstractSelectFriendAction; import com.pikolive.app.friend.view.SelectFriendActivity; import com.pikolive.app.home.adapter.ContactsIndicatorAdapter; -import com.yizhuan.xchat_android_core.bean.RoomHistoryInfo; -import com.yizhuan.xchat_android_core.room.bean.SearchRoomInfo; +import com.pikolive.core.bean.RoomHistoryInfo; +import com.pikolive.core.room.bean.SearchRoomInfo; import com.pikolive.library.base.factory.CreatePresenter; import com.pikolive.library.utils.ImeUtil; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/main/java/com/pikolive/app/ui/search/presenter/SearchPresenter.java b/app/src/main/java/com/pikolive/app/ui/search/presenter/SearchPresenter.java index d7093b6ab..cbe65f750 100644 --- a/app/src/main/java/com/pikolive/app/ui/search/presenter/SearchPresenter.java +++ b/app/src/main/java/com/pikolive/app/ui/search/presenter/SearchPresenter.java @@ -8,9 +8,9 @@ import androidx.annotation.Nullable; import com.yizhuan.erban.R; import com.pikolive.app.base.BaseMvpPresenter; import com.pikolive.app.ui.search.view.ISearchView; -import com.yizhuan.xchat_android_core.room.bean.SearchRoomInfo; -import com.yizhuan.xchat_android_core.room.model.AvRoomModel; -import com.yizhuan.xchat_android_core.user.UserModel; +import com.pikolive.core.room.bean.SearchRoomInfo; +import com.pikolive.core.room.model.AvRoomModel; +import com.pikolive.core.user.UserModel; import com.pikolive.library.utils.NetworkUtils; import com.pikolive.library.utils.ResUtil; import com.pikolive.library.utils.config.BasicConfig; diff --git a/app/src/main/java/com/pikolive/app/ui/search/view/ISearchView.java b/app/src/main/java/com/pikolive/app/ui/search/view/ISearchView.java index 709f37c7f..d563d618e 100644 --- a/app/src/main/java/com/pikolive/app/ui/search/view/ISearchView.java +++ b/app/src/main/java/com/pikolive/app/ui/search/view/ISearchView.java @@ -1,7 +1,7 @@ package com.pikolive.app.ui.search.view; -import com.yizhuan.xchat_android_core.bean.RoomHistoryInfo; -import com.yizhuan.xchat_android_core.room.bean.SearchRoomInfo; +import com.pikolive.core.bean.RoomHistoryInfo; +import com.pikolive.core.room.bean.SearchRoomInfo; import com.pikolive.library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/ui/setting/FeedbackActivity.java b/app/src/main/java/com/pikolive/app/ui/setting/FeedbackActivity.java index 4a0f8c56e..c7e008684 100644 --- a/app/src/main/java/com/pikolive/app/ui/setting/FeedbackActivity.java +++ b/app/src/main/java/com/pikolive/app/ui/setting/FeedbackActivity.java @@ -10,8 +10,8 @@ import com.netease.nim.uikit.StatusBarUtil; import com.trello.rxlifecycle3.android.ActivityEvent; import com.yizhuan.erban.R; import com.pikolive.app.base.BaseActivity; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.home.model.HomeModel; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core2.home.model.HomeModel; import com.pikolive.library.utils.ResUtil; import io.reactivex.SingleObserver; diff --git a/app/src/main/java/com/pikolive/app/ui/setting/LabActivity.java b/app/src/main/java/com/pikolive/app/ui/setting/LabActivity.java index 9b1691a4a..a9eb42b8a 100644 --- a/app/src/main/java/com/pikolive/app/ui/setting/LabActivity.java +++ b/app/src/main/java/com/pikolive/app/ui/setting/LabActivity.java @@ -9,7 +9,7 @@ import com.yizhuan.erban.R; import com.pikolive.app.base.BaseActivity; import com.pikolive.app.ui.utils.ImageLoadKt; import com.pikolive.library.common.application.Env; -import com.yizhuan.xchat_android_core.auth.AuthModel; +import com.pikolive.core.auth.AuthModel; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/main/java/com/pikolive/app/ui/setting/ModifyPwdActivity.java b/app/src/main/java/com/pikolive/app/ui/setting/ModifyPwdActivity.java index d13df3d7c..ca904dd3d 100644 --- a/app/src/main/java/com/pikolive/app/ui/setting/ModifyPwdActivity.java +++ b/app/src/main/java/com/pikolive/app/ui/setting/ModifyPwdActivity.java @@ -14,10 +14,10 @@ import com.yizhuan.erban.R; import com.pikolive.app.base.BaseBindingActivity; import com.yizhuan.erban.databinding.ActivityModifyPwdBinding; import com.pikolive.app.ui.login.PasswordValidator; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.auth.event.LogoutEvent; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.auth.event.LogoutEvent; +import com.pikolive.core.user.UserModel; +import com.pikolive.core.utils.net.BeanObserver; import com.pikolive.library.annatation.ActLayoutRes; import com.pikolive.library.utils.ResUtil; import com.pikolive.library.utils.TextWatcherWrapper; diff --git a/app/src/main/java/com/pikolive/app/ui/setting/NoticeSettingActivity.java b/app/src/main/java/com/pikolive/app/ui/setting/NoticeSettingActivity.java index cff6eace3..2388ab4b1 100644 --- a/app/src/main/java/com/pikolive/app/ui/setting/NoticeSettingActivity.java +++ b/app/src/main/java/com/pikolive/app/ui/setting/NoticeSettingActivity.java @@ -14,8 +14,8 @@ import com.yizhuan.erban.R; import com.pikolive.app.base.BaseViewBindingActivity; import com.pikolive.app.common.widget.TutuSwitchView; import com.yizhuan.erban.databinding.ActivityNoticeSettingBinding; -import com.yizhuan.xchat_android_core.settings.SettingsModel; -import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; +import com.pikolive.core.settings.SettingsModel; +import com.pikolive.core.utils.net.DontWarnObserver; import com.pikolive.library.utils.ResUtil; import com.pikolive.library.widget.IOSSwitchView; diff --git a/app/src/main/java/com/pikolive/app/ui/setting/PermissionGuideActivity.kt b/app/src/main/java/com/pikolive/app/ui/setting/PermissionGuideActivity.kt index 8ea8d1b8c..50f3bbfd5 100644 --- a/app/src/main/java/com/pikolive/app/ui/setting/PermissionGuideActivity.kt +++ b/app/src/main/java/com/pikolive/app/ui/setting/PermissionGuideActivity.kt @@ -7,7 +7,7 @@ import com.yizhuan.erban.R import com.pikolive.app.base.BaseViewBindingActivity import com.yizhuan.erban.databinding.ActivityPermissionGuideBinding import com.pikolive.app.ui.webview.CommonWebViewActivity -import com.yizhuan.xchat_android_core.UriProvider +import com.pikolive.core2.UriProvider import com.pikolive.library.utils.ResUtil class PermissionGuideActivity : BaseViewBindingActivity(), diff --git a/app/src/main/java/com/pikolive/app/ui/setting/PrivacySettingActivity.java b/app/src/main/java/com/pikolive/app/ui/setting/PrivacySettingActivity.java index 85c505d77..4d46c9b42 100644 --- a/app/src/main/java/com/pikolive/app/ui/setting/PrivacySettingActivity.java +++ b/app/src/main/java/com/pikolive/app/ui/setting/PrivacySettingActivity.java @@ -10,11 +10,11 @@ import com.trello.rxlifecycle3.android.ActivityEvent; import com.yizhuan.erban.R; import com.pikolive.app.base.BaseViewBindingActivity; import com.yizhuan.erban.databinding.ActivityPrivacySettingBinding; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.settings.SettingsModel; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.settings.SettingsModel; +import com.pikolive.core.user.UserModel; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.widget.IOSSwitchView; import java.util.concurrent.CancellationException; diff --git a/app/src/main/java/com/pikolive/app/ui/setting/ResetPasswordActivity.kt b/app/src/main/java/com/pikolive/app/ui/setting/ResetPasswordActivity.kt index dfa907eee..c251f8493 100644 --- a/app/src/main/java/com/pikolive/app/ui/setting/ResetPasswordActivity.kt +++ b/app/src/main/java/com/pikolive/app/ui/setting/ResetPasswordActivity.kt @@ -18,9 +18,9 @@ import com.yizhuan.erban.databinding.ActivityResetLoginPwdBinding import com.pikolive.app.ui.login.AreaCodeActivity import com.pikolive.app.ui.login.BindPhoneActivity import com.pikolive.app.ui.login.helper.LogoutHelper -import com.yizhuan.xchat_android_core.auth.AuthModel -import com.yizhuan.xchat_android_core.code.CodeType -import com.yizhuan.xchat_android_core.user.UserModel +import com.pikolive.core.auth.AuthModel +import com.pikolive.core.code.CodeType +import com.pikolive.core.user.UserModel import com.pikolive.library.utils.ResUtil import com.pikolive.library.utils.TextWatcherWrapper import io.reactivex.SingleObserver diff --git a/app/src/main/java/com/pikolive/app/ui/setting/SettingActivity.kt b/app/src/main/java/com/pikolive/app/ui/setting/SettingActivity.kt index e185359ee..631279395 100644 --- a/app/src/main/java/com/pikolive/app/ui/setting/SettingActivity.kt +++ b/app/src/main/java/com/pikolive/app/ui/setting/SettingActivity.kt @@ -21,12 +21,12 @@ import com.pikolive.app.ui.login.ShowBindPhoneActivity import com.pikolive.app.ui.login.helper.LogoutHelper import com.pikolive.app.ui.user.activity.AboutActivity import com.pikolive.app.ui.webview.CommonWebViewActivity -import com.yizhuan.xchat_android_core.UriProvider -import com.yizhuan.xchat_android_core.auth.AuthModel -import com.yizhuan.xchat_android_core.auth.event.LogoutEvent -import com.yizhuan.xchat_android_core.user.UserModel -import com.yizhuan.xchat_android_core.user.bean.UserInfo -import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils +import com.pikolive.core.auth.AuthModel +import com.pikolive.core.auth.event.LogoutEvent +import com.pikolive.core.user.UserModel +import com.pikolive.core.user.bean.UserInfo +import com.pikolive.core.utils.SharedPreferenceUtils +import com.pikolive.core2.UriProvider import com.pikolive.library.common.SpConstants import com.pikolive.library.common.file.FileHelper import com.pikolive.library.common.util.SPUtils @@ -180,7 +180,8 @@ class SettingActivity : BaseViewBindingActivity(), View. private fun clearCache() { try { - SharedPreferenceUtils.remove(SharedPreferenceUtils.SEARCH_HISTORY + AuthModel.get().currentUid) + SharedPreferenceUtils.remove( + SharedPreferenceUtils.SEARCH_HISTORY + AuthModel.get().currentUid) val dataDir = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { File(File(FileHelper.getRootCacheDir().path, "Android"), "data") } else { diff --git a/app/src/main/java/com/pikolive/app/ui/setting/ShieldManageActivity.kt b/app/src/main/java/com/pikolive/app/ui/setting/ShieldManageActivity.kt index 0581b477b..597463d27 100644 --- a/app/src/main/java/com/pikolive/app/ui/setting/ShieldManageActivity.kt +++ b/app/src/main/java/com/pikolive/app/ui/setting/ShieldManageActivity.kt @@ -13,7 +13,7 @@ import com.yizhuan.erban.databinding.ActivityShieldManageBinding import com.pikolive.app.ui.setting.adapter.RoomShieldAdapter import com.pikolive.app.ui.setting.viewmodel.SetViewModel import com.pikolive.app.ui.utils.RVDelegate -import com.yizhuan.xchat_android_core.set.bean.ShieldInfo +import com.pikolive.core2.set.bean.ShieldInfo /** * author: wushaocheng diff --git a/app/src/main/java/com/pikolive/app/ui/setting/VerifyPhoneActivity.kt b/app/src/main/java/com/pikolive/app/ui/setting/VerifyPhoneActivity.kt index 73cd1366d..46ffa8039 100644 --- a/app/src/main/java/com/pikolive/app/ui/setting/VerifyPhoneActivity.kt +++ b/app/src/main/java/com/pikolive/app/ui/setting/VerifyPhoneActivity.kt @@ -16,10 +16,10 @@ import com.pikolive.app.base.BaseViewBindingActivity import com.yizhuan.erban.databinding.ActivityVerifyPhoneBinding import com.pikolive.app.ui.login.AreaCodeActivity import com.pikolive.app.ui.login.BindPhoneActivity -import com.yizhuan.xchat_android_core.auth.AuthModel -import com.yizhuan.xchat_android_core.code.CodeType -import com.yizhuan.xchat_android_core.pay.PayModel -import com.yizhuan.xchat_android_core.utils.net.BeanObserver +import com.pikolive.core.auth.AuthModel +import com.pikolive.core.code.CodeType +import com.pikolive.core.pay.PayModel +import com.pikolive.core.utils.net.BeanObserver import com.pikolive.library.utils.ResUtil class VerifyPhoneActivity : BaseViewBindingActivity(), diff --git a/app/src/main/java/com/pikolive/app/ui/setting/adapter/RoomShieldAdapter.kt b/app/src/main/java/com/pikolive/app/ui/setting/adapter/RoomShieldAdapter.kt index c8f371812..22a17ca26 100644 --- a/app/src/main/java/com/pikolive/app/ui/setting/adapter/RoomShieldAdapter.kt +++ b/app/src/main/java/com/pikolive/app/ui/setting/adapter/RoomShieldAdapter.kt @@ -6,8 +6,8 @@ import com.chad.library.adapter.base.BaseViewHolder import com.yizhuan.erban.R import com.pikolive.app.ui.utils.ImageLoadUtilsV2 import com.pikolive.app.ui.utils.load -import com.yizhuan.xchat_android_core.set.bean.ShieldInfo -import com.yizhuan.xchat_android_core.utils.TextUtils +import com.pikolive.core2.set.bean.ShieldInfo +import com.pikolive.core.utils.TextUtils class RoomShieldAdapter : BaseQuickAdapter(R.layout.item_room_shield) { diff --git a/app/src/main/java/com/pikolive/app/ui/setting/bean/PermissionEntity.kt b/app/src/main/java/com/pikolive/app/ui/setting/bean/PermissionEntity.kt index 7dac1ab00..7f891ecdc 100644 --- a/app/src/main/java/com/pikolive/app/ui/setting/bean/PermissionEntity.kt +++ b/app/src/main/java/com/pikolive/app/ui/setting/bean/PermissionEntity.kt @@ -3,7 +3,7 @@ package com.pikolive.app.ui.setting.bean import android.Manifest import android.os.Build import com.yizhuan.erban.R -import com.yizhuan.xchat_android_core.utils.TextUtils +import com.pikolive.core.utils.TextUtils import com.pikolive.library.utils.ResUtil enum class PermissionEntity( diff --git a/app/src/main/java/com/pikolive/app/ui/setting/viewmodel/SetViewModel.kt b/app/src/main/java/com/pikolive/app/ui/setting/viewmodel/SetViewModel.kt index 2ec59fd51..1c411503c 100644 --- a/app/src/main/java/com/pikolive/app/ui/setting/viewmodel/SetViewModel.kt +++ b/app/src/main/java/com/pikolive/app/ui/setting/viewmodel/SetViewModel.kt @@ -3,10 +3,10 @@ package com.pikolive.app.ui.setting.viewmodel import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import com.pikolive.app.base.BaseViewModel -import com.yizhuan.xchat_android_core.bean.response.ListResult -import com.yizhuan.xchat_android_core.set.bean.ShieldInfo -import com.yizhuan.xchat_android_core.set.model.SetModel -import com.yizhuan.xchat_android_core.utils.toast +import com.pikolive.core.bean.response.ListResult +import com.pikolive.core.utils.toast +import com.pikolive.core2.set.bean.ShieldInfo +import com.pikolive.core2.set.model.SetModel class SetViewModel : BaseViewModel() { diff --git a/app/src/main/java/com/pikolive/app/ui/user/activity/EditUserLabelActivity.kt b/app/src/main/java/com/pikolive/app/ui/user/activity/EditUserLabelActivity.kt index ecf6cec5c..15a1a401d 100644 --- a/app/src/main/java/com/pikolive/app/ui/user/activity/EditUserLabelActivity.kt +++ b/app/src/main/java/com/pikolive/app/ui/user/activity/EditUserLabelActivity.kt @@ -25,8 +25,8 @@ import com.pikolive.app.ui.user.event.UserLabelEvent import com.pikolive.app.ui.user.fragment.LabelFragment import com.pikolive.app.ui.widget.magicindicator.ViewPagerHelper import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator -import com.yizhuan.xchat_android_core.user.UserModel -import com.yizhuan.xchat_android_core.user.bean.UserLabelInfo +import com.pikolive.core.user.UserModel +import com.pikolive.core.user.bean.UserLabelInfo import com.pikolive.library.common.entity.CommonTabEntity import com.pikolive.library.utils.ResUtil import io.reactivex.SingleObserver diff --git a/app/src/main/java/com/pikolive/app/ui/user/activity/ShowPhotoActivity.java b/app/src/main/java/com/pikolive/app/ui/user/activity/ShowPhotoActivity.java index 462de1b08..77ac66798 100644 --- a/app/src/main/java/com/pikolive/app/ui/user/activity/ShowPhotoActivity.java +++ b/app/src/main/java/com/pikolive/app/ui/user/activity/ShowPhotoActivity.java @@ -10,7 +10,7 @@ import androidx.viewpager.widget.ViewPager; import com.yizhuan.erban.R; import com.pikolive.app.base.BaseActivity; import com.pikolive.app.ui.user.adapter.PhotoAdapter; -import com.yizhuan.xchat_android_core.user.bean.UserPhoto; +import com.pikolive.core.user.bean.UserPhoto; import java.util.ArrayList; diff --git a/app/src/main/java/com/pikolive/app/ui/user/activity/UserInfoActivity.java b/app/src/main/java/com/pikolive/app/ui/user/activity/UserInfoActivity.java index 0735d2015..1693188e5 100644 --- a/app/src/main/java/com/pikolive/app/ui/user/activity/UserInfoActivity.java +++ b/app/src/main/java/com/pikolive/app/ui/user/activity/UserInfoActivity.java @@ -65,25 +65,25 @@ import com.pikolive.app.ui.user.dialog.UserLabelDialog; import com.pikolive.app.utils.RegexUtil; import com.pikolive.app.vip.util.VipHelper; import com.yizhuan.erban.databinding.ActivityUserInfoBinding; -import com.yizhuan.xchat_android_constants.XChatConstants; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.bean.RoomQueueInfo; -import com.yizhuan.xchat_android_core.im.friend.IMFriendModel; -import com.yizhuan.xchat_android_core.level.UserLevelVo; -import com.yizhuan.xchat_android_core.manager.AudioEngineManager; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.praise.PraiseModel; -import com.yizhuan.xchat_android_core.praise.event.IsLikedEvent; -import com.yizhuan.xchat_android_core.praise.event.PraiseEvent; -import com.yizhuan.xchat_android_core.user.UserInfoUiMgr; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserDetailInfo; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.user.bean.UserPhoto; -import com.yizhuan.xchat_android_core.user.event.LoginUserInfoUpdateEvent; -import com.yizhuan.xchat_android_core.utils.LogUtils; -import com.yizhuan.xchat_android_core.utils.Logger; +import com.pikolive.core2.XChatConstants; +import com.pikolive.core.Constants; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.bean.RoomQueueInfo; +import com.pikolive.core.im.friend.IMFriendModel; +import com.pikolive.core.level.UserLevelVo; +import com.pikolive.core2.manager.AudioEngineManager; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core.praise.PraiseModel; +import com.pikolive.core.praise.event.IsLikedEvent; +import com.pikolive.core.praise.event.PraiseEvent; +import com.pikolive.core.user.UserInfoUiMgr; +import com.pikolive.core.user.UserModel; +import com.pikolive.core.user.bean.UserDetailInfo; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.user.bean.UserPhoto; +import com.pikolive.core.user.event.LoginUserInfoUpdateEvent; +import com.pikolive.core.utils.LogUtils; +import com.pikolive.core.utils.Logger; import com.pikolive.library.annatation.ActLayoutRes; import com.pikolive.library.common.widget.LinesFlexBoxLayoutManager; import com.pikolive.library.utils.ListUtils; diff --git a/app/src/main/java/com/pikolive/app/ui/user/activity/UserInfoModifyActivity.kt b/app/src/main/java/com/pikolive/app/ui/user/activity/UserInfoModifyActivity.kt index a052b68b9..c0871e964 100644 --- a/app/src/main/java/com/pikolive/app/ui/user/activity/UserInfoModifyActivity.kt +++ b/app/src/main/java/com/pikolive/app/ui/user/activity/UserInfoModifyActivity.kt @@ -44,12 +44,12 @@ import com.pikolive.app.ui.utils.ImageLoadUtils import com.pikolive.app.ui.widget.dialog.CommonTipDialog import com.pikolive.app.ui.widget.recyclerview.decoration.ColorDecoration import com.pikolive.app.utils.RegexUtil -import com.yizhuan.xchat_android_core.auth.AuthModel -import com.yizhuan.xchat_android_core.file.FileModel -import com.yizhuan.xchat_android_core.user.UserModel -import com.yizhuan.xchat_android_core.user.bean.UserInfo -import com.yizhuan.xchat_android_core.user.bean.UserPhoto -import com.yizhuan.xchat_android_core.utils.Logger +import com.pikolive.core.auth.AuthModel +import com.pikolive.core.file.FileModel +import com.pikolive.core.user.UserModel +import com.pikolive.core.user.bean.UserInfo +import com.pikolive.core.user.bean.UserPhoto +import com.pikolive.core.utils.Logger import com.pikolive.library.common.file.FileHelper import com.pikolive.library.common.photo.PhotoProviderNew import com.pikolive.library.common.util.PhotoCompressCallback diff --git a/app/src/main/java/com/pikolive/app/ui/user/activity/UserModifyPhotosActivity.kt b/app/src/main/java/com/pikolive/app/ui/user/activity/UserModifyPhotosActivity.kt index 51cd34ebb..a347baf58 100644 --- a/app/src/main/java/com/pikolive/app/ui/user/activity/UserModifyPhotosActivity.kt +++ b/app/src/main/java/com/pikolive/app/ui/user/activity/UserModifyPhotosActivity.kt @@ -15,7 +15,6 @@ import androidx.core.content.ContextCompat import com.hjq.toast.ToastUtils import com.jph.takephoto.app.TakePhotoActivity import com.netease.nim.uikit.StatusBarUtil -import com.orhanobut.logger.Logger import com.trello.rxlifecycle3.android.ActivityEvent import com.yalantis.ucrop.UCrop import com.yizhuan.erban.R @@ -25,11 +24,12 @@ import com.pikolive.app.common.util.BitmapUtil import com.pikolive.app.ui.user.adapter.UserModifyPhotosAdapter import com.pikolive.app.ui.user.adapter.UserModifyPhotosAdapter.PhotoItemClickListener import com.pikolive.app.ui.widget.dialog.CommonTipDialog -import com.yizhuan.xchat_android_core.file.FileModel -import com.yizhuan.xchat_android_core.user.UserModel -import com.yizhuan.xchat_android_core.user.bean.UserInfo -import com.yizhuan.xchat_android_core.user.bean.UserPhoto -import com.yizhuan.xchat_android_core.utils.net.BeanObserver +import com.pikolive.core.file.FileModel +import com.pikolive.core.user.UserModel +import com.pikolive.core.user.bean.UserInfo +import com.pikolive.core.user.bean.UserPhoto +import com.pikolive.core.utils.Logger +import com.pikolive.core.utils.net.BeanObserver import com.pikolive.library.common.file.FileHelper import com.pikolive.library.common.photo.PhotoProviderNew import com.pikolive.library.common.util.PhotoCompressCallback @@ -291,7 +291,7 @@ class UserModifyPhotosActivity : TakePhotoActivity(), PhotoItemClickListener, mostCompressSize = IMAGE_MOST_COMPRESS_SIZE ) } catch (e: FileNotFoundException) { - com.yizhuan.xchat_android_core.utils.Logger.error(TAG, e.message) + Logger.error(TAG, e.message) } } } @@ -311,7 +311,7 @@ class UserModifyPhotosActivity : TakePhotoActivity(), PhotoItemClickListener, } if (sourceSize > 0) { //不能上传图片的最小文件大小 - com.yizhuan.xchat_android_core.utils.Logger.debug(TAG, "sourceSize: $sourceSize") + Logger.debug(TAG, "sourceSize: $sourceSize") if (sourceSize < MIN_HEAD_PHOTO_SIZE) { toast(R.string.text_bitmap_too_small) return @@ -348,7 +348,6 @@ class UserModifyPhotosActivity : TakePhotoActivity(), PhotoItemClickListener, } private fun onUpload(url: String?) { - Logger.d("onUploadPhoto:$url") UserModel.get().requestAddPhoto(url) .compose(bindUntilEvent(ActivityEvent.DESTROY)) .subscribe(object : BeanObserver() { diff --git a/app/src/main/java/com/pikolive/app/ui/user/adapter/GiftAdapter.java b/app/src/main/java/com/pikolive/app/ui/user/adapter/GiftAdapter.java index a8a3d5a16..e1640fb0d 100644 --- a/app/src/main/java/com/pikolive/app/ui/user/adapter/GiftAdapter.java +++ b/app/src/main/java/com/pikolive/app/ui/user/adapter/GiftAdapter.java @@ -10,7 +10,7 @@ import com.chad.library.adapter.base.BaseViewHolder; import com.pikolive.app.ui.utils.ImageLoadUtils; import com.yizhuan.erban.R; import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.user.bean.UserDetailInfo; +import com.pikolive.core.user.bean.UserDetailInfo; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/ui/user/adapter/MyUserLabelAdapter.kt b/app/src/main/java/com/pikolive/app/ui/user/adapter/MyUserLabelAdapter.kt index ebec824bd..746b38fa8 100644 --- a/app/src/main/java/com/pikolive/app/ui/user/adapter/MyUserLabelAdapter.kt +++ b/app/src/main/java/com/pikolive/app/ui/user/adapter/MyUserLabelAdapter.kt @@ -3,7 +3,7 @@ package com.pikolive.app.ui.user.adapter import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder import com.yizhuan.erban.R -import com.yizhuan.xchat_android_core.user.bean.UserLabelItemInfo +import com.pikolive.core.user.bean.UserLabelItemInfo /** * author: wushaocheng diff --git a/app/src/main/java/com/pikolive/app/ui/user/adapter/PhotoAdapter.java b/app/src/main/java/com/pikolive/app/ui/user/adapter/PhotoAdapter.java index 23f117bf2..bdfecf3c0 100644 --- a/app/src/main/java/com/pikolive/app/ui/user/adapter/PhotoAdapter.java +++ b/app/src/main/java/com/pikolive/app/ui/user/adapter/PhotoAdapter.java @@ -9,7 +9,7 @@ import androidx.viewpager.widget.PagerAdapter; import com.pikolive.app.ui.utils.ImageLoadUtils; import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.user.bean.UserPhoto; +import com.pikolive.core.user.bean.UserPhoto; import java.util.ArrayList; diff --git a/app/src/main/java/com/pikolive/app/ui/user/adapter/SelfPhotoAdapter.kt b/app/src/main/java/com/pikolive/app/ui/user/adapter/SelfPhotoAdapter.kt index ff881c8c5..61abd0d3b 100644 --- a/app/src/main/java/com/pikolive/app/ui/user/adapter/SelfPhotoAdapter.kt +++ b/app/src/main/java/com/pikolive/app/ui/user/adapter/SelfPhotoAdapter.kt @@ -9,7 +9,7 @@ import android.widget.ImageView import com.yizhuan.erban.R import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil import com.pikolive.app.ui.widget.rollviewpager.adapter.StaticPagerAdapterWrapper -import com.yizhuan.xchat_android_core.user.bean.UserDetailInfo +import com.pikolive.core.user.bean.UserDetailInfo class SelfPhotoAdapter( photoBeans: List, diff --git a/app/src/main/java/com/pikolive/app/ui/user/adapter/SkillCardAdapter.kt b/app/src/main/java/com/pikolive/app/ui/user/adapter/SkillCardAdapter.kt index 185679e8a..31dff4860 100644 --- a/app/src/main/java/com/pikolive/app/ui/user/adapter/SkillCardAdapter.kt +++ b/app/src/main/java/com/pikolive/app/ui/user/adapter/SkillCardAdapter.kt @@ -8,7 +8,7 @@ import com.yizhuan.erban.R import com.pikolive.app.ui.user.GradientDrawableCreator import com.pikolive.app.ui.utils.ImageLoadUtilsV2 import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil -import com.yizhuan.xchat_android_core.user.bean.UserInfoSkillEntity +import com.pikolive.core.user.bean.UserInfoSkillEntity class SkillCardAdapter(private val context: Context) : BaseQuickAdapter(R.layout.item_userinfo_skill) { diff --git a/app/src/main/java/com/pikolive/app/ui/user/adapter/UserDesAdapter.java b/app/src/main/java/com/pikolive/app/ui/user/adapter/UserDesAdapter.java index f91a2460f..12f98cfe2 100644 --- a/app/src/main/java/com/pikolive/app/ui/user/adapter/UserDesAdapter.java +++ b/app/src/main/java/com/pikolive/app/ui/user/adapter/UserDesAdapter.java @@ -23,16 +23,16 @@ import com.pikolive.app.UIHelper; import com.pikolive.app.audio.widget.VoiceLine; import com.pikolive.app.bindadapter.BaseAdapter; import com.yizhuan.erban.miniworld.activity.TopicMainActivity; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.bean.UserInfoItem; -import com.yizhuan.xchat_android_core.family.bean.FamilyInfo; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.HTeamInfo; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.OwnerHallInfo; -import com.yizhuan.xchat_android_core.user.bean.JoinWorldInfo; -import com.yizhuan.xchat_android_core.user.bean.UserGameInfo; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.user.bean.UserPhoto; -import com.yizhuan.xchat_android_core.utils.StringUtils; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.bean.UserInfoItem; +import com.pikolive.core.family.bean.FamilyInfo; +import com.pikolive.core.module_hall.hall.bean.HTeamInfo; +import com.pikolive.core.module_hall.hall.bean.OwnerHallInfo; +import com.pikolive.core.user.bean.JoinWorldInfo; +import com.pikolive.core.user.bean.UserGameInfo; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.user.bean.UserPhoto; +import com.pikolive.core.utils.StringUtils; import com.pikolive.library.utils.ListUtils; import com.pikolive.library.utils.ResUtil; import com.pikolive.library.utils.SizeUtils; diff --git a/app/src/main/java/com/pikolive/app/ui/user/adapter/UserGiftAdapter.java b/app/src/main/java/com/pikolive/app/ui/user/adapter/UserGiftAdapter.java index f68aea802..67d257c97 100644 --- a/app/src/main/java/com/pikolive/app/ui/user/adapter/UserGiftAdapter.java +++ b/app/src/main/java/com/pikolive/app/ui/user/adapter/UserGiftAdapter.java @@ -8,8 +8,8 @@ import com.chad.library.adapter.base.BaseViewHolder; import com.pikolive.app.ui.utils.ImageLoadUtils; import com.yizhuan.erban.R; import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.bean.UserInfoItem; -import com.yizhuan.xchat_android_core.user.bean.GiftWallInfo; +import com.pikolive.core.bean.UserInfoItem; +import com.pikolive.core.user.bean.GiftWallInfo; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/ui/user/adapter/UserInfoCarAdapter.java b/app/src/main/java/com/pikolive/app/ui/user/adapter/UserInfoCarAdapter.java index 2b2033233..27e66f922 100644 --- a/app/src/main/java/com/pikolive/app/ui/user/adapter/UserInfoCarAdapter.java +++ b/app/src/main/java/com/pikolive/app/ui/user/adapter/UserInfoCarAdapter.java @@ -1,7 +1,7 @@ package com.pikolive.app.ui.user.adapter; -import static com.yizhuan.xchat_android_core.decoration.car.bean.CarInfo.STATUS_OFF_SHELF; -import static com.yizhuan.xchat_android_core.decoration.car.bean.CarInfo.STATUS_OUT_OF_DATE; +import static com.pikolive.core.decoration.car.bean.CarInfo.STATUS_OFF_SHELF; +import static com.pikolive.core.decoration.car.bean.CarInfo.STATUS_OUT_OF_DATE; import android.content.Context; import android.widget.ImageView; @@ -10,9 +10,9 @@ import com.chad.library.adapter.base.BaseViewHolder; import com.pikolive.app.ui.utils.ImageLoadUtils; import com.yizhuan.erban.R; import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.bean.CarButtonInfo; -import com.yizhuan.xchat_android_core.bean.UserInfoItem; -import com.yizhuan.xchat_android_core.decoration.car.bean.CarInfo; +import com.pikolive.core.bean.CarButtonInfo; +import com.pikolive.core.bean.UserInfoItem; +import com.pikolive.core.decoration.car.bean.CarInfo; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/ui/user/adapter/UserInfoDynamicAdapter.java b/app/src/main/java/com/pikolive/app/ui/user/adapter/UserInfoDynamicAdapter.java index 2ea1df45d..f5ad88efd 100644 --- a/app/src/main/java/com/pikolive/app/ui/user/adapter/UserInfoDynamicAdapter.java +++ b/app/src/main/java/com/pikolive/app/ui/user/adapter/UserInfoDynamicAdapter.java @@ -30,11 +30,11 @@ import com.yizhuan.erban.community.photo.PagerOption; import com.yizhuan.erban.community.utils.ObjectTypeHelper; import com.yizhuan.erban.community.widget.ExpandableTextView; import com.pikolive.app.utils.TimeUiUtils; -import com.yizhuan.xchat_android_core.community.bean.DynamicMedia; -import com.yizhuan.xchat_android_core.community.bean.WorldDynamicBean; -import com.yizhuan.xchat_android_core.community.dynamic.DynamicModel; -import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.community.bean.DynamicMedia; +import com.pikolive.core.community.bean.WorldDynamicBean; +import com.pikolive.core.community.dynamic.DynamicModel; +import com.pikolive.core.utils.net.DontWarnObserver; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.utils.ResUtil; import com.pikolive.library.utils.SingleToastUtil; diff --git a/app/src/main/java/com/pikolive/app/ui/user/adapter/UserInfoPhotoAdapter.java b/app/src/main/java/com/pikolive/app/ui/user/adapter/UserInfoPhotoAdapter.java index 8b4158556..8d687efa3 100644 --- a/app/src/main/java/com/pikolive/app/ui/user/adapter/UserInfoPhotoAdapter.java +++ b/app/src/main/java/com/pikolive/app/ui/user/adapter/UserInfoPhotoAdapter.java @@ -14,8 +14,8 @@ import com.yizhuan.erban.R; import com.pikolive.app.ui.user.activity.ShowPhotoActivity; import com.pikolive.app.ui.utils.ImageLoadUtils; import com.pikolive.app.ui.widget.rollviewpager.adapter.StaticPagerAdapterWrapper; -import com.yizhuan.xchat_android_core.user.bean.UserDetailInfo; -import com.yizhuan.xchat_android_core.user.bean.UserPhoto; +import com.pikolive.core.user.bean.UserDetailInfo; +import com.pikolive.core.user.bean.UserPhoto; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/ui/user/adapter/UserJoinWorldAdapter.java b/app/src/main/java/com/pikolive/app/ui/user/adapter/UserJoinWorldAdapter.java index 3a9d705ed..4aeacc522 100644 --- a/app/src/main/java/com/pikolive/app/ui/user/adapter/UserJoinWorldAdapter.java +++ b/app/src/main/java/com/pikolive/app/ui/user/adapter/UserJoinWorldAdapter.java @@ -6,7 +6,7 @@ import com.pikolive.app.ui.utils.ImageLoadUtilsV2; import com.yizhuan.erban.R; import com.pikolive.app.common.widget.RectRoundImageView; import com.pikolive.app.ui.utils.ImageLoadUtilsV2; -import com.yizhuan.xchat_android_core.user.bean.JoinWorldInfo; +import com.pikolive.core.user.bean.JoinWorldInfo; public class UserJoinWorldAdapter extends BaseQuickAdapter { diff --git a/app/src/main/java/com/pikolive/app/ui/user/adapter/UserLabelAdapter.kt b/app/src/main/java/com/pikolive/app/ui/user/adapter/UserLabelAdapter.kt index b81dd8c3d..df79dc838 100644 --- a/app/src/main/java/com/pikolive/app/ui/user/adapter/UserLabelAdapter.kt +++ b/app/src/main/java/com/pikolive/app/ui/user/adapter/UserLabelAdapter.kt @@ -6,7 +6,7 @@ import com.chad.library.adapter.base.BaseViewHolder import com.hjq.toast.ToastUtils import com.yizhuan.erban.R import com.pikolive.app.ui.user.event.UserLabelEvent -import com.yizhuan.xchat_android_core.user.bean.UserLabelItemInfo +import com.pikolive.core.user.bean.UserLabelItemInfo import org.greenrobot.eventbus.EventBus /** diff --git a/app/src/main/java/com/pikolive/app/ui/user/adapter/UserLabelDialogAdapter.kt b/app/src/main/java/com/pikolive/app/ui/user/adapter/UserLabelDialogAdapter.kt index c2ec72aab..c1a65e599 100644 --- a/app/src/main/java/com/pikolive/app/ui/user/adapter/UserLabelDialogAdapter.kt +++ b/app/src/main/java/com/pikolive/app/ui/user/adapter/UserLabelDialogAdapter.kt @@ -4,7 +4,7 @@ import androidx.appcompat.widget.AppCompatTextView import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder import com.yizhuan.erban.R -import com.yizhuan.xchat_android_core.user.bean.UserLabelItemInfo +import com.pikolive.core.user.bean.UserLabelItemInfo /** * author: wushaocheng diff --git a/app/src/main/java/com/pikolive/app/ui/user/adapter/UserModifyPhotosAdapter.java b/app/src/main/java/com/pikolive/app/ui/user/adapter/UserModifyPhotosAdapter.java index 826db7a97..c4272589a 100644 --- a/app/src/main/java/com/pikolive/app/ui/user/adapter/UserModifyPhotosAdapter.java +++ b/app/src/main/java/com/pikolive/app/ui/user/adapter/UserModifyPhotosAdapter.java @@ -10,7 +10,7 @@ import android.widget.ImageView; import com.makeramen.roundedimageview.RoundedImageView; import com.netease.nim.uikit.support.glide.GlideApp; import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.user.bean.UserPhoto; +import com.pikolive.core.user.bean.UserPhoto; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/ui/user/adapter/UserPhotoAdapter.java b/app/src/main/java/com/pikolive/app/ui/user/adapter/UserPhotoAdapter.java index 6a9f18fa0..f7f608f95 100644 --- a/app/src/main/java/com/pikolive/app/ui/user/adapter/UserPhotoAdapter.java +++ b/app/src/main/java/com/pikolive/app/ui/user/adapter/UserPhotoAdapter.java @@ -10,8 +10,8 @@ import com.pikolive.app.ui.utils.ImageLoadUtils; import com.yizhuan.erban.R; import com.pikolive.app.common.widget.RectRoundImageView; import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.user.bean.UserPhoto; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.user.bean.UserPhoto; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/ui/user/adapter/UserTabBaseAdapter.java b/app/src/main/java/com/pikolive/app/ui/user/adapter/UserTabBaseAdapter.java index 131c4f0a2..9f9e90234 100644 --- a/app/src/main/java/com/pikolive/app/ui/user/adapter/UserTabBaseAdapter.java +++ b/app/src/main/java/com/pikolive/app/ui/user/adapter/UserTabBaseAdapter.java @@ -5,8 +5,8 @@ import android.content.Context; import com.chad.library.adapter.base.BaseMultiItemQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.bean.GiftTitleInfo; -import com.yizhuan.xchat_android_core.bean.UserInfoItem; +import com.pikolive.core.bean.GiftTitleInfo; +import com.pikolive.core.bean.UserInfoItem; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/ui/user/decorationsend/DSAttentionFragment.java b/app/src/main/java/com/pikolive/app/ui/user/decorationsend/DSAttentionFragment.java index 1ca7ca049..65c74c0a4 100644 --- a/app/src/main/java/com/pikolive/app/ui/user/decorationsend/DSAttentionFragment.java +++ b/app/src/main/java/com/pikolive/app/ui/user/decorationsend/DSAttentionFragment.java @@ -12,12 +12,12 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import com.yizhuan.erban.R; import com.pikolive.app.base.BaseFragment; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.praise.event.PraiseEvent; -import com.yizhuan.xchat_android_core.user.AttentionModel; -import com.yizhuan.xchat_android_core.user.bean.AttentionInfo; -import com.yizhuan.xchat_android_core.user.event.LoginUserInfoUpdateEvent; +import com.pikolive.core.Constants; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.praise.event.PraiseEvent; +import com.pikolive.core.user.AttentionModel; +import com.pikolive.core.user.bean.AttentionInfo; +import com.pikolive.core.user.event.LoginUserInfoUpdateEvent; import com.pikolive.library.utils.ListUtils; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/main/java/com/pikolive/app/ui/user/decorationsend/DSAttentionListAdapter.java b/app/src/main/java/com/pikolive/app/ui/user/decorationsend/DSAttentionListAdapter.java index 4d43610b3..8eafca88b 100644 --- a/app/src/main/java/com/pikolive/app/ui/user/decorationsend/DSAttentionListAdapter.java +++ b/app/src/main/java/com/pikolive/app/ui/user/decorationsend/DSAttentionListAdapter.java @@ -1,9 +1,9 @@ package com.pikolive.app.ui.user.decorationsend; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.xchat_android_core.level.UserLevelVo; -import com.yizhuan.xchat_android_core.noble.NobleInfo; -import com.yizhuan.xchat_android_core.user.bean.AttentionInfo; +import com.pikolive.core.level.UserLevelVo; +import com.pikolive.core.noble.NobleInfo; +import com.pikolive.core.user.bean.AttentionInfo; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/ui/user/decorationsend/DSBaseListAdapter.java b/app/src/main/java/com/pikolive/app/ui/user/decorationsend/DSBaseListAdapter.java index 104f2cdc3..a178cc943 100644 --- a/app/src/main/java/com/pikolive/app/ui/user/decorationsend/DSBaseListAdapter.java +++ b/app/src/main/java/com/pikolive/app/ui/user/decorationsend/DSBaseListAdapter.java @@ -13,9 +13,9 @@ import com.pikolive.app.ui.widget.NobleAvatarView; import com.yizhuan.erban.R; import com.pikolive.app.ui.utils.ImageLoadUtils; import com.pikolive.app.ui.widget.NobleAvatarView; -import com.yizhuan.xchat_android_core.level.UserLevelVo; -import com.yizhuan.xchat_android_core.noble.NobleInfo; -import com.yizhuan.xchat_android_core.noble.NobleUtil; +import com.pikolive.core.level.UserLevelVo; +import com.pikolive.core.noble.NobleInfo; +import com.pikolive.core.noble.NobleUtil; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/ui/user/decorationsend/DSFansListFragment.java b/app/src/main/java/com/pikolive/app/ui/user/decorationsend/DSFansListFragment.java index ac9bd5faf..5f718717a 100644 --- a/app/src/main/java/com/pikolive/app/ui/user/decorationsend/DSFansListFragment.java +++ b/app/src/main/java/com/pikolive/app/ui/user/decorationsend/DSFansListFragment.java @@ -12,13 +12,13 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import com.yizhuan.erban.R; import com.pikolive.app.base.BaseFragment; import com.pikolive.app.ui.user.activity.UserInfoActivity; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.praise.event.PraiseEvent; -import com.yizhuan.xchat_android_core.user.AttentionModel; -import com.yizhuan.xchat_android_core.user.bean.FansInfo; -import com.yizhuan.xchat_android_core.user.bean.FansListInfo; -import com.yizhuan.xchat_android_core.user.event.LoginUserInfoUpdateEvent; +import com.pikolive.core.Constants; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.praise.event.PraiseEvent; +import com.pikolive.core.user.AttentionModel; +import com.pikolive.core.user.bean.FansInfo; +import com.pikolive.core.user.bean.FansListInfo; +import com.pikolive.core.user.event.LoginUserInfoUpdateEvent; import com.pikolive.library.utils.ListUtils; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/main/java/com/pikolive/app/ui/user/decorationsend/DSFansViewAdapter.java b/app/src/main/java/com/pikolive/app/ui/user/decorationsend/DSFansViewAdapter.java index e3453c221..7153abe04 100644 --- a/app/src/main/java/com/pikolive/app/ui/user/decorationsend/DSFansViewAdapter.java +++ b/app/src/main/java/com/pikolive/app/ui/user/decorationsend/DSFansViewAdapter.java @@ -1,9 +1,9 @@ package com.pikolive.app.ui.user.decorationsend; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.xchat_android_core.level.UserLevelVo; -import com.yizhuan.xchat_android_core.noble.NobleInfo; -import com.yizhuan.xchat_android_core.user.bean.FansInfo; +import com.pikolive.core.level.UserLevelVo; +import com.pikolive.core.noble.NobleInfo; +import com.pikolive.core.user.bean.FansInfo; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/ui/user/decorationsend/DSFriendListAdapter.java b/app/src/main/java/com/pikolive/app/ui/user/decorationsend/DSFriendListAdapter.java index 31252e24c..6bed8e3c1 100644 --- a/app/src/main/java/com/pikolive/app/ui/user/decorationsend/DSFriendListAdapter.java +++ b/app/src/main/java/com/pikolive/app/ui/user/decorationsend/DSFriendListAdapter.java @@ -1,9 +1,9 @@ package com.pikolive.app.ui.user.decorationsend; import com.chad.library.adapter.base.BaseViewHolder; -import com.yizhuan.xchat_android_core.level.UserLevelVo; -import com.yizhuan.xchat_android_core.noble.NobleInfo; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.pikolive.core.level.UserLevelVo; +import com.pikolive.core.noble.NobleInfo; +import com.pikolive.core.user.bean.UserInfo; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/ui/user/decorationsend/DSFriendListFragment.java b/app/src/main/java/com/pikolive/app/ui/user/decorationsend/DSFriendListFragment.java index 647076df6..732b07dc6 100644 --- a/app/src/main/java/com/pikolive/app/ui/user/decorationsend/DSFriendListFragment.java +++ b/app/src/main/java/com/pikolive/app/ui/user/decorationsend/DSFriendListFragment.java @@ -10,12 +10,12 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import com.yizhuan.erban.R; import com.pikolive.app.base.BaseFragment; -import com.yizhuan.xchat_android_core.im.friend.IMFriendModel; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.manager.RelationShipEvent; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.user.event.LoginUserInfoUpdateEvent; +import com.pikolive.core.im.friend.IMFriendModel; +import com.pikolive.core2.manager.IMNetEaseManager; +import com.pikolive.core.manager.RelationShipEvent; +import com.pikolive.core.user.UserModel; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.user.event.LoginUserInfoUpdateEvent; import com.pikolive.library.utils.ListUtils; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/main/java/com/pikolive/app/ui/user/decorationsend/DecorationSendActivity.java b/app/src/main/java/com/pikolive/app/ui/user/decorationsend/DecorationSendActivity.java index 9981d139e..5cb2000ca 100644 --- a/app/src/main/java/com/pikolive/app/ui/user/decorationsend/DecorationSendActivity.java +++ b/app/src/main/java/com/pikolive/app/ui/user/decorationsend/DecorationSendActivity.java @@ -18,9 +18,9 @@ import com.pikolive.app.decoration.helper.DecorationDialogHelper; import com.pikolive.app.decoration.helper.DecorationSaleType; import com.pikolive.app.decoration.view.widgets.CarMagicIndicator; import com.pikolive.app.friend.action.AbstractSelectFriendAction; -import com.yizhuan.xchat_android_core.decoration.car.bean.CarInfo; -import com.yizhuan.xchat_android_core.decoration.headwear.bean.HeadWearInfo; -import com.yizhuan.xchat_android_core.home.bean.TabInfo; +import com.pikolive.core.decoration.car.bean.CarInfo; +import com.pikolive.core.decoration.headwear.bean.HeadWearInfo; +import com.pikolive.core2.home.bean.TabInfo; import com.pikolive.library.annatation.ActLayoutRes; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/main/java/com/pikolive/app/ui/user/dialog/UserLabelDialog.kt b/app/src/main/java/com/pikolive/app/ui/user/dialog/UserLabelDialog.kt index b83508ba3..6ad12e42e 100644 --- a/app/src/main/java/com/pikolive/app/ui/user/dialog/UserLabelDialog.kt +++ b/app/src/main/java/com/pikolive/app/ui/user/dialog/UserLabelDialog.kt @@ -11,7 +11,7 @@ import com.pikolive.app.base.BaseDialog import com.yizhuan.erban.databinding.DialogUserTagBinding import com.pikolive.app.ui.user.activity.EditUserLabelActivity import com.pikolive.app.ui.user.adapter.UserLabelDialogAdapter -import com.yizhuan.xchat_android_core.auth.AuthModel +import com.pikolive.core.auth.AuthModel import java.io.Serializable /** diff --git a/app/src/main/java/com/pikolive/app/ui/user/fragment/LabelFragment.kt b/app/src/main/java/com/pikolive/app/ui/user/fragment/LabelFragment.kt index 5c17c00cd..0e2314155 100644 --- a/app/src/main/java/com/pikolive/app/ui/user/fragment/LabelFragment.kt +++ b/app/src/main/java/com/pikolive/app/ui/user/fragment/LabelFragment.kt @@ -9,7 +9,7 @@ import com.yizhuan.erban.databinding.FragmentMyTagBinding import com.pikolive.app.ui.user.adapter.UserLabelAdapter import com.pikolive.app.ui.user.event.LabelEvent import com.pikolive.app.ui.user.event.UserLabelEvent -import com.yizhuan.xchat_android_core.user.bean.UserLabelItemInfo +import com.pikolive.core.user.bean.UserLabelItemInfo import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode diff --git a/app/src/main/java/com/pikolive/app/ui/user/fragment/UserInfoCarFragment.java b/app/src/main/java/com/pikolive/app/ui/user/fragment/UserInfoCarFragment.java index 0251537f3..86d0f0060 100644 --- a/app/src/main/java/com/pikolive/app/ui/user/fragment/UserInfoCarFragment.java +++ b/app/src/main/java/com/pikolive/app/ui/user/fragment/UserInfoCarFragment.java @@ -17,14 +17,14 @@ import com.yizhuan.erban.databinding.LayoutUserCarStoreBinding; import com.pikolive.app.decoration.view.DecorationStoreActivity; import com.pikolive.app.decoration.view.MyDecorationActivity; import com.pikolive.app.ui.user.adapter.UserInfoCarAdapter; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.bean.CarButtonInfo; -import com.yizhuan.xchat_android_core.bean.GiftTitleInfo; -import com.yizhuan.xchat_android_core.bean.UserInfoItem; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.decoration.car.CarModel; -import com.yizhuan.xchat_android_core.decoration.car.bean.CarInfo; -import com.yizhuan.xchat_android_core.user.UserInfoUiMgr; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.bean.CarButtonInfo; +import com.pikolive.core.bean.GiftTitleInfo; +import com.pikolive.core.bean.UserInfoItem; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.decoration.car.CarModel; +import com.pikolive.core.decoration.car.bean.CarInfo; +import com.pikolive.core.user.UserInfoUiMgr; import com.pikolive.library.annatation.ActLayoutRes; import com.pikolive.library.utils.ListUtils; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/main/java/com/pikolive/app/ui/user/fragment/UserInfoDynamicFragment.kt b/app/src/main/java/com/pikolive/app/ui/user/fragment/UserInfoDynamicFragment.kt index 50ad6db5d..b8bd8f6d2 100644 --- a/app/src/main/java/com/pikolive/app/ui/user/fragment/UserInfoDynamicFragment.kt +++ b/app/src/main/java/com/pikolive/app/ui/user/fragment/UserInfoDynamicFragment.kt @@ -15,15 +15,15 @@ import com.pikolive.app.ui.user.adapter.UserInfoDynamicAdapter import com.pikolive.app.ui.user.viewmodel.UserInfoViewModel import com.pikolive.app.ui.widget.ButtonItem import com.pikolive.app.ui.widget.recyclerview.decoration.HorizontalDecoration -import com.yizhuan.xchat_android_constants.XChatConstants -import com.yizhuan.xchat_android_core.auth.AuthModel -import com.yizhuan.xchat_android_core.community.bean.WorldDynamicBean -import com.yizhuan.xchat_android_core.community.dynamic.DynamicModel -import com.yizhuan.xchat_android_core.community.event.DynamicRefreshEvent -import com.yizhuan.xchat_android_core.user.UserModel -import com.yizhuan.xchat_android_core.user.bean.UserDetailInfo -import com.yizhuan.xchat_android_core.utils.net.BeanObserver -import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver +import com.pikolive.core.auth.AuthModel +import com.pikolive.core2.XChatConstants +import com.pikolive.core.community.bean.WorldDynamicBean +import com.pikolive.core.community.dynamic.DynamicModel +import com.pikolive.core.community.event.DynamicRefreshEvent +import com.pikolive.core.user.UserModel +import com.pikolive.core.user.bean.UserDetailInfo +import com.pikolive.core.utils.net.BeanObserver +import com.pikolive.core.utils.net.DontWarnObserver import com.pikolive.library.annatation.ActLayoutRes import com.pikolive.library.utils.ResUtil import com.pikolive.library.utils.SizeUtils diff --git a/app/src/main/java/com/pikolive/app/ui/user/fragment/UserInfoGiftFragment.java b/app/src/main/java/com/pikolive/app/ui/user/fragment/UserInfoGiftFragment.java index e90282f4b..615dd1fcb 100644 --- a/app/src/main/java/com/pikolive/app/ui/user/fragment/UserInfoGiftFragment.java +++ b/app/src/main/java/com/pikolive/app/ui/user/fragment/UserInfoGiftFragment.java @@ -16,13 +16,13 @@ import com.yizhuan.erban.R; import com.pikolive.app.base.BaseBindingFragment; import com.yizhuan.erban.databinding.FragmentUserInfoGiftBinding; import com.pikolive.app.ui.user.adapter.UserGiftAdapter; -import com.yizhuan.xchat_android_core.bean.UserInfoItem; -import com.yizhuan.xchat_android_core.user.UserInfoUiMgr; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.GiftWallInfo; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.user.event.LoginUserInfoUpdateEvent; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; +import com.pikolive.core.bean.UserInfoItem; +import com.pikolive.core.user.UserInfoUiMgr; +import com.pikolive.core.user.UserModel; +import com.pikolive.core.user.bean.GiftWallInfo; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.user.event.LoginUserInfoUpdateEvent; +import com.pikolive.core.utils.net.BeanObserver; import com.pikolive.library.annatation.ActLayoutRes; import com.pikolive.library.utils.ListUtils; diff --git a/app/src/main/java/com/pikolive/app/ui/user/fragment/UserInfoInfoFragment.kt b/app/src/main/java/com/pikolive/app/ui/user/fragment/UserInfoInfoFragment.kt index 3a7a1879c..604570a51 100644 --- a/app/src/main/java/com/pikolive/app/ui/user/fragment/UserInfoInfoFragment.kt +++ b/app/src/main/java/com/pikolive/app/ui/user/fragment/UserInfoInfoFragment.kt @@ -15,20 +15,20 @@ import com.yizhuan.erban.module_hall.hall.activity.ModuleHallActivity import com.pikolive.app.ui.user.adapter.UserInfoDynamicAdapter import com.pikolive.app.ui.user.viewmodel.UserInfoViewModel import com.pikolive.app.ui.widget.ButtonItem -import com.yizhuan.xchat_android_constants.XChatConstants -import com.yizhuan.xchat_android_core.auth.AuthModel -import com.yizhuan.xchat_android_core.community.bean.WorldDynamicBean -import com.yizhuan.xchat_android_core.community.dynamic.DynamicModel -import com.yizhuan.xchat_android_core.community.event.DynamicRefreshEvent -import com.yizhuan.xchat_android_core.module_hall.hall.bean.ClanAndHallInfo -import com.yizhuan.xchat_android_core.module_hall.hall.bean.ClanInfo -import com.yizhuan.xchat_android_core.module_hall.hall.bean.HallInfo -import com.yizhuan.xchat_android_core.user.UserInfoUiMgr -import com.yizhuan.xchat_android_core.user.UserModel -import com.yizhuan.xchat_android_core.user.bean.UserDetailInfo -import com.yizhuan.xchat_android_core.utils.StarUtils -import com.yizhuan.xchat_android_core.utils.net.BeanObserver -import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver +import com.pikolive.core.auth.AuthModel +import com.pikolive.core2.XChatConstants +import com.pikolive.core.community.bean.WorldDynamicBean +import com.pikolive.core.community.dynamic.DynamicModel +import com.pikolive.core.community.event.DynamicRefreshEvent +import com.pikolive.core.module_hall.hall.bean.ClanAndHallInfo +import com.pikolive.core.module_hall.hall.bean.ClanInfo +import com.pikolive.core.module_hall.hall.bean.HallInfo +import com.pikolive.core.user.UserInfoUiMgr +import com.pikolive.core.user.UserModel +import com.pikolive.core.user.bean.UserDetailInfo +import com.pikolive.core.utils.StarUtils +import com.pikolive.core.utils.net.BeanObserver +import com.pikolive.core.utils.net.DontWarnObserver import com.pikolive.library.utils.ResUtil import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe diff --git a/app/src/main/java/com/pikolive/app/ui/user/viewmodel/UserInfoViewModel.kt b/app/src/main/java/com/pikolive/app/ui/user/viewmodel/UserInfoViewModel.kt index 21678fe0f..54e21c997 100644 --- a/app/src/main/java/com/pikolive/app/ui/user/viewmodel/UserInfoViewModel.kt +++ b/app/src/main/java/com/pikolive/app/ui/user/viewmodel/UserInfoViewModel.kt @@ -4,14 +4,14 @@ import android.annotation.SuppressLint import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel -import com.yizhuan.xchat_android_core.module_hall.hall.HallModel -import com.yizhuan.xchat_android_core.module_hall.hall.bean.ClanAndHallInfo -import com.yizhuan.xchat_android_core.user.UserInfoUiMgr -import com.yizhuan.xchat_android_core.user.UserModel -import com.yizhuan.xchat_android_core.user.bean.UserDetailInfo -import com.yizhuan.xchat_android_core.user.bean.UserInfo -import com.yizhuan.xchat_android_core.utils.net.BeanObserver -import com.yizhuan.xchat_android_core.utils.toast +import com.pikolive.core.module_hall.hall.HallModel +import com.pikolive.core.module_hall.hall.bean.ClanAndHallInfo +import com.pikolive.core.user.UserInfoUiMgr +import com.pikolive.core.user.UserModel +import com.pikolive.core.user.bean.UserDetailInfo +import com.pikolive.core.user.bean.UserInfo +import com.pikolive.core.utils.net.BeanObserver +import com.pikolive.core.utils.toast import io.reactivex.disposables.CompositeDisposable import io.reactivex.disposables.Disposable diff --git a/app/src/main/java/com/pikolive/app/ui/utils/ImageLoad.kt b/app/src/main/java/com/pikolive/app/ui/utils/ImageLoad.kt index 93162eda5..b528c47e5 100644 --- a/app/src/main/java/com/pikolive/app/ui/utils/ImageLoad.kt +++ b/app/src/main/java/com/pikolive/app/ui/utils/ImageLoad.kt @@ -25,7 +25,7 @@ import com.opensource.svgaplayer.SVGAVideoEntity import com.tencent.qgame.animplayer.AnimView import com.tencent.qgame.animplayer.util.ScaleType import com.yizhuan.erban.R -import com.yizhuan.xchat_android_core.utils.LogUtils +import com.pikolive.core.utils.LogUtils import java.io.File import java.net.MalformedURLException import java.net.URL diff --git a/app/src/main/java/com/pikolive/app/ui/utils/ImageLoadUtils.java b/app/src/main/java/com/pikolive/app/ui/utils/ImageLoadUtils.java index 0821dfbd5..7188e95b1 100644 --- a/app/src/main/java/com/pikolive/app/ui/utils/ImageLoadUtils.java +++ b/app/src/main/java/com/pikolive/app/ui/utils/ImageLoadUtils.java @@ -32,8 +32,8 @@ import com.tencent.qgame.animplayer.util.ScaleType; import com.yizhuan.erban.R; import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil; import com.pikolive.app.utils.BlurTransformation; -import com.yizhuan.xchat_android_core.utils.LogUtils; -import com.yizhuan.xchat_android_core.utils.SystemUtils; +import com.pikolive.core.utils.LogUtils; +import com.pikolive.core.utils.SystemUtils; import java.io.File; diff --git a/app/src/main/java/com/pikolive/app/ui/utils/RVDelegate.java b/app/src/main/java/com/pikolive/app/ui/utils/RVDelegate.java index 044baec33..6f4e9415d 100644 --- a/app/src/main/java/com/pikolive/app/ui/utils/RVDelegate.java +++ b/app/src/main/java/com/pikolive/app/ui/utils/RVDelegate.java @@ -11,8 +11,8 @@ import com.netease.nim.uikit.common.util.sys.NetworkUtil; import com.yizhuan.erban.R; import com.pikolive.app.base.IDataStatus; import com.pikolive.app.common.EmptyViewHelper; -import com.yizhuan.xchat_android_core.bean.response.ListResult; -import com.yizhuan.xchat_android_core.utils.LogUtils; +import com.pikolive.core.bean.response.ListResult; +import com.pikolive.core.utils.LogUtils; import com.pikolive.library.utils.ListUtils; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/main/java/com/pikolive/app/ui/wallet/ExchangeGoldActivity.java b/app/src/main/java/com/pikolive/app/ui/wallet/ExchangeGoldActivity.java index db5a2b543..69beeb2a2 100644 --- a/app/src/main/java/com/pikolive/app/ui/wallet/ExchangeGoldActivity.java +++ b/app/src/main/java/com/pikolive/app/ui/wallet/ExchangeGoldActivity.java @@ -16,10 +16,10 @@ import com.netease.nim.uikit.common.util.string.StringUtil; import com.pikolive.app.ui.widget.password.PassWordFragment; import com.yizhuan.erban.R; import com.pikolive.app.base.BaseActivity; -import com.yizhuan.xchat_android_core.pay.PayModel; -import com.yizhuan.xchat_android_core.pay.bean.WalletInfo; -import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; +import com.pikolive.core.pay.PayModel; +import com.pikolive.core.pay.bean.WalletInfo; +import com.pikolive.core.utils.SharedPreferenceUtils; +import com.pikolive.core.utils.net.BeanObserver; import com.pikolive.library.utils.FormatUtils; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/main/java/com/pikolive/app/ui/wallet/adapter/WithdrawJewelAdapter.java b/app/src/main/java/com/pikolive/app/ui/wallet/adapter/WithdrawJewelAdapter.java index 0dd6a840d..c4ee5ac90 100644 --- a/app/src/main/java/com/pikolive/app/ui/wallet/adapter/WithdrawJewelAdapter.java +++ b/app/src/main/java/com/pikolive/app/ui/wallet/adapter/WithdrawJewelAdapter.java @@ -6,7 +6,7 @@ import android.widget.TextView; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.withdraw.bean.WithdrwaListInfo; +import com.pikolive.core.withdraw.bean.WithdrwaListInfo; import com.pikolive.library.utils.ResUtil; /** diff --git a/app/src/main/java/com/pikolive/app/ui/wallet/adapter/WithdrawRedListAdapter.java b/app/src/main/java/com/pikolive/app/ui/wallet/adapter/WithdrawRedListAdapter.java index c90772bc9..ec3e3d2c1 100644 --- a/app/src/main/java/com/pikolive/app/ui/wallet/adapter/WithdrawRedListAdapter.java +++ b/app/src/main/java/com/pikolive/app/ui/wallet/adapter/WithdrawRedListAdapter.java @@ -6,7 +6,7 @@ import android.widget.TextView; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.redPacket.bean.WithdrawRedListInfo; +import com.pikolive.core.redPacket.bean.WithdrawRedListInfo; /** *

红包提现展示列表

diff --git a/app/src/main/java/com/pikolive/app/ui/wallet/sendgold/SendGoldActivity.java b/app/src/main/java/com/pikolive/app/ui/wallet/sendgold/SendGoldActivity.java index 0476cf06e..8168cbe3f 100644 --- a/app/src/main/java/com/pikolive/app/ui/wallet/sendgold/SendGoldActivity.java +++ b/app/src/main/java/com/pikolive/app/ui/wallet/sendgold/SendGoldActivity.java @@ -24,17 +24,17 @@ import com.yizhuan.erban.databinding.ActivitySendGoldBinding; import com.pikolive.app.ui.utils.ImageLoadUtils; import com.pikolive.app.utils.RegexUtil; import com.pikolive.app.utils.SpannableBuilder; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.pay.GoldGiveModel; -import com.yizhuan.xchat_android_core.pay.IGoldGiveModel; -import com.yizhuan.xchat_android_core.pay.PayModel; -import com.yizhuan.xchat_android_core.pay.bean.GiveInfo; -import com.yizhuan.xchat_android_core.pay.bean.WalletInfo; -import com.yizhuan.xchat_android_core.pay.event.GetWalletInfoEvent; -import com.yizhuan.xchat_android_core.pay.event.SendGoldSuccessEvent; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.pay.GoldGiveModel; +import com.pikolive.core.pay.IGoldGiveModel; +import com.pikolive.core.pay.PayModel; +import com.pikolive.core.pay.bean.GiveInfo; +import com.pikolive.core.pay.bean.WalletInfo; +import com.pikolive.core.pay.event.GetWalletInfoEvent; +import com.pikolive.core.pay.event.SendGoldSuccessEvent; +import com.pikolive.core.user.UserModel; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.utils.net.DontWarnObserver; import com.pikolive.library.utils.FormatUtils; import com.pikolive.library.utils.JavaUtil; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/main/java/com/pikolive/app/ui/wallet/sendgold/SendGoldListAdpater.java b/app/src/main/java/com/pikolive/app/ui/wallet/sendgold/SendGoldListAdpater.java index aec027af8..b349a4f5c 100644 --- a/app/src/main/java/com/pikolive/app/ui/wallet/sendgold/SendGoldListAdpater.java +++ b/app/src/main/java/com/pikolive/app/ui/wallet/sendgold/SendGoldListAdpater.java @@ -6,7 +6,7 @@ import android.widget.TextView; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.pay.bean.GiveInfo; +import com.pikolive.core.pay.bean.GiveInfo; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/ui/webview/CommonWebViewActivity.java b/app/src/main/java/com/pikolive/app/ui/webview/CommonWebViewActivity.java index 46ce9ed52..2d630290d 100644 --- a/app/src/main/java/com/pikolive/app/ui/webview/CommonWebViewActivity.java +++ b/app/src/main/java/com/pikolive/app/ui/webview/CommonWebViewActivity.java @@ -46,12 +46,12 @@ import com.pikolive.app.base.BaseActivity; import com.pikolive.app.ui.im.RouterHandler; import com.pikolive.app.ui.widget.ShareDialog; import com.pikolive.app.utils.WebViewUtils; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.certification.event.CertificationResultEvent; -import com.yizhuan.xchat_android_core.share.ShareModel; -import com.yizhuan.xchat_android_core.web.bean.WebJsBeanInfo; -import com.yizhuan.xchat_android_core.web.event.WebViewRefreshEvent; +import com.pikolive.core.Constants; +import com.pikolive.core2.UriProvider; +import com.pikolive.core.certification.event.CertificationResultEvent; +import com.pikolive.core.share.ShareModel; +import com.pikolive.core.web.bean.WebJsBeanInfo; +import com.pikolive.core.web.event.WebViewRefreshEvent; import com.pikolive.library.rxbus.RxBus; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/main/java/com/pikolive/app/ui/webview/JSInterface.java b/app/src/main/java/com/pikolive/app/ui/webview/JSInterface.java index 60d7f8ee2..32ae687f2 100644 --- a/app/src/main/java/com/pikolive/app/ui/webview/JSInterface.java +++ b/app/src/main/java/com/pikolive/app/ui/webview/JSInterface.java @@ -32,21 +32,21 @@ import com.pikolive.app.ui.im.RouterHandler; import com.pikolive.app.ui.im.avtivity.NimP2PMessageActivity; import com.pikolive.app.ui.pay.ChargeActivity; import com.pikolive.app.ui.widget.ShareDialog; -import com.yizhuan.xchat_android_constants.XChatConstants; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.decoration.bean.DecorationStoreRouterType; -import com.yizhuan.xchat_android_core.file.FileModel; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.market_verify.MarketVerifyModel; -import com.yizhuan.xchat_android_core.pay.PayModel; -import com.yizhuan.xchat_android_core.pay.bean.WalletInfo; -import com.yizhuan.xchat_android_core.praise.PraiseModel; -import com.yizhuan.xchat_android_core.public_chat_hall.manager.PublicChatHallDataManager; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.web.bean.WebJsBeanInfo; +import com.pikolive.core2.XChatConstants; +import com.pikolive.core.Constants; +import com.pikolive.core2.UriProvider; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.decoration.bean.DecorationStoreRouterType; +import com.pikolive.core.file.FileModel; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core2.market_verify.MarketVerifyModel; +import com.pikolive.core.pay.PayModel; +import com.pikolive.core.pay.bean.WalletInfo; +import com.pikolive.core.praise.PraiseModel; +import com.pikolive.core.public_chat_hall.manager.PublicChatHallDataManager; +import com.pikolive.core.room.bean.RoomInfo; +import com.pikolive.core.user.UserModel; +import com.pikolive.core.web.bean.WebJsBeanInfo; import com.pikolive.library.common.util.DeviceUtil; import com.pikolive.library.record.AuditRecorderConfiguration; import com.pikolive.library.record.ExtAudioRecorder; diff --git a/app/src/main/java/com/pikolive/app/ui/webview/ShareH5Event.java b/app/src/main/java/com/pikolive/app/ui/webview/ShareH5Event.java index bf9aec39f..259bfea69 100644 --- a/app/src/main/java/com/pikolive/app/ui/webview/ShareH5Event.java +++ b/app/src/main/java/com/pikolive/app/ui/webview/ShareH5Event.java @@ -1,6 +1,6 @@ package com.pikolive.app.ui.webview; -import com.yizhuan.xchat_android_core.web.bean.WebJsBeanInfo; +import com.pikolive.core.web.bean.WebJsBeanInfo; /** * Created by MadisonRong on 26/06/2018. diff --git a/app/src/main/java/com/pikolive/app/ui/webview/SimpleJSInterface.java b/app/src/main/java/com/pikolive/app/ui/webview/SimpleJSInterface.java index c73e02b96..b9d991d55 100644 --- a/app/src/main/java/com/pikolive/app/ui/webview/SimpleJSInterface.java +++ b/app/src/main/java/com/pikolive/app/ui/webview/SimpleJSInterface.java @@ -10,8 +10,8 @@ import com.alibaba.fastjson.JSONObject; import com.orhanobut.logger.Logger; import com.tencent.vasdolly.helper.ChannelReaderUtil; import com.pikolive.app.application.XChatApplication; -import com.yizhuan.xchat_android_constants.XChatConstants; -import com.yizhuan.xchat_android_core.Constants; +import com.pikolive.core2.XChatConstants; +import com.pikolive.core.Constants; import com.pikolive.library.utils.AppUtils; import com.pikolive.library.utils.VersionUtil; diff --git a/app/src/main/java/com/pikolive/app/ui/webview/event/H5NotifyClientEvent.java b/app/src/main/java/com/pikolive/app/ui/webview/event/H5NotifyClientEvent.java index e8c709c17..5aba91441 100644 --- a/app/src/main/java/com/pikolive/app/ui/webview/event/H5NotifyClientEvent.java +++ b/app/src/main/java/com/pikolive/app/ui/webview/event/H5NotifyClientEvent.java @@ -1,6 +1,6 @@ package com.pikolive.app.ui.webview.event; -import com.yizhuan.xchat_android_core.base.BaseBusEvent; +import com.pikolive.core.base.BaseBusEvent; /** * h5通知客户端的事件 diff --git a/app/src/main/java/com/pikolive/app/ui/widget/DatingSelectDialog.kt b/app/src/main/java/com/pikolive/app/ui/widget/DatingSelectDialog.kt index e36871ae1..9141972aa 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/DatingSelectDialog.kt +++ b/app/src/main/java/com/pikolive/app/ui/widget/DatingSelectDialog.kt @@ -4,7 +4,7 @@ import com.netease.nim.uikit.common.util.sys.ScreenUtil import com.yizhuan.erban.R import com.pikolive.app.base.BaseDialog import com.yizhuan.erban.databinding.DialogDatingSelectBinding -import com.yizhuan.xchat_android_core.room.event.DatingSelectUserEvent +import com.pikolive.core.room.event.DatingSelectUserEvent import com.pikolive.library.utils.ResUtil import org.greenrobot.eventbus.EventBus @@ -17,7 +17,13 @@ class DatingSelectDialog(val position: Int, val uid: Long, private val myUid: Lo dismissAllowingStateLoss() } binding?.btnOk?.setOnClickListener { - EventBus.getDefault().post(DatingSelectUserEvent(uid, myUid, roomUid)) + EventBus.getDefault().post( + DatingSelectUserEvent( + uid, + myUid, + roomUid + ) + ) dismissAllowingStateLoss() } } diff --git a/app/src/main/java/com/pikolive/app/ui/widget/GiftAvatarAdapter.java b/app/src/main/java/com/pikolive/app/ui/widget/GiftAvatarAdapter.java index a45c35022..0945f6746 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/GiftAvatarAdapter.java +++ b/app/src/main/java/com/pikolive/app/ui/widget/GiftAvatarAdapter.java @@ -14,9 +14,9 @@ import com.coorchice.library.SuperTextView; import com.yizhuan.erban.R; import com.pikolive.app.common.widget.CircleImageView; import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.room.pk.bean.PKTeamInfo; -import com.yizhuan.xchat_android_core.room.queue.bean.MicMemberInfo; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core.room.pk.bean.PKTeamInfo; +import com.pikolive.core.room.queue.bean.MicMemberInfo; import com.pikolive.library.utils.ListUtils; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/GiftDialog.java b/app/src/main/java/com/pikolive/app/ui/widget/GiftDialog.java index bfb19a487..ae1cb1696 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/GiftDialog.java +++ b/app/src/main/java/com/pikolive/app/ui/widget/GiftDialog.java @@ -61,36 +61,36 @@ import com.pikolive.app.ui.utils.ImageLoadUtils; import com.pikolive.app.utils.RegexUtil; import com.pikolive.app.utils.SpannableBuilder; import com.pikolive.app.vip.VipMainActivity; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.bean.RoomQueueInfo; -import com.yizhuan.xchat_android_core.gift.GiftModel; -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo; -import com.yizhuan.xchat_android_core.gift.bean.GiftTab; -import com.yizhuan.xchat_android_core.gift.bean.GiftType; -import com.yizhuan.xchat_android_core.gift.bean.LuckyBagNoticeInfo; -import com.yizhuan.xchat_android_core.gift.bean.SimpleUserInfo; -import com.yizhuan.xchat_android_core.gift.event.UpdateKnapEvent; -import com.yizhuan.xchat_android_core.gift.event.UpdateKnapFreeGiftDataEvent; -import com.yizhuan.xchat_android_core.gift.event.UpdateKnapFreeGiftEvent; -import com.yizhuan.xchat_android_core.gift.event.UpdateKnapFreeGiftNumEvent; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomFreeGiftMsgBean; -import com.yizhuan.xchat_android_core.initial.InitialModel; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.manager.RoomEvent; -import com.yizhuan.xchat_android_core.pay.PayModel; -import com.yizhuan.xchat_android_core.pay.bean.WalletInfo; -import com.yizhuan.xchat_android_core.pay.event.FirstChargeEvent; -import com.yizhuan.xchat_android_core.pay.event.UpdateWalletInfoEvent; -import com.yizhuan.xchat_android_core.room.anotherroompk.ShowUserInfoDialogEvent; -import com.yizhuan.xchat_android_core.room.pk.model.PkModel; -import com.yizhuan.xchat_android_core.room.queue.bean.MicMemberInfo; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.utils.StringExtensionKt; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.Constants; +import com.pikolive.core2.UriProvider; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.bean.RoomQueueInfo; +import com.pikolive.core.gift.GiftModel; +import com.pikolive.core.gift.bean.GiftInfo; +import com.pikolive.core.gift.bean.GiftTab; +import com.pikolive.core.gift.bean.GiftType; +import com.pikolive.core.gift.bean.LuckyBagNoticeInfo; +import com.pikolive.core.gift.bean.SimpleUserInfo; +import com.pikolive.core.gift.event.UpdateKnapEvent; +import com.pikolive.core.gift.event.UpdateKnapFreeGiftDataEvent; +import com.pikolive.core.gift.event.UpdateKnapFreeGiftEvent; +import com.pikolive.core.gift.event.UpdateKnapFreeGiftNumEvent; +import com.pikolive.core.im.custom.bean.RoomFreeGiftMsgBean; +import com.pikolive.core.initial.InitialModel; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core2.manager.IMNetEaseManager; +import com.pikolive.core.manager.RoomEvent; +import com.pikolive.core.pay.PayModel; +import com.pikolive.core.pay.bean.WalletInfo; +import com.pikolive.core.pay.event.FirstChargeEvent; +import com.pikolive.core.pay.event.UpdateWalletInfoEvent; +import com.pikolive.core.room.anotherroompk.ShowUserInfoDialogEvent; +import com.pikolive.core.room.pk.model.PkModel; +import com.pikolive.core.room.queue.bean.MicMemberInfo; +import com.pikolive.core.user.UserModel; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.utils.StringExtensionKt; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.bindinglist.IItem; import com.pikolive.library.bindinglist.MultiTypeAdapter; import com.pikolive.library.common.util.DeviceUtil; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/LevelHeadView.java b/app/src/main/java/com/pikolive/app/ui/widget/LevelHeadView.java index 9d3b310e9..234f506bc 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/LevelHeadView.java +++ b/app/src/main/java/com/pikolive/app/ui/widget/LevelHeadView.java @@ -11,7 +11,7 @@ import android.widget.TextView; import com.netease.nim.uikit.support.glide.GlideApp; import com.yizhuan.erban.R; import com.pikolive.app.common.widget.CircleImageView; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.pikolive.core.user.bean.UserInfo; /** * Created by zhouxiangfeng on 2017/6/3. diff --git a/app/src/main/java/com/pikolive/app/ui/widget/MagicAdapter.java b/app/src/main/java/com/pikolive/app/ui/widget/MagicAdapter.java index ee39bd065..4f6dc1362 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/MagicAdapter.java +++ b/app/src/main/java/com/pikolive/app/ui/widget/MagicAdapter.java @@ -11,7 +11,7 @@ import androidx.recyclerview.widget.RecyclerView; import com.netease.nim.uikit.support.glide.GlideApp; import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.magic.bean.MagicInfo; +import com.pikolive.core.magic.bean.MagicInfo; import com.pikolive.library.utils.ListUtils; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/MainRedPointTab.java b/app/src/main/java/com/pikolive/app/ui/widget/MainRedPointTab.java index 15e141893..c661af18f 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/MainRedPointTab.java +++ b/app/src/main/java/com/pikolive/app/ui/widget/MainRedPointTab.java @@ -18,10 +18,10 @@ import com.opensource.svgaplayer.SVGAParser; import com.opensource.svgaplayer.SVGAVideoEntity; import com.yizhuan.erban.R; import com.pikolive.app.common.svga.SimpleSvgaCallback; -import com.yizhuan.xchat_android_core.home.bean.MainTabInfo; -import com.yizhuan.xchat_android_core.home.bean.MainTabType; -import com.yizhuan.xchat_android_core.utils.CheckUtils; -import com.yizhuan.xchat_android_core.utils.TextUtils; +import com.pikolive.core2.home.bean.MainTabInfo; +import com.pikolive.core2.home.bean.MainTabType; +import com.pikolive.core.utils.CheckUtils; +import com.pikolive.core.utils.TextUtils; import java.net.MalformedURLException; import java.net.URL; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/MainTabLayout.java b/app/src/main/java/com/pikolive/app/ui/widget/MainTabLayout.java index e28e92c21..f341e2799 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/MainTabLayout.java +++ b/app/src/main/java/com/pikolive/app/ui/widget/MainTabLayout.java @@ -10,8 +10,8 @@ import androidx.annotation.Nullable; import androidx.annotation.Size; import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.home.bean.MainTabInfo; -import com.yizhuan.xchat_android_core.home.bean.MainTabType; +import com.pikolive.core2.home.bean.MainTabInfo; +import com.pikolive.core2.home.bean.MainTabType; import com.pikolive.library.utils.ListUtils; import java.util.ArrayList; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/NobleAvatarView.java b/app/src/main/java/com/pikolive/app/ui/widget/NobleAvatarView.java index 51056285a..a483b66ce 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/NobleAvatarView.java +++ b/app/src/main/java/com/pikolive/app/ui/widget/NobleAvatarView.java @@ -11,10 +11,10 @@ import androidx.annotation.Nullable; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember; import com.yizhuan.erban.R; import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.noble.NobleInfo; -import com.yizhuan.xchat_android_core.noble.NobleResourceType; -import com.yizhuan.xchat_android_core.noble.NobleUtil; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.pikolive.core.noble.NobleInfo; +import com.pikolive.core.noble.NobleResourceType; +import com.pikolive.core.noble.NobleUtil; +import com.pikolive.core.user.bean.UserInfo; import com.pikolive.library.utils.SizeUtils; /** diff --git a/app/src/main/java/com/pikolive/app/ui/widget/NobleOpenNoticeView.java b/app/src/main/java/com/pikolive/app/ui/widget/NobleOpenNoticeView.java index 7c72227f6..24e0d0f97 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/NobleOpenNoticeView.java +++ b/app/src/main/java/com/pikolive/app/ui/widget/NobleOpenNoticeView.java @@ -20,8 +20,8 @@ import com.opensource.svgaplayer.SVGAImageView; import com.opensource.svgaplayer.SVGAParser; import com.opensource.svgaplayer.SVGAVideoEntity; import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.noble.NobleInfo; -import com.yizhuan.xchat_android_core.noble.NobleUtil; +import com.pikolive.core.noble.NobleInfo; +import com.pikolive.core.noble.NobleUtil; import java.net.MalformedURLException; import java.net.URL; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/RecallDialog.java b/app/src/main/java/com/pikolive/app/ui/widget/RecallDialog.java index a170f6af1..0b21f9e49 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/RecallDialog.java +++ b/app/src/main/java/com/pikolive/app/ui/widget/RecallDialog.java @@ -12,13 +12,13 @@ import android.widget.TextView; import com.netease.nim.uikit.common.util.string.StringUtil; import com.yizhuan.erban.R; import com.pikolive.app.base.BaseActivity; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.recall.RecallModel; -import com.yizhuan.xchat_android_core.recall.bean.GoBackInfo; -import com.yizhuan.xchat_android_core.recall.event.GoBackEvent; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.recall.RecallModel; +import com.pikolive.core.recall.bean.GoBackInfo; +import com.pikolive.core.recall.event.GoBackEvent; +import com.pikolive.core.user.UserModel; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.utils.SharedPreferenceUtils; import com.pikolive.library.utils.ResUtil; import com.pikolive.library.utils.SingleToastUtil; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/UserInfoDialog.java b/app/src/main/java/com/pikolive/app/ui/widget/UserInfoDialog.java index d78f04b08..5d95d2b39 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/UserInfoDialog.java +++ b/app/src/main/java/com/pikolive/app/ui/widget/UserInfoDialog.java @@ -1,8 +1,8 @@ package com.pikolive.app.ui.widget; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_DRAGON_BAR; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_DRAGON_BAR_CANCEL; -import static com.yizhuan.xchat_android_core.manager.RoomEvent.DRAGON_BAR_CANCEL; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_DRAGON_BAR; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_DRAGON_BAR_CANCEL; +import static com.pikolive.core.manager.RoomEvent.DRAGON_BAR_CANCEL; import static com.pikolive.library.utils.ResUtil.getString; import android.annotation.SuppressLint; @@ -47,45 +47,45 @@ import com.pikolive.app.ui.utils.ImageLoadUtils; import com.pikolive.app.utils.RegexUtil; import com.pikolive.app.view.GenderAgeTextView; import com.pikolive.app.vip.util.VipHelper; -import com.yizhuan.xchat_android_constants.XChatConstants; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.bean.RoomMicInfo; -import com.yizhuan.xchat_android_core.bean.RoomQueueInfo; -import com.yizhuan.xchat_android_core.decoration.headwear.bean.HeadWearInfo; -import com.yizhuan.xchat_android_core.family.bean.FamilyInfo; -import com.yizhuan.xchat_android_core.family.model.FamilyModel; -import com.yizhuan.xchat_android_core.im.custom.bean.FaceAttachment; -import com.yizhuan.xchat_android_core.kick.KickModel; -import com.yizhuan.xchat_android_core.level.UserLevelVo; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.manager.RoomEvent; -import com.yizhuan.xchat_android_core.market_verify.MarketVerifyModel; -import com.yizhuan.xchat_android_core.noble.NobleInfo; -import com.yizhuan.xchat_android_core.noble.NobleUtil; -import com.yizhuan.xchat_android_core.praise.PraiseModel; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomResult; -import com.yizhuan.xchat_android_core.room.dragonball.DragonBallModel; -import com.yizhuan.xchat_android_core.room.event.DatingSelectUserEvent; -import com.yizhuan.xchat_android_core.room.event.RoomAtEvent; -import com.yizhuan.xchat_android_core.room.face.FaceReceiveInfo; -import com.yizhuan.xchat_android_core.room.giftvalue.GiftValueModel; -import com.yizhuan.xchat_android_core.room.giftvalue.bean.RoomGiftValue; -import com.yizhuan.xchat_android_core.room.giftvalue.helper.GiftValueMrg; -import com.yizhuan.xchat_android_core.room.model.AvRoomModel; -import com.yizhuan.xchat_android_core.room.model.HomePartyModel; -import com.yizhuan.xchat_android_core.super_admin.model.SuperAdminModel; -import com.yizhuan.xchat_android_core.super_admin.util.SuperAdminUtil; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.BaseInfo; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.utils.Logger; -import com.yizhuan.xchat_android_core.utils.StringUtils; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; -import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core2.XChatConstants; +import com.pikolive.core.Constants; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.bean.RoomMicInfo; +import com.pikolive.core.bean.RoomQueueInfo; +import com.pikolive.core.decoration.headwear.bean.HeadWearInfo; +import com.pikolive.core.family.bean.FamilyInfo; +import com.pikolive.core.family.model.FamilyModel; +import com.pikolive.core.im.custom.bean.FaceAttachment; +import com.pikolive.core.kick.KickModel; +import com.pikolive.core.level.UserLevelVo; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core2.manager.IMNetEaseManager; +import com.pikolive.core.manager.RoomEvent; +import com.pikolive.core2.market_verify.MarketVerifyModel; +import com.pikolive.core.noble.NobleInfo; +import com.pikolive.core.noble.NobleUtil; +import com.pikolive.core.praise.PraiseModel; +import com.pikolive.core.room.bean.RoomInfo; +import com.pikolive.core.room.bean.RoomResult; +import com.pikolive.core.room.dragonball.DragonBallModel; +import com.pikolive.core.room.event.DatingSelectUserEvent; +import com.pikolive.core.room.event.RoomAtEvent; +import com.pikolive.core.room.face.FaceReceiveInfo; +import com.pikolive.core.room.giftvalue.GiftValueModel; +import com.pikolive.core.room.giftvalue.bean.RoomGiftValue; +import com.pikolive.core.room.giftvalue.helper.GiftValueMrg; +import com.pikolive.core.room.model.AvRoomModel; +import com.pikolive.core.room.model.HomePartyModel; +import com.pikolive.core.admin.model.SuperAdminModel; +import com.pikolive.core.admin.util.SuperAdminUtil; +import com.pikolive.core.user.UserModel; +import com.pikolive.core.user.bean.BaseInfo; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.utils.Logger; +import com.pikolive.core.utils.StringUtils; +import com.pikolive.core.utils.net.BeanObserver; +import com.pikolive.core.utils.net.DontWarnObserver; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.net.rxnet.callback.CallBack; import com.pikolive.library.utils.ListUtils; import com.pikolive.library.utils.SingleToastUtil; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/UserInfoView.java b/app/src/main/java/com/pikolive/app/ui/widget/UserInfoView.java index 94c1a3e87..17061fab1 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/UserInfoView.java +++ b/app/src/main/java/com/pikolive/app/ui/widget/UserInfoView.java @@ -14,7 +14,7 @@ import androidx.appcompat.widget.AppCompatImageView; import com.yizhuan.erban.R; import com.pikolive.app.ui.utils.ImageLoadUtils; import com.pikolive.app.utils.RegexUtil; -import com.yizhuan.xchat_android_core.user.bean.SimpleUserInfo; +import com.pikolive.core.user.bean.SimpleUserInfo; /** * 用户信息展示 一个通用的展示，用户昵称，性别，经验等级，魅力等级 diff --git a/app/src/main/java/com/pikolive/app/ui/widget/UserMagicIndicator.java b/app/src/main/java/com/pikolive/app/ui/widget/UserMagicIndicator.java index f89e2f268..c6df5782a 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/UserMagicIndicator.java +++ b/app/src/main/java/com/pikolive/app/ui/widget/UserMagicIndicator.java @@ -13,7 +13,7 @@ import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IP import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator; import com.yizhuan.erban.R; import com.pikolive.app.decoration.view.widgets.BadgeScaleTransitionPagerTitleView; -import com.yizhuan.xchat_android_core.home.bean.TabInfo; +import com.pikolive.core2.home.bean.TabInfo; import com.pikolive.library.utils.ResUtil; import java.util.List; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/dialog/AllPlayEffectDialog.java b/app/src/main/java/com/pikolive/app/ui/widget/dialog/AllPlayEffectDialog.java index 5b1afe807..d077315c2 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/dialog/AllPlayEffectDialog.java +++ b/app/src/main/java/com/pikolive/app/ui/widget/dialog/AllPlayEffectDialog.java @@ -1,9 +1,9 @@ package com.pikolive.app.ui.widget.dialog; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_GIFT_SERVER_ALL; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_SEA_GIFT_SERVER_ALL; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_BOX_ALL_ROOM_NOTIFY_BY_SVGA; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_DRAW_GIFT_L5; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_GIFT_SERVER_ALL; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_SEA_GIFT_SERVER_ALL; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_BOX_ALL_ROOM_NOTIFY_BY_SVGA; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_DRAW_GIFT_L5; import android.content.Context; import android.graphics.Color; @@ -38,14 +38,14 @@ import com.pikolive.app.common.svga.SimpleSvgaCallback; import com.yizhuan.erban.databinding.DialogAllPlayEffectBinding; import com.pikolive.app.utils.RegexUtil; import com.pikolive.app.utils.SpannableBuilder; -import com.yizhuan.xchat_android_core.gift.bean.LuckyBagNoticeInfo; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.NotifyH5Info; -import com.yizhuan.xchat_android_core.im.custom.bean.PlayEffectInfo; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomBoxPrizeInfo; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomLuckySeaMsgBean; -import com.yizhuan.xchat_android_core.im.custom.bean.TarotMsgBean; -import com.yizhuan.xchat_android_core.treasurefairy.FairyMsgInfoBean; +import com.pikolive.core.gift.bean.LuckyBagNoticeInfo; +import com.pikolive.core.im.custom.bean.CustomAttachment; +import com.pikolive.core.im.custom.bean.NotifyH5Info; +import com.pikolive.core.im.custom.bean.PlayEffectInfo; +import com.pikolive.core.im.custom.bean.RoomBoxPrizeInfo; +import com.pikolive.core.im.custom.bean.RoomLuckySeaMsgBean; +import com.pikolive.core.im.custom.bean.TarotMsgBean; +import com.pikolive.core2.treasurefairy.FairyMsgInfoBean; import com.pikolive.library.utils.ResUtil; import com.pikolive.library.utils.StringUtils; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/dialog/AllServiceGiftGoRoomTipsDialog.kt b/app/src/main/java/com/pikolive/app/ui/widget/dialog/AllServiceGiftGoRoomTipsDialog.kt index a1a7f041e..623cf3a41 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/dialog/AllServiceGiftGoRoomTipsDialog.kt +++ b/app/src/main/java/com/pikolive/app/ui/widget/dialog/AllServiceGiftGoRoomTipsDialog.kt @@ -11,7 +11,7 @@ import com.pikolive.utils.ktx.singleClick import com.yizhuan.erban.R import com.yizhuan.erban.databinding.AllServiceGiftGoRoomTipsDialogBinding import com.yizhuan.erban.public_chat_hall.activity.PublicChatHallHomeActivity -import com.yizhuan.xchat_android_core.initial.InitialModel +import com.pikolive.core.initial.InitialModel import com.pikolive.library.common.util.SPUtils import com.pikolive.library.utils.JavaUtil diff --git a/app/src/main/java/com/pikolive/app/ui/widget/dialog/AllServiceGiftLevelDialog.kt b/app/src/main/java/com/pikolive/app/ui/widget/dialog/AllServiceGiftLevelDialog.kt index 4749dc9e0..2ae21a88e 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/dialog/AllServiceGiftLevelDialog.kt +++ b/app/src/main/java/com/pikolive/app/ui/widget/dialog/AllServiceGiftLevelDialog.kt @@ -19,8 +19,8 @@ import com.pikolive.utils.spannable.SpannableTextBuilder import com.yizhuan.erban.R import com.yizhuan.erban.databinding.DialogGiftAllServiceLevelBinding import com.yizhuan.erban.public_chat_hall.activity.PublicChatHallHomeActivity -import com.yizhuan.xchat_android_core.initial.InitialModel -import com.yizhuan.xchat_android_core.noble.AllServiceGiftProtocol +import com.pikolive.core.initial.InitialModel +import com.pikolive.core.noble.AllServiceGiftProtocol import com.pikolive.library.utils.JavaUtil import io.reactivex.Observable import io.reactivex.disposables.Disposable diff --git a/app/src/main/java/com/pikolive/app/ui/widget/dialog/AllServiceVipLevelUPDialog.java b/app/src/main/java/com/pikolive/app/ui/widget/dialog/AllServiceVipLevelUPDialog.java index f180cd98b..62d1554d4 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/dialog/AllServiceVipLevelUPDialog.java +++ b/app/src/main/java/com/pikolive/app/ui/widget/dialog/AllServiceVipLevelUPDialog.java @@ -26,8 +26,8 @@ import com.pikolive.app.common.svga.SimpleSvgaCallback; import com.pikolive.app.common.widget.CircleImageSpan; import com.yizhuan.erban.databinding.DialogVipAllServiceLevelUpBinding; import com.pikolive.app.utils.SpannableBuilder; -import com.yizhuan.xchat_android_core.utils.StringExtensionKt; -import com.yizhuan.xchat_android_core.vip.VipMessageInfo; +import com.pikolive.core.utils.StringExtensionKt; +import com.pikolive.core.vip.VipMessageInfo; import com.pikolive.library.utils.ResUtil; import java.net.URL; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/dialog/CommonDialog.java b/app/src/main/java/com/pikolive/app/ui/widget/dialog/CommonDialog.java index f5885a79e..0ae6b287d 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/dialog/CommonDialog.java +++ b/app/src/main/java/com/pikolive/app/ui/widget/dialog/CommonDialog.java @@ -11,7 +11,7 @@ import android.widget.TextView; import androidx.annotation.ColorRes; import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.utils.TextUtils; +import com.pikolive.core.utils.TextUtils; import com.pikolive.library.utils.ResUtil; import static android.graphics.Typeface.BOLD; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/dialog/CommonTipDialog.java b/app/src/main/java/com/pikolive/app/ui/widget/dialog/CommonTipDialog.java index 21dd439fd..9d7bc8a50 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/dialog/CommonTipDialog.java +++ b/app/src/main/java/com/pikolive/app/ui/widget/dialog/CommonTipDialog.java @@ -13,7 +13,7 @@ import android.widget.TextView; import androidx.annotation.ColorRes; import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.utils.TextUtils; +import com.pikolive.core.utils.TextUtils; import com.pikolive.library.utils.ResUtil; /** diff --git a/app/src/main/java/com/pikolive/app/ui/widget/dialog/GiveDiamondTipDialog.java b/app/src/main/java/com/pikolive/app/ui/widget/dialog/GiveDiamondTipDialog.java index f793f52a3..22defba2c 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/dialog/GiveDiamondTipDialog.java +++ b/app/src/main/java/com/pikolive/app/ui/widget/dialog/GiveDiamondTipDialog.java @@ -16,7 +16,7 @@ import androidx.annotation.ColorRes; import androidx.constraintlayout.widget.ConstraintLayout; import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.utils.TextUtils; +import com.pikolive.core.utils.TextUtils; import com.pikolive.library.utils.ResUtil; /** diff --git a/app/src/main/java/com/pikolive/app/ui/widget/dialog/MonsterDialog.java b/app/src/main/java/com/pikolive/app/ui/widget/dialog/MonsterDialog.java index 34c801fa6..872bca1c6 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/dialog/MonsterDialog.java +++ b/app/src/main/java/com/pikolive/app/ui/widget/dialog/MonsterDialog.java @@ -18,9 +18,9 @@ import com.pikolive.app.ui.webview.CommonWebViewActivity; import com.yizhuan.erban.R; import com.pikolive.app.avroom.activity.AVRoomActivity; import com.yizhuan.erban.databinding.DialogMonsterBinding; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterInfo; -import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterProtocol; +import com.pikolive.core2.UriProvider; +import com.pikolive.core.monsterhunting.bean.MonsterInfo; +import com.pikolive.core.monsterhunting.bean.MonsterProtocol; import com.pikolive.library.utils.SizeUtils; import java.text.SimpleDateFormat; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/dialog/OpenNobleDialog.java b/app/src/main/java/com/pikolive/app/ui/widget/dialog/OpenNobleDialog.java index ade87bb6f..cb8c55704 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/dialog/OpenNobleDialog.java +++ b/app/src/main/java/com/pikolive/app/ui/widget/dialog/OpenNobleDialog.java @@ -10,8 +10,8 @@ import androidx.appcompat.app.AppCompatDialog; import com.pikolive.app.ui.webview.CommonWebViewActivity; import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.noble.NobleUtil; +import com.pikolive.core2.UriProvider; +import com.pikolive.core.noble.NobleUtil; import com.pikolive.library.utils.ResUtil; /** diff --git a/app/src/main/java/com/pikolive/app/ui/widget/drawgift/DrawGiftPlayHelper.java b/app/src/main/java/com/pikolive/app/ui/widget/drawgift/DrawGiftPlayHelper.java index 685f05eaa..b90a0ebc7 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/drawgift/DrawGiftPlayHelper.java +++ b/app/src/main/java/com/pikolive/app/ui/widget/drawgift/DrawGiftPlayHelper.java @@ -17,8 +17,8 @@ import com.bumptech.glide.Glide; import com.bumptech.glide.request.FutureTarget; import com.netease.nim.uikit.common.util.sys.ScreenUtil; import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.gift.GiftModel; -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo; +import com.pikolive.core.gift.GiftModel; +import com.pikolive.core.gift.bean.GiftInfo; import com.pikolive.library.utils.ListUtils; import java.lang.ref.WeakReference; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/dynamicface/DynamicFaceAdapter.java b/app/src/main/java/com/pikolive/app/ui/widget/dynamicface/DynamicFaceAdapter.java index 836055c28..5e53852e3 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/dynamicface/DynamicFaceAdapter.java +++ b/app/src/main/java/com/pikolive/app/ui/widget/dynamicface/DynamicFaceAdapter.java @@ -11,9 +11,9 @@ import android.widget.TextView; import com.yizhuan.erban.R; import com.pikolive.app.ui.utils.ImageLoadUtils; import com.pikolive.app.vip.util.VipHelper; -import com.yizhuan.xchat_android_core.gift.bean.SimpleVipInfo; -import com.yizhuan.xchat_android_core.room.face.FaceInfo; -import com.yizhuan.xchat_android_core.utils.TextUtils; +import com.pikolive.core.gift.bean.SimpleVipInfo; +import com.pikolive.core.room.face.FaceInfo; +import com.pikolive.core.utils.TextUtils; import com.pikolive.library.utils.config.BasicConfig; import java.io.File; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/dynamicface/DynamicFaceDialog.java b/app/src/main/java/com/pikolive/app/ui/widget/dynamicface/DynamicFaceDialog.java index 54681e13c..dab516028 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/dynamicface/DynamicFaceDialog.java +++ b/app/src/main/java/com/pikolive/app/ui/widget/dynamicface/DynamicFaceDialog.java @@ -22,11 +22,11 @@ import com.yizhuan.erban.R; import com.pikolive.app.common.util.Utils; import com.pikolive.app.common.widget.dialog.DialogManager; import com.pikolive.app.vip.VipMainActivity; -import com.yizhuan.xchat_android_core.market_verify.MarketVerifyModel; -import com.yizhuan.xchat_android_core.room.event.FaceIsReadyEvent; -import com.yizhuan.xchat_android_core.room.face.DynamicFaceModel; -import com.yizhuan.xchat_android_core.room.face.FaceInfo; -import com.yizhuan.xchat_android_core.utils.LogUtils; +import com.pikolive.core2.market_verify.MarketVerifyModel; +import com.pikolive.core.room.event.FaceIsReadyEvent; +import com.pikolive.core.room.face.DynamicFaceModel; +import com.pikolive.core.room.face.FaceInfo; +import com.pikolive.core.utils.LogUtils; import com.pikolive.library.utils.ListUtils; import com.pikolive.library.utils.ResUtil; import com.pikolive.library.utils.SingleToastUtil; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/higuide/TuTuGuideHelper.java b/app/src/main/java/com/pikolive/app/ui/widget/higuide/TuTuGuideHelper.java index bcb9c8100..0f3d7fe0a 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/higuide/TuTuGuideHelper.java +++ b/app/src/main/java/com/pikolive/app/ui/widget/higuide/TuTuGuideHelper.java @@ -13,8 +13,8 @@ import android.widget.ImageView; import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil; import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.utils.ActivityUtil; -import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; +import com.pikolive.core.utils.ActivityUtil; +import com.pikolive.core.utils.SharedPreferenceUtils; import com.pikolive.library.utils.ListUtils; import java.util.ArrayList; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/interfacex/MicListItem.java b/app/src/main/java/com/pikolive/app/ui/widget/interfacex/MicListItem.java index f5b0f379e..a20279ff0 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/interfacex/MicListItem.java +++ b/app/src/main/java/com/pikolive/app/ui/widget/interfacex/MicListItem.java @@ -1,6 +1,6 @@ package com.pikolive.app.ui.widget.interfacex; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.pikolive.core.user.bean.UserInfo; /** * Created by zhouxiangfeng on 2017/6/15. diff --git a/app/src/main/java/com/pikolive/app/ui/widget/magicindicator/GiftIndicator.java b/app/src/main/java/com/pikolive/app/ui/widget/magicindicator/GiftIndicator.java index 68612fb2d..344c6edeb 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/magicindicator/GiftIndicator.java +++ b/app/src/main/java/com/pikolive/app/ui/widget/magicindicator/GiftIndicator.java @@ -12,7 +12,7 @@ import androidx.annotation.Nullable; import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil; import com.yizhuan.erban.R; import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.xchat_android_core.gift.bean.GiftTab; +import com.pikolive.core.gift.bean.GiftTab; import java.util.ArrayList; import java.util.HashMap; diff --git a/app/src/main/java/com/pikolive/app/ui/widget/marqueeview/AvRoomNobleWelcomeView.java b/app/src/main/java/com/pikolive/app/ui/widget/marqueeview/AvRoomNobleWelcomeView.java index 65b0ecc76..3c7fadfd0 100644 --- a/app/src/main/java/com/pikolive/app/ui/widget/marqueeview/AvRoomNobleWelcomeView.java +++ b/app/src/main/java/com/pikolive/app/ui/widget/marqueeview/AvRoomNobleWelcomeView.java @@ -16,8 +16,8 @@ import android.widget.TextView; import androidx.appcompat.widget.AppCompatImageView; import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.noble.NobleInfo; -import com.yizhuan.xchat_android_core.noble.NobleUtil; +import com.pikolive.core.noble.NobleInfo; +import com.pikolive.core.noble.NobleUtil; import com.pikolive.library.utils.ScreenUtils; import com.pikolive.library.utils.SizeUtils; diff --git a/app/src/main/java/com/pikolive/app/ui/withdraw/BinderAlipayActivity.java b/app/src/main/java/com/pikolive/app/ui/withdraw/BinderAlipayActivity.java index 99a5a7b2b..6af5131a7 100644 --- a/app/src/main/java/com/pikolive/app/ui/withdraw/BinderAlipayActivity.java +++ b/app/src/main/java/com/pikolive/app/ui/withdraw/BinderAlipayActivity.java @@ -17,13 +17,13 @@ import com.netease.nim.uikit.StatusBarUtil; import com.pikolive.app.ui.login.CodeDownTimer; import com.yizhuan.erban.R; import com.pikolive.app.base.BaseActivity; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.code.CodeType; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; -import com.yizhuan.xchat_android_core.withdraw.WithdrawModel; -import com.yizhuan.xchat_android_core.withdraw.bean.WithdrawInfo; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.code.CodeType; +import com.pikolive.core.user.UserModel; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.utils.net.BeanObserver; +import com.pikolive.core.withdraw.WithdrawModel; +import com.pikolive.core.withdraw.bean.WithdrawInfo; import com.pikolive.library.utils.FormatUtils; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/main/java/com/pikolive/app/ui/withdraw/WithdrawActivity.java b/app/src/main/java/com/pikolive/app/ui/withdraw/WithdrawActivity.java index 98dfd1d89..98202148f 100644 --- a/app/src/main/java/com/pikolive/app/ui/withdraw/WithdrawActivity.java +++ b/app/src/main/java/com/pikolive/app/ui/withdraw/WithdrawActivity.java @@ -22,17 +22,17 @@ import com.pikolive.app.bills.activities.WithdrawBillsActivity; import com.pikolive.app.common.widget.dialog.DialogManager; import com.yizhuan.erban.databinding.ActivityWithdrawBinding; import com.pikolive.app.utils.SpannableBuilder; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.initial.bean.TaxInfo; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; -import com.yizhuan.xchat_android_core.withdraw.WithdrawModel; -import com.yizhuan.xchat_android_core.withdraw.bean.ExchangerInfo; -import com.yizhuan.xchat_android_core.withdraw.bean.RefreshInfo; -import com.yizhuan.xchat_android_core.withdraw.bean.WithdrawInfo; -import com.yizhuan.xchat_android_core.withdraw.bean.WithdrwaListInfo; +import com.pikolive.core2.UriProvider; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.initial.bean.TaxInfo; +import com.pikolive.core.user.UserModel; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.utils.net.BeanObserver; +import com.pikolive.core.withdraw.WithdrawModel; +import com.pikolive.core.withdraw.bean.ExchangerInfo; +import com.pikolive.core.withdraw.bean.RefreshInfo; +import com.pikolive.core.withdraw.bean.WithdrawInfo; +import com.pikolive.core.withdraw.bean.WithdrwaListInfo; import com.pikolive.library.utils.FormatUtils; import com.pikolive.library.utils.ListUtils; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/main/java/com/pikolive/app/ui/withdraw/WithdrawRuleActivity.java b/app/src/main/java/com/pikolive/app/ui/withdraw/WithdrawRuleActivity.java index 3a77183cd..b33705615 100644 --- a/app/src/main/java/com/pikolive/app/ui/withdraw/WithdrawRuleActivity.java +++ b/app/src/main/java/com/pikolive/app/ui/withdraw/WithdrawRuleActivity.java @@ -5,7 +5,7 @@ import android.webkit.WebView; import com.yizhuan.erban.R; import com.pikolive.app.base.BaseActivity; -import com.yizhuan.xchat_android_core.UriProvider; +import com.pikolive.core2.UriProvider; import com.pikolive.library.utils.ResUtil; public class WithdrawRuleActivity extends BaseActivity { diff --git a/app/src/main/java/com/pikolive/app/ui/withdraw/bankcard/BindWithdrawBankCardActivity.java b/app/src/main/java/com/pikolive/app/ui/withdraw/bankcard/BindWithdrawBankCardActivity.java index 8efd82cec..9afd134a0 100644 --- a/app/src/main/java/com/pikolive/app/ui/withdraw/bankcard/BindWithdrawBankCardActivity.java +++ b/app/src/main/java/com/pikolive/app/ui/withdraw/bankcard/BindWithdrawBankCardActivity.java @@ -10,12 +10,12 @@ import com.trello.rxlifecycle3.android.ActivityEvent; import com.yizhuan.erban.R; import com.pikolive.app.base.BaseViewBindingActivity; import com.yizhuan.erban.databinding.ActivityBindWithdrawBankCardBinding; -import com.yizhuan.xchat_android_core.code.CodeModel; -import com.yizhuan.xchat_android_core.code.CodeType; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; -import com.yizhuan.xchat_android_core.withdraw.WithdrawModel; +import com.pikolive.core.code.CodeModel; +import com.pikolive.core.code.CodeType; +import com.pikolive.core.user.UserModel; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.utils.net.DontWarnObserver; +import com.pikolive.core.withdraw.WithdrawModel; import com.pikolive.library.utils.ResUtil; /** diff --git a/app/src/main/java/com/pikolive/app/utils/ActWhiteListMrg.java b/app/src/main/java/com/pikolive/app/utils/ActWhiteListMrg.java index 46c46225c..73283aa21 100644 --- a/app/src/main/java/com/pikolive/app/utils/ActWhiteListMrg.java +++ b/app/src/main/java/com/pikolive/app/utils/ActWhiteListMrg.java @@ -6,7 +6,7 @@ import com.netease.nim.uikit.common.util.log.LogUtil; import com.pikolive.app.NimMiddleActivity; import com.yizhuan.erban.R; import com.pikolive.app.other.activity.SplashActivity; -import com.yizhuan.xchat_android_core.utils.ActivityUtil; +import com.pikolive.core.utils.ActivityUtil; import com.pikolive.library.utils.ResUtil; import java.util.ArrayList; diff --git a/app/src/main/java/com/pikolive/app/utils/CertificateHelper.java b/app/src/main/java/com/pikolive/app/utils/CertificateHelper.java index 8b7a959ba..f9fa089cb 100644 --- a/app/src/main/java/com/pikolive/app/utils/CertificateHelper.java +++ b/app/src/main/java/com/pikolive/app/utils/CertificateHelper.java @@ -1,8 +1,8 @@ package com.pikolive.app.utils; -import static com.yizhuan.xchat_android_core.certification.CertificationModel.CER_TYPE_FORCE; -import static com.yizhuan.xchat_android_core.certification.CertificationModel.CER_TYPE_GUIDE; -import static com.yizhuan.xchat_android_core.certification.CertificationModel.CER_TYPE_NONE; +import static com.pikolive.core.certification.CertificationModel.CER_TYPE_FORCE; +import static com.pikolive.core.certification.CertificationModel.CER_TYPE_GUIDE; +import static com.pikolive.core.certification.CertificationModel.CER_TYPE_NONE; import android.content.Context; import android.text.Spannable; @@ -15,10 +15,10 @@ import androidx.core.content.ContextCompat; import com.yizhuan.erban.R; import com.pikolive.app.common.widget.dialog.DialogManager; import com.pikolive.app.ui.webview.CommonWebViewActivity; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.certification.CertificationModel; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.pikolive.core2.UriProvider; +import com.pikolive.core.certification.CertificationModel; +import com.pikolive.core.user.UserModel; +import com.pikolive.core.user.bean.UserInfo; /** * 强制用户实名认证 diff --git a/app/src/main/java/com/pikolive/app/utils/CommonJumpHelper.java b/app/src/main/java/com/pikolive/app/utils/CommonJumpHelper.java index e258870f4..7546293b1 100644 --- a/app/src/main/java/com/pikolive/app/utils/CommonJumpHelper.java +++ b/app/src/main/java/com/pikolive/app/utils/CommonJumpHelper.java @@ -1,10 +1,10 @@ package com.pikolive.app.utils; -import static com.yizhuan.xchat_android_core.home.bean.BannerInfo.SKIP_TYPE_ROUTER; -import static com.yizhuan.xchat_android_core.home.bean.BannerInfo.SKIP_TYP_APP; -import static com.yizhuan.xchat_android_core.home.bean.BannerInfo.SKIP_TYP_CHAT_ROOM; -import static com.yizhuan.xchat_android_core.home.bean.BannerInfo.SKIP_TYP_H5; +import static com.pikolive.core2.home.bean.BannerInfo.SKIP_TYPE_ROUTER; +import static com.pikolive.core2.home.bean.BannerInfo.SKIP_TYP_APP; +import static com.pikolive.core2.home.bean.BannerInfo.SKIP_TYP_CHAT_ROOM; +import static com.pikolive.core2.home.bean.BannerInfo.SKIP_TYP_H5; import android.content.Context; import android.content.Intent; @@ -13,7 +13,7 @@ import android.text.TextUtils; import com.pikolive.app.avroom.activity.AVRoomActivity; import com.pikolive.app.ui.im.RouterHandler; import com.pikolive.app.ui.webview.CommonWebViewActivity; -import com.yizhuan.xchat_android_core.home.bean.BannerInfo; +import com.pikolive.core2.home.bean.BannerInfo; import com.pikolive.library.utils.JavaUtil; /** diff --git a/app/src/main/java/com/pikolive/app/utils/MsgBuilder.kt b/app/src/main/java/com/pikolive/app/utils/MsgBuilder.kt index 84d1c6937..c2023a796 100644 --- a/app/src/main/java/com/pikolive/app/utils/MsgBuilder.kt +++ b/app/src/main/java/com/pikolive/app/utils/MsgBuilder.kt @@ -4,9 +4,9 @@ import android.text.style.ForegroundColorSpan import android.view.View import androidx.core.graphics.toColorInt import com.pikolive.app.ui.webview.CommonWebViewActivity -import com.yizhuan.xchat_android_core.im.custom.bean.FairyMsgAttachment -import com.yizhuan.xchat_android_core.manager.RoomEvent -import com.yizhuan.xchat_android_core.utils.sub +import com.pikolive.core.im.custom.bean.FairyMsgAttachment +import com.pikolive.core.manager.RoomEvent +import com.pikolive.core.utils.sub class MsgBuilder { diff --git a/app/src/main/java/com/pikolive/app/utils/PushMessageHandler.java b/app/src/main/java/com/pikolive/app/utils/PushMessageHandler.java index cbf89429f..e092281b3 100644 --- a/app/src/main/java/com/pikolive/app/utils/PushMessageHandler.java +++ b/app/src/main/java/com/pikolive/app/utils/PushMessageHandler.java @@ -9,7 +9,7 @@ import android.text.TextUtils; import com.coorchice.library.utils.LogUtils; import com.netease.nimlib.sdk.StatusBarNotificationConfig; import com.netease.nimlib.sdk.mixpush.MixPushMessageHandler; -import com.yizhuan.xchat_android_core.DemoCache; +import com.pikolive.core.DemoCache; import java.io.Serializable; import java.util.Map; diff --git a/app/src/main/java/com/pikolive/app/utils/UserUtils.java b/app/src/main/java/com/pikolive/app/utils/UserUtils.java index 3823636db..42be40c3f 100644 --- a/app/src/main/java/com/pikolive/app/utils/UserUtils.java +++ b/app/src/main/java/com/pikolive/app/utils/UserUtils.java @@ -1,9 +1,9 @@ package com.pikolive.app.utils; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core.user.UserModel; +import com.pikolive.core.user.bean.UserInfo; public class UserUtils { diff --git a/app/src/main/java/com/pikolive/app/vip/VipBroadcastView.kt b/app/src/main/java/com/pikolive/app/vip/VipBroadcastView.kt index b67bfa38c..0f1dd5ab6 100644 --- a/app/src/main/java/com/pikolive/app/vip/VipBroadcastView.kt +++ b/app/src/main/java/com/pikolive/app/vip/VipBroadcastView.kt @@ -12,10 +12,10 @@ import androidx.core.view.isVisible import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage import com.yizhuan.erban.databinding.LayoutVipBroadcastViewBinding import com.pikolive.app.ui.utils.ImageLoadUtils -import com.yizhuan.xchat_android_core.im.custom.bean.VipMessageAttachment -import com.yizhuan.xchat_android_core.room.anotherroompk.ShowUserInfoDialogEvent -import com.yizhuan.xchat_android_core.utils.subAndReplaceDot -import com.yizhuan.xchat_android_core.vip.VipBroadcastMsgEvent +import com.pikolive.core.im.custom.bean.VipMessageAttachment +import com.pikolive.core.room.anotherroompk.ShowUserInfoDialogEvent +import com.pikolive.core.utils.subAndReplaceDot +import com.pikolive.core.vip.VipBroadcastMsgEvent import com.pikolive.library.rxbus.RxBus import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers @@ -36,7 +36,11 @@ class VipBroadcastView @JvmOverloads constructor( init { addView(binding.root, LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT)) binding.llRoot.setOnClickListener { - RxBus.get().post(ShowUserInfoDialogEvent(binding.llRoot.tag as String)) + RxBus.get().post( + ShowUserInfoDialogEvent( + binding.llRoot.tag as String + ) + ) } EventBus.getDefault().register(this) } @@ -93,7 +97,8 @@ class VipBroadcastView @JvmOverloads constructor( @SuppressLint("SetTextI18n") private fun showMessage(chatRoomMessage: ChatRoomMessage?) { - val attachment = chatRoomMessage?.attachment as? VipMessageAttachment ?: return + val attachment = chatRoomMessage?.attachment as? VipMessageAttachment + ?: return attachment.vipMessageInfo?.let { ImageLoadUtils.loadAvatar(it.avatar, binding.ivAvatar) ImageLoadUtils.loadImage(context, it.vipIcon, binding.ivVipIcon) diff --git a/app/src/main/java/com/pikolive/app/vip/VipMainActivity.kt b/app/src/main/java/com/pikolive/app/vip/VipMainActivity.kt index f1287f3ba..4f0d28492 100644 --- a/app/src/main/java/com/pikolive/app/vip/VipMainActivity.kt +++ b/app/src/main/java/com/pikolive/app/vip/VipMainActivity.kt @@ -42,17 +42,17 @@ import com.pikolive.app.vip.adapter.VipMagicIndicatorAdapter import com.pikolive.app.vip.dialog.SelectPayTypeDialog import com.pikolive.app.vip.dialog.VipAuthDetailsDialog import com.pikolive.app.vip.dialog.VipRemainTimeDialog -import com.yizhuan.xchat_android_core.Constants -import com.yizhuan.xchat_android_core.UriProvider -import com.yizhuan.xchat_android_core.auth.AuthModel -import com.yizhuan.xchat_android_core.pay.PayModel -import com.yizhuan.xchat_android_core.pay.bean.ChargeBean -import com.yizhuan.xchat_android_core.pay.bean.PayRecordId -import com.yizhuan.xchat_android_core.utils.net.IgnoreException -import com.yizhuan.xchat_android_core.utils.toast -import com.yizhuan.xchat_android_core.vip.VipAuthInfo -import com.yizhuan.xchat_android_core.vip.VipInfo -import com.yizhuan.xchat_android_core.vip.VipOpenEvent +import com.pikolive.core.Constants +import com.pikolive.core.auth.AuthModel +import com.pikolive.core.pay.PayModel +import com.pikolive.core.pay.bean.ChargeBean +import com.pikolive.core.pay.bean.PayRecordId +import com.pikolive.core.utils.net.IgnoreException +import com.pikolive.core.utils.toast +import com.pikolive.core.vip.VipAuthInfo +import com.pikolive.core.vip.VipInfo +import com.pikolive.core.vip.VipOpenEvent +import com.pikolive.core2.UriProvider import com.pikolive.library.common.util.DeviceUtil import com.pikolive.library.utils.AppMetaDataUtil import com.pikolive.library.utils.SingleToastUtil diff --git a/app/src/main/java/com/pikolive/app/vip/VipSettingActivity.kt b/app/src/main/java/com/pikolive/app/vip/VipSettingActivity.kt index 854687ffa..0094cca94 100644 --- a/app/src/main/java/com/pikolive/app/vip/VipSettingActivity.kt +++ b/app/src/main/java/com/pikolive/app/vip/VipSettingActivity.kt @@ -8,7 +8,7 @@ import com.netease.nim.uikit.StatusBarUtil import com.yizhuan.erban.R import com.pikolive.app.base.BaseViewBindingActivity import com.yizhuan.erban.databinding.ActivityVipSettingBinding -import com.yizhuan.xchat_android_core.user.UserModel +import com.pikolive.core.user.UserModel import com.pikolive.library.utils.ResUtil class VipSettingActivity : BaseViewBindingActivity() { diff --git a/app/src/main/java/com/pikolive/app/vip/VipViewModel.kt b/app/src/main/java/com/pikolive/app/vip/VipViewModel.kt index 40f570312..4ee250174 100644 --- a/app/src/main/java/com/pikolive/app/vip/VipViewModel.kt +++ b/app/src/main/java/com/pikolive/app/vip/VipViewModel.kt @@ -4,14 +4,14 @@ import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import com.yizhuan.erban.R import com.pikolive.app.base.BaseViewModel -import com.yizhuan.xchat_android_core.bean.response.BeanResult -import com.yizhuan.xchat_android_core.user.UserInfoUiMgr -import com.yizhuan.xchat_android_core.user.UserModel -import com.yizhuan.xchat_android_core.utils.toast -import com.yizhuan.xchat_android_core.vip.VipAuthInfo -import com.yizhuan.xchat_android_core.vip.VipBroadcastInfo -import com.yizhuan.xchat_android_core.vip.VipInfo -import com.yizhuan.xchat_android_core.vip.VipModel +import com.pikolive.core.bean.response.BeanResult +import com.pikolive.core.user.UserInfoUiMgr +import com.pikolive.core.user.UserModel +import com.pikolive.core.utils.toast +import com.pikolive.core.vip.VipAuthInfo +import com.pikolive.core.vip.VipBroadcastInfo +import com.pikolive.core.vip.VipInfo +import com.pikolive.core.vip.VipModel import com.pikolive.library.utils.ResUtil class VipViewModel : BaseViewModel() { diff --git a/app/src/main/java/com/pikolive/app/vip/adapter/VipAuthAdapter.kt b/app/src/main/java/com/pikolive/app/vip/adapter/VipAuthAdapter.kt index 6b857eb57..ce9475860 100644 --- a/app/src/main/java/com/pikolive/app/vip/adapter/VipAuthAdapter.kt +++ b/app/src/main/java/com/pikolive/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.yizhuan.erban.R import com.pikolive.app.ui.utils.load -import com.yizhuan.xchat_android_core.vip.VipAuthInfo -import com.yizhuan.xchat_android_core.vip.VipInfo +import com.pikolive.core.vip.VipAuthInfo +import com.pikolive.core.vip.VipInfo class VipAuthAdapter : BaseQuickAdapter(R.layout.item_vip_auth) { diff --git a/app/src/main/java/com/pikolive/app/vip/dialog/SelectPayTypeDialog.kt b/app/src/main/java/com/pikolive/app/vip/dialog/SelectPayTypeDialog.kt index 17f43fd2b..068eacbf8 100644 --- a/app/src/main/java/com/pikolive/app/vip/dialog/SelectPayTypeDialog.kt +++ b/app/src/main/java/com/pikolive/app/vip/dialog/SelectPayTypeDialog.kt @@ -14,9 +14,9 @@ import com.pikolive.app.base.BaseDialog import com.yizhuan.erban.databinding.DialogSelectPayTypeBinding import com.pikolive.app.ui.widget.dialog.CommonTipDialog import com.pikolive.app.utils.SpannableBuilder -import com.yizhuan.xchat_android_core.pay.PayModel -import com.yizhuan.xchat_android_core.pay.bean.WalletInfo -import com.yizhuan.xchat_android_core.utils.Logger +import com.pikolive.core.pay.PayModel +import com.pikolive.core.pay.bean.WalletInfo +import com.pikolive.core.utils.Logger import com.pikolive.library.utils.FormatUtils import com.pikolive.library.utils.ResUtil import com.pikolive.library.utils.SingleToastUtil diff --git a/app/src/main/java/com/pikolive/app/vip/dialog/VipBroadcastDialog.kt b/app/src/main/java/com/pikolive/app/vip/dialog/VipBroadcastDialog.kt index 482305456..c22ed8613 100644 --- a/app/src/main/java/com/pikolive/app/vip/dialog/VipBroadcastDialog.kt +++ b/app/src/main/java/com/pikolive/app/vip/dialog/VipBroadcastDialog.kt @@ -9,8 +9,8 @@ import com.pikolive.app.base.BaseActivity import com.pikolive.app.base.BaseDialog import com.yizhuan.erban.databinding.DialogVipBroadcastBinding import com.pikolive.app.vip.VipViewModel -import com.yizhuan.xchat_android_core.utils.CurrentTimeUtils -import com.yizhuan.xchat_android_core.utils.toast +import com.pikolive.core.utils.CurrentTimeUtils +import com.pikolive.core.utils.toast import com.pikolive.library.utils.ResUtil import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers diff --git a/app/src/main/java/com/pikolive/app/vip/dialog/VipUpgradeDialog.kt b/app/src/main/java/com/pikolive/app/vip/dialog/VipUpgradeDialog.kt index 8c74689b2..0162c7e4d 100644 --- a/app/src/main/java/com/pikolive/app/vip/dialog/VipUpgradeDialog.kt +++ b/app/src/main/java/com/pikolive/app/vip/dialog/VipUpgradeDialog.kt @@ -10,7 +10,7 @@ import com.pikolive.app.base.BaseActivity import com.pikolive.app.base.BaseDialog import com.yizhuan.erban.databinding.DialogVipUpgradeBinding import com.pikolive.app.vip.VipViewModel -import com.yizhuan.xchat_android_core.vip.VipInfo +import com.pikolive.core.vip.VipInfo import java.net.MalformedURLException import java.net.URL diff --git a/app/src/main/java/com/pikolive/app/vip/util/VipHelper.java b/app/src/main/java/com/pikolive/app/vip/util/VipHelper.java index 1dcf67e35..5d4eceb98 100644 --- a/app/src/main/java/com/pikolive/app/vip/util/VipHelper.java +++ b/app/src/main/java/com/pikolive/app/vip/util/VipHelper.java @@ -9,10 +9,10 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.utils.TextUtils; -import com.yizhuan.xchat_android_core.vip.UserVipInfo; +import com.pikolive.core.user.UserModel; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.utils.TextUtils; +import com.pikolive.core.vip.UserVipInfo; public class VipHelper { diff --git a/app/src/main/java/com/pikolive/app/vip/view/VipBroadcastView.kt b/app/src/main/java/com/pikolive/app/vip/view/VipBroadcastView.kt index 164f8db8b..0a8a860e3 100644 --- a/app/src/main/java/com/pikolive/app/vip/view/VipBroadcastView.kt +++ b/app/src/main/java/com/pikolive/app/vip/view/VipBroadcastView.kt @@ -12,10 +12,10 @@ import androidx.core.view.isVisible import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage import com.yizhuan.erban.databinding.LayoutVipBroadcastViewBinding import com.pikolive.app.ui.utils.ImageLoadUtils -import com.yizhuan.xchat_android_core.im.custom.bean.VipMessageAttachment -import com.yizhuan.xchat_android_core.room.anotherroompk.ShowUserInfoDialogEvent -import com.yizhuan.xchat_android_core.utils.subAndReplaceDot -import com.yizhuan.xchat_android_core.vip.VipBroadcastMsgEvent +import com.pikolive.core.im.custom.bean.VipMessageAttachment +import com.pikolive.core.room.anotherroompk.ShowUserInfoDialogEvent +import com.pikolive.core.utils.subAndReplaceDot +import com.pikolive.core.vip.VipBroadcastMsgEvent import com.pikolive.library.rxbus.RxBus import io.reactivex.Observable import io.reactivex.android.schedulers.AndroidSchedulers @@ -36,7 +36,11 @@ class VipBroadcastView @JvmOverloads constructor( init { addView(binding.root, LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT)) binding.llRoot.setOnClickListener { - RxBus.get().post(ShowUserInfoDialogEvent(binding.llRoot.tag as String)) + RxBus.get().post( + ShowUserInfoDialogEvent( + binding.llRoot.tag as String + ) + ) } EventBus.getDefault().register(this) } @@ -93,7 +97,8 @@ class VipBroadcastView @JvmOverloads constructor( @SuppressLint("SetTextI18n") private fun showMessage(chatRoomMessage: ChatRoomMessage?) { - val attachment = chatRoomMessage?.attachment as? VipMessageAttachment ?: return + val attachment = chatRoomMessage?.attachment as? VipMessageAttachment + ?: return attachment.vipMessageInfo?.let { ImageLoadUtils.loadAvatar(it.avatar, binding.ivAvatar) ImageLoadUtils.loadImage(context, it.vipIcon, binding.ivVipIcon) diff --git a/app/src/main/res/layout/activity_cp_home.xml b/app/src/main/res/layout/activity_cp_home.xml index a54cb32c1..b53e12351 100644 --- a/app/src/main/res/layout/activity_cp_home.xml +++ b/app/src/main/res/layout/activity_cp_home.xml @@ -12,7 +12,7 @@ android:layout_height="wrap_content" app:layout_constraintTop_toTopOf="parent" /> - - + type="com.pikolive.core.team.bean.TeamInfo" /> - - + + diff --git a/app/src/main/res/layout/dialog_cp_invite.xml b/app/src/main/res/layout/dialog_cp_invite.xml index 79e55b545..eeed36a70 100644 --- a/app/src/main/res/layout/dialog_cp_invite.xml +++ b/app/src/main/res/layout/dialog_cp_invite.xml @@ -48,7 +48,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> - + type="com.pikolive.core.noble.AllServiceGiftProtocol.DataBean" /> diff --git a/app/src/main/res/layout/dialog_monster.xml b/app/src/main/res/layout/dialog_monster.xml index 125a8a87a..370b21cb8 100644 --- a/app/src/main/res/layout/dialog_monster.xml +++ b/app/src/main/res/layout/dialog_monster.xml @@ -7,7 +7,7 @@ + type="com.pikolive.core.monsterhunting.bean.MonsterProtocol.DataBean" /> - + + type="com.pikolive.core.user.bean.UserInfo" /> + type="com.pikolive.core.room.bean.RoomInfo" /> - + + type="com.pikolive.core.user.bean.UserInfo" /> - + type="com.pikolive.core.family.bean.FamilyMemberInfo" /> + type="com.pikolive.core.decoration.car.bean.CarInfo" /> + type="com.pikolive.core.decoration.car.bean.CarInfo" /> + type="com.pikolive.core.decoration.headwear.bean.HeadWearInfo" /> diff --git a/app/src/main/res/layout/item_home_attention.xml b/app/src/main/res/layout/item_home_attention.xml index c5df69cfc..04b7f496d 100644 --- a/app/src/main/res/layout/item_home_attention.xml +++ b/app/src/main/res/layout/item_home_attention.xml @@ -5,7 +5,7 @@ + type="com.pikolive.core.user.bean.AttentionInfo" /> diff --git a/app/src/main/res/layout/item_live_tag.xml b/app/src/main/res/layout/item_live_tag.xml index fe9765c44..cf966d33a 100644 --- a/app/src/main/res/layout/item_live_tag.xml +++ b/app/src/main/res/layout/item_live_tag.xml @@ -5,7 +5,7 @@ + type="com.pikolive.core.user.bean.LiveTagInfo.LiveSkillVoListBean" /> - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/item_my_chat_bubble.xml b/app/src/main/res/layout/item_my_chat_bubble.xml index b1ea440d0..709e713c7 100644 --- a/app/src/main/res/layout/item_my_chat_bubble.xml +++ b/app/src/main/res/layout/item_my_chat_bubble.xml @@ -7,7 +7,7 @@ + type="com.pikolive.core.decoration.headwear.bean.ChatBubbleInfo" /> + type="com.pikolive.core.decoration.headwear.bean.HeadWearInfo" /> + type="com.pikolive.core.decoration.headwear.bean.UserCardWearInfo" /> + type="com.pikolive.core.team.bean.TeamInfo" /> + type="com.pikolive.core.team.bean.TeamMemberInfo" /> + type="com.pikolive.core.team.bean.TeamTransactionRecordInfo" /> + type="com.pikolive.core.user.bean.UserGameInfo" /> + type="com.pikolive.core2.home.bean.BannerInfo" /> + type="com.pikolive.core.relation.cp.CpRelation" /> + type="com.pikolive.core.relation.cp.CpInvitePageEntity" /> - + type="com.pikolive.app.skill.widget.RecordIResourceItem" /> @@ -35,7 +35,7 @@ android:paddingTop="@dimen/dp_25" android:paddingBottom="@dimen/dp_25"> - + type="com.pikolive.core.monsterhunting.bean.MonsterInfo"/> { diff --git a/app/src/module_community/java/com/yizhuan/erban/community/publish/view/WorldsChooseFrg.java b/app/src/module_community/java/com/yizhuan/erban/community/publish/view/WorldsChooseFrg.java index be503d109..9243e9121 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/publish/view/WorldsChooseFrg.java +++ b/app/src/module_community/java/com/yizhuan/erban/community/publish/view/WorldsChooseFrg.java @@ -12,8 +12,8 @@ import com.yizhuan.erban.R; import com.pikolive.app.base.BaseMvpFragment; import com.yizhuan.erban.community.publish.presenter.WorldChoosePresenter; import com.pikolive.app.ui.widget.recyclerview.decoration.HorizontalDecoration; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.community.bean.MiniWorldChooseInfo; +import com.pikolive.core.Constants; +import com.pikolive.core.community.bean.MiniWorldChooseInfo; import com.pikolive.library.base.factory.CreatePresenter; import com.pikolive.library.utils.SizeUtils; diff --git a/app/src/module_community/java/com/yizhuan/erban/community/square/SquareDynamicFragment.java b/app/src/module_community/java/com/yizhuan/erban/community/square/SquareDynamicFragment.java index c48b231f3..ec7a7c04a 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/square/SquareDynamicFragment.java +++ b/app/src/module_community/java/com/yizhuan/erban/community/square/SquareDynamicFragment.java @@ -33,20 +33,20 @@ import com.yizhuan.erban.miniworld.listener.DoubleClickCheckListener; import com.yizhuan.erban.miniworld.presenter.MiniWorldCategoryPresenter; import com.yizhuan.erban.miniworld.view.IMiniWorldCategoryView; import com.pikolive.app.ui.widget.ButtonItem; -import com.yizhuan.xchat_android_constants.XChatConstants; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.community.CommunityConstant; -import com.yizhuan.xchat_android_core.community.bean.WorldDynamicBean; -import com.yizhuan.xchat_android_core.community.bean.WorldDynamicListResult; -import com.yizhuan.xchat_android_core.community.dynamic.DynamicModel; -import com.yizhuan.xchat_android_core.community.event.DynamicPublishEvent; -import com.yizhuan.xchat_android_core.community.event.DynamicRefreshEvent; -import com.yizhuan.xchat_android_core.community.square.SquareModel; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldInfo; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.event.LoadLoginUserInfoEvent; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; -import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; +import com.pikolive.core2.XChatConstants; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.community.CommunityConstant; +import com.pikolive.core.community.bean.WorldDynamicBean; +import com.pikolive.core.community.bean.WorldDynamicListResult; +import com.pikolive.core.community.dynamic.DynamicModel; +import com.pikolive.core.community.event.DynamicPublishEvent; +import com.pikolive.core.community.event.DynamicRefreshEvent; +import com.pikolive.core.community.square.SquareModel; +import com.pikolive.core.miniworld.bean.MiniWorldInfo; +import com.pikolive.core.user.UserModel; +import com.pikolive.core.user.event.LoadLoginUserInfoEvent; +import com.pikolive.core.utils.net.BeanObserver; +import com.pikolive.core.utils.net.DontWarnObserver; import com.pikolive.library.base.factory.CreatePresenter; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/module_community/java/com/yizhuan/erban/community/square/SquareFragment.java b/app/src/module_community/java/com/yizhuan/erban/community/square/SquareFragment.java index 9d370ed3b..c34435f35 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/square/SquareFragment.java +++ b/app/src/module_community/java/com/yizhuan/erban/community/square/SquareFragment.java @@ -25,10 +25,10 @@ import com.pikolive.app.ui.user.adapter.UserInfoPagerAdapter; import com.pikolive.app.ui.widget.magicindicator.MagicIndicator; import com.pikolive.app.ui.widget.magicindicator.ViewPagerHelper; import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.community.event.UnReadCountEvent; -import com.yizhuan.xchat_android_core.home.model.HomeModel; -import com.yizhuan.xchat_android_core.user.event.LoadLoginUserInfoEvent; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.community.event.UnReadCountEvent; +import com.pikolive.core2.home.model.HomeModel; +import com.pikolive.core.user.event.LoadLoginUserInfoEvent; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/module_community/java/com/yizhuan/erban/community/square/adapter/SquareDynamicAdapter.java b/app/src/module_community/java/com/yizhuan/erban/community/square/adapter/SquareDynamicAdapter.java index 91552da66..38eec337b 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/square/adapter/SquareDynamicAdapter.java +++ b/app/src/module_community/java/com/yizhuan/erban/community/square/adapter/SquareDynamicAdapter.java @@ -27,11 +27,11 @@ import com.yizhuan.erban.miniworld.presenter.MiniWorldCategoryPresenter; import com.pikolive.app.ui.utils.ImageLoadUtilsV2; import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil; import com.pikolive.app.utils.TimeUiUtils; -import com.yizhuan.xchat_android_core.community.bean.WorldDynamicBean; -import com.yizhuan.xchat_android_core.community.dynamic.DynamicModel; -import com.yizhuan.xchat_android_core.noble.NobleUtil; -import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.community.bean.WorldDynamicBean; +import com.pikolive.core.community.dynamic.DynamicModel; +import com.pikolive.core.noble.NobleUtil; +import com.pikolive.core.utils.net.DontWarnObserver; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.base.factory.CreatePresenter; import com.pikolive.library.utils.ResUtil; import com.pikolive.library.utils.SingleToastUtil; diff --git a/app/src/module_community/java/com/yizhuan/erban/community/square/adapter/SquareTopicAdapter.java b/app/src/module_community/java/com/yizhuan/erban/community/square/adapter/SquareTopicAdapter.java index 93b08613d..15d18716f 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/square/adapter/SquareTopicAdapter.java +++ b/app/src/module_community/java/com/yizhuan/erban/community/square/adapter/SquareTopicAdapter.java @@ -4,7 +4,7 @@ package com.yizhuan.erban.community.square.adapter; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldInfo; +import com.pikolive.core.miniworld.bean.MiniWorldInfo; /** * create by lvzebiao @2019/11/13 diff --git a/app/src/module_community/java/com/yizhuan/erban/community/user_dynamic/IUserDynamicView.java b/app/src/module_community/java/com/yizhuan/erban/community/user_dynamic/IUserDynamicView.java index ac002b2da..7997a3715 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/user_dynamic/IUserDynamicView.java +++ b/app/src/module_community/java/com/yizhuan/erban/community/user_dynamic/IUserDynamicView.java @@ -1,6 +1,6 @@ package com.yizhuan.erban.community.user_dynamic; -import com.yizhuan.xchat_android_core.community.bean.WorldDynamicBean; +import com.pikolive.core.community.bean.WorldDynamicBean; import com.pikolive.library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/module_community/java/com/yizhuan/erban/community/user_dynamic/UserDynamicAdapter.java b/app/src/module_community/java/com/yizhuan/erban/community/user_dynamic/UserDynamicAdapter.java index 184e0b43d..02676a622 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/user_dynamic/UserDynamicAdapter.java +++ b/app/src/module_community/java/com/yizhuan/erban/community/user_dynamic/UserDynamicAdapter.java @@ -28,12 +28,12 @@ import com.yizhuan.erban.community.photo.PagerOption; import com.yizhuan.erban.community.utils.ObjectTypeHelper; import com.yizhuan.erban.community.widget.ExpandableTextView; import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.xchat_android_core.community.bean.DynamicMedia; -import com.yizhuan.xchat_android_core.community.bean.UserDynamicItem; -import com.yizhuan.xchat_android_core.community.bean.WorldDynamicBean; -import com.yizhuan.xchat_android_core.community.dynamic.DynamicModel; -import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.community.bean.DynamicMedia; +import com.pikolive.core.community.bean.UserDynamicItem; +import com.pikolive.core.community.bean.WorldDynamicBean; +import com.pikolive.core.community.dynamic.DynamicModel; +import com.pikolive.core.utils.net.DontWarnObserver; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.utils.ResUtil; import com.pikolive.library.utils.ScreenUtils; import com.pikolive.library.utils.SingleToastUtil; diff --git a/app/src/module_community/java/com/yizhuan/erban/community/user_dynamic/UserDynamicFrg.java b/app/src/module_community/java/com/yizhuan/erban/community/user_dynamic/UserDynamicFrg.java index 59b4210cb..85182a5c2 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/user_dynamic/UserDynamicFrg.java +++ b/app/src/module_community/java/com/yizhuan/erban/community/user_dynamic/UserDynamicFrg.java @@ -16,10 +16,10 @@ import com.yizhuan.erban.community.dynamic.view.DynamicDetailActivity; import com.yizhuan.erban.community.helper.ShareDynamicHelper; import com.yizhuan.erban.miniworld.activity.TopicMainActivity; import com.pikolive.app.ui.widget.ButtonItem; -import com.yizhuan.xchat_android_constants.XChatConstants; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.community.bean.UserDynamicItem; -import com.yizhuan.xchat_android_core.community.bean.WorldDynamicBean; +import com.pikolive.core2.XChatConstants; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.community.bean.UserDynamicItem; +import com.pikolive.core.community.bean.WorldDynamicBean; import com.pikolive.library.base.factory.CreatePresenter; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/module_community/java/com/yizhuan/erban/community/user_dynamic/UserDynamicPresenter.java b/app/src/module_community/java/com/yizhuan/erban/community/user_dynamic/UserDynamicPresenter.java index 2d3eedb2b..454c87cb2 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/user_dynamic/UserDynamicPresenter.java +++ b/app/src/module_community/java/com/yizhuan/erban/community/user_dynamic/UserDynamicPresenter.java @@ -4,11 +4,11 @@ import android.annotation.SuppressLint; import com.yizhuan.erban.R; import com.pikolive.app.base.BaseMvpPresenter; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.community.bean.UserDynamicItem; -import com.yizhuan.xchat_android_core.community.bean.WorldDynamicBean; -import com.yizhuan.xchat_android_core.community.dynamic.DynamicModel; -import com.yizhuan.xchat_android_core.user.UserDynamicModel; +import com.pikolive.core.Constants; +import com.pikolive.core.community.bean.UserDynamicItem; +import com.pikolive.core.community.bean.WorldDynamicBean; +import com.pikolive.core.community.dynamic.DynamicModel; +import com.pikolive.core.user.UserDynamicModel; import com.pikolive.library.utils.ResUtil; import java.util.ArrayList; diff --git a/app/src/module_community/java/com/yizhuan/erban/community/utils/ObjectTypeHelper.java b/app/src/module_community/java/com/yizhuan/erban/community/utils/ObjectTypeHelper.java index 79222c052..3ccc9fcd7 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/utils/ObjectTypeHelper.java +++ b/app/src/module_community/java/com/yizhuan/erban/community/utils/ObjectTypeHelper.java @@ -1,6 +1,6 @@ package com.yizhuan.erban.community.utils; -import com.yizhuan.xchat_android_core.community.bean.DynamicMedia; +import com.pikolive.core.community.bean.DynamicMedia; import com.zhihu.matisse.internal.entity.CustomItem; import java.util.ArrayList; diff --git a/app/src/module_community/java/com/yizhuan/erban/community/widget/DynamicNickDetailWidget.java b/app/src/module_community/java/com/yizhuan/erban/community/widget/DynamicNickDetailWidget.java index c8a7aa81a..602f08f15 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/widget/DynamicNickDetailWidget.java +++ b/app/src/module_community/java/com/yizhuan/erban/community/widget/DynamicNickDetailWidget.java @@ -17,7 +17,7 @@ import com.pikolive.app.utils.RegexUtil; import com.pikolive.app.utils.TimeUiUtils; import com.pikolive.app.view.GenderAgeTextView; import com.pikolive.app.vip.util.VipHelper; -import com.yizhuan.xchat_android_core.user.bean.BaseUserInfo; +import com.pikolive.core.user.bean.BaseUserInfo; import com.pikolive.library.widget.ShapeConstrainLayout; /** diff --git a/app/src/module_community/java/com/yizhuan/erban/community/widget/GridImageWidget.java b/app/src/module_community/java/com/yizhuan/erban/community/widget/GridImageWidget.java index e4a541da2..76313da55 100644 --- a/app/src/module_community/java/com/yizhuan/erban/community/widget/GridImageWidget.java +++ b/app/src/module_community/java/com/yizhuan/erban/community/widget/GridImageWidget.java @@ -21,8 +21,8 @@ import com.yizhuan.erban.community.photo.DynamicImageAdapter; import com.yizhuan.erban.community.photo.PagerOption; import com.yizhuan.erban.community.utils.ObjectTypeHelper; import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.xchat_android_core.community.bean.DynamicMedia; -import com.yizhuan.xchat_android_core.community.bean.WorldDynamicBean; +import com.pikolive.core.community.bean.DynamicMedia; +import com.pikolive.core.community.bean.WorldDynamicBean; import com.pikolive.library.utils.ListUtils; import java.util.List; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/HallDataManager.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/HallDataManager.java index 204b97e36..9aa57cbb7 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/HallDataManager.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/HallDataManager.java @@ -1,6 +1,6 @@ package com.yizhuan.erban.module_hall; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_MODULE_HALL; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_MODULE_HALL; import android.annotation.SuppressLint; @@ -10,19 +10,19 @@ import androidx.lifecycle.Observer; import com.netease.nim.uikit.api.NimUIKit; import com.yizhuan.erban.module_hall.im.msgholder.HallMsgViewHolder; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.auth.event.LogoutEvent; -import com.yizhuan.xchat_android_core.im.custom.AttachManager; -import com.yizhuan.xchat_android_core.manager.event.HallInfoChangeEvent; -import com.yizhuan.xchat_android_core.module_hall.hall.HallModel; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.ClanAndHallInfo; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.ClanInfo; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.HallInfo; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.RoleType; -import com.yizhuan.xchat_android_core.module_hall.hall.event.UserHallUpdateEvent; -import com.yizhuan.xchat_android_core.module_hall.im.HallAttachment; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.auth.event.LogoutEvent; +import com.pikolive.core.im.custom.AttachManager; +import com.pikolive.core.manager.event.HallInfoChangeEvent; +import com.pikolive.core.module_hall.hall.HallModel; +import com.pikolive.core.module_hall.hall.bean.ClanAndHallInfo; +import com.pikolive.core.module_hall.hall.bean.ClanInfo; +import com.pikolive.core.module_hall.hall.bean.HallInfo; +import com.pikolive.core.module_hall.hall.bean.RoleType; +import com.pikolive.core.module_hall.hall.event.UserHallUpdateEvent; +import com.pikolive.core.module_hall.im.HallAttachment; +import com.pikolive.core.user.UserModel; +import com.pikolive.core.user.bean.UserInfo; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/AdminAddActivity.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/AdminAddActivity.java index 131f2011b..619d081fd 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/AdminAddActivity.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/AdminAddActivity.java @@ -20,12 +20,12 @@ import com.pikolive.app.common.widget.dialog.DialogManager; import com.yizhuan.erban.module_hall.hall.adapter.GroupMemberListAdapter; import com.yizhuan.erban.module_hall.hall.presenter.AdminAddPresenter; import com.yizhuan.erban.module_hall.hall.view.IAdminAddView; -import com.yizhuan.xchat_android_core.module_hall.hall.HallModel; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.ListMemberInfo; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.MemberInfo; -import com.yizhuan.xchat_android_core.module_hall.income.event.UpdateMemberListEvent; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.module_hall.hall.HallModel; +import com.pikolive.core.module_hall.hall.bean.ListMemberInfo; +import com.pikolive.core.module_hall.hall.bean.MemberInfo; +import com.pikolive.core.module_hall.income.event.UpdateMemberListEvent; +import com.pikolive.core.utils.net.BeanObserver; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.base.factory.CreatePresenter; import com.pikolive.library.utils.ListUtils; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/AdminListActivity.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/AdminListActivity.java index b104d6690..5fde5df1c 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/AdminListActivity.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/AdminListActivity.java @@ -17,7 +17,7 @@ import com.pikolive.app.base.TitleBar; import com.yizhuan.erban.module_hall.hall.adapter.GroupMemberListAdapter; import com.yizhuan.erban.module_hall.hall.presenter.AdminListPresenter; import com.yizhuan.erban.module_hall.hall.view.IAdminListView; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.MemberInfo; +import com.pikolive.core.module_hall.hall.bean.MemberInfo; import com.pikolive.library.base.factory.CreatePresenter; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/AuthSettingActivity.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/AuthSettingActivity.java index e9e340e2a..96bf69c35 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/AuthSettingActivity.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/AuthSettingActivity.java @@ -21,8 +21,8 @@ import com.yizhuan.erban.module_hall.hall.adapter.AuthSettingAdapter; import com.yizhuan.erban.module_hall.hall.presenter.AuthSettingPresenter; import com.yizhuan.erban.module_hall.hall.view.IAuthSettingView; import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.AuthInfo; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.MemberInfo; +import com.pikolive.core.module_hall.hall.bean.AuthInfo; +import com.pikolive.core.module_hall.hall.bean.MemberInfo; import com.pikolive.library.base.factory.CreatePresenter; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/HallMemberListActivity.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/HallMemberListActivity.java index 7dc1f734c..55f660a80 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/HallMemberListActivity.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/HallMemberListActivity.java @@ -15,8 +15,8 @@ import com.yizhuan.erban.module_hall.hall.adapter.GroupMemberListAdapter; import com.yizhuan.erban.module_hall.hall.presenter.AdminListPresenter; import com.pikolive.app.ui.user.activity.UserInfoActivity; import com.pikolive.app.ui.utils.RVDelegate; -import com.yizhuan.xchat_android_core.module_hall.hall.HallModel; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.MemberInfo; +import com.pikolive.core.module_hall.hall.HallModel; +import com.pikolive.core.module_hall.hall.bean.MemberInfo; import com.pikolive.library.base.factory.CreatePresenter; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/MemberSearchActivity.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/MemberSearchActivity.java index 299f15eb9..514c84831 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/MemberSearchActivity.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/MemberSearchActivity.java @@ -16,8 +16,8 @@ import com.pikolive.app.common.EmptyViewHelper; import com.yizhuan.erban.databinding.ActivityAddMemberBinding; import com.yizhuan.erban.module_hall.hall.adapter.GroupMemberListAdapter; import com.pikolive.app.ui.utils.RVDelegate; -import com.yizhuan.xchat_android_core.module_hall.hall.HallModel; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.MemberInfo; +import com.pikolive.core.module_hall.hall.HallModel; +import com.pikolive.core.module_hall.hall.bean.MemberInfo; import com.pikolive.library.utils.ResUtil; import java.util.ArrayList; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/ModuleClanActivity.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/ModuleClanActivity.java index cf6fb0f4c..756863cb1 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/ModuleClanActivity.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/ModuleClanActivity.java @@ -22,12 +22,12 @@ import com.yizhuan.erban.module_hall.hall.adapter.HallListAdapter; import com.pikolive.app.ui.user.activity.UserInfoActivity; import com.pikolive.app.ui.utils.ImageLoadUtils; import com.pikolive.app.ui.utils.RVDelegate; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.module_hall.hall.HallModel; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.ClanInfo; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.HallInfo; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.MemberInfo; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.module_hall.hall.HallModel; +import com.pikolive.core.module_hall.hall.bean.ClanInfo; +import com.pikolive.core.module_hall.hall.bean.HallInfo; +import com.pikolive.core.module_hall.hall.bean.MemberInfo; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.utils.ListUtils; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/ModuleHallActivity.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/ModuleHallActivity.java index 11dd41063..f60bde664 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/ModuleHallActivity.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/ModuleHallActivity.java @@ -29,16 +29,16 @@ import com.pikolive.app.ui.im.avtivity.NimP2PMessageActivity; import com.pikolive.app.ui.user.activity.UserInfoActivity; import com.pikolive.app.ui.utils.ImageLoadUtils; import com.pikolive.app.ui.widget.ButtonItem; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.module_hall.hall.HallModel; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.AuthInfo; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.ClanInfo; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.HallInfo; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.JoinRoomInfo; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.MemberInfo; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.RoleType; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.module_hall.hall.HallModel; +import com.pikolive.core.module_hall.hall.bean.AuthInfo; +import com.pikolive.core.module_hall.hall.bean.ClanInfo; +import com.pikolive.core.module_hall.hall.bean.HallInfo; +import com.pikolive.core.module_hall.hall.bean.JoinRoomInfo; +import com.pikolive.core.module_hall.hall.bean.MemberInfo; +import com.pikolive.core.module_hall.hall.bean.RoleType; +import com.pikolive.core.utils.net.BeanObserver; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.base.factory.CreatePresenter; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/RemoveMemberListActivity.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/RemoveMemberListActivity.java index 6a3339096..c05845e2c 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/RemoveMemberListActivity.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/RemoveMemberListActivity.java @@ -27,11 +27,11 @@ import com.yizhuan.erban.module_hall.hall.presenter.RemoveMemberPresenter; import com.yizhuan.erban.module_hall.hall.view.IRemoveMemberView; import com.pikolive.app.ui.utils.RVDelegate; import com.pikolive.app.ui.widget.TextWatcherSimple; -import com.yizhuan.xchat_android_core.module_hall.hall.HallModel; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.MemberInfo; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.RoleType; -import com.yizhuan.xchat_android_core.module_hall.income.event.UpdateMemberListEvent; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.module_hall.hall.HallModel; +import com.pikolive.core.module_hall.hall.bean.MemberInfo; +import com.pikolive.core.module_hall.hall.bean.RoleType; +import com.pikolive.core.module_hall.income.event.UpdateMemberListEvent; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.base.factory.CreatePresenter; import com.pikolive.library.utils.ListUtils; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/SuperAdminAddActivity.kt b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/SuperAdminAddActivity.kt index 1d126aef4..df2d5011b 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/SuperAdminAddActivity.kt +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/SuperAdminAddActivity.kt @@ -11,9 +11,9 @@ import com.pikolive.app.common.EmptyViewHelper import com.yizhuan.erban.databinding.ActivitySuperAdminAddBinding import com.yizhuan.erban.module_hall.hall.adapter.SearchAdminAdapter import com.pikolive.app.ui.utils.RVDelegate -import com.yizhuan.xchat_android_core.module_hall.hall.HallModel -import com.yizhuan.xchat_android_core.module_hall.hall.bean.SuperAdminInfo -import com.yizhuan.xchat_android_core.utils.toast +import com.pikolive.core.module_hall.hall.HallModel +import com.pikolive.core.module_hall.hall.bean.SuperAdminInfo +import com.pikolive.core.utils.toast import com.pikolive.library.utils.ResUtil class SuperAdminAddActivity : BaseViewBindingActivity() { diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/SuperAdminManageActivity.kt b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/SuperAdminManageActivity.kt index a084716f6..1bc56bbb1 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/SuperAdminManageActivity.kt +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/SuperAdminManageActivity.kt @@ -18,9 +18,9 @@ import com.pikolive.app.common.EmptyViewHelper import com.yizhuan.erban.databinding.ActivitySuperAdminManegeBinding import com.yizhuan.erban.module_hall.hall.adapter.ManageSuperAdminAdapter import com.pikolive.app.ui.utils.RVDelegate -import com.yizhuan.xchat_android_core.module_hall.hall.HallModel -import com.yizhuan.xchat_android_core.module_hall.hall.bean.SuperAdminInfo -import com.yizhuan.xchat_android_core.utils.toast +import com.pikolive.core.module_hall.hall.HallModel +import com.pikolive.core.module_hall.hall.bean.SuperAdminInfo +import com.pikolive.core.utils.toast import com.pikolive.library.utils.ResUtil class SuperAdminManageActivity : BaseViewBindingActivity() { diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/SuperAdminRoomSetActivity.kt b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/SuperAdminRoomSetActivity.kt index 5f8e424b0..bd534b6fb 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/SuperAdminRoomSetActivity.kt +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/SuperAdminRoomSetActivity.kt @@ -11,9 +11,9 @@ import com.pikolive.app.common.EmptyViewHelper import com.yizhuan.erban.databinding.ActivitySuperAdminRoomSetBinding import com.yizhuan.erban.module_hall.hall.adapter.ManageRoomSetAdapter import com.pikolive.app.ui.utils.RVDelegate -import com.yizhuan.xchat_android_core.module_hall.hall.HallModel -import com.yizhuan.xchat_android_core.module_hall.hall.bean.SuperAdminHall -import com.yizhuan.xchat_android_core.utils.toast +import com.pikolive.core.module_hall.hall.HallModel +import com.pikolive.core.module_hall.hall.bean.SuperAdminHall +import com.pikolive.core.utils.toast import com.pikolive.library.utils.ResUtil class SuperAdminRoomSetActivity : BaseViewBindingActivity() { diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/AssociationAdapter.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/AssociationAdapter.java index 39fe749c3..2be1aa88d 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/AssociationAdapter.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/AssociationAdapter.java @@ -8,7 +8,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; import com.yizhuan.erban.R; import com.pikolive.app.ui.utils.ImageLoadUtilsV2; -import com.yizhuan.xchat_android_core.association.bean.ClanListInfo; +import com.pikolive.core2.association.bean.ClanListInfo; /** * Created by yudi diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/AssociationRoomAdapter.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/AssociationRoomAdapter.java index fa06f26ef..643992a38 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/AssociationRoomAdapter.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/AssociationRoomAdapter.java @@ -9,7 +9,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; import com.yizhuan.erban.R; import com.pikolive.app.ui.utils.ImageLoadUtilsV2; -import com.yizhuan.xchat_android_core.association.bean.HallListInfo; +import com.pikolive.core2.association.bean.HallListInfo; /** * Created by yudi diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/AuthSettingAdapter.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/AuthSettingAdapter.java index 17be78eff..43ed0d6a1 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/AuthSettingAdapter.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/AuthSettingAdapter.java @@ -8,7 +8,7 @@ import android.view.ViewGroup; import android.widget.TextView; import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.AuthInfo; +import com.pikolive.core.module_hall.hall.bean.AuthInfo; import com.pikolive.library.widget.IOSSwitchView; public class AuthSettingAdapter { diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/EnableExchangeAdapter.kt b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/EnableExchangeAdapter.kt index 616e8c5d9..4a55a6405 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/EnableExchangeAdapter.kt +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/EnableExchangeAdapter.kt @@ -6,7 +6,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder import com.yizhuan.erban.R import com.pikolive.app.ui.utils.ImageLoadUtils -import com.yizhuan.xchat_android_core.association.bean.MemberExchangeInfo +import com.pikolive.core2.association.bean.MemberExchangeInfo /** * 可兑换 diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/GroupListAdapter.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/GroupListAdapter.java index 12cad38b0..2388b4b9a 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/GroupListAdapter.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/GroupListAdapter.java @@ -4,7 +4,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; import com.yizhuan.erban.R; import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.HTeamInfo; +import com.pikolive.core.module_hall.hall.bean.HTeamInfo; public class GroupListAdapter extends BaseQuickAdapter { diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/GroupMemberListAdapter.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/GroupMemberListAdapter.java index 4da9779cb..311d82b71 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/GroupMemberListAdapter.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/GroupMemberListAdapter.java @@ -9,9 +9,9 @@ import com.chad.library.adapter.base.BaseViewHolder; import com.yizhuan.erban.R; import com.pikolive.app.ui.utils.ImageLoadUtils; import com.pikolive.app.utils.RegexUtil; -import com.yizhuan.xchat_android_core.level.UserLevelVo; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.MemberInfo; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.RoleType; +import com.pikolive.core.level.UserLevelVo; +import com.pikolive.core.module_hall.hall.bean.MemberInfo; +import com.pikolive.core.module_hall.hall.bean.RoleType; import org.jetbrains.annotations.NotNull; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/HallListAdapter.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/HallListAdapter.java index c99cfee7a..3cf44f3f1 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/HallListAdapter.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/HallListAdapter.java @@ -5,7 +5,7 @@ import com.chad.library.adapter.base.BaseViewHolder; import com.netease.nim.uikit.common.util.sys.ScreenUtil; import com.yizhuan.erban.R; import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.HallInfo; +import com.pikolive.core.module_hall.hall.bean.HallInfo; public class HallListAdapter extends BaseQuickAdapter { public HallListAdapter() { diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/ManageRoomAdapter.kt b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/ManageRoomAdapter.kt index 8ddaf282c..a549c2007 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/ManageRoomAdapter.kt +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/ManageRoomAdapter.kt @@ -5,7 +5,7 @@ import com.chad.library.adapter.base.BaseViewHolder import com.netease.nim.uikit.common.util.sys.ScreenUtil import com.yizhuan.erban.R import com.pikolive.app.ui.utils.ImageLoadUtils -import com.yizhuan.xchat_android_core.module_hall.hall.bean.SuperAdminHall +import com.pikolive.core.module_hall.hall.bean.SuperAdminHall class ManageRoomAdapter : BaseQuickAdapter(R.layout.item_manage_room) { diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/ManageRoomSetAdapter.kt b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/ManageRoomSetAdapter.kt index 0f1bc01d9..cf4988a5a 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/ManageRoomSetAdapter.kt +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/ManageRoomSetAdapter.kt @@ -4,7 +4,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder import com.yizhuan.erban.R import com.pikolive.app.ui.utils.ImageLoadUtils -import com.yizhuan.xchat_android_core.module_hall.hall.bean.SuperAdminHall +import com.pikolive.core.module_hall.hall.bean.SuperAdminHall class ManageRoomSetAdapter : BaseQuickAdapter(R.layout.item_manage_room_set) { diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/ManageSuperAdminAdapter.kt b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/ManageSuperAdminAdapter.kt index 4fbb288e4..7fa2c74db 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/ManageSuperAdminAdapter.kt +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/ManageSuperAdminAdapter.kt @@ -8,8 +8,8 @@ import com.yizhuan.erban.R import com.pikolive.app.common.EmptyViewHelper import com.pikolive.app.ui.utils.ImageLoadUtils import com.pikolive.app.ui.utils.RVDelegate -import com.yizhuan.xchat_android_core.module_hall.hall.bean.SuperAdminHall -import com.yizhuan.xchat_android_core.module_hall.hall.bean.SuperAdminInfo +import com.pikolive.core.module_hall.hall.bean.SuperAdminHall +import com.pikolive.core.module_hall.hall.bean.SuperAdminInfo class ManageSuperAdminAdapter : BaseQuickAdapter(R.layout.item_manage_super_admin) { diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/NoExchangeAdapter.kt b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/NoExchangeAdapter.kt index 712fd1e9e..d2492a894 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/NoExchangeAdapter.kt +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/NoExchangeAdapter.kt @@ -4,7 +4,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder import com.yizhuan.erban.R import com.pikolive.app.ui.utils.ImageLoadUtils -import com.yizhuan.xchat_android_core.association.bean.MemberExchangeInfo +import com.pikolive.core2.association.bean.MemberExchangeInfo /** * 不可兑换 diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/OptionAdapter.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/OptionAdapter.java index debac81e8..5a8703b93 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/OptionAdapter.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/OptionAdapter.java @@ -9,7 +9,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; import com.netease.nim.uikit.support.glide.GlideApp; import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.OptionInfo; +import com.pikolive.core.module_hall.hall.bean.OptionInfo; import java.util.List; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/SearchAdminAdapter.kt b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/SearchAdminAdapter.kt index 1e208e9cf..d1f973466 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/SearchAdminAdapter.kt +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/adapter/SearchAdminAdapter.kt @@ -4,7 +4,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter import com.chad.library.adapter.base.BaseViewHolder import com.yizhuan.erban.R import com.pikolive.app.ui.utils.ImageLoadUtils -import com.yizhuan.xchat_android_core.module_hall.hall.bean.SuperAdminInfo +import com.pikolive.core.module_hall.hall.bean.SuperAdminInfo import com.pikolive.library.utils.ResUtil class SearchAdminAdapter : diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/fragment/AssociationFragment.kt b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/fragment/AssociationFragment.kt index 84386f368..605d87ad4 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/fragment/AssociationFragment.kt +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/fragment/AssociationFragment.kt @@ -13,10 +13,10 @@ import com.pikolive.app.common.EmptyViewHelper import com.yizhuan.erban.databinding.FragmentAssociationBinding import com.yizhuan.erban.module_hall.hall.activity.ModuleClanActivity import com.pikolive.app.ui.utils.RVDelegate -import com.yizhuan.xchat_android_core.association.bean.ClanListInfo -import com.yizhuan.xchat_android_core.module_hall.hall.HallModel -import com.yizhuan.xchat_android_core.utils.net.BeanObserver -import com.yizhuan.xchat_android_core.utils.net.RxHelper +import com.pikolive.core2.association.bean.ClanListInfo +import com.pikolive.core.module_hall.hall.HallModel +import com.pikolive.core.utils.net.BeanObserver +import com.pikolive.core.utils.net.RxHelper import com.pikolive.library.utils.ResUtil /** diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/fragment/AssociationRoomFragment.kt b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/fragment/AssociationRoomFragment.kt index 470b21e20..cc3feac80 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/fragment/AssociationRoomFragment.kt +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/fragment/AssociationRoomFragment.kt @@ -22,10 +22,10 @@ import com.yizhuan.erban.module_hall.hall.adapter.AssociationRoomAdapter import com.yizhuan.erban.module_hall.viewmodel.AssociationViewModel import com.pikolive.app.ui.im.avtivity.NimP2PMessageActivity import com.pikolive.app.ui.utils.RVDelegate -import com.yizhuan.xchat_android_core.association.bean.HallListInfo -import com.yizhuan.xchat_android_core.module_hall.hall.HallModel -import com.yizhuan.xchat_android_core.utils.net.BeanObserver -import com.yizhuan.xchat_android_core.utils.net.RxHelper +import com.pikolive.core.module_hall.hall.HallModel +import com.pikolive.core.utils.net.BeanObserver +import com.pikolive.core.utils.net.RxHelper +import com.pikolive.core2.association.bean.HallListInfo import com.pikolive.library.utils.ResUtil class AssociationRoomFragment : BaseViewBindingFragment() { diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/presenter/AdminAddPresenter.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/presenter/AdminAddPresenter.java index 270a02468..2baf440ec 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/presenter/AdminAddPresenter.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/presenter/AdminAddPresenter.java @@ -2,7 +2,7 @@ package com.yizhuan.erban.module_hall.hall.presenter; import com.pikolive.app.base.BaseMvpPresenter; import com.yizhuan.erban.module_hall.hall.view.IAdminAddView; -import com.yizhuan.xchat_android_core.module_hall.hall.HallModel; +import com.pikolive.core.module_hall.hall.HallModel; import io.reactivex.SingleObserver; import io.reactivex.disposables.Disposable; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/presenter/AdminListPresenter.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/presenter/AdminListPresenter.java index 131563b7b..b0697c238 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/presenter/AdminListPresenter.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/presenter/AdminListPresenter.java @@ -2,9 +2,9 @@ package com.yizhuan.erban.module_hall.hall.presenter; import com.pikolive.app.base.BaseMvpPresenter; import com.yizhuan.erban.module_hall.hall.view.IAdminListView; -import com.yizhuan.xchat_android_core.module_hall.hall.HallModel; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.ListMemberInfo; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; +import com.pikolive.core.module_hall.hall.HallModel; +import com.pikolive.core.module_hall.hall.bean.ListMemberInfo; +import com.pikolive.core.utils.net.BeanObserver; import com.pikolive.library.utils.ListUtils; public class AdminListPresenter extends BaseMvpPresenter { diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/presenter/AuthSettingPresenter.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/presenter/AuthSettingPresenter.java index 6a45e64d8..7eff10584 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/presenter/AuthSettingPresenter.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/presenter/AuthSettingPresenter.java @@ -2,8 +2,8 @@ package com.yizhuan.erban.module_hall.hall.presenter; import com.pikolive.app.base.BaseMvpPresenter; import com.yizhuan.erban.module_hall.hall.view.IAuthSettingView; -import com.yizhuan.xchat_android_core.module_hall.hall.HallModel; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.AuthInfo; +import com.pikolive.core.module_hall.hall.HallModel; +import com.pikolive.core.module_hall.hall.bean.AuthInfo; import java.util.List; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/presenter/HallNamePresenter.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/presenter/HallNamePresenter.java index 212cd0452..93cff23e2 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/presenter/HallNamePresenter.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/presenter/HallNamePresenter.java @@ -2,7 +2,7 @@ package com.yizhuan.erban.module_hall.hall.presenter; import com.pikolive.app.base.BaseMvpPresenter; import com.yizhuan.erban.module_hall.hall.view.IHallNameView; -import com.yizhuan.xchat_android_core.module_hall.hall.HallNameModel; +import com.pikolive.core.module_hall.hall.HallNameModel; import io.reactivex.SingleObserver; import io.reactivex.disposables.Disposable; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/presenter/ModuleHallPresenter.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/presenter/ModuleHallPresenter.java index 895da4568..ecd1390f2 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/presenter/ModuleHallPresenter.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/presenter/ModuleHallPresenter.java @@ -12,9 +12,9 @@ import com.pikolive.app.avroom.widget.MessageView; import com.pikolive.app.base.BaseMvpPresenter; import com.yizhuan.erban.module_hall.HallDataManager; import com.yizhuan.erban.module_hall.hall.view.IModuleHallView; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.module_hall.hall.HallModel; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.AuthInfo; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.module_hall.hall.HallModel; +import com.pikolive.core.module_hall.hall.bean.AuthInfo; import com.pikolive.library.utils.ResUtil; import java.util.ArrayList; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/presenter/RemoveMemberPresenter.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/presenter/RemoveMemberPresenter.java index 15d1fb46b..76ff642c4 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/presenter/RemoveMemberPresenter.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/presenter/RemoveMemberPresenter.java @@ -10,7 +10,7 @@ import androidx.core.content.ContextCompat; import com.yizhuan.erban.R; import com.pikolive.app.base.BaseMvpPresenter; import com.yizhuan.erban.module_hall.hall.view.IRemoveMemberView; -import com.yizhuan.xchat_android_core.module_hall.hall.HallModel; +import com.pikolive.core.module_hall.hall.HallModel; import com.pikolive.library.utils.ResUtil; import com.pikolive.library.utils.SingleToastUtil; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/IAdminAddView.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/IAdminAddView.java index e377d554a..0c39e9c14 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/IAdminAddView.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/IAdminAddView.java @@ -1,6 +1,6 @@ package com.yizhuan.erban.module_hall.hall.view; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.MemberInfo; +import com.pikolive.core.module_hall.hall.bean.MemberInfo; import com.pikolive.library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/IAdminListView.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/IAdminListView.java index 0fb8df25d..039bbe51e 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/IAdminListView.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/IAdminListView.java @@ -1,6 +1,6 @@ package com.yizhuan.erban.module_hall.hall.view; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.MemberInfo; +import com.pikolive.core.module_hall.hall.bean.MemberInfo; import com.pikolive.library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/IAuthSettingView.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/IAuthSettingView.java index 79a61d102..c286ee2f5 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/IAuthSettingView.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/IAuthSettingView.java @@ -1,6 +1,6 @@ package com.yizhuan.erban.module_hall.hall.view; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.AuthInfo; +import com.pikolive.core.module_hall.hall.bean.AuthInfo; import com.pikolive.library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/IMemberSearchView.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/IMemberSearchView.java index 773d07c79..7cf31f4ce 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/IMemberSearchView.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/IMemberSearchView.java @@ -1,6 +1,6 @@ package com.yizhuan.erban.module_hall.hall.view; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.MemberInfo; +import com.pikolive.core.module_hall.hall.bean.MemberInfo; import com.pikolive.library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/IModuleHallView.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/IModuleHallView.java index 309164f0f..ce63d2c10 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/IModuleHallView.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/IModuleHallView.java @@ -1,7 +1,7 @@ package com.yizhuan.erban.module_hall.hall.view; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.AuthInfo; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.MemberInfo; +import com.pikolive.core.module_hall.hall.bean.AuthInfo; +import com.pikolive.core.module_hall.hall.bean.MemberInfo; import com.pikolive.library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/dialog/HallMenuDialog.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/dialog/HallMenuDialog.java index 788f22a60..337f7dd15 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/dialog/HallMenuDialog.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/dialog/HallMenuDialog.java @@ -15,7 +15,7 @@ import android.widget.TextView; import androidx.annotation.NonNull; import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.AuthInfo; +import com.pikolive.core.module_hall.hall.bean.AuthInfo; import com.pikolive.library.utils.SizeUtils; import java.util.List; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/im/NimHelper.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/im/NimHelper.java index 7e63461bf..8452b8638 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/im/NimHelper.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/im/NimHelper.java @@ -9,9 +9,9 @@ import com.netease.nimlib.sdk.msg.model.IMMessage; import com.netease.nimlib.sdk.team.model.Team; import com.trello.rxlifecycle3.LifecycleProvider; import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.module_hall.im.ClanImMsgInfo; -import com.yizhuan.xchat_android_core.module_hall.im.HallImMsgInfo; +import com.pikolive.core2.manager.IMNetEaseManager; +import com.pikolive.core.module_hall.im.ClanImMsgInfo; +import com.pikolive.core.module_hall.im.HallImMsgInfo; import com.pikolive.library.utils.ResUtil; import java.util.Map; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/im/msgholder/ClanMsgViewHolder.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/im/msgholder/ClanMsgViewHolder.java index 727b52a4f..0289411ec 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/im/msgholder/ClanMsgViewHolder.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/im/msgholder/ClanMsgViewHolder.java @@ -23,15 +23,15 @@ import com.orhanobut.logger.Logger; import com.yizhuan.erban.R; import com.yizhuan.erban.module_hall.im.NimHelper; import com.pikolive.app.ui.im.RouterHandler; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.module_hall.hall.HallModel; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.ApplyResult; -import com.yizhuan.xchat_android_core.module_hall.im.ClanAttachment; -import com.yizhuan.xchat_android_core.module_hall.im.ClanImMsgInfo; -import com.yizhuan.xchat_android_core.module_hall.im.bean.HallMsgComponent; -import com.yizhuan.xchat_android_core.module_hall.im.bean.HallMsgLayout; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; +import com.pikolive.core.im.custom.bean.CustomAttachment; +import com.pikolive.core2.manager.IMNetEaseManager; +import com.pikolive.core.module_hall.hall.HallModel; +import com.pikolive.core.module_hall.hall.bean.ApplyResult; +import com.pikolive.core.module_hall.im.ClanAttachment; +import com.pikolive.core.module_hall.im.ClanImMsgInfo; +import com.pikolive.core.module_hall.im.bean.HallMsgComponent; +import com.pikolive.core.module_hall.im.bean.HallMsgLayout; +import com.pikolive.core.utils.net.BeanObserver; import com.pikolive.library.utils.ResUtil; import com.pikolive.library.utils.SingleToastUtil; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/im/msgholder/HallMsgViewHolder.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/im/msgholder/HallMsgViewHolder.java index b29b49d31..14e0db630 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/im/msgholder/HallMsgViewHolder.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/im/msgholder/HallMsgViewHolder.java @@ -26,16 +26,16 @@ import com.yizhuan.erban.module_hall.im.NimHelper; import com.yizhuan.erban.module_hall.im.dialog.AgreeApplyDialog; import com.yizhuan.erban.module_hall.im.dialog.RefuseApplyDialog; import com.pikolive.app.ui.im.RouterHandler; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.manager.event.HallInfoChangeEvent; -import com.yizhuan.xchat_android_core.module_hall.hall.HallModel; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.ApplyResult; -import com.yizhuan.xchat_android_core.module_hall.im.HallAttachment; -import com.yizhuan.xchat_android_core.module_hall.im.HallImMsgInfo; -import com.yizhuan.xchat_android_core.module_hall.im.bean.HallMsgComponent; -import com.yizhuan.xchat_android_core.module_hall.im.bean.HallMsgLayout; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; +import com.pikolive.core.im.custom.bean.CustomAttachment; +import com.pikolive.core2.manager.IMNetEaseManager; +import com.pikolive.core.manager.event.HallInfoChangeEvent; +import com.pikolive.core.module_hall.hall.HallModel; +import com.pikolive.core.module_hall.hall.bean.ApplyResult; +import com.pikolive.core.module_hall.im.HallAttachment; +import com.pikolive.core.module_hall.im.HallImMsgInfo; +import com.pikolive.core.module_hall.im.bean.HallMsgComponent; +import com.pikolive.core.module_hall.im.bean.HallMsgLayout; +import com.pikolive.core.utils.net.BeanObserver; import com.pikolive.library.utils.ResUtil; import com.pikolive.library.utils.SingleToastUtil; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/ClanIncomeFragment.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/ClanIncomeFragment.java index 6fad1043e..95ef04c93 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/ClanIncomeFragment.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/ClanIncomeFragment.java @@ -10,7 +10,7 @@ import com.pikolive.app.base.BaseMvpFragment; import com.yizhuan.erban.module_hall.income.adapter.ClanIncomeAdapter; import com.yizhuan.erban.module_hall.income.presenter.ClanIncomeFragmentPresenter; import com.yizhuan.erban.module_hall.income.view.IClanIncomeView; -import com.yizhuan.xchat_android_core.module_hall.income.bean.ClanTotalIncomeInfo; +import com.pikolive.core.module_hall.income.bean.ClanTotalIncomeInfo; import com.pikolive.library.base.factory.CreatePresenter; import com.pikolive.library.utils.ListUtils; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/DayIncomeFragment.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/DayIncomeFragment.java index 5038fc8e3..4d161cfa5 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/DayIncomeFragment.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/DayIncomeFragment.java @@ -10,8 +10,8 @@ import com.pikolive.app.base.BaseMvpFragment; import com.yizhuan.erban.module_hall.income.adapter.IncomeAdapter; import com.yizhuan.erban.module_hall.income.presenter.IncomePresenter; import com.yizhuan.erban.module_hall.income.view.IIncomeView; -import com.yizhuan.xchat_android_core.module_hall.income.bean.IncomeInfo; -import com.yizhuan.xchat_android_core.module_hall.income.bean.IncomeTotalInfo; +import com.pikolive.core.module_hall.income.bean.IncomeInfo; +import com.pikolive.core.module_hall.income.bean.IncomeTotalInfo; import com.pikolive.library.base.factory.CreatePresenter; import java.util.List; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/GoldRecordFragment.kt b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/GoldRecordFragment.kt index 9c2bfca16..bd3ba89f4 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/GoldRecordFragment.kt +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/GoldRecordFragment.kt @@ -10,7 +10,7 @@ import com.yizhuan.erban.databinding.FragmentAssociationBinding import com.pikolive.app.earn.EarnRecordViewModel import com.pikolive.app.earn.adapter.GoldRecordAdapter import com.pikolive.app.ui.utils.RVDelegate -import com.yizhuan.xchat_android_core.earn.bean.HallMemberGoldFlowInfo +import com.pikolive.core2.earn.bean.HallMemberGoldFlowInfo import com.pikolive.library.utils.ResUtil /** diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/HallIncomeFragment.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/HallIncomeFragment.java index a1303a808..98ebdf72b 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/HallIncomeFragment.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/HallIncomeFragment.java @@ -10,7 +10,7 @@ import com.pikolive.app.base.BaseMvpFragment; import com.yizhuan.erban.module_hall.income.adapter.HallIncomeAdapter; import com.yizhuan.erban.module_hall.income.presenter.HallIncomeFragmentPresenter; import com.yizhuan.erban.module_hall.income.view.IHallIncomeView; -import com.yizhuan.xchat_android_core.module_hall.income.bean.HallTotalIncomeInfo; +import com.pikolive.core.module_hall.income.bean.HallTotalIncomeInfo; import com.pikolive.library.base.factory.CreatePresenter; import com.pikolive.library.utils.ListUtils; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/IncomeDetailActivity.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/IncomeDetailActivity.java index 489d05633..928957a1b 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/IncomeDetailActivity.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/IncomeDetailActivity.java @@ -18,8 +18,8 @@ import com.yizhuan.erban.module_hall.income.presenter.IncomeDetailPresenter; import com.yizhuan.erban.module_hall.income.view.IIncomeDetailView; import com.pikolive.app.ui.utils.ImageLoadUtils; import com.pikolive.app.ui.widget.recyclerview.decoration.SpacingDecoration; -import com.yizhuan.xchat_android_core.module_hall.income.bean.IncomeGiftInfo; -import com.yizhuan.xchat_android_core.module_hall.income.bean.IncomeInfo; +import com.pikolive.core.module_hall.income.bean.IncomeGiftInfo; +import com.pikolive.core.module_hall.income.bean.IncomeInfo; import com.pikolive.library.base.factory.CreatePresenter; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/SingleRoomIncomeFragment.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/SingleRoomIncomeFragment.java index 6e40eb7d6..7e1ededee 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/SingleRoomIncomeFragment.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/SingleRoomIncomeFragment.java @@ -10,7 +10,7 @@ import com.pikolive.app.base.BaseMvpFragment; import com.yizhuan.erban.module_hall.income.adapter.SingleRoomIncomeAdapter; import com.yizhuan.erban.module_hall.income.presenter.SingRoomIncomeFragmentPresenter; import com.yizhuan.erban.module_hall.income.view.ISingRoomIncomeView; -import com.yizhuan.xchat_android_core.module_hall.income.bean.SingleRoomTotalIncomeInfo; +import com.pikolive.core.module_hall.income.bean.SingleRoomTotalIncomeInfo; import com.pikolive.library.base.factory.CreatePresenter; import com.pikolive.library.utils.ListUtils; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/adapter/ClanIncomeAdapter.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/adapter/ClanIncomeAdapter.java index 637cc5f9e..35fec73e7 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/adapter/ClanIncomeAdapter.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/adapter/ClanIncomeAdapter.java @@ -4,7 +4,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; import com.yizhuan.erban.R; import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.module_hall.income.bean.ClanIncomeInfo; +import com.pikolive.core.module_hall.income.bean.ClanIncomeInfo; import com.pikolive.library.utils.ResUtil; import org.jetbrains.annotations.NotNull; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/adapter/HallIncomeAdapter.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/adapter/HallIncomeAdapter.java index b27945f00..81386405e 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/adapter/HallIncomeAdapter.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/adapter/HallIncomeAdapter.java @@ -4,7 +4,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; import com.yizhuan.erban.R; import com.pikolive.app.ui.utils.ImageLoadUtilsV2; -import com.yizhuan.xchat_android_core.module_hall.income.bean.HallIncomeInfo; +import com.pikolive.core.module_hall.income.bean.HallIncomeInfo; import org.jetbrains.annotations.NotNull; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/adapter/IncomeAdapter.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/adapter/IncomeAdapter.java index 1c3da5993..07012e8c8 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/adapter/IncomeAdapter.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/adapter/IncomeAdapter.java @@ -9,7 +9,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; import com.yizhuan.erban.R; import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.module_hall.income.bean.IncomeInfo; +import com.pikolive.core.module_hall.income.bean.IncomeInfo; import java.text.DecimalFormat; import java.util.List; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/adapter/IncomeDetailAdapter.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/adapter/IncomeDetailAdapter.java index 964784021..f6ff3c36a 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/adapter/IncomeDetailAdapter.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/adapter/IncomeDetailAdapter.java @@ -10,7 +10,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; import com.yizhuan.erban.R; import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.module_hall.income.bean.IncomeGiftInfo; +import com.pikolive.core.module_hall.income.bean.IncomeGiftInfo; import com.pikolive.library.utils.ResUtil; import java.math.BigDecimal; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/adapter/LiveIncomeAdapter.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/adapter/LiveIncomeAdapter.java index 865ceed3e..524f159bb 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/adapter/LiveIncomeAdapter.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/adapter/LiveIncomeAdapter.java @@ -5,7 +5,7 @@ import com.chad.library.adapter.base.BaseViewHolder; import com.yizhuan.erban.R; import com.pikolive.app.ui.utils.ImageLoadUtils; import com.pikolive.app.ui.utils.ImageLoadUtilsV2; -import com.yizhuan.xchat_android_core.module_hall.income.bean.LiveIncomeInfo; +import com.pikolive.core.module_hall.income.bean.LiveIncomeInfo; import org.jetbrains.annotations.NotNull; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/adapter/SingleRoomIncomeAdapter.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/adapter/SingleRoomIncomeAdapter.java index bd1d4f69d..a84407717 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/adapter/SingleRoomIncomeAdapter.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/adapter/SingleRoomIncomeAdapter.java @@ -4,7 +4,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; import com.yizhuan.erban.R; import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.module_hall.income.bean.SingleRoomIncomeInfo; +import com.pikolive.core.module_hall.income.bean.SingleRoomIncomeInfo; import com.pikolive.library.utils.ResUtil; import org.jetbrains.annotations.NotNull; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/presenter/ClanIncomeFragmentPresenter.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/presenter/ClanIncomeFragmentPresenter.java index cd887bdcd..30618247a 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/presenter/ClanIncomeFragmentPresenter.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/presenter/ClanIncomeFragmentPresenter.java @@ -2,8 +2,8 @@ package com.yizhuan.erban.module_hall.income.presenter; import com.pikolive.app.base.BaseMvpPresenter; import com.yizhuan.erban.module_hall.income.view.IClanIncomeView; -import com.yizhuan.xchat_android_core.module_hall.income.IncomeModel; -import com.yizhuan.xchat_android_core.module_hall.income.bean.ClanTotalIncomeInfo; +import com.pikolive.core.module_hall.income.IncomeModel; +import com.pikolive.core.module_hall.income.bean.ClanTotalIncomeInfo; import org.jetbrains.annotations.NotNull; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/presenter/HallIncomeFragmentPresenter.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/presenter/HallIncomeFragmentPresenter.java index 04b2a9ad5..689d942cf 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/presenter/HallIncomeFragmentPresenter.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/presenter/HallIncomeFragmentPresenter.java @@ -2,8 +2,8 @@ package com.yizhuan.erban.module_hall.income.presenter; import com.pikolive.app.base.BaseMvpPresenter; import com.yizhuan.erban.module_hall.income.view.IHallIncomeView; -import com.yizhuan.xchat_android_core.module_hall.income.IncomeModel; -import com.yizhuan.xchat_android_core.module_hall.income.bean.HallTotalIncomeInfo; +import com.pikolive.core.module_hall.income.IncomeModel; +import com.pikolive.core.module_hall.income.bean.HallTotalIncomeInfo; import org.jetbrains.annotations.NotNull; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/presenter/IncomeDetailPresenter.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/presenter/IncomeDetailPresenter.java index 784735403..c160eeb3b 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/presenter/IncomeDetailPresenter.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/presenter/IncomeDetailPresenter.java @@ -2,8 +2,8 @@ package com.yizhuan.erban.module_hall.income.presenter; import com.pikolive.app.base.BaseMvpPresenter; import com.yizhuan.erban.module_hall.income.view.IIncomeDetailView; -import com.yizhuan.xchat_android_core.module_hall.income.IncomeModel; -import com.yizhuan.xchat_android_core.module_hall.income.bean.IncomeGiftInfo; +import com.pikolive.core.module_hall.income.IncomeModel; +import com.pikolive.core.module_hall.income.bean.IncomeGiftInfo; import java.util.List; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/presenter/IncomePresenter.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/presenter/IncomePresenter.java index 0074e56d6..54859454c 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/presenter/IncomePresenter.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/presenter/IncomePresenter.java @@ -2,8 +2,8 @@ package com.yizhuan.erban.module_hall.income.presenter; import com.pikolive.app.base.BaseMvpPresenter; import com.yizhuan.erban.module_hall.income.view.IIncomeView; -import com.yizhuan.xchat_android_core.module_hall.income.IncomeModel; -import com.yizhuan.xchat_android_core.module_hall.income.bean.IncomeTotalInfo; +import com.pikolive.core.module_hall.income.IncomeModel; +import com.pikolive.core.module_hall.income.bean.IncomeTotalInfo; import io.reactivex.SingleObserver; import io.reactivex.disposables.Disposable; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/presenter/LiveIncomeFragmentPresenter.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/presenter/LiveIncomeFragmentPresenter.java index f6185c2b5..8eeaaca39 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/presenter/LiveIncomeFragmentPresenter.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/presenter/LiveIncomeFragmentPresenter.java @@ -2,8 +2,8 @@ package com.yizhuan.erban.module_hall.income.presenter; import com.pikolive.app.base.BaseMvpPresenter; import com.yizhuan.erban.module_hall.income.view.ILiveIncomeView; -import com.yizhuan.xchat_android_core.module_hall.income.IncomeModel; -import com.yizhuan.xchat_android_core.module_hall.income.bean.LiveTotalIncomeInfo; +import com.pikolive.core.module_hall.income.IncomeModel; +import com.pikolive.core.module_hall.income.bean.LiveTotalIncomeInfo; import org.jetbrains.annotations.NotNull; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/presenter/SingRoomIncomeFragmentPresenter.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/presenter/SingRoomIncomeFragmentPresenter.java index 929e72437..e44ea7137 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/presenter/SingRoomIncomeFragmentPresenter.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/presenter/SingRoomIncomeFragmentPresenter.java @@ -2,8 +2,8 @@ package com.yizhuan.erban.module_hall.income.presenter; import com.pikolive.app.base.BaseMvpPresenter; import com.yizhuan.erban.module_hall.income.view.ISingRoomIncomeView; -import com.yizhuan.xchat_android_core.module_hall.income.IncomeModel; -import com.yizhuan.xchat_android_core.module_hall.income.bean.SingleRoomTotalIncomeInfo; +import com.pikolive.core.module_hall.income.IncomeModel; +import com.pikolive.core.module_hall.income.bean.SingleRoomTotalIncomeInfo; import org.jetbrains.annotations.NotNull; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/view/IClanIncomeView.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/view/IClanIncomeView.java index 12ddb70f1..d24147555 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/view/IClanIncomeView.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/view/IClanIncomeView.java @@ -1,6 +1,6 @@ package com.yizhuan.erban.module_hall.income.view; -import com.yizhuan.xchat_android_core.module_hall.income.bean.ClanTotalIncomeInfo; +import com.pikolive.core.module_hall.income.bean.ClanTotalIncomeInfo; import com.pikolive.library.base.IMvpBaseView; public interface IClanIncomeView extends IMvpBaseView { diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/view/IHallIncomeView.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/view/IHallIncomeView.java index 7a0f89160..af6338183 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/view/IHallIncomeView.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/view/IHallIncomeView.java @@ -1,6 +1,6 @@ package com.yizhuan.erban.module_hall.income.view; -import com.yizhuan.xchat_android_core.module_hall.income.bean.HallTotalIncomeInfo; +import com.pikolive.core.module_hall.income.bean.HallTotalIncomeInfo; import com.pikolive.library.base.IMvpBaseView; public interface IHallIncomeView extends IMvpBaseView { diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/view/IIncomeDetailView.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/view/IIncomeDetailView.java index 77644f512..6746b7865 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/view/IIncomeDetailView.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/view/IIncomeDetailView.java @@ -1,6 +1,6 @@ package com.yizhuan.erban.module_hall.income.view; -import com.yizhuan.xchat_android_core.module_hall.income.bean.IncomeGiftInfo; +import com.pikolive.core.module_hall.income.bean.IncomeGiftInfo; import com.pikolive.library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/view/IIncomeView.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/view/IIncomeView.java index 334a09db5..747272637 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/view/IIncomeView.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/view/IIncomeView.java @@ -1,6 +1,6 @@ package com.yizhuan.erban.module_hall.income.view; -import com.yizhuan.xchat_android_core.module_hall.income.bean.IncomeTotalInfo; +import com.pikolive.core.module_hall.income.bean.IncomeTotalInfo; import com.pikolive.library.base.IMvpBaseView; public interface IIncomeView extends IMvpBaseView { diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/view/ILiveIncomeView.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/view/ILiveIncomeView.java index ebcf50906..c4ca68c4b 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/view/ILiveIncomeView.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/view/ILiveIncomeView.java @@ -1,6 +1,6 @@ package com.yizhuan.erban.module_hall.income.view; -import com.yizhuan.xchat_android_core.module_hall.income.bean.LiveTotalIncomeInfo; +import com.pikolive.core.module_hall.income.bean.LiveTotalIncomeInfo; import com.pikolive.library.base.IMvpBaseView; public interface ILiveIncomeView extends IMvpBaseView { diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/view/ISingRoomIncomeView.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/view/ISingRoomIncomeView.java index c4b4ea26f..23c4c5208 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/view/ISingRoomIncomeView.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/view/ISingRoomIncomeView.java @@ -1,6 +1,6 @@ package com.yizhuan.erban.module_hall.income.view; -import com.yizhuan.xchat_android_core.module_hall.income.bean.SingleRoomTotalIncomeInfo; +import com.pikolive.core.module_hall.income.bean.SingleRoomTotalIncomeInfo; import com.pikolive.library.base.IMvpBaseView; public interface ISingRoomIncomeView extends IMvpBaseView { diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/view/LiveIncomeFragment.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/view/LiveIncomeFragment.java index 1e8191465..401adaacf 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/view/LiveIncomeFragment.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/income/view/LiveIncomeFragment.java @@ -9,7 +9,7 @@ import com.yizhuan.erban.R; import com.pikolive.app.base.BaseMvpFragment; import com.yizhuan.erban.module_hall.income.adapter.LiveIncomeAdapter; import com.yizhuan.erban.module_hall.income.presenter.LiveIncomeFragmentPresenter; -import com.yizhuan.xchat_android_core.module_hall.income.bean.LiveTotalIncomeInfo; +import com.pikolive.core.module_hall.income.bean.LiveTotalIncomeInfo; import com.pikolive.library.base.factory.CreatePresenter; import com.pikolive.library.utils.ListUtils; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/secretcode/PwdCodeMgr.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/secretcode/PwdCodeMgr.java index 7698f29bd..6c65c57a8 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/secretcode/PwdCodeMgr.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/secretcode/PwdCodeMgr.java @@ -3,8 +3,8 @@ package com.yizhuan.erban.module_hall.secretcode; import android.text.TextUtils; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.module_hall.secretcode.bean.SecretCodeInfo; -import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; +import com.pikolive.core.module_hall.secretcode.bean.SecretCodeInfo; +import com.pikolive.core.utils.SharedPreferenceUtils; /** * emoji 暗号的一个缓存处理，24小时刷新 diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/HTeamDataManager.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/HTeamDataManager.java index 2b4a67d9f..246ed1895 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/HTeamDataManager.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/HTeamDataManager.java @@ -4,7 +4,7 @@ import androidx.lifecycle.LifecycleOwner; import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.Observer; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.HTeamInfo; +import com.pikolive.core.module_hall.hall.bean.HTeamInfo; /** * 厅群信息的管理，只针对单个群信息 diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/activity/CreateHallTeamActivity.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/activity/CreateHallTeamActivity.java index 90536d525..57eb42133 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/activity/CreateHallTeamActivity.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/activity/CreateHallTeamActivity.java @@ -26,10 +26,10 @@ import com.yizhuan.erban.module_hall.team.presenter.CreateHallTeamPresenter; import com.yizhuan.erban.module_hall.team.view.ICreateHallTeamView; import com.pikolive.app.ui.utils.ImageLoadUtils; import com.pikolive.app.utils.KeyBoardUtils; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.HTeamInfo; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.MemberInfo; -import com.yizhuan.xchat_android_core.module_hall.team.HTeamModel; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.module_hall.hall.bean.HTeamInfo; +import com.pikolive.core.module_hall.hall.bean.MemberInfo; +import com.pikolive.core.module_hall.team.HTeamModel; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.base.factory.CreatePresenter; import com.pikolive.library.utils.ResUtil; import com.pikolive.library.widget.decoration.RowColumnDifItemDecoration; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/activity/HTeamMemberListActivity.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/activity/HTeamMemberListActivity.java index f14e989ff..501465cdb 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/activity/HTeamMemberListActivity.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/activity/HTeamMemberListActivity.java @@ -25,11 +25,11 @@ import com.yizhuan.erban.databinding.ActivityHteamMemberListBinding; import com.yizhuan.erban.module_hall.HallConstant; import com.yizhuan.erban.module_hall.team.adapter.HTeamMemberListAdapter; import com.pikolive.app.team.bean.NimTeamMember; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.HTeamInfo; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.HTeamMember; -import com.yizhuan.xchat_android_core.module_hall.team.HTeamModel; -import com.yizhuan.xchat_android_core.module_hall.team.event.HteamMemberNumChangeEvent; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; +import com.pikolive.core.module_hall.hall.bean.HTeamInfo; +import com.pikolive.core.module_hall.hall.bean.HTeamMember; +import com.pikolive.core.module_hall.team.HTeamModel; +import com.pikolive.core.module_hall.team.event.HteamMemberNumChangeEvent; +import com.pikolive.core.utils.net.BeanObserver; import com.pikolive.library.utils.ResUtil; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/activity/HallTeamMessageActivity.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/activity/HallTeamMessageActivity.java index cdd561fd1..6bca4b079 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/activity/HallTeamMessageActivity.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/activity/HallTeamMessageActivity.java @@ -33,14 +33,14 @@ import com.pikolive.app.team.view.NimTeamManagementActivity; import com.pikolive.app.team.view.NimTeamMessageFragment; import com.pikolive.app.team.viewmodel.TeamVM; import com.pikolive.app.ui.im.avtivity.BaseMessageActivity; -import com.yizhuan.xchat_android_core.initial.InitialModel; -import com.yizhuan.xchat_android_core.initial.bean.InitInfo; -import com.yizhuan.xchat_android_core.level.UserLevelVo; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.HTeamInfo; -import com.yizhuan.xchat_android_core.module_hall.team.HTeamModel; -import com.yizhuan.xchat_android_core.team.bean.TeamEvent; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.pikolive.core.initial.InitialModel; +import com.pikolive.core.initial.bean.InitInfo; +import com.pikolive.core.level.UserLevelVo; +import com.pikolive.core.module_hall.hall.bean.HTeamInfo; +import com.pikolive.core.module_hall.team.HTeamModel; +import com.pikolive.core.team.bean.TeamEvent; +import com.pikolive.core.user.UserModel; +import com.pikolive.core.user.bean.UserInfo; import com.pikolive.library.rxbus.RxBus; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/activity/SelectTeamMemberActivity.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/activity/SelectTeamMemberActivity.java index e81013fee..3c87773f5 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/activity/SelectTeamMemberActivity.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/activity/SelectTeamMemberActivity.java @@ -20,11 +20,11 @@ import com.yizhuan.erban.databinding.ActivitySelectGroupMemberBinding; import com.yizhuan.erban.module_hall.HallConstant; import com.yizhuan.erban.module_hall.HallDataManager; import com.yizhuan.erban.module_hall.team.adapter.SelectTeamMemberAdapter; -import com.yizhuan.xchat_android_core.module_hall.hall.HallModel; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.ListMemberInfo; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.MemberInfo; -import com.yizhuan.xchat_android_core.module_hall.team.HTeamModel; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; +import com.pikolive.core.module_hall.hall.HallModel; +import com.pikolive.core.module_hall.hall.bean.ListMemberInfo; +import com.pikolive.core.module_hall.hall.bean.MemberInfo; +import com.pikolive.core.module_hall.team.HTeamModel; +import com.pikolive.core.utils.net.BeanObserver; import com.pikolive.library.utils.ResUtil; import java.util.ArrayList; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/activity/TeamEditActivity.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/activity/TeamEditActivity.java index 6326182d2..4078ae464 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/activity/TeamEditActivity.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/activity/TeamEditActivity.java @@ -12,10 +12,10 @@ import com.pikolive.app.base.TitleBar; import com.yizhuan.erban.databinding.ActivityTeamEditBinding; import com.yizhuan.erban.module_hall.HallConstant; import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.HTeamInfo; -import com.yizhuan.xchat_android_core.module_hall.team.HTeamModel; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.module_hall.hall.bean.HTeamInfo; +import com.pikolive.core.module_hall.team.HTeamModel; +import com.pikolive.core.utils.net.BeanObserver; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.utils.ResUtil; /** diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/activity/TeamInfoShowActivity.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/activity/TeamInfoShowActivity.java index df23ae6d1..b1df329d8 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/activity/TeamInfoShowActivity.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/activity/TeamInfoShowActivity.java @@ -24,13 +24,13 @@ import com.yizhuan.erban.module_hall.team.view.ITeamInfoShowView; import com.yizhuan.erban.module_hall.team.view.widget.GridMemberView; import com.pikolive.app.ui.utils.ImageLoadUtils; import com.pikolive.app.ui.widget.ButtonItem; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.HTeamInfo; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.HTeamMember; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.RoleType; -import com.yizhuan.xchat_android_core.module_hall.team.HTeamModel; -import com.yizhuan.xchat_android_core.module_hall.team.bean.HTeamType; -import com.yizhuan.xchat_android_core.module_hall.team.event.HteamInfoUpdateInfoEvent; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; +import com.pikolive.core.module_hall.hall.bean.HTeamInfo; +import com.pikolive.core.module_hall.hall.bean.HTeamMember; +import com.pikolive.core.module_hall.hall.bean.RoleType; +import com.pikolive.core.module_hall.team.HTeamModel; +import com.pikolive.core.module_hall.team.bean.HTeamType; +import com.pikolive.core.module_hall.team.event.HteamInfoUpdateInfoEvent; +import com.pikolive.core.utils.net.BeanObserver; import com.pikolive.library.base.factory.CreatePresenter; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/adapter/HTeamMemberListAdapter.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/adapter/HTeamMemberListAdapter.java index 68bae7569..2a10b41f1 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/adapter/HTeamMemberListAdapter.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/adapter/HTeamMemberListAdapter.java @@ -8,8 +8,8 @@ import com.pikolive.app.base.list.BaseViewHolder; import com.pikolive.app.base.list.CommonAdapter; import com.pikolive.app.ui.utils.ImageLoadUtils; import com.pikolive.app.ui.widget.UserInfoView; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.HTeamMember; -import com.yizhuan.xchat_android_core.user.UserModel; +import com.pikolive.core.module_hall.hall.bean.HTeamMember; +import com.pikolive.core.user.UserModel; /** * 厅群成员列表 diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/adapter/SelectTeamMemberAdapter.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/adapter/SelectTeamMemberAdapter.java index 1238a5544..03f6d12fc 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/adapter/SelectTeamMemberAdapter.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/adapter/SelectTeamMemberAdapter.java @@ -8,9 +8,9 @@ import com.pikolive.app.base.list.BaseViewHolder; import com.pikolive.app.base.list.CommonAdapter; import com.pikolive.app.ui.utils.ImageLoadUtils; import com.pikolive.app.ui.widget.UserInfoView; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.MemberInfo; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.RoleType; -import com.yizhuan.xchat_android_core.user.UserModel; +import com.pikolive.core.module_hall.hall.bean.MemberInfo; +import com.pikolive.core.module_hall.hall.bean.RoleType; +import com.pikolive.core.user.UserModel; /** * 选择厅成员 diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/presenter/CreateHallTeamPresenter.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/presenter/CreateHallTeamPresenter.java index 1a5db6209..6b988a5fd 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/presenter/CreateHallTeamPresenter.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/presenter/CreateHallTeamPresenter.java @@ -3,10 +3,10 @@ package com.yizhuan.erban.module_hall.team.presenter; import com.pikolive.app.base.BaseMvpPresenter; import com.yizhuan.erban.module_hall.HallDataManager; import com.yizhuan.erban.module_hall.team.view.ICreateHallTeamView; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.HTeamInfo; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.MemberInfo; -import com.yizhuan.xchat_android_core.module_hall.team.HTeamModel; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; +import com.pikolive.core.module_hall.hall.bean.HTeamInfo; +import com.pikolive.core.module_hall.hall.bean.MemberInfo; +import com.pikolive.core.module_hall.team.HTeamModel; +import com.pikolive.core.utils.net.BeanObserver; import com.pikolive.library.base.PresenterEvent; import java.util.List; diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/presenter/TeamInfoShowPresenter.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/presenter/TeamInfoShowPresenter.java index a4194f7e4..7ae6e5d9d 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/presenter/TeamInfoShowPresenter.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/presenter/TeamInfoShowPresenter.java @@ -2,9 +2,9 @@ package com.yizhuan.erban.module_hall.team.presenter; import com.pikolive.app.base.BaseMvpPresenter; import com.yizhuan.erban.module_hall.team.view.ITeamInfoShowView; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.HTeamInfo; -import com.yizhuan.xchat_android_core.module_hall.team.HTeamModel; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; +import com.pikolive.core.module_hall.hall.bean.HTeamInfo; +import com.pikolive.core.module_hall.team.HTeamModel; +import com.pikolive.core.utils.net.BeanObserver; import com.pikolive.library.base.PresenterEvent; /** diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/view/ICreateHallTeamView.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/view/ICreateHallTeamView.java index 368003452..85fddb3af 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/view/ICreateHallTeamView.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/view/ICreateHallTeamView.java @@ -1,6 +1,6 @@ package com.yizhuan.erban.module_hall.team.view; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.HTeamInfo; +import com.pikolive.core.module_hall.hall.bean.HTeamInfo; import com.pikolive.library.base.IMvpBaseView; /** diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/view/ITeamInfoShowView.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/view/ITeamInfoShowView.java index b6df980d3..3ac6d3e43 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/view/ITeamInfoShowView.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/team/view/ITeamInfoShowView.java @@ -1,6 +1,6 @@ package com.yizhuan.erban.module_hall.team.view; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.HTeamInfo; +import com.pikolive.core.module_hall.hall.bean.HTeamInfo; import com.pikolive.library.base.IMvpBaseView; /** diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/viewmodel/AssociationViewModel.kt b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/viewmodel/AssociationViewModel.kt index 758f5d021..3a3a951c0 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/viewmodel/AssociationViewModel.kt +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/viewmodel/AssociationViewModel.kt @@ -2,10 +2,10 @@ package com.yizhuan.erban.module_hall.viewmodel import androidx.lifecycle.MutableLiveData import com.pikolive.app.base.BaseViewModel -import com.yizhuan.xchat_android_core.association.bean.ClanListInfo -import com.yizhuan.xchat_android_core.association.bean.HallListInfo -import com.yizhuan.xchat_android_core.association.bean.MemberExchangeInfo -import com.yizhuan.xchat_android_core.association.model.AssociationModel +import com.pikolive.core2.association.bean.ClanListInfo +import com.pikolive.core2.association.bean.HallListInfo +import com.pikolive.core2.association.bean.MemberExchangeInfo +import com.pikolive.core2.association.model.AssociationModel class AssociationViewModel : BaseViewModel() { diff --git a/app/src/module_labour_union/res/layout/item_live_tag_dialog.xml b/app/src/module_labour_union/res/layout/item_live_tag_dialog.xml index 4da0f5d84..bc78bf040 100644 --- a/app/src/module_labour_union/res/layout/item_live_tag_dialog.xml +++ b/app/src/module_labour_union/res/layout/item_live_tag_dialog.xml @@ -5,7 +5,7 @@ + type="com.pikolive.core.user.bean.LiveTagInfo.LiveSkillVoListBean" /> { diff --git a/app/src/module_mentoring_relationship/java/com/yizhuan/tutu/mentoring_relationship/adapter/ResultMarqueeAdapter.java b/app/src/module_mentoring_relationship/java/com/yizhuan/tutu/mentoring_relationship/adapter/ResultMarqueeAdapter.java index 606fdc783..94879c333 100644 --- a/app/src/module_mentoring_relationship/java/com/yizhuan/tutu/mentoring_relationship/adapter/ResultMarqueeAdapter.java +++ b/app/src/module_mentoring_relationship/java/com/yizhuan/tutu/mentoring_relationship/adapter/ResultMarqueeAdapter.java @@ -8,7 +8,7 @@ import android.widget.TextView; import com.yizhuan.erban.R; import com.pikolive.app.ui.widget.marqueeview.BetterMarqueeView; -import com.yizhuan.xchat_android_core.mentoring_relationship.bean.MentoringResultMarqueeInfo; +import com.pikolive.core.mentoring_relationship.bean.MentoringResultMarqueeInfo; import java.util.ArrayList; import java.util.List; diff --git a/app/src/module_mentoring_relationship/java/com/yizhuan/tutu/mentoring_relationship/presenter/MentoringRelationshipPresenter.java b/app/src/module_mentoring_relationship/java/com/yizhuan/tutu/mentoring_relationship/presenter/MentoringRelationshipPresenter.java index 0e856dac4..0a363f25a 100644 --- a/app/src/module_mentoring_relationship/java/com/yizhuan/tutu/mentoring_relationship/presenter/MentoringRelationshipPresenter.java +++ b/app/src/module_mentoring_relationship/java/com/yizhuan/tutu/mentoring_relationship/presenter/MentoringRelationshipPresenter.java @@ -3,11 +3,11 @@ package com.yizhuan.tutu.mentoring_relationship.presenter; import android.annotation.SuppressLint; import com.pikolive.app.base.BaseMvpPresenter; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.exception.FailReasonException; -import com.yizhuan.xchat_android_core.mentoring_relationship.bean.MentoringRankingDataInfo; -import com.yizhuan.xchat_android_core.mentoring_relationship.model.MentoringRelationshipModel; -import com.yizhuan.xchat_android_core.mentoring_relationship.view.IMentoringRelationshipView; +import com.pikolive.core.Constants; +import com.pikolive.core.exception.FailReasonException; +import com.pikolive.core.mentoring_relationship.bean.MentoringRankingDataInfo; +import com.pikolive.core.mentoring_relationship.model.MentoringRelationshipModel; +import com.pikolive.core.mentoring_relationship.view.IMentoringRelationshipView; import com.pikolive.library.base.PresenterEvent; import com.pikolive.library.utils.ListUtils; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/AllTopicActivity.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/AllTopicActivity.java index 02d9ab847..3bea4ee45 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/AllTopicActivity.java +++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/AllTopicActivity.java @@ -26,7 +26,7 @@ import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IP import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator; import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.titles.SimplePagerTitleView; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldCategoryInfo; +import com.pikolive.core.miniworld.bean.MiniWorldCategoryInfo; import com.pikolive.library.base.factory.CreatePresenter; import com.pikolive.library.utils.ListUtils; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/AudioPartyDialog.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/AudioPartyDialog.java index 82065acd9..9e87136e4 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/AudioPartyDialog.java +++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/AudioPartyDialog.java @@ -27,12 +27,12 @@ import com.pikolive.app.avroom.activity.AVRoomActivity; import com.yizhuan.erban.miniworld.adapter.AudioPartyAdapter; import com.yizhuan.erban.miniworld.presenter.AudioPartyDialogPresenter; import com.yizhuan.erban.miniworld.view.IAudioPartyDialogView; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.miniworld.bean.AudioPartyInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.AudioPartyItem; -import com.yizhuan.xchat_android_core.miniworld.model.MiniWorldHelper; -import com.yizhuan.xchat_android_core.super_admin.util.SuperAdminUtil; +import com.pikolive.core.Constants; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.miniworld.bean.AudioPartyInfo; +import com.pikolive.core.miniworld.bean.AudioPartyItem; +import com.pikolive.core.miniworld.model.MiniWorldHelper; +import com.pikolive.core.admin.util.SuperAdminUtil; import com.pikolive.library.utils.ResUtil; import com.pikolive.library.utils.SingleToastUtil; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MWTeamRoomMessageAct.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MWTeamRoomMessageAct.java index 5801c3f2a..8f1978b17 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MWTeamRoomMessageAct.java +++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MWTeamRoomMessageAct.java @@ -45,28 +45,28 @@ import com.pikolive.app.ui.widget.GiftDialog; import com.pikolive.app.ui.widget.UserInfoDialog; import com.pikolive.app.ui.widget.dialog.OpenNobleDialog; import com.pikolive.app.utils.CertificateHelper; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.gift.GiftModel; -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo; -import com.yizhuan.xchat_android_core.gift.toolbox.GiftToolbox; -import com.yizhuan.xchat_android_core.initial.InitialModel; -import com.yizhuan.xchat_android_core.initial.bean.InitInfo; -import com.yizhuan.xchat_android_core.level.UserLevelVo; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.miniworld.bean.MWChatInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.OpenAudioPartyAttachment; -import com.yizhuan.xchat_android_core.miniworld.event.MWChatTopicEvent; -import com.yizhuan.xchat_android_core.miniworld.model.MiniWorldHelper; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.room.model.AvRoomModel; -import com.yizhuan.xchat_android_core.room.model.RoomSettingModel; -import com.yizhuan.xchat_android_core.room.queue.bean.MicMemberInfo; -import com.yizhuan.xchat_android_core.team.bean.TeamEvent; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.utils.ActivityUtil; -import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.gift.GiftModel; +import com.pikolive.core.gift.bean.GiftInfo; +import com.pikolive.core.gift.toolbox.GiftToolbox; +import com.pikolive.core.initial.InitialModel; +import com.pikolive.core.initial.bean.InitInfo; +import com.pikolive.core.level.UserLevelVo; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core.miniworld.bean.MWChatInfo; +import com.pikolive.core.miniworld.bean.OpenAudioPartyAttachment; +import com.pikolive.core.miniworld.event.MWChatTopicEvent; +import com.pikolive.core.miniworld.model.MiniWorldHelper; +import com.pikolive.core.room.bean.RoomInfo; +import com.pikolive.core.room.model.AvRoomModel; +import com.pikolive.core.room.model.RoomSettingModel; +import com.pikolive.core.room.queue.bean.MicMemberInfo; +import com.pikolive.core.team.bean.TeamEvent; +import com.pikolive.core.user.UserModel; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.utils.ActivityUtil; +import com.pikolive.core.utils.SharedPreferenceUtils; +import com.pikolive.core.utils.net.BeanObserver; import com.pikolive.library.net.rxnet.callback.CallBack; import com.pikolive.library.rxbus.RxBus; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldActivity.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldActivity.java index 393a50ac8..7db3dbc88 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldActivity.java +++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldActivity.java @@ -25,7 +25,7 @@ import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IP import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator; import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.titles.SimplePagerTitleView; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldCategoryInfo; +import com.pikolive.core.miniworld.bean.MiniWorldCategoryInfo; import com.pikolive.library.base.factory.CreatePresenter; import com.pikolive.library.utils.ListUtils; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldEditActivity.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldEditActivity.java index b16421a11..ba4ea41e1 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldEditActivity.java +++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldEditActivity.java @@ -27,8 +27,8 @@ import com.yizhuan.erban.miniworld.viewmodel.MiniWorldEditableInfoVM; import com.yizhuan.erban.miniworld.widget.MiniWorldEditChooseClassifyDialog; import com.pikolive.app.ui.utils.ImageLoadUtils; import com.pikolive.app.ui.widget.ButtonItem; -import com.yizhuan.xchat_android_core.file.FileModel; -import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; +import com.pikolive.core.file.FileModel; +import com.pikolive.core.utils.net.DontWarnObserver; import com.pikolive.library.base.factory.CreatePresenter; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldGroupThemeActivity.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldGroupThemeActivity.java index a2afa47fd..c2315d67b 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldGroupThemeActivity.java +++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldGroupThemeActivity.java @@ -15,7 +15,7 @@ import com.pikolive.app.base.BaseMvpActivity; import com.pikolive.app.common.widget.dialog.DialogManager; import com.yizhuan.erban.miniworld.presenter.MWThemePresenter; import com.yizhuan.erban.miniworld.view.IMWThemeView; -import com.yizhuan.xchat_android_core.miniworld.bean.TopicInfo; +import com.pikolive.core.miniworld.bean.TopicInfo; import com.pikolive.library.base.factory.CreatePresenter; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldGuestPageActivity.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldGuestPageActivity.java index fd1aba773..ee928c3d8 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldGuestPageActivity.java +++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldGuestPageActivity.java @@ -60,23 +60,23 @@ import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil; import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; import com.pikolive.app.ui.widget.recyclerview.decoration.VerticalDecoration; import com.pikolive.app.utils.AppBarStateChangeListener; -import com.yizhuan.xchat_android_constants.XChatConstants; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.home.bean.TabInfo; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.miniworld.bean.AudioPartyInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldDetailInfo; -import com.yizhuan.xchat_android_core.miniworld.event.MiniWorldJoinVerifiedEvent; -import com.yizhuan.xchat_android_core.miniworld.event.MiniWorldStateChangedEvent; -import com.yizhuan.xchat_android_core.miniworld.event.MiniWorldTeamExitEvent; -import com.yizhuan.xchat_android_core.miniworld.event.OpenedMyMiniWorldEvent; -import com.yizhuan.xchat_android_core.miniworld.model.MiniWorldModel; -import com.yizhuan.xchat_android_core.share.ShareModel; -import com.yizhuan.xchat_android_core.share.bean.SessionType; -import com.yizhuan.xchat_android_core.utils.ActivityUtil; -import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; -import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; +import com.pikolive.core2.XChatConstants; +import com.pikolive.core2.UriProvider; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core2.home.bean.TabInfo; +import com.pikolive.core2.manager.IMNetEaseManager; +import com.pikolive.core.miniworld.bean.AudioPartyInfo; +import com.pikolive.core.miniworld.bean.MiniWorldDetailInfo; +import com.pikolive.core.miniworld.event.MiniWorldJoinVerifiedEvent; +import com.pikolive.core.miniworld.event.MiniWorldStateChangedEvent; +import com.pikolive.core.miniworld.event.MiniWorldTeamExitEvent; +import com.pikolive.core.miniworld.event.OpenedMyMiniWorldEvent; +import com.pikolive.core.miniworld.model.MiniWorldModel; +import com.pikolive.core.share.ShareModel; +import com.pikolive.core.share.bean.SessionType; +import com.pikolive.core.utils.ActivityUtil; +import com.pikolive.core.utils.SharedPreferenceUtils; +import com.pikolive.core.utils.net.DontWarnObserver; import com.pikolive.library.base.factory.CreatePresenter; import com.pikolive.library.utils.JavaUtil; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldMainActivity.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldMainActivity.java index ee77444ea..72e319191 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldMainActivity.java +++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldMainActivity.java @@ -29,12 +29,12 @@ import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil; import com.pikolive.app.ui.widget.rollviewpager.RollPagerView; import com.pikolive.app.ui.widget.rollviewpager.Util; import com.pikolive.app.ui.widget.rollviewpager.hintview.ColorPointHintView; -import com.yizhuan.xchat_android_core.home.bean.BannerInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldCategoryInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldMainItemInfo; -import com.yizhuan.xchat_android_core.miniworld.event.MiniWorldStateChangedEvent; -import com.yizhuan.xchat_android_core.miniworld.event.OpenedMyMiniWorldEvent; +import com.pikolive.core2.home.bean.BannerInfo; +import com.pikolive.core.miniworld.bean.MiniWorldCategoryInfo; +import com.pikolive.core.miniworld.bean.MiniWorldInfo; +import com.pikolive.core.miniworld.bean.MiniWorldMainItemInfo; +import com.pikolive.core.miniworld.event.MiniWorldStateChangedEvent; +import com.pikolive.core.miniworld.event.OpenedMyMiniWorldEvent; import com.pikolive.library.base.factory.CreatePresenter; import com.pikolive.library.utils.ListUtils; import com.pikolive.library.utils.SizeUtils; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldMemberListActivity.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldMemberListActivity.java index 0c0a3a2da..61e998130 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldMemberListActivity.java +++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldMemberListActivity.java @@ -21,9 +21,9 @@ import com.pikolive.app.base.BaseMvpActivity; import com.yizhuan.erban.miniworld.adapter.MiniWorldMemberListAdapter; import com.yizhuan.erban.miniworld.presenter.MiniWorldMemberListPresenter; import com.yizhuan.erban.miniworld.view.IMiniWorldMemberListView; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldMemberListMemberInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core.miniworld.bean.MiniWorldMemberListMemberInfo; +import com.pikolive.core.room.bean.RoomInfo; import com.pikolive.library.base.factory.CreatePresenter; import com.pikolive.library.utils.ListUtils; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldSearchActivity.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldSearchActivity.java index f48b1c050..72b039775 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldSearchActivity.java +++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldSearchActivity.java @@ -26,7 +26,7 @@ import com.yizhuan.erban.miniworld.adapter.MiniWorldListAdapter; import com.yizhuan.erban.miniworld.listener.DoubleClickCheckListener; import com.yizhuan.erban.miniworld.presenter.MiniWorldSearchPresenter; import com.yizhuan.erban.miniworld.view.IMiniWorldSearchView; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldInfo; +import com.pikolive.core.miniworld.bean.MiniWorldInfo; import com.pikolive.library.base.factory.CreatePresenter; import com.pikolive.library.utils.ImeUtil; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldTeamMessageActivity.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldTeamMessageActivity.java index a9c81589b..b25b9840c 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldTeamMessageActivity.java +++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/MiniWorldTeamMessageActivity.java @@ -50,34 +50,34 @@ import com.pikolive.app.ui.widget.GiftDialog; import com.pikolive.app.ui.widget.UserInfoDialog; import com.pikolive.app.ui.widget.dialog.OpenNobleDialog; import com.pikolive.app.utils.CertificateHelper; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.gift.GiftModel; -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo; -import com.yizhuan.xchat_android_core.gift.toolbox.GiftToolbox; -import com.yizhuan.xchat_android_core.initial.InitialModel; -import com.yizhuan.xchat_android_core.initial.bean.InitInfo; -import com.yizhuan.xchat_android_core.level.UserLevelVo; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.miniworld.bean.MWChatInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.OpenAudioPartyAttachment; -import com.yizhuan.xchat_android_core.miniworld.event.AudioPartyOpenEvent; -import com.yizhuan.xchat_android_core.miniworld.event.MWChatTopicEvent; -import com.yizhuan.xchat_android_core.miniworld.event.MWGroupChatMemberEvent; -import com.yizhuan.xchat_android_core.miniworld.event.MiniWorldTeamExitEvent; -import com.yizhuan.xchat_android_core.miniworld.model.MiniWorldHelper; -import com.yizhuan.xchat_android_core.miniworld.model.MiniWorldModel; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.room.model.AvRoomModel; -import com.yizhuan.xchat_android_core.room.model.RoomSettingModel; -import com.yizhuan.xchat_android_core.room.queue.bean.MicMemberInfo; -import com.yizhuan.xchat_android_core.team.bean.TeamEvent; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.utils.ActivityUtil; -import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; -import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.gift.GiftModel; +import com.pikolive.core.gift.bean.GiftInfo; +import com.pikolive.core.gift.toolbox.GiftToolbox; +import com.pikolive.core.initial.InitialModel; +import com.pikolive.core.initial.bean.InitInfo; +import com.pikolive.core.level.UserLevelVo; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core.miniworld.bean.MWChatInfo; +import com.pikolive.core.miniworld.bean.OpenAudioPartyAttachment; +import com.pikolive.core.miniworld.event.AudioPartyOpenEvent; +import com.pikolive.core.miniworld.event.MWChatTopicEvent; +import com.pikolive.core.miniworld.event.MWGroupChatMemberEvent; +import com.pikolive.core.miniworld.event.MiniWorldTeamExitEvent; +import com.pikolive.core.miniworld.model.MiniWorldHelper; +import com.pikolive.core.miniworld.model.MiniWorldModel; +import com.pikolive.core.room.bean.RoomInfo; +import com.pikolive.core.room.model.AvRoomModel; +import com.pikolive.core.room.model.RoomSettingModel; +import com.pikolive.core.room.queue.bean.MicMemberInfo; +import com.pikolive.core.team.bean.TeamEvent; +import com.pikolive.core.user.UserModel; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.utils.ActivityUtil; +import com.pikolive.core.utils.SharedPreferenceUtils; +import com.pikolive.core.utils.net.BeanObserver; +import com.pikolive.core.utils.net.DontWarnObserver; import com.pikolive.library.net.rxnet.callback.CallBack; import com.pikolive.library.rxbus.RxBus; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/TopicMainActivity.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/TopicMainActivity.java index 10b245615..351dd5efb 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/TopicMainActivity.java +++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/activity/TopicMainActivity.java @@ -43,20 +43,20 @@ import com.pikolive.app.ui.widget.magicindicator.MagicIndicator; import com.pikolive.app.ui.widget.magicindicator.ViewPagerHelper; import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil; import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator; -import com.yizhuan.xchat_android_constants.XChatConstants; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.home.bean.TabInfo; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.miniworld.bean.AudioPartyInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldDetailInfo; -import com.yizhuan.xchat_android_core.miniworld.event.MiniWorldJoinVerifiedEvent; -import com.yizhuan.xchat_android_core.miniworld.event.MiniWorldStateChangedEvent; -import com.yizhuan.xchat_android_core.miniworld.event.MiniWorldTeamExitEvent; -import com.yizhuan.xchat_android_core.miniworld.model.MiniWorldModel; -import com.yizhuan.xchat_android_core.share.ShareModel; -import com.yizhuan.xchat_android_core.share.bean.SessionType; -import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; -import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; +import com.pikolive.core2.XChatConstants; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core2.home.bean.TabInfo; +import com.pikolive.core2.manager.IMNetEaseManager; +import com.pikolive.core.miniworld.bean.AudioPartyInfo; +import com.pikolive.core.miniworld.bean.MiniWorldDetailInfo; +import com.pikolive.core.miniworld.event.MiniWorldJoinVerifiedEvent; +import com.pikolive.core.miniworld.event.MiniWorldStateChangedEvent; +import com.pikolive.core.miniworld.event.MiniWorldTeamExitEvent; +import com.pikolive.core.miniworld.model.MiniWorldModel; +import com.pikolive.core.share.ShareModel; +import com.pikolive.core.share.bean.SessionType; +import com.pikolive.core.utils.SharedPreferenceUtils; +import com.pikolive.core.utils.net.DontWarnObserver; import com.pikolive.library.base.factory.CreatePresenter; import com.pikolive.library.utils.JavaUtil; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/AllTopicListAdapter.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/AllTopicListAdapter.java index 80d63402c..2147e4098 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/AllTopicListAdapter.java +++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/AllTopicListAdapter.java @@ -5,7 +5,7 @@ import androidx.annotation.Nullable; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldInfo; +import com.pikolive.core.miniworld.bean.MiniWorldInfo; import java.util.List; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/AudioPartyAdapter.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/AudioPartyAdapter.java index 4242696f5..1ce7ff5db 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/AudioPartyAdapter.java +++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/AudioPartyAdapter.java @@ -9,8 +9,8 @@ import com.chad.library.adapter.base.BaseMultiItemQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; import com.yizhuan.erban.R; import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.miniworld.bean.AudioPartyInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.AudioPartyItem; +import com.pikolive.core.miniworld.bean.AudioPartyInfo; +import com.pikolive.core.miniworld.bean.AudioPartyItem; import com.pikolive.library.utils.ResUtil; import java.util.List; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/GuestAudioPartyAdapter.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/GuestAudioPartyAdapter.java index 6eb590182..8fc4dd8a6 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/GuestAudioPartyAdapter.java +++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/GuestAudioPartyAdapter.java @@ -5,7 +5,7 @@ import com.chad.library.adapter.base.BaseViewHolder; import com.yizhuan.erban.R; import com.pikolive.app.common.widget.CircleImageView; import com.pikolive.app.ui.utils.ImageLoadUtilsV2; -import com.yizhuan.xchat_android_core.miniworld.bean.AudioPartyInfo; +import com.pikolive.core.miniworld.bean.AudioPartyInfo; public class GuestAudioPartyAdapter extends BaseQuickAdapter { diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/MiniWorldEditClassifyAdapter.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/MiniWorldEditClassifyAdapter.java index 1dc79c1c5..56d9d5daa 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/MiniWorldEditClassifyAdapter.java +++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/MiniWorldEditClassifyAdapter.java @@ -12,7 +12,7 @@ import com.chad.library.adapter.base.BaseViewHolder; import com.netease.nim.uikit.common.util.sys.ScreenUtil; import com.yizhuan.erban.R; import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldEditClassifyInfo; +import com.pikolive.core.miniworld.bean.MiniWorldEditClassifyInfo; import java.util.List; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/MiniWorldListAdapter.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/MiniWorldListAdapter.java index 2400c6c06..3d162b25c 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/MiniWorldListAdapter.java +++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/MiniWorldListAdapter.java @@ -11,8 +11,8 @@ import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; import com.yizhuan.erban.R; import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldInfo; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.pikolive.core.miniworld.bean.MiniWorldInfo; +import com.pikolive.core.user.bean.UserInfo; import com.pikolive.library.utils.ResUtil; import java.util.List; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/MiniWorldMainAdapter.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/MiniWorldMainAdapter.java index 20a05aed8..b1553fe4c 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/MiniWorldMainAdapter.java +++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/MiniWorldMainAdapter.java @@ -1,12 +1,12 @@ package com.yizhuan.erban.miniworld.adapter; -import static com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldMainItemInfo.TYPE_BANNER; -import static com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldMainItemInfo.TYPE_BOTTOM_PADDING; -import static com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldMainItemInfo.TYPE_DIVIDER; -import static com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldMainItemInfo.TYPE_FIND; -import static com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldMainItemInfo.TYPE_ITEM; -import static com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldMainItemInfo.TYPE_PLACEHOLDER; -import static com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldMainItemInfo.TYPE_TITLE; +import static com.pikolive.core.miniworld.bean.MiniWorldMainItemInfo.TYPE_BANNER; +import static com.pikolive.core.miniworld.bean.MiniWorldMainItemInfo.TYPE_BOTTOM_PADDING; +import static com.pikolive.core.miniworld.bean.MiniWorldMainItemInfo.TYPE_DIVIDER; +import static com.pikolive.core.miniworld.bean.MiniWorldMainItemInfo.TYPE_FIND; +import static com.pikolive.core.miniworld.bean.MiniWorldMainItemInfo.TYPE_ITEM; +import static com.pikolive.core.miniworld.bean.MiniWorldMainItemInfo.TYPE_PLACEHOLDER; +import static com.pikolive.core.miniworld.bean.MiniWorldMainItemInfo.TYPE_TITLE; import android.text.TextUtils; import android.widget.ImageView; @@ -19,9 +19,9 @@ import com.chad.library.adapter.base.BaseViewHolder; import com.yizhuan.erban.R; import com.pikolive.app.avroom.widget.MessageView; import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldCategoryInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldMainItemInfo; +import com.pikolive.core.miniworld.bean.MiniWorldCategoryInfo; +import com.pikolive.core.miniworld.bean.MiniWorldInfo; +import com.pikolive.core.miniworld.bean.MiniWorldMainItemInfo; import com.pikolive.library.utils.ResUtil; import com.pikolive.library.utils.SizeUtils; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/MiniWorldMemberListAdapter.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/MiniWorldMemberListAdapter.java index aa408271f..2ec0d2077 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/MiniWorldMemberListAdapter.java +++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/MiniWorldMemberListAdapter.java @@ -17,8 +17,8 @@ import com.chad.library.adapter.base.BaseViewHolder; import com.yizhuan.erban.R; import com.pikolive.app.common.widget.CircleImageView; import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.level.UserLevelVo; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldMemberListMemberInfo; +import com.pikolive.core.level.UserLevelVo; +import com.pikolive.core.miniworld.bean.MiniWorldMemberListMemberInfo; import java.util.List; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/RecommendTopicListAdapter.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/RecommendTopicListAdapter.java index 1af30884e..d2a76de67 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/RecommendTopicListAdapter.java +++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/adapter/RecommendTopicListAdapter.java @@ -8,7 +8,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; import com.yizhuan.erban.R; import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldInfo; +import com.pikolive.core.miniworld.bean.MiniWorldInfo; import java.util.List; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/fragment/MiniWorldCategoryFragment.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/fragment/MiniWorldCategoryFragment.java index 6dc637d75..654d02a0c 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/fragment/MiniWorldCategoryFragment.java +++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/fragment/MiniWorldCategoryFragment.java @@ -20,10 +20,10 @@ import com.yizhuan.erban.miniworld.adapter.AllTopicListAdapter; import com.yizhuan.erban.miniworld.listener.DoubleClickCheckListener; import com.yizhuan.erban.miniworld.presenter.MiniWorldCategoryPresenter; import com.yizhuan.erban.miniworld.view.IMiniWorldCategoryView; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldCategoryInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldInfo; -import com.yizhuan.xchat_android_core.miniworld.event.MiniWorldStateChangedEvent; -import com.yizhuan.xchat_android_core.miniworld.event.OpenedMyMiniWorldEvent; +import com.pikolive.core.miniworld.bean.MiniWorldCategoryInfo; +import com.pikolive.core.miniworld.bean.MiniWorldInfo; +import com.pikolive.core.miniworld.event.MiniWorldStateChangedEvent; +import com.pikolive.core.miniworld.event.OpenedMyMiniWorldEvent; import com.pikolive.library.base.factory.CreatePresenter; import com.pikolive.library.utils.ResUtil; import com.pikolive.library.utils.SizeUtils; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/presenter/AudioPartyDialogPresenter.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/presenter/AudioPartyDialogPresenter.java index 0eda1dd50..89abbba4f 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/presenter/AudioPartyDialogPresenter.java +++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/presenter/AudioPartyDialogPresenter.java @@ -1,11 +1,11 @@ package com.yizhuan.erban.miniworld.presenter; import com.yizhuan.erban.miniworld.view.IAudioPartyDialogView; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.miniworld.bean.AudioPartyInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.AudioPartyItem; -import com.yizhuan.xchat_android_core.miniworld.bean.AudioPartyListInfo; -import com.yizhuan.xchat_android_core.miniworld.model.MiniWorldModel; +import com.pikolive.core.Constants; +import com.pikolive.core.miniworld.bean.AudioPartyInfo; +import com.pikolive.core.miniworld.bean.AudioPartyItem; +import com.pikolive.core.miniworld.bean.AudioPartyListInfo; +import com.pikolive.core.miniworld.model.MiniWorldModel; import java.util.ArrayList; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/presenter/MWTeamMessagePresenter.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/presenter/MWTeamMessagePresenter.java index 053ee0c05..8a1b634b7 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/presenter/MWTeamMessagePresenter.java +++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/presenter/MWTeamMessagePresenter.java @@ -12,14 +12,14 @@ import com.trello.rxlifecycle3.LifecycleProvider; import com.trello.rxlifecycle3.android.ActivityEvent; import com.yizhuan.erban.R; import com.yizhuan.erban.miniworld.view.IMWTeamMessageView; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.miniworld.bean.MWChatInfo; -import com.yizhuan.xchat_android_core.miniworld.model.MiniWorldModel; -import com.yizhuan.xchat_android_core.patriarch.exception.PmRoomLimitException; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.room.model.AvRoomModel; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.miniworld.bean.MWChatInfo; +import com.pikolive.core.miniworld.model.MiniWorldModel; +import com.pikolive.core.patriarch.exception.PmRoomLimitException; +import com.pikolive.core.room.bean.RoomInfo; +import com.pikolive.core.room.model.AvRoomModel; +import com.pikolive.core.utils.net.BeanObserver; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.net.rxnet.callback.CallBack; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/presenter/MWThemePresenter.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/presenter/MWThemePresenter.java index 300cb1a03..d7b0a245e 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/presenter/MWThemePresenter.java +++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/presenter/MWThemePresenter.java @@ -2,9 +2,9 @@ package com.yizhuan.erban.miniworld.presenter; import com.pikolive.app.base.BaseMvpPresenter; import com.yizhuan.erban.miniworld.view.IMWThemeView; -import com.yizhuan.xchat_android_core.miniworld.bean.TopicInfo; -import com.yizhuan.xchat_android_core.miniworld.model.MiniWorldModel; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; +import com.pikolive.core.miniworld.bean.TopicInfo; +import com.pikolive.core.miniworld.model.MiniWorldModel; +import com.pikolive.core.utils.net.BeanObserver; import java.util.List; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/presenter/MiniWorldCategoryPresenter.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/presenter/MiniWorldCategoryPresenter.java index a4613de78..db66eec42 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/presenter/MiniWorldCategoryPresenter.java +++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/presenter/MiniWorldCategoryPresenter.java @@ -4,9 +4,9 @@ import android.annotation.SuppressLint; import com.pikolive.app.base.BaseMvpPresenter; import com.yizhuan.erban.miniworld.view.IMiniWorldCategoryView; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldInfo; -import com.yizhuan.xchat_android_core.miniworld.model.MiniWorldModel; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.miniworld.bean.MiniWorldInfo; +import com.pikolive.core.miniworld.model.MiniWorldModel; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.base.PresenterEvent; import com.pikolive.library.utils.ListUtils; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/presenter/MiniWorldEditPresenter.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/presenter/MiniWorldEditPresenter.java index 52fdeeb74..92e8f6c64 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/presenter/MiniWorldEditPresenter.java +++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/presenter/MiniWorldEditPresenter.java @@ -5,8 +5,8 @@ import android.text.TextUtils; import com.yizhuan.erban.R; import com.pikolive.app.base.BaseMvpPresenter; import com.yizhuan.erban.miniworld.view.IMiniWorldEditView; -import com.yizhuan.xchat_android_core.miniworld.model.MiniWorldModel; -import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; +import com.pikolive.core.miniworld.model.MiniWorldModel; +import com.pikolive.core.utils.net.DontWarnObserver; import com.pikolive.library.base.PresenterEvent; import com.pikolive.library.utils.ResUtil; import com.pikolive.library.utils.SingleToastUtil; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/presenter/MiniWorldGuestPagePresenter.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/presenter/MiniWorldGuestPagePresenter.java index fa412d25a..2664d8610 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/presenter/MiniWorldGuestPagePresenter.java +++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/presenter/MiniWorldGuestPagePresenter.java @@ -10,17 +10,17 @@ import com.pikolive.app.base.BaseMvpPresenter; import com.yizhuan.erban.miniworld.view.IMiniWorldGuestPage; import com.yizhuan.erban.miniworld.viewmodel.MiniWorldDetailInfoVM; import com.yizhuan.erban.miniworld.viewmodel.MiniWorldEditableInfoVM; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.exception.FailReasonException; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.miniworld.bean.AudioPartyInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldDetailInfo; -import com.yizhuan.xchat_android_core.miniworld.event.MiniWorldStateChangedEvent; -import com.yizhuan.xchat_android_core.miniworld.model.MiniWorldModel; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; -import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.exception.FailReasonException; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core.miniworld.bean.AudioPartyInfo; +import com.pikolive.core.miniworld.bean.MiniWorldDetailInfo; +import com.pikolive.core.miniworld.event.MiniWorldStateChangedEvent; +import com.pikolive.core.miniworld.model.MiniWorldModel; +import com.pikolive.core.room.bean.RoomInfo; +import com.pikolive.core.utils.net.BeanObserver; +import com.pikolive.core.utils.net.DontWarnObserver; import com.pikolive.library.base.PresenterEvent; import com.pikolive.library.utils.ResUtil; import com.pikolive.library.utils.SingleToastUtil; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/presenter/MiniWorldMainPresenter.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/presenter/MiniWorldMainPresenter.java index a7d87de24..2efad801f 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/presenter/MiniWorldMainPresenter.java +++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/presenter/MiniWorldMainPresenter.java @@ -6,14 +6,14 @@ import android.util.Pair; import com.pikolive.app.base.BaseMvpPresenter; import com.yizhuan.erban.miniworld.view.IMiniWorldMainView; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.home.bean.BannerInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldCategoryInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldMainInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldMainItemInfo; -import com.yizhuan.xchat_android_core.miniworld.model.MiniWorldModel; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core2.home.bean.BannerInfo; +import com.pikolive.core.miniworld.bean.MiniWorldCategoryInfo; +import com.pikolive.core.miniworld.bean.MiniWorldInfo; +import com.pikolive.core.miniworld.bean.MiniWorldMainInfo; +import com.pikolive.core.miniworld.bean.MiniWorldMainItemInfo; +import com.pikolive.core.miniworld.model.MiniWorldModel; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.base.PresenterEvent; import com.pikolive.library.utils.ListUtils; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/presenter/MiniWorldMemberListPresenter.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/presenter/MiniWorldMemberListPresenter.java index a33c56bde..c20b7bbc7 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/presenter/MiniWorldMemberListPresenter.java +++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/presenter/MiniWorldMemberListPresenter.java @@ -6,11 +6,11 @@ import android.util.Log; import com.pikolive.app.base.BaseMvpPresenter; import com.yizhuan.erban.miniworld.activity.MiniWorldMemberListActivity; import com.yizhuan.erban.miniworld.view.IMiniWorldMemberListView; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldMemberListInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldMemberListMemberInfo; -import com.yizhuan.xchat_android_core.miniworld.model.MiniWorldModel; -import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.miniworld.bean.MiniWorldMemberListInfo; +import com.pikolive.core.miniworld.bean.MiniWorldMemberListMemberInfo; +import com.pikolive.core.miniworld.model.MiniWorldModel; +import com.pikolive.core.utils.net.DontWarnObserver; import com.pikolive.library.base.PresenterEvent; import java.util.List; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/presenter/MiniWorldPresenter.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/presenter/MiniWorldPresenter.java index 121ef9924..cfe3c4a64 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/presenter/MiniWorldPresenter.java +++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/presenter/MiniWorldPresenter.java @@ -4,10 +4,10 @@ import android.annotation.SuppressLint; import com.pikolive.app.base.BaseMvpPresenter; import com.yizhuan.erban.miniworld.view.IMiniWorldView; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldCategoryInfo; -import com.yizhuan.xchat_android_core.miniworld.model.MiniWorldModel; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_core.utils.net.ServerException; +import com.pikolive.core.miniworld.bean.MiniWorldCategoryInfo; +import com.pikolive.core.miniworld.model.MiniWorldModel; +import com.pikolive.core.utils.net.RxHelper; +import com.pikolive.core.utils.net.ServerException; import com.pikolive.library.base.PresenterEvent; import com.pikolive.library.utils.ListUtils; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/presenter/MiniWorldSearchPresenter.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/presenter/MiniWorldSearchPresenter.java index a3ac3ba4f..21350c054 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/presenter/MiniWorldSearchPresenter.java +++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/presenter/MiniWorldSearchPresenter.java @@ -4,9 +4,9 @@ import android.annotation.SuppressLint; import com.pikolive.app.base.BaseMvpPresenter; import com.yizhuan.erban.miniworld.view.IMiniWorldSearchView; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldInfo; -import com.yizhuan.xchat_android_core.miniworld.model.MiniWorldModel; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.miniworld.bean.MiniWorldInfo; +import com.pikolive.core.miniworld.model.MiniWorldModel; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.base.PresenterEvent; import com.pikolive.library.utils.ListUtils; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/view/IMWTeamMessageView.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/view/IMWTeamMessageView.java index f415778f4..9f8251930 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/view/IMWTeamMessageView.java +++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/view/IMWTeamMessageView.java @@ -1,6 +1,6 @@ package com.yizhuan.erban.miniworld.view; -import com.yizhuan.xchat_android_core.miniworld.bean.MWChatInfo; +import com.pikolive.core.miniworld.bean.MWChatInfo; import com.pikolive.library.base.IMvpBaseView; public interface IMWTeamMessageView extends IMvpBaseView { diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/view/IMWThemeView.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/view/IMWThemeView.java index c5a2afaf2..e37b88acb 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/view/IMWThemeView.java +++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/view/IMWThemeView.java @@ -1,6 +1,6 @@ package com.yizhuan.erban.miniworld.view; -import com.yizhuan.xchat_android_core.miniworld.bean.TopicInfo; +import com.pikolive.core.miniworld.bean.TopicInfo; import com.pikolive.library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/view/IMiniWorldCategoryView.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/view/IMiniWorldCategoryView.java index 47a8f0ffa..f2dc81df6 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/view/IMiniWorldCategoryView.java +++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/view/IMiniWorldCategoryView.java @@ -1,6 +1,6 @@ package com.yizhuan.erban.miniworld.view; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldInfo; +import com.pikolive.core.miniworld.bean.MiniWorldInfo; import com.pikolive.library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/view/IMiniWorldGuestPage.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/view/IMiniWorldGuestPage.java index 1d4b23f57..01e7c505f 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/view/IMiniWorldGuestPage.java +++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/view/IMiniWorldGuestPage.java @@ -3,7 +3,7 @@ package com.yizhuan.erban.miniworld.view; import androidx.annotation.NonNull; import com.yizhuan.erban.miniworld.viewmodel.MiniWorldDetailInfoVM; -import com.yizhuan.xchat_android_core.miniworld.bean.AudioPartyInfo; +import com.pikolive.core.miniworld.bean.AudioPartyInfo; import com.pikolive.library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/view/IMiniWorldMainView.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/view/IMiniWorldMainView.java index 8fc44e56e..1ee7d48f1 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/view/IMiniWorldMainView.java +++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/view/IMiniWorldMainView.java @@ -1,7 +1,7 @@ package com.yizhuan.erban.miniworld.view; -import com.yizhuan.xchat_android_core.home.bean.BannerInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldMainItemInfo; +import com.pikolive.core2.home.bean.BannerInfo; +import com.pikolive.core.miniworld.bean.MiniWorldMainItemInfo; import com.pikolive.library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/view/IMiniWorldMemberListView.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/view/IMiniWorldMemberListView.java index 6a570085d..e152b6522 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/view/IMiniWorldMemberListView.java +++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/view/IMiniWorldMemberListView.java @@ -1,6 +1,6 @@ package com.yizhuan.erban.miniworld.view; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldMemberListMemberInfo; +import com.pikolive.core.miniworld.bean.MiniWorldMemberListMemberInfo; import com.pikolive.library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/view/IMiniWorldSearchView.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/view/IMiniWorldSearchView.java index 5ad057948..ca21b6d33 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/view/IMiniWorldSearchView.java +++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/view/IMiniWorldSearchView.java @@ -1,6 +1,6 @@ package com.yizhuan.erban.miniworld.view; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldInfo; +import com.pikolive.core.miniworld.bean.MiniWorldInfo; import com.pikolive.library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/view/IMiniWorldView.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/view/IMiniWorldView.java index e30c3b286..7c2089888 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/view/IMiniWorldView.java +++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/view/IMiniWorldView.java @@ -1,6 +1,6 @@ package com.yizhuan.erban.miniworld.view; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldCategoryInfo; +import com.pikolive.core.miniworld.bean.MiniWorldCategoryInfo; import com.pikolive.library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/viewmodel/MiniWorldDetailInfoVM.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/viewmodel/MiniWorldDetailInfoVM.java index 1a4967bde..9d7c63bb6 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/viewmodel/MiniWorldDetailInfoVM.java +++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/viewmodel/MiniWorldDetailInfoVM.java @@ -3,10 +3,10 @@ package com.yizhuan.erban.miniworld.viewmodel; import android.text.TextUtils; import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldDetailInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldDetailInfoWithCurrentMember; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldDetailInfoWithMemberInfo; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.miniworld.bean.MiniWorldDetailInfo; +import com.pikolive.core.miniworld.bean.MiniWorldDetailInfoWithCurrentMember; +import com.pikolive.core.miniworld.bean.MiniWorldDetailInfoWithMemberInfo; import com.pikolive.library.utils.ListUtils; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/widget/MWMagicIndicator.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/widget/MWMagicIndicator.java index b530cd781..b89c409d7 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/widget/MWMagicIndicator.java +++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/widget/MWMagicIndicator.java @@ -11,7 +11,7 @@ import com.pikolive.app.ui.widget.XRecyclerView.ScaleTransitionPagerTitleView; import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter; import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator; import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView; -import com.yizhuan.xchat_android_core.home.bean.TabInfo; +import com.pikolive.core2.home.bean.TabInfo; import java.util.List; diff --git a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/widget/MiniWorldEditChooseClassifyDialog.java b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/widget/MiniWorldEditChooseClassifyDialog.java index 3cc152cd2..c779cad55 100644 --- a/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/widget/MiniWorldEditChooseClassifyDialog.java +++ b/app/src/module_mini_world/java/com/yizhuan/erban/miniworld/widget/MiniWorldEditChooseClassifyDialog.java @@ -18,9 +18,9 @@ import com.netease.nim.uikit.common.util.sys.ScreenUtil; import com.yizhuan.erban.R; import com.yizhuan.erban.miniworld.adapter.MiniWorldEditClassifyAdapter; import com.pikolive.app.ui.widget.recyclerview.decoration.SpacingDecoration; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldEditClassifyInfo; -import com.yizhuan.xchat_android_core.miniworld.model.MiniWorldModel; -import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; +import com.pikolive.core.miniworld.bean.MiniWorldEditClassifyInfo; +import com.pikolive.core.miniworld.model.MiniWorldModel; +import com.pikolive.core.utils.net.DontWarnObserver; import com.pikolive.library.utils.SingleToastUtil; import java.util.List; diff --git a/app/src/module_mini_world/res/layout/fragment_av_room_game.xml b/app/src/module_mini_world/res/layout/fragment_av_room_game.xml index ada9b1bd7..e3749ae69 100644 --- a/app/src/module_mini_world/res/layout/fragment_av_room_game.xml +++ b/app/src/module_mini_world/res/layout/fragment_av_room_game.xml @@ -2,7 +2,7 @@ + tools:context="com.yizhuan.erban.HomePartyRoomFragment"> @@ -12,7 +12,7 @@ + type="com.pikolive.core.room.bean.RoomInfo" /> + tools:context="com.yizhuan.erban.HomePartyRoomFragment"> @@ -12,7 +12,7 @@ + type="com.pikolive.core.room.bean.RoomInfo" /> { diff --git a/app/src/module_music/java/com/yizhuan/tutu/music/fragment/LocalMusicListFragment.java b/app/src/module_music/java/com/yizhuan/tutu/music/fragment/LocalMusicListFragment.java index 76b73448b..a01bc1ad6 100644 --- a/app/src/module_music/java/com/yizhuan/tutu/music/fragment/LocalMusicListFragment.java +++ b/app/src/module_music/java/com/yizhuan/tutu/music/fragment/LocalMusicListFragment.java @@ -23,15 +23,15 @@ import com.yizhuan.tutu.music.activity.MusicListActivity; import com.yizhuan.tutu.music.adapter.LocalMusicListAdapter; import com.yizhuan.tutu.music.presenter.LocalMusicListPresenter; import com.yizhuan.tutu.music.widget.VoiceSeekDialog; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.music.db.bean.LocalMusicBean; -import com.yizhuan.xchat_android_core.music.event.CurrentMusicUpdateEvent; -import com.yizhuan.xchat_android_core.music.event.MusicPauseEvent; -import com.yizhuan.xchat_android_core.music.event.MusicPlayingEvent; -import com.yizhuan.xchat_android_core.music.event.MusicStopEvent; -import com.yizhuan.xchat_android_core.music.model.IPlayerModel; -import com.yizhuan.xchat_android_core.music.model.PlayerModel; -import com.yizhuan.xchat_android_core.music.view.ILocalMusicListView; +import com.pikolive.core.Constants; +import com.pikolive.core.music.db.bean.LocalMusicBean; +import com.pikolive.core.music.event.CurrentMusicUpdateEvent; +import com.pikolive.core.music.event.MusicPauseEvent; +import com.pikolive.core.music.event.MusicPlayingEvent; +import com.pikolive.core.music.event.MusicStopEvent; +import com.pikolive.core.music.model.IPlayerModel; +import com.pikolive.core.music.model.PlayerModel; +import com.pikolive.core.music.view.ILocalMusicListView; import com.pikolive.library.base.factory.CreatePresenter; import com.pikolive.library.utils.ListUtils; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/module_music/java/com/yizhuan/tutu/music/fragment/ShareMusicListFragment.java b/app/src/module_music/java/com/yizhuan/tutu/music/fragment/ShareMusicListFragment.java index 67b107fd9..a3d5c2e42 100644 --- a/app/src/module_music/java/com/yizhuan/tutu/music/fragment/ShareMusicListFragment.java +++ b/app/src/module_music/java/com/yizhuan/tutu/music/fragment/ShareMusicListFragment.java @@ -23,10 +23,10 @@ import com.pikolive.app.utils.KeyBoardUtils; import com.yizhuan.tutu.music.activity.MusicListActivity; import com.yizhuan.tutu.music.adapter.ShareMusicListAdapter; import com.yizhuan.tutu.music.presenter.ShareMusicListPresenter; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.music.bean.ShareMusicInfo; -import com.yizhuan.xchat_android_core.music.db.bean.LocalMusicBean; -import com.yizhuan.xchat_android_core.music.view.IShareMusicListView; +import com.pikolive.core.Constants; +import com.pikolive.core.music.bean.ShareMusicInfo; +import com.pikolive.core.music.db.bean.LocalMusicBean; +import com.pikolive.core.music.view.IShareMusicListView; import com.pikolive.library.base.factory.CreatePresenter; import com.pikolive.library.utils.ListUtils; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/module_music/java/com/yizhuan/tutu/music/presenter/AddLocalMusicListPresenter.kt b/app/src/module_music/java/com/yizhuan/tutu/music/presenter/AddLocalMusicListPresenter.kt index 32c80c619..9f5201915 100644 --- a/app/src/module_music/java/com/yizhuan/tutu/music/presenter/AddLocalMusicListPresenter.kt +++ b/app/src/module_music/java/com/yizhuan/tutu/music/presenter/AddLocalMusicListPresenter.kt @@ -4,11 +4,11 @@ import android.net.Uri import android.os.Build import android.os.Environment import com.pikolive.app.base.BaseMvpPresenter -import com.yizhuan.xchat_android_core.music.db.bean.LocalMusicBean -import com.yizhuan.xchat_android_core.music.db.model.LocalMusicDbModel -import com.yizhuan.xchat_android_core.music.view.IAddLocalMusicListView -import com.yizhuan.xchat_android_core.utils.Logger -import com.yizhuan.xchat_android_core.utils.net.RxHelper +import com.pikolive.core.music.db.bean.LocalMusicBean +import com.pikolive.core.music.db.model.LocalMusicDbModel +import com.pikolive.core.music.view.IAddLocalMusicListView +import com.pikolive.core.utils.Logger +import com.pikolive.core.utils.net.RxHelper import com.pikolive.library.base.PresenterEvent import com.pikolive.library.common.file.FileHelper import io.reactivex.disposables.Disposable diff --git a/app/src/module_music/java/com/yizhuan/tutu/music/presenter/LocalMusicListPresenter.java b/app/src/module_music/java/com/yizhuan/tutu/music/presenter/LocalMusicListPresenter.java index 9df553261..88a86d412 100644 --- a/app/src/module_music/java/com/yizhuan/tutu/music/presenter/LocalMusicListPresenter.java +++ b/app/src/module_music/java/com/yizhuan/tutu/music/presenter/LocalMusicListPresenter.java @@ -3,13 +3,13 @@ package com.yizhuan.tutu.music.presenter; import android.annotation.SuppressLint; import com.pikolive.app.base.BaseMvpPresenter; -import com.yizhuan.tutu.database.AppDataBase; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.music.db.bean.LocalMusicBean; -import com.yizhuan.xchat_android_core.music.db.model.LocalMusicDbModel; -import com.yizhuan.xchat_android_core.music.model.PlayerModel; -import com.yizhuan.xchat_android_core.music.view.ILocalMusicListView; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.database.AppDataBase; +import com.pikolive.core.Constants; +import com.pikolive.core.music.db.bean.LocalMusicBean; +import com.pikolive.core.music.db.model.LocalMusicDbModel; +import com.pikolive.core.music.model.PlayerModel; +import com.pikolive.core.music.view.ILocalMusicListView; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.base.PresenterEvent; import com.pikolive.library.utils.ListUtils; diff --git a/app/src/module_music/java/com/yizhuan/tutu/music/presenter/MusicListPresenter.java b/app/src/module_music/java/com/yizhuan/tutu/music/presenter/MusicListPresenter.java index cc4b112a3..f6da18d63 100644 --- a/app/src/module_music/java/com/yizhuan/tutu/music/presenter/MusicListPresenter.java +++ b/app/src/module_music/java/com/yizhuan/tutu/music/presenter/MusicListPresenter.java @@ -1,7 +1,7 @@ package com.yizhuan.tutu.music.presenter; import com.pikolive.app.base.BaseMvpPresenter; -import com.yizhuan.xchat_android_core.music.view.IMusicListView; +import com.pikolive.core.music.view.IMusicListView; public class MusicListPresenter extends BaseMvpPresenter { } diff --git a/app/src/module_music/java/com/yizhuan/tutu/music/presenter/ShareMusicListPresenter.java b/app/src/module_music/java/com/yizhuan/tutu/music/presenter/ShareMusicListPresenter.java index c703ca679..711469cda 100644 --- a/app/src/module_music/java/com/yizhuan/tutu/music/presenter/ShareMusicListPresenter.java +++ b/app/src/module_music/java/com/yizhuan/tutu/music/presenter/ShareMusicListPresenter.java @@ -3,13 +3,13 @@ package com.yizhuan.tutu.music.presenter; import android.annotation.SuppressLint; import com.pikolive.app.base.BaseMvpPresenter; -import com.yizhuan.tutu.database.AppDataBase; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.music.bean.ShareMusicInfo; -import com.yizhuan.xchat_android_core.music.db.bean.LocalMusicBean; -import com.yizhuan.xchat_android_core.music.model.ShareMusicListModel; -import com.yizhuan.xchat_android_core.music.view.IShareMusicListView; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.database.AppDataBase; +import com.pikolive.core.Constants; +import com.pikolive.core.music.bean.ShareMusicInfo; +import com.pikolive.core.music.db.bean.LocalMusicBean; +import com.pikolive.core.music.model.ShareMusicListModel; +import com.pikolive.core.music.view.IShareMusicListView; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.base.PresenterEvent; import com.pikolive.library.utils.ListUtils; diff --git a/app/src/module_music/java/com/yizhuan/tutu/music/widget/MusicPlayerView.java b/app/src/module_music/java/com/yizhuan/tutu/music/widget/MusicPlayerView.java index 6ddc0f51a..210141829 100644 --- a/app/src/module_music/java/com/yizhuan/tutu/music/widget/MusicPlayerView.java +++ b/app/src/module_music/java/com/yizhuan/tutu/music/widget/MusicPlayerView.java @@ -22,14 +22,14 @@ import com.yizhuan.erban.R; import com.pikolive.app.base.BaseMvpActivity; import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil; import com.yizhuan.tutu.music.activity.MusicListActivity; -import com.yizhuan.xchat_android_core.DemoCache; -import com.yizhuan.xchat_android_core.music.db.bean.LocalMusicBean; -import com.yizhuan.xchat_android_core.music.event.CurrentMusicUpdateEvent; -import com.yizhuan.xchat_android_core.music.event.MusicPauseEvent; -import com.yizhuan.xchat_android_core.music.event.MusicPlayingEvent; -import com.yizhuan.xchat_android_core.music.event.MusicStopEvent; -import com.yizhuan.xchat_android_core.music.model.IPlayerModel; -import com.yizhuan.xchat_android_core.music.model.PlayerModel; +import com.pikolive.core.DemoCache; +import com.pikolive.core.music.db.bean.LocalMusicBean; +import com.pikolive.core.music.event.CurrentMusicUpdateEvent; +import com.pikolive.core.music.event.MusicPauseEvent; +import com.pikolive.core.music.event.MusicPlayingEvent; +import com.pikolive.core.music.event.MusicStopEvent; +import com.pikolive.core.music.model.IPlayerModel; +import com.pikolive.core.music.model.PlayerModel; import com.pikolive.library.utils.ResUtil; import com.pikolive.library.utils.SingleToastUtil; diff --git a/app/src/module_music/java/com/yizhuan/tutu/music/widget/VoiceSeekDialog.java b/app/src/module_music/java/com/yizhuan/tutu/music/widget/VoiceSeekDialog.java index 731b58978..b83e067c9 100644 --- a/app/src/module_music/java/com/yizhuan/tutu/music/widget/VoiceSeekDialog.java +++ b/app/src/module_music/java/com/yizhuan/tutu/music/widget/VoiceSeekDialog.java @@ -13,7 +13,7 @@ import com.google.android.material.bottomsheet.BottomSheetBehavior; import com.google.android.material.bottomsheet.BottomSheetDialog; import com.yizhuan.erban.R; import com.pikolive.app.common.util.Utils; -import com.yizhuan.xchat_android_core.music.model.PlayerModel; +import com.pikolive.core.music.model.PlayerModel; /** diff --git a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/activity/AitFriendsSearchActivity.java b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/activity/AitFriendsSearchActivity.java index ef837e8cd..917419b98 100644 --- a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/activity/AitFriendsSearchActivity.java +++ b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/activity/AitFriendsSearchActivity.java @@ -25,8 +25,8 @@ import com.yizhuan.erban.public_chat_hall.adapter.AitFriendsSearchAdapter; import com.yizhuan.erban.public_chat_hall.bean.PublicChatHallSearchRoomInfo; import com.yizhuan.erban.public_chat_hall.event.PublicChatHallAitFriendSearchCompleteEvent; import com.yizhuan.erban.public_chat_hall.event.PublicChatHallAitFriendSearchFinishEvent; -import com.yizhuan.xchat_android_core.contacts.ContactModel; -import com.yizhuan.xchat_android_core.room.bean.SearchRoomInfo; +import com.pikolive.core.contacts.ContactModel; +import com.pikolive.core.room.bean.SearchRoomInfo; import com.pikolive.library.annatation.ActLayoutRes; import com.pikolive.library.utils.ImeUtil; import com.pikolive.library.utils.SingleToastUtil; diff --git a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/activity/PublicChatHallHomeActivity.java b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/activity/PublicChatHallHomeActivity.java index 2efff16f8..ba2aa0c48 100644 --- a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/activity/PublicChatHallHomeActivity.java +++ b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/activity/PublicChatHallHomeActivity.java @@ -15,7 +15,7 @@ import com.yizhuan.erban.public_chat_hall.adapter.PagerDataAdapter; import com.yizhuan.erban.public_chat_hall.fragment.PublicChatHallMessageFragment; import com.pikolive.app.ui.webview.CommonWebViewActivity; import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.xchat_android_core.UriProvider; +import com.pikolive.core2.UriProvider; import com.pikolive.library.annatation.ActLayoutRes; import com.zyyoona7.lib.EasyPopup; import com.zyyoona7.lib.HorizontalGravity; diff --git a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/adapter/AitFriendsSearchAdapter.java b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/adapter/AitFriendsSearchAdapter.java index 994c5d2e3..33539be8c 100644 --- a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/adapter/AitFriendsSearchAdapter.java +++ b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/adapter/AitFriendsSearchAdapter.java @@ -14,8 +14,8 @@ import com.yizhuan.erban.public_chat_hall.event.AitFriendEvent; import com.yizhuan.erban.public_chat_hall.event.PublicChatHallAitFriendSearchFinishEvent; import com.pikolive.app.ui.utils.ImageLoadUtils; import com.pikolive.app.ui.widget.NobleAvatarView; -import com.yizhuan.xchat_android_core.noble.NobleUtil; -import com.yizhuan.xchat_android_core.room.bean.SearchRoomInfo; +import com.pikolive.core.noble.NobleUtil; +import com.pikolive.core.room.bean.SearchRoomInfo; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/adapter/PublicChatHallAttentionListAdapter.java b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/adapter/PublicChatHallAttentionListAdapter.java index 182a4739a..dcabd7d6f 100644 --- a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/adapter/PublicChatHallAttentionListAdapter.java +++ b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/adapter/PublicChatHallAttentionListAdapter.java @@ -11,8 +11,8 @@ import com.yizhuan.erban.public_chat_hall.bean.PublicChatHallAttentionInfo; import com.yizhuan.erban.public_chat_hall.event.AitFriendEvent; import com.pikolive.app.ui.utils.ImageLoadUtils; import com.pikolive.app.ui.widget.NobleAvatarView; -import com.yizhuan.xchat_android_core.noble.NobleUtil; -import com.yizhuan.xchat_android_core.user.bean.AttentionInfo; +import com.pikolive.core.noble.NobleUtil; +import com.pikolive.core.user.bean.AttentionInfo; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/adapter/PublicChatHallFansViewAdapter.java b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/adapter/PublicChatHallFansViewAdapter.java index 1c84940d9..aa44564fd 100644 --- a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/adapter/PublicChatHallFansViewAdapter.java +++ b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/adapter/PublicChatHallFansViewAdapter.java @@ -12,8 +12,8 @@ import com.yizhuan.erban.public_chat_hall.bean.PublicChatHallFansInfo; import com.yizhuan.erban.public_chat_hall.event.AitFriendEvent; import com.pikolive.app.ui.utils.ImageLoadUtils; import com.pikolive.app.ui.widget.NobleAvatarView; -import com.yizhuan.xchat_android_core.noble.NobleUtil; -import com.yizhuan.xchat_android_core.user.bean.FansInfo; +import com.pikolive.core.noble.NobleUtil; +import com.pikolive.core.user.bean.FansInfo; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/adapter/PublicChatHallFriendListAdapter.java b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/adapter/PublicChatHallFriendListAdapter.java index df62565c9..c24f677fb 100644 --- a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/adapter/PublicChatHallFriendListAdapter.java +++ b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/adapter/PublicChatHallFriendListAdapter.java @@ -13,8 +13,8 @@ import com.yizhuan.erban.public_chat_hall.bean.PublicChatHallFriendInfo; import com.yizhuan.erban.public_chat_hall.event.AitFriendEvent; import com.pikolive.app.ui.utils.ImageLoadUtils; import com.pikolive.app.ui.widget.NobleAvatarView; -import com.yizhuan.xchat_android_core.noble.NobleUtil; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.pikolive.core.noble.NobleUtil; +import com.pikolive.core.user.bean.UserInfo; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/adapter/PublicChatHallMsgAdapter.java b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/adapter/PublicChatHallMsgAdapter.java index a2510a7ea..a30d952a0 100644 --- a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/adapter/PublicChatHallMsgAdapter.java +++ b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/adapter/PublicChatHallMsgAdapter.java @@ -12,7 +12,7 @@ import com.yizhuan.erban.public_chat_hall.msg.BaseMultiItemFetchLoadAdapter; import com.yizhuan.erban.public_chat_hall.msg.BaseViewHolder; import com.yizhuan.erban.public_chat_hall.msg.viewholder.ChatRoomMsgViewHolderBase; import com.yizhuan.erban.public_chat_hall.msg.viewholder.ChatRoomMsgViewHolderFactory; -import com.yizhuan.xchat_android_core.public_chat_hall.bean.PublicChatHallMessage; +import com.pikolive.core.public_chat_hall.bean.PublicChatHallMessage; import java.util.HashMap; import java.util.HashSet; diff --git a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/bean/PublicChatHallAttentionInfo.java b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/bean/PublicChatHallAttentionInfo.java index 25ffc55f2..0ab845b3e 100644 --- a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/bean/PublicChatHallAttentionInfo.java +++ b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/bean/PublicChatHallAttentionInfo.java @@ -1,6 +1,6 @@ package com.yizhuan.erban.public_chat_hall.bean; -import com.yizhuan.xchat_android_core.user.bean.AttentionInfo; +import com.pikolive.core.user.bean.AttentionInfo; public class PublicChatHallAttentionInfo { diff --git a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/bean/PublicChatHallFansInfo.java b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/bean/PublicChatHallFansInfo.java index a272b84e0..92a4314e2 100644 --- a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/bean/PublicChatHallFansInfo.java +++ b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/bean/PublicChatHallFansInfo.java @@ -1,6 +1,6 @@ package com.yizhuan.erban.public_chat_hall.bean; -import com.yizhuan.xchat_android_core.user.bean.FansInfo; +import com.pikolive.core.user.bean.FansInfo; public class PublicChatHallFansInfo { diff --git a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/bean/PublicChatHallFriendInfo.java b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/bean/PublicChatHallFriendInfo.java index 8c943eef8..e63c0effc 100644 --- a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/bean/PublicChatHallFriendInfo.java +++ b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/bean/PublicChatHallFriendInfo.java @@ -1,6 +1,6 @@ package com.yizhuan.erban.public_chat_hall.bean; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.pikolive.core.user.bean.UserInfo; public class PublicChatHallFriendInfo { diff --git a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/bean/PublicChatHallSearchRoomInfo.java b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/bean/PublicChatHallSearchRoomInfo.java index 38ffa16b6..ed8690190 100644 --- a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/bean/PublicChatHallSearchRoomInfo.java +++ b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/bean/PublicChatHallSearchRoomInfo.java @@ -3,7 +3,7 @@ package com.yizhuan.erban.public_chat_hall.bean; import android.os.Parcel; import android.os.Parcelable; -import com.yizhuan.xchat_android_core.room.bean.SearchRoomInfo; +import com.pikolive.core.room.bean.SearchRoomInfo; import lombok.Data; diff --git a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/fragment/PublicChatHallAttentionFragment.java b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/fragment/PublicChatHallAttentionFragment.java index 7df3e47b6..675ad9769 100644 --- a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/fragment/PublicChatHallAttentionFragment.java +++ b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/fragment/PublicChatHallAttentionFragment.java @@ -13,10 +13,10 @@ import com.yizhuan.erban.R; import com.pikolive.app.base.BaseFragment; import com.yizhuan.erban.public_chat_hall.adapter.PublicChatHallAttentionListAdapter; import com.yizhuan.erban.public_chat_hall.bean.PublicChatHallAttentionInfo; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.user.AttentionModel; -import com.yizhuan.xchat_android_core.user.bean.AttentionInfo; +import com.pikolive.core.Constants; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.user.AttentionModel; +import com.pikolive.core.user.bean.AttentionInfo; import com.pikolive.library.utils.ListUtils; import java.util.ArrayList; diff --git a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/fragment/PublicChatHallFansListFragment.java b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/fragment/PublicChatHallFansListFragment.java index 5ac401014..e59be44b2 100644 --- a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/fragment/PublicChatHallFansListFragment.java +++ b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/fragment/PublicChatHallFansListFragment.java @@ -14,11 +14,11 @@ import com.yizhuan.erban.R; import com.pikolive.app.base.BaseFragment; import com.yizhuan.erban.public_chat_hall.adapter.PublicChatHallFansViewAdapter; import com.yizhuan.erban.public_chat_hall.bean.PublicChatHallFansInfo; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.user.AttentionModel; -import com.yizhuan.xchat_android_core.user.bean.FansInfo; -import com.yizhuan.xchat_android_core.user.bean.FansListInfo; +import com.pikolive.core.Constants; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.user.AttentionModel; +import com.pikolive.core.user.bean.FansInfo; +import com.pikolive.core.user.bean.FansListInfo; import com.pikolive.library.utils.ListUtils; import java.util.ArrayList; diff --git a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/fragment/PublicChatHallFriendListFragment.java b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/fragment/PublicChatHallFriendListFragment.java index 9d3525f79..2eb1af09e 100644 --- a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/fragment/PublicChatHallFriendListFragment.java +++ b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/fragment/PublicChatHallFriendListFragment.java @@ -10,12 +10,12 @@ import com.yizhuan.erban.R; import com.pikolive.app.base.BaseFragment; import com.yizhuan.erban.public_chat_hall.adapter.PublicChatHallFriendListAdapter; import com.yizhuan.erban.public_chat_hall.bean.PublicChatHallFriendInfo; -import com.yizhuan.xchat_android_core.im.friend.IMFriendModel; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.manager.RelationShipEvent; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.user.event.LoginUserInfoUpdateEvent; +import com.pikolive.core.im.friend.IMFriendModel; +import com.pikolive.core2.manager.IMNetEaseManager; +import com.pikolive.core.manager.RelationShipEvent; +import com.pikolive.core.user.UserModel; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.user.event.LoginUserInfoUpdateEvent; import com.pikolive.library.utils.ListUtils; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/fragment/PublicChatHallMessageFragment.java b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/fragment/PublicChatHallMessageFragment.java index fe2cf0959..be5839ca0 100644 --- a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/fragment/PublicChatHallMessageFragment.java +++ b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/fragment/PublicChatHallMessageFragment.java @@ -47,28 +47,28 @@ import com.pikolive.app.ui.gift.callback.OnGiftDialogBtnClickListenerWrapper; import com.pikolive.app.ui.widget.GiftDialog; import com.pikolive.app.ui.widget.UserInfoDialog; import com.pikolive.app.ui.widget.dialog.OpenNobleDialog; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.gift.GiftModel; -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo; -import com.yizhuan.xchat_android_core.gift.bean.GiftReceiveInfo; -import com.yizhuan.xchat_android_core.gift.toolbox.GiftToolbox; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.ImTipAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.RouterType; -import com.yizhuan.xchat_android_core.initial.InitialModel; -import com.yizhuan.xchat_android_core.public_chat_hall.attachment.AitFriendsAttachment; -import com.yizhuan.xchat_android_core.public_chat_hall.attachment.AitMeAttachment; -import com.yizhuan.xchat_android_core.public_chat_hall.bean.AitFriendsInfo; -import com.yizhuan.xchat_android_core.public_chat_hall.bean.AitMeInfo; -import com.yizhuan.xchat_android_core.public_chat_hall.event.PublicChatHallMsgCountingDownEvent; -import com.yizhuan.xchat_android_core.public_chat_hall.event.PublicChatHallMsgIncomingEvent; -import com.yizhuan.xchat_android_core.public_chat_hall.event.PublicChatHallPlayGiftAnimationEvent; -import com.yizhuan.xchat_android_core.public_chat_hall.manager.PublicChatHallDataManager; -import com.yizhuan.xchat_android_core.public_chat_hall.model.PublicChatHallModel; -import com.yizhuan.xchat_android_core.room.queue.bean.MicMemberInfo; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.user.event.LoginUserInfoUpdateEvent; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.gift.GiftModel; +import com.pikolive.core.gift.bean.GiftInfo; +import com.pikolive.core.gift.bean.GiftReceiveInfo; +import com.pikolive.core.gift.toolbox.GiftToolbox; +import com.pikolive.core.im.custom.bean.CustomAttachment; +import com.pikolive.core.im.custom.bean.ImTipAttachment; +import com.pikolive.core.im.custom.bean.RouterType; +import com.pikolive.core.initial.InitialModel; +import com.pikolive.core.public_chat_hall.attachment.AitFriendsAttachment; +import com.pikolive.core.public_chat_hall.attachment.AitMeAttachment; +import com.pikolive.core.public_chat_hall.bean.AitFriendsInfo; +import com.pikolive.core.public_chat_hall.bean.AitMeInfo; +import com.pikolive.core.public_chat_hall.event.PublicChatHallMsgCountingDownEvent; +import com.pikolive.core.public_chat_hall.event.PublicChatHallMsgIncomingEvent; +import com.pikolive.core.public_chat_hall.event.PublicChatHallPlayGiftAnimationEvent; +import com.pikolive.core.public_chat_hall.manager.PublicChatHallDataManager; +import com.pikolive.core.public_chat_hall.model.PublicChatHallModel; +import com.pikolive.core.room.queue.bean.MicMemberInfo; +import com.pikolive.core.user.UserModel; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.user.event.LoginUserInfoUpdateEvent; import com.pikolive.library.utils.ResUtil; import com.pikolive.library.utils.SingleToastUtil; diff --git a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/fragment/PublicChatHallMyHistoryMessageFragment.java b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/fragment/PublicChatHallMyHistoryMessageFragment.java index 07427e3e0..16ac925f8 100644 --- a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/fragment/PublicChatHallMyHistoryMessageFragment.java +++ b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/fragment/PublicChatHallMyHistoryMessageFragment.java @@ -23,14 +23,14 @@ import com.pikolive.app.base.BaseMvpFragment; import com.yizhuan.erban.public_chat_hall.adapter.PublicChatHallMsgAdapter; import com.yizhuan.erban.public_chat_hall.presenter.PublicChatHallMyMessagePresenter; import com.yizhuan.erban.public_chat_hall.view.IPublicChatHallMyMessageView; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.GiftAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.ImTipAttachment; -import com.yizhuan.xchat_android_core.public_chat_hall.attachment.AitFriendsAttachment; -import com.yizhuan.xchat_android_core.public_chat_hall.bean.PublicChatHallMessage; -import com.yizhuan.xchat_android_core.public_chat_hall.manager.PublicChatHallDataManager; +import com.pikolive.core.Constants; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.im.custom.bean.CustomAttachment; +import com.pikolive.core.im.custom.bean.GiftAttachment; +import com.pikolive.core.im.custom.bean.ImTipAttachment; +import com.pikolive.core.public_chat_hall.attachment.AitFriendsAttachment; +import com.pikolive.core.public_chat_hall.bean.PublicChatHallMessage; +import com.pikolive.core.public_chat_hall.manager.PublicChatHallDataManager; import com.pikolive.library.base.factory.CreatePresenter; import com.pikolive.library.utils.ListUtils; diff --git a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/module/PublicChatHallInputPanel.java b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/module/PublicChatHallInputPanel.java index a33da5cde..f08543d3b 100644 --- a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/module/PublicChatHallInputPanel.java +++ b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/module/PublicChatHallInputPanel.java @@ -56,11 +56,11 @@ import com.yizhuan.erban.R; import com.yizhuan.erban.public_chat_hall.activity.PublicChatHallAitFriendsActivity; import com.yizhuan.erban.public_chat_hall.utils.RemainCountManager; import com.pikolive.app.utils.KeyBoardUtils; -import com.yizhuan.xchat_android_core.initial.InitialModel; -import com.yizhuan.xchat_android_core.public_chat_hall.manager.PublicChatHallDataManager; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.utils.StringUtils; +import com.pikolive.core.initial.InitialModel; +import com.pikolive.core.public_chat_hall.manager.PublicChatHallDataManager; +import com.pikolive.core.user.UserModel; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.utils.StringUtils; import com.pikolive.library.utils.SingleToastUtil; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/module/PublicChatHallMessageListPanel.java b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/module/PublicChatHallMessageListPanel.java index dc296da95..5f75f0f72 100644 --- a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/module/PublicChatHallMessageListPanel.java +++ b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/module/PublicChatHallMessageListPanel.java @@ -45,7 +45,7 @@ import com.yizhuan.erban.public_chat_hall.msg.BaseFetchLoadAdapter; import com.yizhuan.erban.public_chat_hall.msg.MsgListFetchLoadMoreView; import com.yizhuan.erban.public_chat_hall.msg.OnItemClickListener; import com.yizhuan.erban.public_chat_hall.msg.viewholder.ChatRoomMsgViewHolderBase; -import com.yizhuan.xchat_android_core.public_chat_hall.manager.PublicChatHallDataManager; +import com.pikolive.core.public_chat_hall.manager.PublicChatHallDataManager; import com.pikolive.library.utils.SingleToastUtil; import java.util.ArrayList; diff --git a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderAitFriends.java b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderAitFriends.java index 821222c45..8e4b30bd3 100644 --- a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderAitFriends.java +++ b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderAitFriends.java @@ -12,9 +12,9 @@ import com.netease.nim.uikit.api.NimUIKit; import com.netease.nim.uikit.business.session.emoji.MoonUtil; import com.yizhuan.erban.R; import com.yizhuan.erban.public_chat_hall.msg.BaseMultiItemFetchLoadAdapter; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.public_chat_hall.attachment.AitFriendsAttachment; -import com.yizhuan.xchat_android_core.public_chat_hall.bean.AitFriendsInfo; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.public_chat_hall.attachment.AitFriendsAttachment; +import com.pikolive.core.public_chat_hall.bean.AitFriendsInfo; import java.util.Objects; import java.util.regex.Matcher; diff --git a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderBase.java b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderBase.java index 6b4b567b5..da418e555 100644 --- a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderBase.java +++ b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderBase.java @@ -27,11 +27,11 @@ import com.yizhuan.erban.public_chat_hall.msg.BaseMultiItemFetchLoadAdapter; import com.yizhuan.erban.public_chat_hall.msg.BaseViewHolder; import com.yizhuan.erban.public_chat_hall.msg.RecyclerViewHolder; import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.level.UserLevelResourceType; -import com.yizhuan.xchat_android_core.noble.NobleResourceType; -import com.yizhuan.xchat_android_core.noble.NobleUtil; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.utils.StringUtils; +import com.pikolive.core.level.UserLevelResourceType; +import com.pikolive.core.noble.NobleResourceType; +import com.pikolive.core.noble.NobleUtil; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.utils.StringUtils; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderFactory.java b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderFactory.java index 2d3ed1d61..6fd57b9cf 100644 --- a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderFactory.java +++ b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderFactory.java @@ -6,9 +6,9 @@ import com.netease.nimlib.sdk.msg.attachment.ImageAttachment; import com.netease.nimlib.sdk.msg.attachment.MsgAttachment; import com.netease.nimlib.sdk.msg.constant.MsgTypeEnum; import com.netease.nimlib.sdk.robot.model.RobotAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.GiftAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.ImTipAttachment; -import com.yizhuan.xchat_android_core.public_chat_hall.attachment.AitFriendsAttachment; +import com.pikolive.core.im.custom.bean.GiftAttachment; +import com.pikolive.core.im.custom.bean.ImTipAttachment; +import com.pikolive.core.public_chat_hall.attachment.AitFriendsAttachment; import java.util.ArrayList; import java.util.HashMap; diff --git a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderGiftText.java b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderGiftText.java index 3ccb10765..2eb3fd111 100644 --- a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderGiftText.java +++ b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderGiftText.java @@ -8,11 +8,11 @@ import androidx.core.content.ContextCompat; import com.yizhuan.erban.R; import com.yizhuan.erban.public_chat_hall.msg.BaseMultiItemFetchLoadAdapter; import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.gift.GiftModel; -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo; -import com.yizhuan.xchat_android_core.gift.bean.GiftReceiveInfo; -import com.yizhuan.xchat_android_core.im.custom.bean.GiftAttachment; -import com.yizhuan.xchat_android_core.public_chat_hall.event.PublicChatHallPlayGiftAnimationEvent; +import com.pikolive.core.gift.GiftModel; +import com.pikolive.core.gift.bean.GiftInfo; +import com.pikolive.core.gift.bean.GiftReceiveInfo; +import com.pikolive.core.im.custom.bean.GiftAttachment; +import com.pikolive.core.public_chat_hall.event.PublicChatHallPlayGiftAnimationEvent; import com.pikolive.library.utils.ResUtil; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderTip.java b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderTip.java index 51e42b038..4a4e33bfd 100644 --- a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderTip.java +++ b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/viewholder/ChatRoomMsgViewHolderTip.java @@ -5,7 +5,7 @@ import androidx.databinding.DataBindingUtil; import com.yizhuan.erban.R; import com.yizhuan.erban.databinding.ItemImTipsBinding; import com.yizhuan.erban.public_chat_hall.msg.BaseMultiItemFetchLoadAdapter; -import com.yizhuan.xchat_android_core.im.custom.bean.ImTipAttachment; +import com.pikolive.core.im.custom.bean.ImTipAttachment; public class ChatRoomMsgViewHolderTip extends ChatRoomMsgViewHolderBase { diff --git a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/viewholder/MsgViewHolderAitMe.java b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/viewholder/MsgViewHolderAitMe.java index dad3e785e..d7a54dd48 100644 --- a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/viewholder/MsgViewHolderAitMe.java +++ b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/msg/viewholder/MsgViewHolderAitMe.java @@ -11,9 +11,9 @@ import com.netease.nim.uikit.business.session.viewholder.MsgViewHolderBase; import com.netease.nim.uikit.common.ui.recyclerview.adapter.BaseMultiItemFetchLoadAdapter; import com.yizhuan.erban.R; import com.pikolive.app.ui.im.RouterHandler; -import com.yizhuan.xchat_android_core.public_chat_hall.attachment.AitMeAttachment; -import com.yizhuan.xchat_android_core.public_chat_hall.bean.AitMeInfo; -import com.yizhuan.xchat_android_core.utils.StringUtils; +import com.pikolive.core.public_chat_hall.attachment.AitMeAttachment; +import com.pikolive.core.public_chat_hall.bean.AitMeInfo; +import com.pikolive.core.utils.StringUtils; import com.pikolive.library.utils.ResUtil; public class MsgViewHolderAitMe extends MsgViewHolderBase { diff --git a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/presenter/PublicChatHallMyMessagePresenter.java b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/presenter/PublicChatHallMyMessagePresenter.java index d161f7312..44ce745fc 100644 --- a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/presenter/PublicChatHallMyMessagePresenter.java +++ b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/presenter/PublicChatHallMyMessagePresenter.java @@ -5,9 +5,9 @@ import android.annotation.SuppressLint; import com.pikolive.app.base.BaseMvpPresenter; import com.yizhuan.erban.public_chat_hall.fragment.PublicChatHallMyHistoryMessageFragment; import com.yizhuan.erban.public_chat_hall.view.IPublicChatHallMyMessageView; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.public_chat_hall.bean.PublicChatHallMessage; -import com.yizhuan.xchat_android_core.public_chat_hall.model.PublicChatHallModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.public_chat_hall.bean.PublicChatHallMessage; +import com.pikolive.core.public_chat_hall.model.PublicChatHallModel; import java.util.List; diff --git a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/utils/RemainCountManager.java b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/utils/RemainCountManager.java index bbb241ddd..6cb64d86d 100644 --- a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/utils/RemainCountManager.java +++ b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/utils/RemainCountManager.java @@ -1,6 +1,6 @@ package com.yizhuan.erban.public_chat_hall.utils; -import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; +import com.pikolive.core.utils.SharedPreferenceUtils; import java.util.Calendar; diff --git a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/view/IPublicChatHallMyMessageView.java b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/view/IPublicChatHallMyMessageView.java index c8f36a84f..796a36c61 100644 --- a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/view/IPublicChatHallMyMessageView.java +++ b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/view/IPublicChatHallMyMessageView.java @@ -1,6 +1,6 @@ package com.yizhuan.erban.public_chat_hall.view; -import com.yizhuan.xchat_android_core.public_chat_hall.bean.PublicChatHallMessage; +import com.pikolive.core.public_chat_hall.bean.PublicChatHallMessage; import com.pikolive.library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/widget/PublicChatHallGiftAnimationDialog.java b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/widget/PublicChatHallGiftAnimationDialog.java index 4b9c5b6dc..9009fc604 100644 --- a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/widget/PublicChatHallGiftAnimationDialog.java +++ b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/widget/PublicChatHallGiftAnimationDialog.java @@ -23,10 +23,10 @@ import com.pikolive.app.base.BaseSdDialog; import com.pikolive.app.common.svga.SimpleSvgaCallback; import com.pikolive.app.ui.utils.ImageLoadUtils; import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.xchat_android_core.gift.GiftModel; -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo; -import com.yizhuan.xchat_android_core.gift.bean.GiftReceiveInfo; -import com.yizhuan.xchat_android_core.utils.ActivityUtil; +import com.pikolive.core.gift.GiftModel; +import com.pikolive.core.gift.bean.GiftInfo; +import com.pikolive.core.gift.bean.GiftReceiveInfo; +import com.pikolive.core.utils.ActivityUtil; import java.net.MalformedURLException; import java.net.URL; diff --git a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/widget/ShutUpDialog.java b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/widget/ShutUpDialog.java index 7877f0e1e..c6fdbad5f 100644 --- a/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/widget/ShutUpDialog.java +++ b/app/src/module_public_chat_hall/java/com/yizhuan/erban/public_chat_hall/widget/ShutUpDialog.java @@ -9,10 +9,10 @@ import com.yizhuan.erban.R; import com.yizhuan.erban.treasure_box.widget.dialog.BaseBindingDialog; import com.yizhuan.erban.databinding.DialogPubRoomShutupBinding; import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.xchat_android_core.public_chat_hall.manager.PublicChatHallDataManager; -import com.yizhuan.xchat_android_core.public_chat_hall.model.PublicChatHallModel; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.pikolive.core.public_chat_hall.manager.PublicChatHallDataManager; +import com.pikolive.core.public_chat_hall.model.PublicChatHallModel; +import com.pikolive.core.user.UserModel; +import com.pikolive.core.user.bean.UserInfo; import com.pikolive.library.annatation.ActLayoutRes; import com.pikolive.library.utils.SingleToastUtil; import com.zyyoona7.lib.EasyPopup; diff --git a/app/src/module_public_chat_hall/res/layout/activity_public_chat_hall.xml b/app/src/module_public_chat_hall/res/layout/activity_public_chat_hall.xml index 4d3dfefc7..2659a6e0b 100644 --- a/app/src/module_public_chat_hall/res/layout/activity_public_chat_hall.xml +++ b/app/src/module_public_chat_hall/res/layout/activity_public_chat_hall.xml @@ -7,7 +7,7 @@ + type="com.pikolive.core.noble.AllServiceGiftProtocol" /> { diff --git a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/adapter/RoomMsgTeamRecentViewHolder.java b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/adapter/RoomMsgTeamRecentViewHolder.java index eec388b71..fe160f6b7 100644 --- a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/adapter/RoomMsgTeamRecentViewHolder.java +++ b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/adapter/RoomMsgTeamRecentViewHolder.java @@ -26,8 +26,8 @@ import com.netease.nimlib.sdk.team.constant.TeamMessageNotifyTypeEnum; import com.netease.nimlib.sdk.team.model.Team; import com.yizhuan.erban.R; import com.pikolive.app.ui.im.recent.TeamExt; -import com.yizhuan.xchat_android_core.im.custom.bean.LuckyMoneyAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.LuckyMoneyTipsAttachment; +import com.pikolive.core.im.custom.bean.LuckyMoneyAttachment; +import com.pikolive.core.im.custom.bean.LuckyMoneyTipsAttachment; public class RoomMsgTeamRecentViewHolder extends RoomMsgRecentViewHolder { diff --git a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/adapter/RoomNewbieListAdapter.java b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/adapter/RoomNewbieListAdapter.java index eb5abf0ae..cedddaa15 100644 --- a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/adapter/RoomNewbieListAdapter.java +++ b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/adapter/RoomNewbieListAdapter.java @@ -12,7 +12,7 @@ import com.chad.library.adapter.base.BaseViewHolder; import com.yizhuan.erban.R; import com.pikolive.app.ui.user.activity.UserInfoActivity; import com.pikolive.app.ui.utils.ImageLoadUtils; -import com.yizhuan.xchat_android_core.bean.RoomNewbieInfo; +import com.pikolive.core.bean.RoomNewbieInfo; import com.pikolive.library.utils.ResUtil; /** diff --git a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/adapter/RoomNewbieMessageAdapter.java b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/adapter/RoomNewbieMessageAdapter.java index 9541423f7..67a9ff5d2 100644 --- a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/adapter/RoomNewbieMessageAdapter.java +++ b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/adapter/RoomNewbieMessageAdapter.java @@ -5,7 +5,7 @@ import android.widget.RadioButton; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; import com.yizhuan.erban.R; -import com.yizhuan.xchat_android_core.bean.RoomNewbieMessageInfo; +import com.pikolive.core.bean.RoomNewbieMessageInfo; /** * @author jack diff --git a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgAttentionFragment.java b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgAttentionFragment.java index f1f4337ee..cd54f220f 100644 --- a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgAttentionFragment.java +++ b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgAttentionFragment.java @@ -15,13 +15,13 @@ import com.pikolive.app.base.BaseFragment; import com.pikolive.app.friend.view.SelectFriendActivity; import com.yizhuan.tutu.room_chat.activity.NimRoomP2PMessageActivity; import com.yizhuan.tutu.room_chat.adapter.RoomMsgAttentionListAdapter; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.praise.event.PraiseEvent; -import com.yizhuan.xchat_android_core.user.AttentionModel; -import com.yizhuan.xchat_android_core.user.bean.AttentionInfo; -import com.yizhuan.xchat_android_core.user.event.LoginUserInfoUpdateEvent; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.Constants; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.praise.event.PraiseEvent; +import com.pikolive.core.user.AttentionModel; +import com.pikolive.core.user.bean.AttentionInfo; +import com.pikolive.core.user.event.LoginUserInfoUpdateEvent; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.utils.ListUtils; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgFansListFragment.java b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgFansListFragment.java index 72e23dac2..94e1f12a8 100644 --- a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgFansListFragment.java +++ b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgFansListFragment.java @@ -15,14 +15,14 @@ import com.pikolive.app.base.BaseFragment; import com.pikolive.app.common.NoDataFragment; import com.yizhuan.tutu.room_chat.activity.NimRoomP2PMessageActivity; import com.yizhuan.tutu.room_chat.adapter.RoomMsgFansViewAdapter; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.praise.event.PraiseEvent; -import com.yizhuan.xchat_android_core.user.AttentionModel; -import com.yizhuan.xchat_android_core.user.bean.FansInfo; -import com.yizhuan.xchat_android_core.user.bean.FansListInfo; -import com.yizhuan.xchat_android_core.user.event.LoginUserInfoUpdateEvent; -import com.yizhuan.xchat_android_core.utils.SystemUidUtil; +import com.pikolive.core.Constants; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.praise.event.PraiseEvent; +import com.pikolive.core.user.AttentionModel; +import com.pikolive.core.user.bean.FansInfo; +import com.pikolive.core.user.bean.FansListInfo; +import com.pikolive.core.user.event.LoginUserInfoUpdateEvent; +import com.pikolive.core.utils.SystemUidUtil; import com.pikolive.library.utils.ListUtils; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgFriendListFragment.java b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgFriendListFragment.java index e794b4d5a..63c661c4f 100644 --- a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgFriendListFragment.java +++ b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgFriendListFragment.java @@ -14,12 +14,12 @@ import com.pikolive.app.base.BaseFragment; import com.pikolive.app.common.NoDataFragment; import com.yizhuan.tutu.room_chat.activity.NimRoomP2PMessageActivity; import com.yizhuan.tutu.room_chat.adapter.RoomMsgFriendListAdapter; -import com.yizhuan.xchat_android_core.im.friend.IMFriendModel; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.manager.RelationShipEvent; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.user.event.LoginUserInfoUpdateEvent; +import com.pikolive.core.im.friend.IMFriendModel; +import com.pikolive.core2.manager.IMNetEaseManager; +import com.pikolive.core.manager.RelationShipEvent; +import com.pikolive.core.user.UserModel; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.user.event.LoginUserInfoUpdateEvent; import com.pikolive.library.utils.ListUtils; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgRecentListFragment.java b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgRecentListFragment.java index 9b6b80df3..9e99d4b6c 100644 --- a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgRecentListFragment.java +++ b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomMsgRecentListFragment.java @@ -24,13 +24,13 @@ import com.yizhuan.tutu.room_chat.activity.NimHallTeamRoomMessageActivity; import com.yizhuan.tutu.room_chat.activity.NimRoomP2PMessageActivity; import com.yizhuan.tutu.room_chat.activity.NimTeamRoomMessageActivity; import com.yizhuan.tutu.room_chat.activity.RoomNewbieActivity; -import com.yizhuan.xchat_android_core.auth.event.LoginEvent; -import com.yizhuan.xchat_android_core.initial.InitialModel; -import com.yizhuan.xchat_android_core.level.UserLevelVo; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.event.LoadLoginUserInfoEvent; -import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; +import com.pikolive.core.auth.event.LoginEvent; +import com.pikolive.core.initial.InitialModel; +import com.pikolive.core.level.UserLevelVo; +import com.pikolive.core.user.UserModel; +import com.pikolive.core.user.event.LoadLoginUserInfoEvent; +import com.pikolive.core.utils.SharedPreferenceUtils; +import com.pikolive.core.utils.net.BeanObserver; import com.pikolive.library.utils.ResUtil; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomNewbieListFragment.java b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomNewbieListFragment.java index 64478970d..fc4274bff 100644 --- a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomNewbieListFragment.java +++ b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomNewbieListFragment.java @@ -16,7 +16,7 @@ import com.pikolive.app.module.IRoomNewbieView; import com.yizhuan.tutu.room_chat.activity.RoomNewbieMessageActivity; import com.yizhuan.tutu.room_chat.adapter.RoomNewbieListAdapter; import com.yizhuan.tutu.room_chat.event.SendHelloSuccessEvent; -import com.yizhuan.xchat_android_core.bean.RoomNewbieInfo; +import com.pikolive.core.bean.RoomNewbieInfo; import com.pikolive.library.base.factory.CreatePresenter; import com.pikolive.library.utils.ListUtils; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomNewbieMessageFragment.java b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomNewbieMessageFragment.java index a07118931..06f56a640 100644 --- a/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomNewbieMessageFragment.java +++ b/app/src/module_room_chat/java/com/yizhuan/tutu/room_chat/fragment/RoomNewbieMessageFragment.java @@ -18,7 +18,7 @@ import com.yizhuan.tutu.room_chat.adapter.RoomNewbieMessageAdapter; import com.yizhuan.tutu.room_chat.event.ChangeNewbieMessageEvent; import com.yizhuan.tutu.room_chat.event.SendHelloEvent; import com.yizhuan.tutu.room_chat.event.SendHelloSuccessEvent; -import com.yizhuan.xchat_android_core.bean.RoomNewbieMessageInfo; +import com.pikolive.core.bean.RoomNewbieMessageInfo; import com.pikolive.library.base.factory.CreatePresenter; import com.pikolive.library.utils.ResUtil; import com.pikolive.library.utils.SingleToastUtil; diff --git a/app/src/module_super_admin/java/com/tongdaxing/erban/sadmin/RoomSAdminManagerActivity.java b/app/src/module_super_admin/java/com/tongdaxing/erban/sadmin/RoomSAdminManagerActivity.java index 60bc1de92..8ab5d9ca3 100644 --- a/app/src/module_super_admin/java/com/tongdaxing/erban/sadmin/RoomSAdminManagerActivity.java +++ b/app/src/module_super_admin/java/com/tongdaxing/erban/sadmin/RoomSAdminManagerActivity.java @@ -11,16 +11,16 @@ import com.pikolive.app.avroom.activity.RoomBlackListActivity; import com.pikolive.app.base.BaseViewBindingActivity; import com.pikolive.app.common.widget.dialog.DialogManager; import com.yizhuan.erban.databinding.ActivityRoomSAdminManagerBinding; -import com.yizhuan.xchat_android_core.base.CancelNoToastException; -import com.yizhuan.xchat_android_core.kick.KickModel; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.room.model.AvRoomModel; -import com.yizhuan.xchat_android_core.super_admin.model.ISuperAdminModel; -import com.yizhuan.xchat_android_core.super_admin.model.SuperAdminModel; -import com.yizhuan.xchat_android_core.super_admin.util.SaAttachmentFactory; -import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; +import com.pikolive.core.base.CancelNoToastException; +import com.pikolive.core.kick.KickModel; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core2.manager.IMNetEaseManager; +import com.pikolive.core.room.bean.RoomInfo; +import com.pikolive.core.room.model.AvRoomModel; +import com.pikolive.core.admin.model.ISuperAdminModel; +import com.pikolive.core.admin.model.SuperAdminModel; +import com.pikolive.core.admin.util.SaAttachmentFactory; +import com.pikolive.core.utils.net.DontWarnObserver; import com.pikolive.library.net.rxnet.callback.CallBack; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/module_super_admin/java/com/tongdaxing/erban/sadmin/utils/SaAttachmentToMsgUtil.java b/app/src/module_super_admin/java/com/tongdaxing/erban/sadmin/utils/SaAttachmentToMsgUtil.java index e2ea191d6..ce7d6b240 100644 --- a/app/src/module_super_admin/java/com/tongdaxing/erban/sadmin/utils/SaAttachmentToMsgUtil.java +++ b/app/src/module_super_admin/java/com/tongdaxing/erban/sadmin/utils/SaAttachmentToMsgUtil.java @@ -6,10 +6,10 @@ import android.widget.TextView; import com.yizhuan.erban.R; import com.pikolive.app.avroom.widget.MessageView; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.super_admin.attachment.SuperAdminOpAttachment; -import com.yizhuan.xchat_android_core.super_admin.bean.SaOpInfo; +import com.pikolive.core.im.custom.bean.CustomAttachment; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core.admin.attachment.SuperAdminOpAttachment; +import com.pikolive.core.admin.bean.SaOpInfo; import com.pikolive.library.utils.ResUtil; /** diff --git a/app/src/module_treasure_box/java/com/yizhuan/erban/shipantics/IRadishRankingView.java b/app/src/module_treasure_box/java/com/yizhuan/erban/shipantics/IRadishRankingView.java index 8fe62186a..20d0ac389 100644 --- a/app/src/module_treasure_box/java/com/yizhuan/erban/shipantics/IRadishRankingView.java +++ b/app/src/module_treasure_box/java/com/yizhuan/erban/shipantics/IRadishRankingView.java @@ -1,6 +1,6 @@ package com.yizhuan.erban.shipantics; -import com.yizhuan.xchat_android_core.room.treasure_box.bean.BoxRankingInfo; +import com.pikolive.core.room.treasure_box.bean.BoxRankingInfo; import com.pikolive.library.base.IMvpBaseView; public interface IRadishRankingView extends IMvpBaseView { diff --git a/app/src/module_treasure_box/java/com/yizhuan/erban/shipantics/PullRadishActivity.java b/app/src/module_treasure_box/java/com/yizhuan/erban/shipantics/PullRadishActivity.java index aae321076..c7d9f8117 100644 --- a/app/src/module_treasure_box/java/com/yizhuan/erban/shipantics/PullRadishActivity.java +++ b/app/src/module_treasure_box/java/com/yizhuan/erban/shipantics/PullRadishActivity.java @@ -22,15 +22,15 @@ import com.pikolive.app.base.BaseBindingActivity; import com.pikolive.app.common.svga.SimpleSvgaCallback; import com.yizhuan.erban.databinding.ActivityPullRadishBinding; import com.pikolive.app.ui.webview.DialogWebViewActivity; -import com.yizhuan.treasure_box.bean.PrizeInfo; -import com.yizhuan.treasure_box.model.IBoxModel; -import com.yizhuan.treasure_box.model.RadishModel; -import com.yizhuan.xchat_android_core.DemoCache; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.manager.RoomEvent; -import com.yizhuan.xchat_android_core.pay.PayModel; -import com.yizhuan.xchat_android_core.utils.StringUtils; +import com.pikolive.treasure_box.bean.PrizeInfo; +import com.pikolive.treasure_box.model.IBoxModel; +import com.pikolive.treasure_box.model.RadishModel; +import com.pikolive.core.DemoCache; +import com.pikolive.core2.UriProvider; +import com.pikolive.core2.manager.IMNetEaseManager; +import com.pikolive.core.manager.RoomEvent; +import com.pikolive.core.pay.PayModel; +import com.pikolive.core.utils.StringUtils; import com.pikolive.library.annatation.ActLayoutRes; import com.pikolive.library.utils.ResUtil; import com.pikolive.library.utils.SingleToastUtil; diff --git a/app/src/module_treasure_box/java/com/yizhuan/erban/shipantics/RadishBuyKeyDialog.kt b/app/src/module_treasure_box/java/com/yizhuan/erban/shipantics/RadishBuyKeyDialog.kt index 04948ac6a..2479f03a1 100644 --- a/app/src/module_treasure_box/java/com/yizhuan/erban/shipantics/RadishBuyKeyDialog.kt +++ b/app/src/module_treasure_box/java/com/yizhuan/erban/shipantics/RadishBuyKeyDialog.kt @@ -3,7 +3,7 @@ package com.yizhuan.erban.shipantics import com.pikolive.app.base.BaseDialog import com.yizhuan.erban.databinding.DialogRadishBuyKeyBinding import com.pikolive.app.ui.webview.DialogWebViewActivity -import com.yizhuan.xchat_android_core.UriProvider +import com.pikolive.core2.UriProvider class RadishBuyKeyDialog : BaseDialog() { diff --git a/app/src/module_treasure_box/java/com/yizhuan/erban/shipantics/RadishRankingActivity.java b/app/src/module_treasure_box/java/com/yizhuan/erban/shipantics/RadishRankingActivity.java index 341143694..8738ba46c 100644 --- a/app/src/module_treasure_box/java/com/yizhuan/erban/shipantics/RadishRankingActivity.java +++ b/app/src/module_treasure_box/java/com/yizhuan/erban/shipantics/RadishRankingActivity.java @@ -13,9 +13,9 @@ import com.pikolive.app.common.ViewPagerAdapter; import com.yizhuan.erban.databinding.ActivityRadishRankingBinding; import com.pikolive.app.decoration.view.widgets.CarMagicIndicator; import com.yizhuan.tutu.room_chat.event.ClickRootViewEvent; -import com.yizhuan.xchat_android_core.home.bean.TabInfo; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.manager.RoomEvent; +import com.pikolive.core2.home.bean.TabInfo; +import com.pikolive.core2.manager.IMNetEaseManager; +import com.pikolive.core.manager.RoomEvent; import com.pikolive.library.utils.ResUtil; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/module_treasure_box/java/com/yizhuan/erban/shipantics/RadishRankingFragment.java b/app/src/module_treasure_box/java/com/yizhuan/erban/shipantics/RadishRankingFragment.java index b572e3d7a..1cbf4a5e8 100644 --- a/app/src/module_treasure_box/java/com/yizhuan/erban/shipantics/RadishRankingFragment.java +++ b/app/src/module_treasure_box/java/com/yizhuan/erban/shipantics/RadishRankingFragment.java @@ -11,8 +11,8 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import com.chad.library.adapter.base.BaseQuickAdapter; import com.yizhuan.erban.R; import com.pikolive.app.base.BaseMvpFragment; -import com.yizhuan.xchat_android_core.room.treasure_box.bean.BoxRankingInfo; -import com.yizhuan.xchat_android_core.room.treasure_box.event.RefreshBoxRankingEvent; +import com.pikolive.core.room.treasure_box.bean.BoxRankingInfo; +import com.pikolive.core.room.treasure_box.event.RefreshBoxRankingEvent; import com.pikolive.library.base.factory.CreatePresenter; import com.pikolive.library.utils.ListUtils; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/module_treasure_box/java/com/yizhuan/erban/shipantics/RadishRankingListAdapter.java b/app/src/module_treasure_box/java/com/yizhuan/erban/shipantics/RadishRankingListAdapter.java index 5cb3e9565..b07e6f9e7 100644 --- a/app/src/module_treasure_box/java/com/yizhuan/erban/shipantics/RadishRankingListAdapter.java +++ b/app/src/module_treasure_box/java/com/yizhuan/erban/shipantics/RadishRankingListAdapter.java @@ -9,7 +9,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; import com.yizhuan.erban.R; import com.pikolive.app.ui.utils.ImageLoadKt; -import com.yizhuan.xchat_android_core.room.treasure_box.bean.BoxRankingInfo; +import com.pikolive.core.room.treasure_box.bean.BoxRankingInfo; /** * @author jack diff --git a/app/src/module_treasure_box/java/com/yizhuan/erban/shipantics/RadishRankingPresenter.java b/app/src/module_treasure_box/java/com/yizhuan/erban/shipantics/RadishRankingPresenter.java index 8218ffa48..60fe7604b 100644 --- a/app/src/module_treasure_box/java/com/yizhuan/erban/shipantics/RadishRankingPresenter.java +++ b/app/src/module_treasure_box/java/com/yizhuan/erban/shipantics/RadishRankingPresenter.java @@ -2,9 +2,9 @@ package com.yizhuan.erban.shipantics; import com.yizhuan.erban.R; import com.pikolive.app.base.BaseMvpPresenter; -import com.yizhuan.treasure_box.model.RadishModel; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.room.treasure_box.bean.BoxRankingInfo; +import com.pikolive.treasure_box.model.RadishModel; +import com.pikolive.core.Constants; +import com.pikolive.core.room.treasure_box.bean.BoxRankingInfo; import com.pikolive.library.utils.ResUtil; import io.reactivex.SingleObserver; diff --git a/app/src/module_treasure_box/java/com/yizhuan/erban/shipantics/RadishResultDialog.kt b/app/src/module_treasure_box/java/com/yizhuan/erban/shipantics/RadishResultDialog.kt index fb574d139..63bb41c76 100644 --- a/app/src/module_treasure_box/java/com/yizhuan/erban/shipantics/RadishResultDialog.kt +++ b/app/src/module_treasure_box/java/com/yizhuan/erban/shipantics/RadishResultDialog.kt @@ -12,8 +12,8 @@ import com.pikolive.app.base.BaseDialog import com.yizhuan.erban.databinding.DialogRadishResultBinding import com.pikolive.app.ui.utils.RVDelegate import com.pikolive.app.ui.utils.load -import com.yizhuan.treasure_box.bean.OpenBoxResult -import com.yizhuan.treasure_box.bean.PrizeInfo +import com.pikolive.treasure_box.bean.OpenBoxResult +import com.pikolive.treasure_box.bean.PrizeInfo class RadishResultDialog : BaseDialog() { diff --git a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/BoxRankingActivity.java b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/BoxRankingActivity.java index bb1087cae..ba5d10e3a 100644 --- a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/BoxRankingActivity.java +++ b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/BoxRankingActivity.java @@ -14,10 +14,10 @@ import com.yizhuan.erban.databinding.ActivityRoomBoxRankingBinding; import com.pikolive.app.decoration.view.widgets.CarMagicIndicator; import com.yizhuan.erban.treasure_box.fragment.BoxRankingFragment; import com.yizhuan.tutu.room_chat.event.ClickRootViewEvent; -import com.yizhuan.xchat_android_core.home.bean.TabInfo; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.manager.RoomEvent; -import com.yizhuan.xchat_android_core.room.treasure_box.event.RefreshBoxRankingEvent; +import com.pikolive.core2.home.bean.TabInfo; +import com.pikolive.core2.manager.IMNetEaseManager; +import com.pikolive.core.manager.RoomEvent; +import com.pikolive.core.room.treasure_box.event.RefreshBoxRankingEvent; import com.pikolive.library.utils.ResUtil; import org.greenrobot.eventbus.EventBus; diff --git a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/TreasureBoxActivity.java b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/TreasureBoxActivity.java index 2e9ce0fe9..94181a9f3 100644 --- a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/TreasureBoxActivity.java +++ b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/TreasureBoxActivity.java @@ -1,14 +1,14 @@ package com.yizhuan.erban.treasure_box.activity; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_BOX; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_FAIRY; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_GIFT; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_GIFT_SERVER_ALL; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_GIFT_SERVER_NOTIFY; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_SEA; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_SEA_GIFT_SERVER_ALL; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_BOX_ALL_ROOM_NOTIFY_BY_SVGA; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_DRAW_GIFT_L5; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_BOX; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_FAIRY; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_GIFT; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_GIFT_SERVER_ALL; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_GIFT_SERVER_NOTIFY; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_SEA; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_SEA_GIFT_SERVER_ALL; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_BOX_ALL_ROOM_NOTIFY_BY_SVGA; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_DRAW_GIFT_L5; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -45,27 +45,27 @@ import com.yizhuan.erban.treasure_box.widget.dialog.TreasureBoxDialog; import com.pikolive.app.ui.utils.ImageLoadUtils; import com.pikolive.app.utils.KeyBoardUtils; import com.pikolive.app.utils.UserUtils; -import com.yizhuan.treasure_box.bean.PrizeNewInfo; -import com.yizhuan.treasure_box.bean.UserTicketInfo; -import com.yizhuan.treasure_box.model.BoxModel; -import com.yizhuan.xchat_android_core.DemoCache; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.bean.BaseProtocol; -import com.yizhuan.xchat_android_core.exception.FailReasonException; -import com.yizhuan.xchat_android_core.gift.bean.LuckyBagNoticeInfo; -import com.yizhuan.xchat_android_core.im.custom.bean.FairyMsgAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomBoxPrizeAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomBoxPrizeInfo; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomLuckySeaAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomLuckySeaMsgBean; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomReceivedLuckyGiftAttachment; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.manager.RoomEvent; -import com.yizhuan.xchat_android_core.pay.PayModel; -import com.yizhuan.xchat_android_core.pay.bean.WalletInfo; -import com.yizhuan.xchat_android_core.room.bean.FindLoveSwitchVo; -import com.yizhuan.xchat_android_core.treasurefairy.FairyMsgInfoBean; +import com.pikolive.treasure_box.bean.PrizeNewInfo; +import com.pikolive.treasure_box.bean.UserTicketInfo; +import com.pikolive.treasure_box.model.BoxModel; +import com.pikolive.core.DemoCache; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.bean.BaseProtocol; +import com.pikolive.core.exception.FailReasonException; +import com.pikolive.core.gift.bean.LuckyBagNoticeInfo; +import com.pikolive.core.im.custom.bean.FairyMsgAttachment; +import com.pikolive.core.im.custom.bean.RoomBoxPrizeAttachment; +import com.pikolive.core.im.custom.bean.RoomBoxPrizeInfo; +import com.pikolive.core.im.custom.bean.RoomLuckySeaAttachment; +import com.pikolive.core.im.custom.bean.RoomLuckySeaMsgBean; +import com.pikolive.core.im.custom.bean.RoomReceivedLuckyGiftAttachment; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core2.manager.IMNetEaseManager; +import com.pikolive.core.manager.RoomEvent; +import com.pikolive.core.pay.PayModel; +import com.pikolive.core.pay.bean.WalletInfo; +import com.pikolive.core.room.bean.FindLoveSwitchVo; +import com.pikolive.core2.treasurefairy.FairyMsgInfoBean; import com.pikolive.library.annatation.ActLayoutRes; import com.pikolive.library.common.SpConstants; import com.pikolive.library.common.util.SPUtils; diff --git a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/TreasureBoxHonourActivity.java b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/TreasureBoxHonourActivity.java index cedcd4de7..d46f748e2 100644 --- a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/TreasureBoxHonourActivity.java +++ b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/activity/TreasureBoxHonourActivity.java @@ -26,16 +26,16 @@ import com.yizhuan.erban.databinding.ActivityTreasureBoxHonourBinding; import com.yizhuan.erban.treasure_box.widget.dialog.BoxMoreDialog; import com.pikolive.app.ui.utils.ImageLoadUtils; import com.pikolive.app.ui.webview.DialogWebViewActivity; -import com.yizhuan.treasure_box.bean.PrizeInfo; -import com.yizhuan.treasure_box.model.BoxModel; -import com.yizhuan.treasure_box.model.IBoxModel; -import com.yizhuan.xchat_android_core.DemoCache; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.manager.RoomEvent; -import com.yizhuan.xchat_android_core.pay.PayModel; -import com.yizhuan.xchat_android_core.pay.bean.WalletInfo; -import com.yizhuan.xchat_android_core.utils.StringUtils; +import com.pikolive.treasure_box.bean.PrizeInfo; +import com.pikolive.treasure_box.model.BoxModel; +import com.pikolive.treasure_box.model.IBoxModel; +import com.pikolive.core.DemoCache; +import com.pikolive.core2.UriProvider; +import com.pikolive.core2.manager.IMNetEaseManager; +import com.pikolive.core.manager.RoomEvent; +import com.pikolive.core.pay.PayModel; +import com.pikolive.core.pay.bean.WalletInfo; +import com.pikolive.core.utils.StringUtils; import com.pikolive.library.annatation.ActLayoutRes; import com.pikolive.library.utils.FormatUtils; import com.pikolive.library.utils.ResUtil; diff --git a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/adapter/BoxRankingListAdapter.java b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/adapter/BoxRankingListAdapter.java index 927172061..5464441a3 100644 --- a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/adapter/BoxRankingListAdapter.java +++ b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/adapter/BoxRankingListAdapter.java @@ -13,7 +13,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; import com.yizhuan.erban.R; import com.pikolive.app.ui.utils.ImageLoadKt; -import com.yizhuan.xchat_android_core.room.treasure_box.bean.TreasureRankingInfo; +import com.pikolive.core.room.treasure_box.bean.TreasureRankingInfo; /** * @author jack diff --git a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/fragment/BoxRankingFragment.java b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/fragment/BoxRankingFragment.java index b88ab0b98..56172aaa7 100644 --- a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/fragment/BoxRankingFragment.java +++ b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/fragment/BoxRankingFragment.java @@ -19,8 +19,8 @@ import com.yizhuan.erban.treasure_box.widget.BoxRankLoadMoreView; import com.pikolive.app.ui.user.activity.UserInfoActivity; import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil; import com.pikolive.app.ui.widget.recyclerview.decoration.HorizontalDecoration; -import com.yizhuan.xchat_android_core.room.treasure_box.bean.TreasureRankingInfo; -import com.yizhuan.xchat_android_core.room.treasure_box.event.RefreshBoxRankingEvent; +import com.pikolive.core.room.treasure_box.bean.TreasureRankingInfo; +import com.pikolive.core.room.treasure_box.event.RefreshBoxRankingEvent; import com.pikolive.library.base.factory.CreatePresenter; import com.pikolive.library.utils.ListUtils; diff --git a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/fragment/ChooseTreasureBoxDialogFragment.java b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/fragment/ChooseTreasureBoxDialogFragment.java index 2c0e92d8a..8e923f96a 100644 --- a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/fragment/ChooseTreasureBoxDialogFragment.java +++ b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/fragment/ChooseTreasureBoxDialogFragment.java @@ -18,7 +18,7 @@ import androidx.fragment.app.DialogFragment; import com.coorchice.library.utils.LogUtils; import com.yizhuan.erban.R; import com.pikolive.app.ui.webview.DialogWebViewActivity; -import com.yizhuan.xchat_android_core.UriProvider; +import com.pikolive.core2.UriProvider; import com.pikolive.library.utils.ResUtil; import com.pikolive.library.utils.TimeUtils; diff --git a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/module/BoxRankingModel.java b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/module/BoxRankingModel.java index 5f790af36..088ec5ad3 100644 --- a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/module/BoxRankingModel.java +++ b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/module/BoxRankingModel.java @@ -1,10 +1,10 @@ package com.yizhuan.erban.treasure_box.module; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.community.CommunityConstant; -import com.yizhuan.xchat_android_core.room.treasure_box.bean.TreasureRankingInfo; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.community.CommunityConstant; +import com.pikolive.core.room.treasure_box.bean.TreasureRankingInfo; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.net.rxnet.RxNet; import java.util.List; diff --git a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/module/IBoxRankingView.java b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/module/IBoxRankingView.java index d0f0681f6..821a43b23 100644 --- a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/module/IBoxRankingView.java +++ b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/module/IBoxRankingView.java @@ -1,6 +1,6 @@ package com.yizhuan.erban.treasure_box.module; -import com.yizhuan.xchat_android_core.room.treasure_box.bean.TreasureRankingInfo; +import com.pikolive.core.room.treasure_box.bean.TreasureRankingInfo; import com.pikolive.library.base.IMvpBaseView; import java.util.List; diff --git a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/presenter/BoxRankingPresenter.java b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/presenter/BoxRankingPresenter.java index 284000539..faf5b9111 100644 --- a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/presenter/BoxRankingPresenter.java +++ b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/presenter/BoxRankingPresenter.java @@ -4,8 +4,8 @@ import com.yizhuan.erban.R; import com.pikolive.app.base.BaseMvpPresenter; import com.yizhuan.erban.treasure_box.module.BoxRankingModel; import com.yizhuan.erban.treasure_box.module.IBoxRankingView; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.room.treasure_box.bean.TreasureRankingInfo; +import com.pikolive.core.Constants; +import com.pikolive.core.room.treasure_box.bean.TreasureRankingInfo; import com.pikolive.library.utils.ResUtil; import java.util.List; diff --git a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/widget/GoldBoxHelper.java b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/widget/GoldBoxHelper.java index 9888dc5f3..0bb2d2c94 100644 --- a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/widget/GoldBoxHelper.java +++ b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/widget/GoldBoxHelper.java @@ -9,15 +9,15 @@ import com.yizhuan.erban.R; import com.yizhuan.erban.treasure_box.activity.TreasureBoxActivity; import com.yizhuan.erban.treasure_box.activity.TreasureBoxHonourActivity; import com.yizhuan.erban.treasure_box.fragment.ChooseTreasureBoxDialogFragment; -import com.yizhuan.xchat_android_core.initial.InitialModel; -import com.yizhuan.xchat_android_core.initial.bean.FairyOpenInfo; -import com.yizhuan.xchat_android_core.initial.bean.InitInfo; -import com.yizhuan.xchat_android_core.level.UserLevelVo; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.market_verify.MarketVerifyModel; -import com.yizhuan.xchat_android_core.super_admin.util.SuperAdminUtil; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.pikolive.core.initial.InitialModel; +import com.pikolive.core.initial.bean.FairyOpenInfo; +import com.pikolive.core.initial.bean.InitInfo; +import com.pikolive.core.level.UserLevelVo; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core2.market_verify.MarketVerifyModel; +import com.pikolive.core.admin.util.SuperAdminUtil; +import com.pikolive.core.user.UserModel; +import com.pikolive.core.user.bean.UserInfo; import com.pikolive.library.utils.ResUtil; import com.pikolive.library.utils.SingleToastUtil; import com.pikolive.library.utils.TimeUtils; diff --git a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/widget/dialog/BoxLoveLackDialog.kt b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/widget/dialog/BoxLoveLackDialog.kt index 0e5bb242d..14c21f6bb 100644 --- a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/widget/dialog/BoxLoveLackDialog.kt +++ b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/widget/dialog/BoxLoveLackDialog.kt @@ -11,10 +11,10 @@ import com.pikolive.app.base.BaseDialog import com.yizhuan.erban.databinding.TreasureBoxDialogLoveLackBinding import com.yizhuan.erban.treasure_box.activity.TreasureBoxActivity.MAX_BUY_QUANTITY_LIMIT import com.yizhuan.erban.treasure_box.widget.dialog.TreasureBoxDialog.Companion.newInstance -import com.yizhuan.treasure_box.bean.UserTicketInfo -import com.yizhuan.treasure_box.model.BoxModel -import com.yizhuan.xchat_android_core.exception.FailReasonException -import com.yizhuan.xchat_android_core.utils.StringUtils +import com.pikolive.treasure_box.bean.UserTicketInfo +import com.pikolive.treasure_box.model.BoxModel +import com.pikolive.core.exception.FailReasonException +import com.pikolive.core.utils.StringUtils import com.pikolive.library.common.SpConstants import com.pikolive.library.common.util.SPUtils import com.pikolive.library.common.util.SoftKeyboardStateHelper diff --git a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/widget/dialog/BoxMoreDialog.java b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/widget/dialog/BoxMoreDialog.java index a005482e7..9ac59cdcc 100644 --- a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/widget/dialog/BoxMoreDialog.java +++ b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/widget/dialog/BoxMoreDialog.java @@ -9,8 +9,8 @@ import com.yizhuan.erban.R; import com.yizhuan.erban.databinding.DialogBoxMoreBinding; import com.pikolive.app.ui.webview.DialogWebViewActivity; import com.pikolive.app.utils.UserUtils; -import com.yizhuan.xchat_android_core.DemoCache; -import com.yizhuan.xchat_android_core.UriProvider; +import com.pikolive.core.DemoCache; +import com.pikolive.core2.UriProvider; import com.pikolive.library.annatation.ActLayoutRes; import com.pikolive.library.utils.ResUtil; import com.pikolive.library.utils.SingleToastUtil; diff --git a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/widget/dialog/BuyLoveDialog.kt b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/widget/dialog/BuyLoveDialog.kt index de765e041..5c71df5ee 100644 --- a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/widget/dialog/BuyLoveDialog.kt +++ b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/widget/dialog/BuyLoveDialog.kt @@ -8,9 +8,9 @@ import com.hjq.toast.ToastUtils import com.yizhuan.erban.R import com.pikolive.app.base.BaseDialog import com.yizhuan.erban.databinding.TreasureBoxDialogBuyLoveBinding -import com.yizhuan.treasure_box.bean.UserTicketInfo -import com.yizhuan.treasure_box.model.BoxModel -import com.yizhuan.xchat_android_core.exception.FailReasonException +import com.pikolive.treasure_box.bean.UserTicketInfo +import com.pikolive.treasure_box.model.BoxModel +import com.pikolive.core.exception.FailReasonException import com.pikolive.library.common.SpConstants import com.pikolive.library.common.util.SPUtils import com.pikolive.library.utils.SingleToastUtil diff --git a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/widget/dialog/TreasureBoxDialog.kt b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/widget/dialog/TreasureBoxDialog.kt index e53e76dec..43fd6edfb 100644 --- a/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/widget/dialog/TreasureBoxDialog.kt +++ b/app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/widget/dialog/TreasureBoxDialog.kt @@ -4,8 +4,8 @@ import com.pikolive.app.base.BaseDialog import com.yizhuan.erban.databinding.DialogTreasureBoxBinding import com.pikolive.app.ui.pay.ChargeActivity import com.pikolive.app.ui.webview.CommonWebViewActivity -import com.yizhuan.xchat_android_core.Constants -import com.yizhuan.xchat_android_core.UriProvider +import com.pikolive.core.Constants +import com.pikolive.core2.UriProvider import com.pikolive.library.common.util.DeviceUtil.getDeviceId import com.pikolive.library.utils.AppMetaDataUtil diff --git a/app/src/module_upgrade_app/java/com/tongdaxing/erban/upgrade/AppUpdateDialog.java b/app/src/module_upgrade_app/java/com/tongdaxing/erban/upgrade/AppUpdateDialog.java index b9f722876..2a1891061 100644 --- a/app/src/module_upgrade_app/java/com/tongdaxing/erban/upgrade/AppUpdateDialog.java +++ b/app/src/module_upgrade_app/java/com/tongdaxing/erban/upgrade/AppUpdateDialog.java @@ -19,10 +19,10 @@ import androidx.fragment.app.FragmentManager; import com.orhanobut.logger.Logger; import com.yizhuan.erban.R; import com.pikolive.app.ui.widget.magicindicator.buildins.UIUtil; -import com.yizhuan.xchat_android_constants.XChatConstants; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.UriHelper; -import com.yizhuan.xchat_android_core.upgrade.bean.NewestVersionInfo; +import com.pikolive.core2.XChatConstants; +import com.pikolive.core.Constants; +import com.pikolive.core2.UriHelper; +import com.pikolive.core.upgrade.bean.NewestVersionInfo; import com.pikolive.library.utils.AppMetaDataUtil; public class AppUpdateDialog extends DialogFragment implements View.OnClickListener { diff --git a/app/src/module_upgrade_app/java/com/tongdaxing/erban/upgrade/AppUpgradeDataMrg.java b/app/src/module_upgrade_app/java/com/tongdaxing/erban/upgrade/AppUpgradeDataMrg.java index 7b329d281..f3c41a726 100644 --- a/app/src/module_upgrade_app/java/com/tongdaxing/erban/upgrade/AppUpgradeDataMrg.java +++ b/app/src/module_upgrade_app/java/com/tongdaxing/erban/upgrade/AppUpgradeDataMrg.java @@ -4,8 +4,8 @@ import android.text.TextUtils; import com.google.gson.Gson; import com.netease.nim.uikit.common.util.log.LogUtil; -import com.yizhuan.xchat_android_core.upgrade.bean.UpgradeCache; -import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; +import com.pikolive.core.upgrade.bean.UpgradeCache; +import com.pikolive.core.utils.SharedPreferenceUtils; import com.pikolive.library.utils.TimeUtils; import java.util.Objects; diff --git a/app/src/module_upgrade_app/java/com/tongdaxing/erban/upgrade/AppUpgradeHelper.java b/app/src/module_upgrade_app/java/com/tongdaxing/erban/upgrade/AppUpgradeHelper.java index 831b01a8d..e948aab33 100644 --- a/app/src/module_upgrade_app/java/com/tongdaxing/erban/upgrade/AppUpgradeHelper.java +++ b/app/src/module_upgrade_app/java/com/tongdaxing/erban/upgrade/AppUpgradeHelper.java @@ -5,12 +5,12 @@ import android.annotation.SuppressLint; import com.trello.rxlifecycle3.android.ActivityEvent; import com.trello.rxlifecycle3.components.support.RxAppCompatActivity; import com.pikolive.app.common.widget.dialog.DialogManager; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.upgrade.bean.NewestVersionInfo; -import com.yizhuan.xchat_android_core.upgrade.bean.UpgradeCache; -import com.yizhuan.xchat_android_core.upgrade.model.UpgradeModel; -import com.yizhuan.xchat_android_core.utils.ActivityUtil; -import com.yizhuan.xchat_android_core.utils.Logger; +import com.pikolive.core.Constants; +import com.pikolive.core.upgrade.bean.NewestVersionInfo; +import com.pikolive.core.upgrade.bean.UpgradeCache; +import com.pikolive.core.upgrade.model.UpgradeModel; +import com.pikolive.core.utils.ActivityUtil; +import com.pikolive.core.utils.Logger; import com.pikolive.library.utils.AppMetaDataUtil; import com.pikolive.library.utils.SingleToastUtil; import com.pikolive.library.utils.config.BasicConfig; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/UriHelper.java b/core/src/diff_src_erban/java/com/pikolive/core2/UriHelper.java similarity index 98% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/UriHelper.java rename to core/src/diff_src_erban/java/com/pikolive/core2/UriHelper.java index f099ee14a..405d1623c 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/UriHelper.java +++ b/core/src/diff_src_erban/java/com/pikolive/core2/UriHelper.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core; +package com.pikolive.core2; import android.net.Uri; import android.text.TextUtils; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/UriProvider.java b/core/src/diff_src_erban/java/com/pikolive/core2/UriProvider.java similarity index 99% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/UriProvider.java rename to core/src/diff_src_erban/java/com/pikolive/core2/UriProvider.java index 3ae25e88b..0e83a75f3 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/UriProvider.java +++ b/core/src/diff_src_erban/java/com/pikolive/core2/UriProvider.java @@ -1,8 +1,8 @@ -package com.yizhuan.xchat_android_core; +package com.pikolive.core2; import android.text.TextUtils; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; +import com.pikolive.core.manager.AvRoomDataManager; import com.pikolive.library.common.application.Env; /** diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_constants/XChatConstants.java b/core/src/diff_src_erban/java/com/pikolive/core2/XChatConstants.java similarity index 98% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_constants/XChatConstants.java rename to core/src/diff_src_erban/java/com/pikolive/core2/XChatConstants.java index 3e1e31c6a..f93cba3a3 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_constants/XChatConstants.java +++ b/core/src/diff_src_erban/java/com/pikolive/core2/XChatConstants.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_constants; +package com.pikolive.core2; -import com.yizhuan.xchat_android_core.BuildConfig; -import com.yizhuan.xchat_android_core.R; +import com.pikolive.core.BuildConfig; +import com.pikolive.core.R; import com.pikolive.library.utils.ResUtil; /** diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/association/bean/ClanListInfo.kt b/core/src/diff_src_erban/java/com/pikolive/core2/association/bean/ClanListInfo.kt similarity index 84% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/association/bean/ClanListInfo.kt rename to core/src/diff_src_erban/java/com/pikolive/core2/association/bean/ClanListInfo.kt index 39c5966d7..b64844043 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/association/bean/ClanListInfo.kt +++ b/core/src/diff_src_erban/java/com/pikolive/core2/association/bean/ClanListInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.association.bean +package com.pikolive.core2.association.bean data class ClanListInfo( val clanId: Int = 0, diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/association/bean/HallListInfo.java b/core/src/diff_src_erban/java/com/pikolive/core2/association/bean/HallListInfo.java similarity index 90% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/association/bean/HallListInfo.java rename to core/src/diff_src_erban/java/com/pikolive/core2/association/bean/HallListInfo.java index bc9d7dc68..5c2ee2bdd 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/association/bean/HallListInfo.java +++ b/core/src/diff_src_erban/java/com/pikolive/core2/association/bean/HallListInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.association.bean; +package com.pikolive.core2.association.bean; import lombok.Data; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/association/bean/MemberExchangeInfo.kt b/core/src/diff_src_erban/java/com/pikolive/core2/association/bean/MemberExchangeInfo.kt similarity index 89% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/association/bean/MemberExchangeInfo.kt rename to core/src/diff_src_erban/java/com/pikolive/core2/association/bean/MemberExchangeInfo.kt index f19db874d..f65452144 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/association/bean/MemberExchangeInfo.kt +++ b/core/src/diff_src_erban/java/com/pikolive/core2/association/bean/MemberExchangeInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.association.bean +package com.pikolive.core2.association.bean import lombok.Data diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/association/bean/UserLevelInfo.kt b/core/src/diff_src_erban/java/com/pikolive/core2/association/bean/UserLevelInfo.kt similarity index 87% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/association/bean/UserLevelInfo.kt rename to core/src/diff_src_erban/java/com/pikolive/core2/association/bean/UserLevelInfo.kt index a20015a7a..e3843ac62 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/association/bean/UserLevelInfo.kt +++ b/core/src/diff_src_erban/java/com/pikolive/core2/association/bean/UserLevelInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.association.bean +package com.pikolive.core2.association.bean import lombok.Data diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/association/model/AssociationModel.kt b/core/src/diff_src_erban/java/com/pikolive/core2/association/model/AssociationModel.kt similarity index 77% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/association/model/AssociationModel.kt rename to core/src/diff_src_erban/java/com/pikolive/core2/association/model/AssociationModel.kt index eb65add30..4f54da60d 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/association/model/AssociationModel.kt +++ b/core/src/diff_src_erban/java/com/pikolive/core2/association/model/AssociationModel.kt @@ -1,12 +1,12 @@ -package com.yizhuan.xchat_android_core.association.model +package com.pikolive.core2.association.model -import com.yizhuan.xchat_android_core.association.bean.ClanListInfo -import com.yizhuan.xchat_android_core.association.bean.HallListInfo -import com.yizhuan.xchat_android_core.association.bean.MemberExchangeInfo -import com.yizhuan.xchat_android_core.base.BaseModel -import com.yizhuan.xchat_android_core.bean.response.ServiceResult -import com.yizhuan.xchat_android_core.utils.net.launchRequest +import com.pikolive.core.base.BaseModel +import com.pikolive.core.bean.response.ServiceResult +import com.pikolive.core.utils.net.launchRequest import com.pikolive.library.net.rxnet.RxNet +import com.pikolive.core2.association.bean.ClanListInfo +import com.pikolive.core2.association.bean.HallListInfo +import com.pikolive.core2.association.bean.MemberExchangeInfo import retrofit2.http.* object AssociationModel : BaseModel() { diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/audio/AudioModel.java b/core/src/diff_src_erban/java/com/pikolive/core2/audio/AudioModel.java similarity index 89% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/audio/AudioModel.java rename to core/src/diff_src_erban/java/com/pikolive/core2/audio/AudioModel.java index 160cebce8..9535196a2 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/audio/AudioModel.java +++ b/core/src/diff_src_erban/java/com/pikolive/core2/audio/AudioModel.java @@ -1,15 +1,15 @@ -package com.yizhuan.xchat_android_core.audio; +package com.pikolive.core2.audio; import com.google.gson.JsonElement; -import com.yizhuan.xchat_android_core.audio.bean.HistoryVoiceInfo; -import com.yizhuan.xchat_android_core.audio.bean.SaveVoiceSuccessResultInfo; -import com.yizhuan.xchat_android_core.audio.bean.UserVoiceInfo; -import com.yizhuan.xchat_android_core.audio.bean.VoiceCardInfo; -import com.yizhuan.xchat_android_core.audio.bean.VoiceMatchInfo; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core2.audio.bean.HistoryVoiceInfo; +import com.pikolive.core2.audio.bean.SaveVoiceSuccessResultInfo; +import com.pikolive.core2.audio.bean.UserVoiceInfo; +import com.pikolive.core2.audio.bean.VoiceCardInfo; +import com.pikolive.core2.audio.bean.VoiceMatchInfo; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.net.rxnet.RxNet; import java.util.ArrayList; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/audio/IAudioModel.java b/core/src/diff_src_erban/java/com/pikolive/core2/audio/IAudioModel.java similarity index 82% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/audio/IAudioModel.java rename to core/src/diff_src_erban/java/com/pikolive/core2/audio/IAudioModel.java index a37a159a0..52173f54f 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/audio/IAudioModel.java +++ b/core/src/diff_src_erban/java/com/pikolive/core2/audio/IAudioModel.java @@ -1,11 +1,11 @@ -package com.yizhuan.xchat_android_core.audio; +package com.pikolive.core2.audio; -import com.yizhuan.xchat_android_core.audio.bean.HistoryVoiceInfo; -import com.yizhuan.xchat_android_core.audio.bean.SaveVoiceSuccessResultInfo; -import com.yizhuan.xchat_android_core.audio.bean.UserVoiceInfo; -import com.yizhuan.xchat_android_core.audio.bean.VoiceCardInfo; -import com.yizhuan.xchat_android_core.audio.bean.VoiceMatchInfo; -import com.yizhuan.xchat_android_core.base.IModel; +import com.pikolive.core2.audio.bean.HistoryVoiceInfo; +import com.pikolive.core2.audio.bean.SaveVoiceSuccessResultInfo; +import com.pikolive.core2.audio.bean.UserVoiceInfo; +import com.pikolive.core2.audio.bean.VoiceCardInfo; +import com.pikolive.core2.audio.bean.VoiceMatchInfo; +import com.pikolive.core.base.IModel; import java.util.List; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/audio/bean/HistoryVoiceInfo.java b/core/src/diff_src_erban/java/com/pikolive/core2/audio/bean/HistoryVoiceInfo.java similarity index 98% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/audio/bean/HistoryVoiceInfo.java rename to core/src/diff_src_erban/java/com/pikolive/core2/audio/bean/HistoryVoiceInfo.java index f2dba8d0e..12ea82fbd 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/audio/bean/HistoryVoiceInfo.java +++ b/core/src/diff_src_erban/java/com/pikolive/core2/audio/bean/HistoryVoiceInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.audio.bean; +package com.pikolive.core2.audio.bean; /** * 查询旧版本个人介绍声音 diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/audio/bean/SaveVoiceSuccessResultInfo.java b/core/src/diff_src_erban/java/com/pikolive/core2/audio/bean/SaveVoiceSuccessResultInfo.java similarity index 97% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/audio/bean/SaveVoiceSuccessResultInfo.java rename to core/src/diff_src_erban/java/com/pikolive/core2/audio/bean/SaveVoiceSuccessResultInfo.java index 0e9732abf..41599c0a7 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/audio/bean/SaveVoiceSuccessResultInfo.java +++ b/core/src/diff_src_erban/java/com/pikolive/core2/audio/bean/SaveVoiceSuccessResultInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.audio.bean; +package com.pikolive.core2.audio.bean; /** * 保存声音成功时 接口返回的声音信息 diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/audio/bean/UserVoiceInfo.java b/core/src/diff_src_erban/java/com/pikolive/core2/audio/bean/UserVoiceInfo.java similarity index 97% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/audio/bean/UserVoiceInfo.java rename to core/src/diff_src_erban/java/com/pikolive/core2/audio/bean/UserVoiceInfo.java index 656bfd303..4df6b90b3 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/audio/bean/UserVoiceInfo.java +++ b/core/src/diff_src_erban/java/com/pikolive/core2/audio/bean/UserVoiceInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.audio.bean; +package com.pikolive.core2.audio.bean; /** * 我的声音列表 diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/audio/bean/VoiceCardInfo.java b/core/src/diff_src_erban/java/com/pikolive/core2/audio/bean/VoiceCardInfo.java similarity index 95% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/audio/bean/VoiceCardInfo.java rename to core/src/diff_src_erban/java/com/pikolive/core2/audio/bean/VoiceCardInfo.java index 7483a3559..d039258ec 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/audio/bean/VoiceCardInfo.java +++ b/core/src/diff_src_erban/java/com/pikolive/core2/audio/bean/VoiceCardInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.audio.bean; +package com.pikolive.core2.audio.bean; /** * 声音卡片的信息 diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/audio/bean/VoiceMatchInfo.java b/core/src/diff_src_erban/java/com/pikolive/core2/audio/bean/VoiceMatchInfo.java similarity index 94% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/audio/bean/VoiceMatchInfo.java rename to core/src/diff_src_erban/java/com/pikolive/core2/audio/bean/VoiceMatchInfo.java index a7b819472..d95e66763 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/audio/bean/VoiceMatchInfo.java +++ b/core/src/diff_src_erban/java/com/pikolive/core2/audio/bean/VoiceMatchInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.audio.bean; +package com.pikolive.core2.audio.bean; import lombok.Data; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/channel/ChannelModel.java b/core/src/diff_src_erban/java/com/pikolive/core2/channel/ChannelModel.java similarity index 89% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/channel/ChannelModel.java rename to core/src/diff_src_erban/java/com/pikolive/core2/channel/ChannelModel.java index 13cd17e44..0eeb59c6c 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/channel/ChannelModel.java +++ b/core/src/diff_src_erban/java/com/pikolive/core2/channel/ChannelModel.java @@ -1,12 +1,12 @@ -package com.yizhuan.xchat_android_core.channel; +package com.pikolive.core2.channel; import com.orhanobut.logger.Logger; -import com.yizhuan.xchat_android_core.R; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.user.event.CurrentUserInfoCompleteEvent; +import com.pikolive.core.R; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.user.UserModel; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.user.event.CurrentUserInfoCompleteEvent; import com.pikolive.library.utils.AppMetaDataUtil; import com.pikolive.library.utils.ResUtil; diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/channel/IChannelModel.java b/core/src/diff_src_erban/java/com/pikolive/core2/channel/IChannelModel.java new file mode 100644 index 000000000..8e42e4c53 --- /dev/null +++ b/core/src/diff_src_erban/java/com/pikolive/core2/channel/IChannelModel.java @@ -0,0 +1,6 @@ +package com.pikolive.core2.channel; + +import com.pikolive.core.base.IModel; + +public interface IChannelModel extends IModel { +} diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/ClanHallMemberIncomeTotalInfo.kt b/core/src/diff_src_erban/java/com/pikolive/core2/earn/bean/ClanHallMemberIncomeTotalInfo.kt similarity index 87% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/ClanHallMemberIncomeTotalInfo.kt rename to core/src/diff_src_erban/java/com/pikolive/core2/earn/bean/ClanHallMemberIncomeTotalInfo.kt index 7eaf1371c..156acef0d 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/ClanHallMemberIncomeTotalInfo.kt +++ b/core/src/diff_src_erban/java/com/pikolive/core2/earn/bean/ClanHallMemberIncomeTotalInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.earn.bean +package com.pikolive.core2.earn.bean import lombok.Data import java.math.BigDecimal diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/ConfigWithdrawInfo.kt b/core/src/diff_src_erban/java/com/pikolive/core2/earn/bean/ConfigWithdrawInfo.kt similarity index 88% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/ConfigWithdrawInfo.kt rename to core/src/diff_src_erban/java/com/pikolive/core2/earn/bean/ConfigWithdrawInfo.kt index 1f035a74b..ad67afe39 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/ConfigWithdrawInfo.kt +++ b/core/src/diff_src_erban/java/com/pikolive/core2/earn/bean/ConfigWithdrawInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.earn.bean +package com.pikolive.core2.earn.bean import lombok.Data import java.io.Serializable diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/EarnRecordInfo.kt b/core/src/diff_src_erban/java/com/pikolive/core2/earn/bean/EarnRecordInfo.kt similarity index 86% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/EarnRecordInfo.kt rename to core/src/diff_src_erban/java/com/pikolive/core2/earn/bean/EarnRecordInfo.kt index c5733fd74..c9d24accb 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/EarnRecordInfo.kt +++ b/core/src/diff_src_erban/java/com/pikolive/core2/earn/bean/EarnRecordInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.earn.bean +package com.pikolive.core2.earn.bean import lombok.Data import java.math.BigDecimal diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/GoldRecordInfo.kt b/core/src/diff_src_erban/java/com/pikolive/core2/earn/bean/GoldRecordInfo.kt similarity index 61% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/GoldRecordInfo.kt rename to core/src/diff_src_erban/java/com/pikolive/core2/earn/bean/GoldRecordInfo.kt index 972f907b6..680a1b93f 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/GoldRecordInfo.kt +++ b/core/src/diff_src_erban/java/com/pikolive/core2/earn/bean/GoldRecordInfo.kt @@ -1,7 +1,6 @@ -package com.yizhuan.xchat_android_core.earn.bean +package com.pikolive.core2.earn.bean import lombok.Data -import java.math.BigDecimal @Data data class GoldRecordInfo( diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/GoldToDiamondInfo.kt b/core/src/diff_src_erban/java/com/pikolive/core2/earn/bean/GoldToDiamondInfo.kt similarity index 88% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/GoldToDiamondInfo.kt rename to core/src/diff_src_erban/java/com/pikolive/core2/earn/bean/GoldToDiamondInfo.kt index 700005a46..7b3494e00 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/GoldToDiamondInfo.kt +++ b/core/src/diff_src_erban/java/com/pikolive/core2/earn/bean/GoldToDiamondInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.earn.bean +package com.pikolive.core2.earn.bean import lombok.Data import java.io.Serializable diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/HallMemberGoldFlowInfo.kt b/core/src/diff_src_erban/java/com/pikolive/core2/earn/bean/HallMemberGoldFlowInfo.kt similarity index 88% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/HallMemberGoldFlowInfo.kt rename to core/src/diff_src_erban/java/com/pikolive/core2/earn/bean/HallMemberGoldFlowInfo.kt index f48cbe56b..b1fb7e967 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/HallMemberGoldFlowInfo.kt +++ b/core/src/diff_src_erban/java/com/pikolive/core2/earn/bean/HallMemberGoldFlowInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.earn.bean +package com.pikolive.core2.earn.bean import lombok.Data diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/HallMemberGoldFlowTotalInfo.kt b/core/src/diff_src_erban/java/com/pikolive/core2/earn/bean/HallMemberGoldFlowTotalInfo.kt similarity index 65% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/HallMemberGoldFlowTotalInfo.kt rename to core/src/diff_src_erban/java/com/pikolive/core2/earn/bean/HallMemberGoldFlowTotalInfo.kt index 318c0b512..05142a98a 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/HallMemberGoldFlowTotalInfo.kt +++ b/core/src/diff_src_erban/java/com/pikolive/core2/earn/bean/HallMemberGoldFlowTotalInfo.kt @@ -1,7 +1,6 @@ -package com.yizhuan.xchat_android_core.earn.bean +package com.pikolive.core2.earn.bean import lombok.Data -import java.math.BigDecimal @Data data class HallMemberGoldFlowTotalInfo( diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/HallVo.kt b/core/src/diff_src_erban/java/com/pikolive/core2/earn/bean/HallVo.kt similarity index 75% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/HallVo.kt rename to core/src/diff_src_erban/java/com/pikolive/core2/earn/bean/HallVo.kt index c1444890c..dec672b60 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/HallVo.kt +++ b/core/src/diff_src_erban/java/com/pikolive/core2/earn/bean/HallVo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.earn.bean +package com.pikolive.core2.earn.bean import lombok.Data diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/RoomTypeInfo.kt b/core/src/diff_src_erban/java/com/pikolive/core2/earn/bean/RoomTypeInfo.kt similarity index 88% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/RoomTypeInfo.kt rename to core/src/diff_src_erban/java/com/pikolive/core2/earn/bean/RoomTypeInfo.kt index 5bcaa93d9..a848de6ef 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/RoomTypeInfo.kt +++ b/core/src/diff_src_erban/java/com/pikolive/core2/earn/bean/RoomTypeInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.earn.bean +package com.pikolive.core2.earn.bean import java.math.BigDecimal diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/WithdrawAccount.kt b/core/src/diff_src_erban/java/com/pikolive/core2/earn/bean/WithdrawAccount.kt similarity index 86% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/WithdrawAccount.kt rename to core/src/diff_src_erban/java/com/pikolive/core2/earn/bean/WithdrawAccount.kt index fec14c024..c8ab9bbb6 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/bean/WithdrawAccount.kt +++ b/core/src/diff_src_erban/java/com/pikolive/core2/earn/bean/WithdrawAccount.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.earn.bean +package com.pikolive.core2.earn.bean import lombok.Data import java.io.Serializable diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/model/EarnModel.kt b/core/src/diff_src_erban/java/com/pikolive/core2/earn/model/EarnModel.kt similarity index 92% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/model/EarnModel.kt rename to core/src/diff_src_erban/java/com/pikolive/core2/earn/model/EarnModel.kt index 8d4a60f16..49628ec26 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/earn/model/EarnModel.kt +++ b/core/src/diff_src_erban/java/com/pikolive/core2/earn/model/EarnModel.kt @@ -1,11 +1,10 @@ -package com.yizhuan.xchat_android_core.earn.model +package com.pikolive.core2.earn.model -import com.yizhuan.xchat_android_core.base.BaseModel -import com.yizhuan.xchat_android_core.bean.response.ServiceResult -import com.yizhuan.xchat_android_core.earn.bean.* -import com.yizhuan.xchat_android_core.home.bean.* -import com.yizhuan.xchat_android_core.utils.net.launchRequest +import com.pikolive.core2.earn.bean.* +import com.pikolive.core.utils.net.launchRequest import com.pikolive.library.net.rxnet.RxNet +import com.pikolive.core.base.BaseModel +import com.pikolive.core.bean.response.ServiceResult import retrofit2.http.GET import retrofit2.http.POST import retrofit2.http.Query diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/helper/AtProxy.java b/core/src/diff_src_erban/java/com/pikolive/core2/helper/AtProxy.java similarity index 97% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/helper/AtProxy.java rename to core/src/diff_src_erban/java/com/pikolive/core2/helper/AtProxy.java index 47b0c0086..04f333750 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/helper/AtProxy.java +++ b/core/src/diff_src_erban/java/com/pikolive/core2/helper/AtProxy.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.helper; +package com.pikolive.core2.helper; import android.widget.EditText; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/helper/ImHelperUtils.java b/core/src/diff_src_erban/java/com/pikolive/core2/helper/ImHelperUtils.java similarity index 76% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/helper/ImHelperUtils.java rename to core/src/diff_src_erban/java/com/pikolive/core2/helper/ImHelperUtils.java index 182029960..873b82b84 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/helper/ImHelperUtils.java +++ b/core/src/diff_src_erban/java/com/pikolive/core2/helper/ImHelperUtils.java @@ -1,26 +1,26 @@ -package com.yizhuan.xchat_android_core.helper; +package com.pikolive.core2.helper; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MESS_HEAD_CAR; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MESS_HEAD_NOBLE; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_ASSISTANT_MSG; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_COMMON_SYSTEM_MSG; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_LOTTERY; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_LUCKY_MONEY; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_NOTICE; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_OPEN_ROOM_NOTI; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_PACKET; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_SHARE_IN_APP; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_MODULE_HALL; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_NEWBIE; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_PUBLIC_CHAT_HALL; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_RED_PACKAGE; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SHARE_FAMILY; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SHARE_ROOM; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SHARE_TEAM; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SHIFT_OUT; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_PUBLIC_CHAT_HALL_AIT_ME; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_RECEIVE_LUCKY_MONEY; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_LUCKY_MONEY; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MESS_HEAD_CAR; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MESS_HEAD_NOBLE; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_ASSISTANT_MSG; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_COMMON_SYSTEM_MSG; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_LOTTERY; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_LUCKY_MONEY; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_NOTICE; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_OPEN_ROOM_NOTI; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_PACKET; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_SHARE_IN_APP; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_MODULE_HALL; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_NEWBIE; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_PUBLIC_CHAT_HALL; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_RED_PACKAGE; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SHARE_FAMILY; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SHARE_ROOM; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SHARE_TEAM; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SHIFT_OUT; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_PUBLIC_CHAT_HALL_AIT_ME; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_RECEIVE_LUCKY_MONEY; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_LUCKY_MONEY; import androidx.annotation.NonNull; @@ -34,27 +34,27 @@ import com.netease.nimlib.sdk.msg.attachment.MsgAttachment; import com.netease.nimlib.sdk.msg.attachment.NotificationAttachment; import com.netease.nimlib.sdk.msg.model.IMMessage; import com.netease.nimlib.sdk.msg.model.RecentContact; -import com.yizhuan.xchat_android_core.R; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.community.im.WorldDynamicAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.AssistantAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.CarAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.CarveUpGoldThirdLevelAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.ChatHintAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.ImTipAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.LuckyMoneyTipsAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.MatchAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.NewbieHelloAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.NobleAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.NoticeAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.RedPacketAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.SysMsgVoiceAttachment; -import com.yizhuan.xchat_android_core.luckymoney.LuckyMoneyInfo; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.public_chat_hall.attachment.AitMeAttachment; -import com.yizhuan.xchat_android_core.public_chat_hall.bean.AitMeInfo; +import com.pikolive.core2.manager.IMNetEaseManager; +import com.pikolive.core.R; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.community.im.WorldDynamicAttachment; +import com.pikolive.core.im.custom.bean.AssistantAttachment; +import com.pikolive.core.im.custom.bean.CarAttachment; +import com.pikolive.core.im.custom.bean.CarveUpGoldThirdLevelAttachment; +import com.pikolive.core.im.custom.bean.ChatHintAttachment; +import com.pikolive.core.im.custom.bean.CustomAttachment; +import com.pikolive.core.im.custom.bean.ImTipAttachment; +import com.pikolive.core.im.custom.bean.LuckyMoneyTipsAttachment; +import com.pikolive.core.im.custom.bean.MatchAttachment; +import com.pikolive.core.im.custom.bean.NewbieHelloAttachment; +import com.pikolive.core.im.custom.bean.NobleAttachment; +import com.pikolive.core.im.custom.bean.NoticeAttachment; +import com.pikolive.core.im.custom.bean.RedPacketAttachment; +import com.pikolive.core.im.custom.bean.SysMsgVoiceAttachment; +import com.pikolive.core.luckymoney.LuckyMoneyInfo; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core.public_chat_hall.attachment.AitMeAttachment; +import com.pikolive.core.public_chat_hall.bean.AitMeInfo; import com.pikolive.library.utils.ResUtil; import java.util.ArrayList; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/IHomeTabMapView.java b/core/src/diff_src_erban/java/com/pikolive/core2/home/IHomeTabMapView.java similarity index 75% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/IHomeTabMapView.java rename to core/src/diff_src_erban/java/com/pikolive/core2/home/IHomeTabMapView.java index 7f2a45341..a0c0bcdde 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/IHomeTabMapView.java +++ b/core/src/diff_src_erban/java/com/pikolive/core2/home/IHomeTabMapView.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.home; +package com.pikolive.core2.home; -import com.yizhuan.xchat_android_core.home.bean.HomeTabMapInfo; +import com.pikolive.core2.home.bean.HomeTabMapInfo; import com.pikolive.library.base.IMvpBaseView; import java.util.List; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/BannerInfo.java b/core/src/diff_src_erban/java/com/pikolive/core2/home/bean/BannerInfo.java similarity index 97% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/BannerInfo.java rename to core/src/diff_src_erban/java/com/pikolive/core2/home/bean/BannerInfo.java index ee45c7f8f..81fe24ac4 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/BannerInfo.java +++ b/core/src/diff_src_erban/java/com/pikolive/core2/home/bean/BannerInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.home.bean; +package com.pikolive.core2.home.bean; import android.os.Parcel; import android.os.Parcelable; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/CollectionRoomInfo.java b/core/src/diff_src_erban/java/com/pikolive/core2/home/bean/CollectionRoomInfo.java similarity index 95% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/CollectionRoomInfo.java rename to core/src/diff_src_erban/java/com/pikolive/core2/home/bean/CollectionRoomInfo.java index e2b3bfcf5..6e34a2e02 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/CollectionRoomInfo.java +++ b/core/src/diff_src_erban/java/com/pikolive/core2/home/bean/CollectionRoomInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.home.bean; +package com.pikolive.core2.home.bean; import java.util.List; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/CurrentResourceInfo.kt b/core/src/diff_src_erban/java/com/pikolive/core2/home/bean/CurrentResourceInfo.kt similarity index 82% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/CurrentResourceInfo.kt rename to core/src/diff_src_erban/java/com/pikolive/core2/home/bean/CurrentResourceInfo.kt index 1ddee3d64..2549532d9 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/CurrentResourceInfo.kt +++ b/core/src/diff_src_erban/java/com/pikolive/core2/home/bean/CurrentResourceInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.home.bean +package com.pikolive.core2.home.bean import lombok.Data diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/HomeConcernsInfo.java b/core/src/diff_src_erban/java/com/pikolive/core2/home/bean/HomeConcernsInfo.java similarity index 83% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/HomeConcernsInfo.java rename to core/src/diff_src_erban/java/com/pikolive/core2/home/bean/HomeConcernsInfo.java index 859a71544..cb8130907 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/HomeConcernsInfo.java +++ b/core/src/diff_src_erban/java/com/pikolive/core2/home/bean/HomeConcernsInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.home.bean; +package com.pikolive.core2.home.bean; import java.io.Serializable; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/HomeRoomInfo.java b/core/src/diff_src_erban/java/com/pikolive/core2/home/bean/HomeRoomInfo.java similarity index 96% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/HomeRoomInfo.java rename to core/src/diff_src_erban/java/com/pikolive/core2/home/bean/HomeRoomInfo.java index b037f5f4d..02bedefb4 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/HomeRoomInfo.java +++ b/core/src/diff_src_erban/java/com/pikolive/core2/home/bean/HomeRoomInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.home.bean; +package com.pikolive.core2.home.bean; import android.text.TextUtils; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/HomeTabMapInfo.java b/core/src/diff_src_erban/java/com/pikolive/core2/home/bean/HomeTabMapInfo.java similarity index 97% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/HomeTabMapInfo.java rename to core/src/diff_src_erban/java/com/pikolive/core2/home/bean/HomeTabMapInfo.java index 223aa0608..821e4fee3 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/HomeTabMapInfo.java +++ b/core/src/diff_src_erban/java/com/pikolive/core2/home/bean/HomeTabMapInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.home.bean; +package com.pikolive.core2.home.bean; import com.chad.library.adapter.base.entity.MultiItemEntity; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/HomeTagInfo.java b/core/src/diff_src_erban/java/com/pikolive/core2/home/bean/HomeTagInfo.java similarity index 93% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/HomeTagInfo.java rename to core/src/diff_src_erban/java/com/pikolive/core2/home/bean/HomeTagInfo.java index 0899ed0f7..2dbbf2c86 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/HomeTagInfo.java +++ b/core/src/diff_src_erban/java/com/pikolive/core2/home/bean/HomeTagInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.home.bean; +package com.pikolive.core2.home.bean; import lombok.Data; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/MainTabInfo.kt b/core/src/diff_src_erban/java/com/pikolive/core2/home/bean/MainTabInfo.kt similarity index 81% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/MainTabInfo.kt rename to core/src/diff_src_erban/java/com/pikolive/core2/home/bean/MainTabInfo.kt index 7c4bc5bcd..b33510843 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/MainTabInfo.kt +++ b/core/src/diff_src_erban/java/com/pikolive/core2/home/bean/MainTabInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.home.bean +package com.pikolive.core2.home.bean import lombok.Data diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/MainTabType.java b/core/src/diff_src_erban/java/com/pikolive/core2/home/bean/MainTabType.java similarity index 82% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/MainTabType.java rename to core/src/diff_src_erban/java/com/pikolive/core2/home/bean/MainTabType.java index 56aa7939f..d77533193 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/MainTabType.java +++ b/core/src/diff_src_erban/java/com/pikolive/core2/home/bean/MainTabType.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.home.bean; +package com.pikolive.core2.home.bean; public interface MainTabType { //tabType(1-派对，2-广场，3-赛事，4-消息，5-我的) diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/MicUsersBean.java b/core/src/diff_src_erban/java/com/pikolive/core2/home/bean/MicUsersBean.java similarity index 85% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/MicUsersBean.java rename to core/src/diff_src_erban/java/com/pikolive/core2/home/bean/MicUsersBean.java index b4d216349..0b7be0d24 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/MicUsersBean.java +++ b/core/src/diff_src_erban/java/com/pikolive/core2/home/bean/MicUsersBean.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.home.bean; +package com.pikolive.core2.home.bean; import lombok.Data; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/ResourceInfo.kt b/core/src/diff_src_erban/java/com/pikolive/core2/home/bean/ResourceInfo.kt similarity index 82% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/ResourceInfo.kt rename to core/src/diff_src_erban/java/com/pikolive/core2/home/bean/ResourceInfo.kt index f7d7bc529..5fab5b80d 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/ResourceInfo.kt +++ b/core/src/diff_src_erban/java/com/pikolive/core2/home/bean/ResourceInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.home.bean +package com.pikolive.core2.home.bean import lombok.Data diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/TabInfo.java b/core/src/diff_src_erban/java/com/pikolive/core2/home/bean/TabInfo.java similarity index 96% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/TabInfo.java rename to core/src/diff_src_erban/java/com/pikolive/core2/home/bean/TabInfo.java index 9adae0dc0..df0fcc3c2 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/TabInfo.java +++ b/core/src/diff_src_erban/java/com/pikolive/core2/home/bean/TabInfo.java @@ -1,9 +1,9 @@ -package com.yizhuan.xchat_android_core.home.bean; +package com.pikolive.core2.home.bean; import android.os.Parcel; import android.os.Parcelable; -import com.yizhuan.xchat_android_core.R; +import com.pikolive.core.R; import com.pikolive.library.utils.ResUtil; import java.io.Serializable; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/TagListInfo.java b/core/src/diff_src_erban/java/com/pikolive/core2/home/bean/TagListInfo.java similarity index 79% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/TagListInfo.java rename to core/src/diff_src_erban/java/com/pikolive/core2/home/bean/TagListInfo.java index c56f81d47..b3ed625c1 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/TagListInfo.java +++ b/core/src/diff_src_erban/java/com/pikolive/core2/home/bean/TagListInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.home.bean; +package com.pikolive.core2.home.bean; import java.io.Serializable; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/VisitorInfo.kt b/core/src/diff_src_erban/java/com/pikolive/core2/home/bean/VisitorInfo.kt similarity index 82% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/VisitorInfo.kt rename to core/src/diff_src_erban/java/com/pikolive/core2/home/bean/VisitorInfo.kt index 14b28b2d0..9ea601350 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/VisitorInfo.kt +++ b/core/src/diff_src_erban/java/com/pikolive/core2/home/bean/VisitorInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.home.bean +package com.pikolive.core2.home.bean import lombok.Data diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/home/event/FollowRoomEvent.java b/core/src/diff_src_erban/java/com/pikolive/core2/home/event/FollowRoomEvent.java new file mode 100644 index 000000000..036153b79 --- /dev/null +++ b/core/src/diff_src_erban/java/com/pikolive/core2/home/event/FollowRoomEvent.java @@ -0,0 +1,4 @@ +package com.pikolive.core2.home.event; + +public class FollowRoomEvent { +} diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/event/OpenRoomMessageInputEvent.kt b/core/src/diff_src_erban/java/com/pikolive/core2/home/event/OpenRoomMessageInputEvent.kt similarity index 72% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/event/OpenRoomMessageInputEvent.kt rename to core/src/diff_src_erban/java/com/pikolive/core2/home/event/OpenRoomMessageInputEvent.kt index 985a938ca..299cb5aa6 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/event/OpenRoomMessageInputEvent.kt +++ b/core/src/diff_src_erban/java/com/pikolive/core2/home/event/OpenRoomMessageInputEvent.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.home.event +package com.pikolive.core2.home.event /** * Created by Max on 2023/10/27 11:56 diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/home/event/RefreshHomeDataEvent.java b/core/src/diff_src_erban/java/com/pikolive/core2/home/event/RefreshHomeDataEvent.java new file mode 100644 index 000000000..82d3c6b63 --- /dev/null +++ b/core/src/diff_src_erban/java/com/pikolive/core2/home/event/RefreshHomeDataEvent.java @@ -0,0 +1,4 @@ +package com.pikolive.core2.home.event; + +public class RefreshHomeDataEvent { +} diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/home/event/ShareRoomEvent.java b/core/src/diff_src_erban/java/com/pikolive/core2/home/event/ShareRoomEvent.java new file mode 100644 index 000000000..1c7ad3301 --- /dev/null +++ b/core/src/diff_src_erban/java/com/pikolive/core2/home/event/ShareRoomEvent.java @@ -0,0 +1,4 @@ +package com.pikolive.core2.home.event; + +public class ShareRoomEvent { +} diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/event/VisitorUnreadCountEvent.java b/core/src/diff_src_erban/java/com/pikolive/core2/home/event/VisitorUnreadCountEvent.java similarity index 74% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/event/VisitorUnreadCountEvent.java rename to core/src/diff_src_erban/java/com/pikolive/core2/home/event/VisitorUnreadCountEvent.java index d8fd75801..4fabf19f6 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/event/VisitorUnreadCountEvent.java +++ b/core/src/diff_src_erban/java/com/pikolive/core2/home/event/VisitorUnreadCountEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.home.event; +package com.pikolive.core2.home.event; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/model/CollectionRoomModel.java b/core/src/diff_src_erban/java/com/pikolive/core2/home/model/CollectionRoomModel.java similarity index 89% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/model/CollectionRoomModel.java rename to core/src/diff_src_erban/java/com/pikolive/core2/home/model/CollectionRoomModel.java index d29c5017c..0fa79ecf9 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/model/CollectionRoomModel.java +++ b/core/src/diff_src_erban/java/com/pikolive/core2/home/model/CollectionRoomModel.java @@ -1,10 +1,10 @@ -package com.yizhuan.xchat_android_core.home.model; +package com.pikolive.core2.home.model; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.home.bean.CollectionRoomInfo; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core2.home.bean.CollectionRoomInfo; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.net.rxnet.RxNet; import io.reactivex.Single; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/model/CommunityNoticeModel.java b/core/src/diff_src_erban/java/com/pikolive/core2/home/model/CommunityNoticeModel.java similarity index 91% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/model/CommunityNoticeModel.java rename to core/src/diff_src_erban/java/com/pikolive/core2/home/model/CommunityNoticeModel.java index df62545bf..6ab63fb20 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/model/CommunityNoticeModel.java +++ b/core/src/diff_src_erban/java/com/pikolive/core2/home/model/CommunityNoticeModel.java @@ -1,8 +1,8 @@ -package com.yizhuan.xchat_android_core.home.model; +package com.pikolive.core2.home.model; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.community.bean.CommunityNoticeInfo; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.community.bean.CommunityNoticeInfo; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.net.rxnet.RxNet; import java.util.List; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/model/GameHomeModel.java b/core/src/diff_src_erban/java/com/pikolive/core2/home/model/GameHomeModel.java similarity index 85% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/model/GameHomeModel.java rename to core/src/diff_src_erban/java/com/pikolive/core2/home/model/GameHomeModel.java index daddfb5d2..cb27404ef 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/model/GameHomeModel.java +++ b/core/src/diff_src_erban/java/com/pikolive/core2/home/model/GameHomeModel.java @@ -1,13 +1,13 @@ -package com.yizhuan.xchat_android_core.home.model; +package com.pikolive.core2.home.model; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.community.CommunityConstant; -import com.yizhuan.xchat_android_core.home.bean.BannerInfo; -import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo; -import com.yizhuan.xchat_android_core.home.bean.HomeTabMapInfo; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.community.CommunityConstant; +import com.pikolive.core2.home.bean.BannerInfo; +import com.pikolive.core2.home.bean.HomeRoomInfo; +import com.pikolive.core2.home.bean.HomeTabMapInfo; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.net.rxnet.RxNet; import java.util.List; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/model/HomeModel.kt b/core/src/diff_src_erban/java/com/pikolive/core2/home/model/HomeModel.kt similarity index 92% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/model/HomeModel.kt rename to core/src/diff_src_erban/java/com/pikolive/core2/home/model/HomeModel.kt index 4aed1b377..0226d1dcc 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/model/HomeModel.kt +++ b/core/src/diff_src_erban/java/com/pikolive/core2/home/model/HomeModel.kt @@ -1,24 +1,25 @@ -package com.yizhuan.xchat_android_core.home.model +package com.pikolive.core2.home.model -import com.yizhuan.xchat_android_core.R -import com.yizhuan.xchat_android_core.auth.AuthModel -import com.yizhuan.xchat_android_core.base.BaseModel -import com.yizhuan.xchat_android_core.bean.response.ServiceResult -import com.yizhuan.xchat_android_core.community.CommunityConstant -import com.yizhuan.xchat_android_core.community.bean.UnReadCountInfo -import com.yizhuan.xchat_android_core.home.bean.* -import com.yizhuan.xchat_android_core.room.bean.AnchorInfo -import com.yizhuan.xchat_android_core.room.bean.HomeLiveTopInfo -import com.yizhuan.xchat_android_core.room.bean.MeCenterInfo -import com.yizhuan.xchat_android_core.room.bean.SingleRoomSortInfo -import com.yizhuan.xchat_android_core.room.game.GameInfo -import com.yizhuan.xchat_android_core.user.bean.DiamondGiveHistoryInfo -import com.yizhuan.xchat_android_core.user.bean.SearchUserInfo -import com.yizhuan.xchat_android_core.user.bean.UserInfo -import com.yizhuan.xchat_android_core.utils.net.RxHelper -import com.yizhuan.xchat_android_core.utils.net.launchRequest +import com.pikolive.core.R +import com.pikolive.core.auth.AuthModel +import com.pikolive.core.community.CommunityConstant +import com.pikolive.core.community.bean.UnReadCountInfo +import com.pikolive.core2.earn.bean.* +import com.pikolive.core2.home.bean.* +import com.pikolive.core.room.bean.AnchorInfo +import com.pikolive.core.room.bean.HomeLiveTopInfo +import com.pikolive.core.room.bean.MeCenterInfo +import com.pikolive.core.room.game.GameInfo +import com.pikolive.core.utils.net.launchRequest import com.pikolive.library.net.rxnet.RxNet import com.pikolive.library.utils.ResUtil +import com.pikolive.core.base.BaseModel +import com.pikolive.core.bean.response.ServiceResult +import com.pikolive.core.room.bean.SingleRoomSortInfo +import com.pikolive.core.user.bean.DiamondGiveHistoryInfo +import com.pikolive.core.user.bean.SearchUserInfo +import com.pikolive.core.user.bean.UserInfo +import com.pikolive.core.utils.net.RxHelper import io.reactivex.Single import retrofit2.http.GET import retrofit2.http.POST diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/model/ICommunityNoticeModel.java b/core/src/diff_src_erban/java/com/pikolive/core2/home/model/ICommunityNoticeModel.java similarity index 69% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/model/ICommunityNoticeModel.java rename to core/src/diff_src_erban/java/com/pikolive/core2/home/model/ICommunityNoticeModel.java index e20ae58d8..c43bffc38 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/model/ICommunityNoticeModel.java +++ b/core/src/diff_src_erban/java/com/pikolive/core2/home/model/ICommunityNoticeModel.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.home.model; +package com.pikolive.core2.home.model; -import com.yizhuan.xchat_android_core.community.bean.CommunityNoticeInfo; +import com.pikolive.core.community.bean.CommunityNoticeInfo; import com.pikolive.library.base.IMvpBaseView; import java.util.List; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/AudioEngineManager.java b/core/src/diff_src_erban/java/com/pikolive/core2/manager/AudioEngineManager.java similarity index 96% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/AudioEngineManager.java rename to core/src/diff_src_erban/java/com/pikolive/core2/manager/AudioEngineManager.java index 141e89c90..a2f0d911a 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/AudioEngineManager.java +++ b/core/src/diff_src_erban/java/com/pikolive/core2/manager/AudioEngineManager.java @@ -1,12 +1,13 @@ -package com.yizhuan.xchat_android_core.manager; +package com.pikolive.core2.manager; import com.netease.nim.uikit.common.util.log.LogUtil; -import com.yizhuan.xchat_android_core.manager.agora.RtcEngineManager; -import com.yizhuan.xchat_android_core.manager.trtc.TRtcEngineManager; -import com.yizhuan.xchat_android_core.room.bean.RoomAudioSdkType; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.utils.LogUtils; +import com.pikolive.core2.manager.agora.RtcEngineManager; +import com.pikolive.core2.manager.trtc.TRtcEngineManager; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core.room.bean.RoomAudioSdkType; +import com.pikolive.core.room.bean.RoomInfo; +import com.pikolive.core.utils.LogUtils; import io.agora.rtc2.Constants; import io.agora.rtc2.video.VideoCanvas; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/BaseEngine.java b/core/src/diff_src_erban/java/com/pikolive/core2/manager/BaseEngine.java similarity index 97% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/BaseEngine.java rename to core/src/diff_src_erban/java/com/pikolive/core2/manager/BaseEngine.java index 8f45a8610..e7d877cba 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/BaseEngine.java +++ b/core/src/diff_src_erban/java/com/pikolive/core2/manager/BaseEngine.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.manager; +package com.pikolive.core2.manager; import java.util.ArrayList; import java.util.List; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/EngineType.java b/core/src/diff_src_erban/java/com/pikolive/core2/manager/EngineType.java similarity index 68% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/EngineType.java rename to core/src/diff_src_erban/java/com/pikolive/core2/manager/EngineType.java index dc9444a9c..2c2cd2638 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/EngineType.java +++ b/core/src/diff_src_erban/java/com/pikolive/core2/manager/EngineType.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.manager; +package com.pikolive.core2.manager; public enum EngineType { TYPE_AGORA, diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/IAudioEngine.java b/core/src/diff_src_erban/java/com/pikolive/core2/manager/IAudioEngine.java similarity index 97% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/IAudioEngine.java rename to core/src/diff_src_erban/java/com/pikolive/core2/manager/IAudioEngine.java index d550fa1bb..b77be6ce9 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/IAudioEngine.java +++ b/core/src/diff_src_erban/java/com/pikolive/core2/manager/IAudioEngine.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.manager; +package com.pikolive.core2.manager; public interface IAudioEngine { diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/IMNetEaseManager.java b/core/src/diff_src_erban/java/com/pikolive/core2/manager/IMNetEaseManager.java similarity index 95% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/IMNetEaseManager.java rename to core/src/diff_src_erban/java/com/pikolive/core2/manager/IMNetEaseManager.java index e3d5df91b..45fc4d31e 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/IMNetEaseManager.java +++ b/core/src/diff_src_erban/java/com/pikolive/core2/manager/IMNetEaseManager.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.manager; +package com.pikolive.core2.manager; -import static com.yizhuan.xchat_android_constants.XChatConstants.SELECT_ANIM_DURATION; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.*; +import static com.pikolive.core2.XChatConstants.SELECT_ANIM_DURATION; +import static com.pikolive.core.im.custom.bean.CustomAttachment.*; import android.annotation.SuppressLint; import android.graphics.BitmapFactory; @@ -59,119 +59,124 @@ import com.netease.nimlib.sdk.msg.model.NIMAntiSpamOption; import com.netease.nimlib.sdk.util.Entry; import com.netease.nimlib.sdk.util.api.RequestResult; import com.orhanobut.logger.Logger; -import com.yizhuan.xchat_android_constants.XChatConstants; -import com.yizhuan.xchat_android_core.BuildConfig; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.R; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.bean.RoomMicInfo; -import com.yizhuan.xchat_android_core.bean.RoomQueueInfo; -import com.yizhuan.xchat_android_core.bean.attachmsg.RoomQueueMsgAttachment; -import com.yizhuan.xchat_android_core.decoration.car.bean.CarInfo; -import com.yizhuan.xchat_android_core.decoration.headwear.bean.HeadWearInfo; -import com.yizhuan.xchat_android_core.exception.ErrorThrowable; -import com.yizhuan.xchat_android_core.family.bean.FamilyInfo; -import com.yizhuan.xchat_android_core.family.event.FamilyMineEvent; -import com.yizhuan.xchat_android_core.gift.GiftModel; -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo; -import com.yizhuan.xchat_android_core.gift.bean.GiftReceiveInfo; -import com.yizhuan.xchat_android_core.gift.event.UpdateKnapFreeGiftDataEvent; -import com.yizhuan.xchat_android_core.helper.AtProxy; -import com.yizhuan.xchat_android_core.im.custom.bean.ActivityTimerAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.AssistantAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.CarAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.DatingAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.DatingPublishAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.GiftAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.GiftBatchAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.InAppSharingFamilyAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.InAppSharingMiniWorldAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.InAppSharingRoomAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.InAppSharingTeamAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.LuckyMoneyAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.LuckyMoneyTipsAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.MagicAllMicAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.MagicAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.MagicBatchAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.MonsterAttackAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.MonsterHuntingResultAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.MonsterStatusAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.MultiGiftAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.NobleAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomBoxPrizeAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomFreeGiftAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomFreeGiftMsgBean; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomGiftValueAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomInfoAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomLuckySeaAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomLuckySeaMsgBean; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomPKAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomPkBean; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomTipAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.RouterType; -import com.yizhuan.xchat_android_core.im.custom.bean.SysMsgAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.TarotAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.WelcomeAttachment; -import com.yizhuan.xchat_android_core.level.UserLevelVo; -import com.yizhuan.xchat_android_core.luckymoney.LuckyMoneyInfo; -import com.yizhuan.xchat_android_core.magic.MagicModel; -import com.yizhuan.xchat_android_core.magic.bean.MagicInfo; -import com.yizhuan.xchat_android_core.magic.toolbox.MagicToolbox; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldDetailInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldDetailInfoWithCurrentMember; -import com.yizhuan.xchat_android_core.miniworld.event.MiniWorldJoinVerifiedEvent; -import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterInfo; -import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterProtocol; -import com.yizhuan.xchat_android_core.msg.sys.ErbanSysMsgInfo; -import com.yizhuan.xchat_android_core.msg.sys.ErbanSysMsgParamKey; -import com.yizhuan.xchat_android_core.msg.sysv2.ErbanSysMsgV2Info; -import com.yizhuan.xchat_android_core.noble.NobleInfo; -import com.yizhuan.xchat_android_core.noble.NobleResourceType; -import com.yizhuan.xchat_android_core.noble.NobleUtil; -import com.yizhuan.xchat_android_core.public_chat_hall.manager.PublicChatHallDataManager; -import com.yizhuan.xchat_android_core.retry.ImRetryManager; -import com.yizhuan.xchat_android_core.retry.ReconnectListener; -import com.yizhuan.xchat_android_core.retry.RetryChatRoomMessage; -import com.yizhuan.xchat_android_core.room.activitytimer.ActivityTimerEvent; -import com.yizhuan.xchat_android_core.room.activitytimer.TimerBean; -import com.yizhuan.xchat_android_core.room.auction.bean.AuctionInfo; -import com.yizhuan.xchat_android_core.room.bean.LeaveModeAttachment; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.room.exception.AntiSpamHitException; -import com.yizhuan.xchat_android_core.room.face.DynamicFaceModel; -import com.yizhuan.xchat_android_core.room.giftvalue.helper.GiftValueMrg; -import com.yizhuan.xchat_android_core.room.model.AvRoomModel; -import com.yizhuan.xchat_android_core.room.model.MicQueueModel; -import com.yizhuan.xchat_android_core.room.pk.attachment.RoomPkAttachment; -import com.yizhuan.xchat_android_core.room.pk.bean.PKTeamInfo; -import com.yizhuan.xchat_android_core.room.pk.bean.RoomPKInvitedUpMicMember; -import com.yizhuan.xchat_android_core.room.pk.bean.RoomPkData; -import com.yizhuan.xchat_android_core.room.pk.model.PkModel; -import com.yizhuan.xchat_android_core.room.queue.bean.MicMemberInfo; -import com.yizhuan.xchat_android_core.room.queuing_mic.attachment.QueuingMicAttachment; -import com.yizhuan.xchat_android_core.room.queuing_mic.bean.QueuingMicInfo; -import com.yizhuan.xchat_android_core.room.queuing_mic.event.QueuingMicEmptyEvent; -import com.yizhuan.xchat_android_core.room.queuing_mic.event.QueuingMicNotEmptyEvent; -import com.yizhuan.xchat_android_core.share.bean.InAppSharingFamilyInfo; -import com.yizhuan.xchat_android_core.share.bean.InAppSharingMiniWorldInfo; -import com.yizhuan.xchat_android_core.share.bean.InAppSharingRoomInfo; -import com.yizhuan.xchat_android_core.share.bean.InAppSharingTeamInfo; -import com.yizhuan.xchat_android_core.share.bean.SessionType; -import com.yizhuan.xchat_android_core.statistic.StatLogKey; -import com.yizhuan.xchat_android_core.super_admin.SuperAdminDataMrg; -import com.yizhuan.xchat_android_core.super_admin.attachment.SuperAdminOpAttachment; -import com.yizhuan.xchat_android_core.super_admin.bean.SaOpInfo; -import com.yizhuan.xchat_android_core.super_admin.util.SuperAdminUtil; -import com.yizhuan.xchat_android_core.team.bean.TeamInfo; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.BaseInfo; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.utils.ExtensionUtils; -import com.yizhuan.xchat_android_core.utils.LogUtils; -import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; -import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; -import com.yizhuan.xchat_android_core.vip.VipBroadcastMsgEvent; +import com.pikolive.core2.XChatConstants; +import com.pikolive.core.BuildConfig; +import com.pikolive.core.Constants; +import com.pikolive.core.R; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.bean.RoomMicInfo; +import com.pikolive.core.bean.RoomQueueInfo; +import com.pikolive.core.bean.attachmsg.RoomQueueMsgAttachment; +import com.pikolive.core.decoration.car.bean.CarInfo; +import com.pikolive.core.decoration.headwear.bean.HeadWearInfo; +import com.pikolive.core.exception.ErrorThrowable; +import com.pikolive.core.family.bean.FamilyInfo; +import com.pikolive.core.family.event.FamilyMineEvent; +import com.pikolive.core.gift.GiftModel; +import com.pikolive.core.gift.bean.GiftInfo; +import com.pikolive.core.gift.bean.GiftReceiveInfo; +import com.pikolive.core.gift.event.UpdateKnapFreeGiftDataEvent; +import com.pikolive.core2.helper.AtProxy; +import com.pikolive.core.im.custom.bean.ActivityTimerAttachment; +import com.pikolive.core.im.custom.bean.AssistantAttachment; +import com.pikolive.core.im.custom.bean.CarAttachment; +import com.pikolive.core.im.custom.bean.CustomAttachment; +import com.pikolive.core.im.custom.bean.DatingAttachment; +import com.pikolive.core.im.custom.bean.DatingPublishAttachment; +import com.pikolive.core.im.custom.bean.GiftAttachment; +import com.pikolive.core.im.custom.bean.GiftBatchAttachment; +import com.pikolive.core.im.custom.bean.InAppSharingFamilyAttachment; +import com.pikolive.core.im.custom.bean.InAppSharingMiniWorldAttachment; +import com.pikolive.core.im.custom.bean.InAppSharingRoomAttachment; +import com.pikolive.core.im.custom.bean.InAppSharingTeamAttachment; +import com.pikolive.core.im.custom.bean.LuckyMoneyAttachment; +import com.pikolive.core.im.custom.bean.LuckyMoneyTipsAttachment; +import com.pikolive.core.im.custom.bean.MagicAllMicAttachment; +import com.pikolive.core.im.custom.bean.MagicAttachment; +import com.pikolive.core.im.custom.bean.MagicBatchAttachment; +import com.pikolive.core.im.custom.bean.MonsterAttackAttachment; +import com.pikolive.core.im.custom.bean.MonsterHuntingResultAttachment; +import com.pikolive.core.im.custom.bean.MonsterStatusAttachment; +import com.pikolive.core.im.custom.bean.MultiGiftAttachment; +import com.pikolive.core.im.custom.bean.NobleAttachment; +import com.pikolive.core.im.custom.bean.RoomBoxPrizeAttachment; +import com.pikolive.core.im.custom.bean.RoomFreeGiftAttachment; +import com.pikolive.core.im.custom.bean.RoomFreeGiftMsgBean; +import com.pikolive.core.im.custom.bean.RoomGiftValueAttachment; +import com.pikolive.core.im.custom.bean.RoomInfoAttachment; +import com.pikolive.core.im.custom.bean.RoomLuckySeaAttachment; +import com.pikolive.core.im.custom.bean.RoomLuckySeaMsgBean; +import com.pikolive.core.im.custom.bean.RoomPKAttachment; +import com.pikolive.core.im.custom.bean.RoomPkBean; +import com.pikolive.core.im.custom.bean.RoomTipAttachment; +import com.pikolive.core.im.custom.bean.RouterType; +import com.pikolive.core.im.custom.bean.SysMsgAttachment; +import com.pikolive.core.im.custom.bean.TarotAttachment; +import com.pikolive.core.im.custom.bean.WelcomeAttachment; +import com.pikolive.core.level.UserLevelVo; +import com.pikolive.core.luckymoney.LuckyMoneyInfo; +import com.pikolive.core.magic.MagicModel; +import com.pikolive.core.magic.bean.MagicInfo; +import com.pikolive.core.magic.toolbox.MagicToolbox; +import com.pikolive.core.miniworld.bean.MiniWorldDetailInfo; +import com.pikolive.core.miniworld.bean.MiniWorldDetailInfoWithCurrentMember; +import com.pikolive.core.miniworld.event.MiniWorldJoinVerifiedEvent; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core.manager.BaseMvpModel; +import com.pikolive.core.manager.IMMessageManager; +import com.pikolive.core.manager.RelationShipEvent; +import com.pikolive.core.manager.RoomEvent; +import com.pikolive.core.monsterhunting.bean.MonsterInfo; +import com.pikolive.core.monsterhunting.bean.MonsterProtocol; +import com.pikolive.core.msg.sys.ErbanSysMsgInfo; +import com.pikolive.core.msg.sys.ErbanSysMsgParamKey; +import com.pikolive.core.msg.sysv2.ErbanSysMsgV2Info; +import com.pikolive.core.noble.NobleInfo; +import com.pikolive.core.noble.NobleResourceType; +import com.pikolive.core.noble.NobleUtil; +import com.pikolive.core.public_chat_hall.manager.PublicChatHallDataManager; +import com.pikolive.core2.retry.ImRetryManager; +import com.pikolive.core2.retry.ReconnectListener; +import com.pikolive.core2.retry.RetryChatRoomMessage; +import com.pikolive.core.room.activitytimer.ActivityTimerEvent; +import com.pikolive.core.room.activitytimer.TimerBean; +import com.pikolive.core.room.auction.bean.AuctionInfo; +import com.pikolive.core.room.bean.LeaveModeAttachment; +import com.pikolive.core.room.bean.RoomInfo; +import com.pikolive.core.room.exception.AntiSpamHitException; +import com.pikolive.core.room.face.DynamicFaceModel; +import com.pikolive.core.room.giftvalue.helper.GiftValueMrg; +import com.pikolive.core.room.model.AvRoomModel; +import com.pikolive.core.room.model.MicQueueModel; +import com.pikolive.core.room.pk.attachment.RoomPkAttachment; +import com.pikolive.core.room.pk.bean.PKTeamInfo; +import com.pikolive.core.room.pk.bean.RoomPKInvitedUpMicMember; +import com.pikolive.core.room.pk.bean.RoomPkData; +import com.pikolive.core.room.pk.model.PkModel; +import com.pikolive.core.room.queue.bean.MicMemberInfo; +import com.pikolive.core.room.queuing_mic.attachment.QueuingMicAttachment; +import com.pikolive.core.room.queuing_mic.bean.QueuingMicInfo; +import com.pikolive.core.room.queuing_mic.event.QueuingMicEmptyEvent; +import com.pikolive.core.room.queuing_mic.event.QueuingMicNotEmptyEvent; +import com.pikolive.core.share.bean.InAppSharingFamilyInfo; +import com.pikolive.core.share.bean.InAppSharingMiniWorldInfo; +import com.pikolive.core.share.bean.InAppSharingRoomInfo; +import com.pikolive.core.share.bean.InAppSharingTeamInfo; +import com.pikolive.core.share.bean.SessionType; +import com.pikolive.core.statistic.StatLogKey; +import com.pikolive.core.admin.SuperAdminDataMrg; +import com.pikolive.core.admin.attachment.SuperAdminOpAttachment; +import com.pikolive.core.admin.bean.SaOpInfo; +import com.pikolive.core.admin.util.SuperAdminUtil; +import com.pikolive.core.team.bean.TeamInfo; +import com.pikolive.core.user.UserModel; +import com.pikolive.core.user.bean.BaseInfo; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.utils.ExtensionUtils; +import com.pikolive.core.utils.LogUtils; +import com.pikolive.core.utils.SharedPreferenceUtils; +import com.pikolive.core.utils.net.DontWarnObserver; +import com.pikolive.core.vip.VipBroadcastMsgEvent; import com.pikolive.library.net.rxnet.callback.CallBack; import com.pikolive.library.rxbus.RxBus; import com.pikolive.library.utils.JavaUtil; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/VolumeSetting.java b/core/src/diff_src_erban/java/com/pikolive/core2/manager/VolumeSetting.java similarity index 95% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/VolumeSetting.java rename to core/src/diff_src_erban/java/com/pikolive/core2/manager/VolumeSetting.java index 6c04c45bb..f1c63e8ed 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/VolumeSetting.java +++ b/core/src/diff_src_erban/java/com/pikolive/core2/manager/VolumeSetting.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.manager; +package com.pikolive.core2.manager; import com.pikolive.library.utils.config.BasicConfig; import com.pikolive.library.utils.pref.CommonPref; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/agora/EngineEventHandler.java b/core/src/diff_src_erban/java/com/pikolive/core2/manager/agora/EngineEventHandler.java similarity index 94% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/agora/EngineEventHandler.java rename to core/src/diff_src_erban/java/com/pikolive/core2/manager/agora/EngineEventHandler.java index 53d539aad..9a4098e6e 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/agora/EngineEventHandler.java +++ b/core/src/diff_src_erban/java/com/pikolive/core2/manager/agora/EngineEventHandler.java @@ -1,12 +1,12 @@ -package com.yizhuan.xchat_android_core.manager.agora; +package com.pikolive.core2.manager.agora; import android.os.Message; import com.orhanobut.logger.Logger; -import com.yizhuan.xchat_android_core.R; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.manager.RoomEvent; +import com.pikolive.core.R; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core2.manager.IMNetEaseManager; +import com.pikolive.core.manager.RoomEvent; import com.pikolive.library.utils.ResUtil; import com.pikolive.library.utils.SingleToastUtil; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/agora/RtcEngineHandler.java b/core/src/diff_src_erban/java/com/pikolive/core2/manager/agora/RtcEngineHandler.java similarity index 90% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/agora/RtcEngineHandler.java rename to core/src/diff_src_erban/java/com/pikolive/core2/manager/agora/RtcEngineHandler.java index eac43ef4a..0354a10d9 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/agora/RtcEngineHandler.java +++ b/core/src/diff_src_erban/java/com/pikolive/core2/manager/agora/RtcEngineHandler.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.manager.agora; +package com.pikolive.core2.manager.agora; import static io.agora.rtc2.Constants.AUDIO_RECORDING_QUALITY_LOW; @@ -6,12 +6,12 @@ import android.os.Environment; import android.os.Handler; import android.os.Message; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.manager.AudioEngineManager; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.manager.RoomEvent; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core2.manager.AudioEngineManager; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core2.manager.IMNetEaseManager; +import com.pikolive.core.manager.RoomEvent; +import com.pikolive.core.room.bean.RoomInfo; import com.pikolive.library.common.file.FileHelper; import com.pikolive.library.utils.config.BasicConfig; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/agora/RtcEngineManager.java b/core/src/diff_src_erban/java/com/pikolive/core2/manager/agora/RtcEngineManager.java similarity index 96% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/agora/RtcEngineManager.java rename to core/src/diff_src_erban/java/com/pikolive/core2/manager/agora/RtcEngineManager.java index 989eab5fa..881566635 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/agora/RtcEngineManager.java +++ b/core/src/diff_src_erban/java/com/pikolive/core2/manager/agora/RtcEngineManager.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.manager.agora; +package com.pikolive.core2.manager.agora; import static io.agora.rtc2.Constants.AUDIO_PROFILE_MUSIC_STANDARD; import static io.agora.rtc2.Constants.AUDIO_SCENARIO_GAME_STREAMING; @@ -12,10 +12,10 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import com.orhanobut.logger.Logger; -import com.yizhuan.xchat_android_constants.XChatConstants; -import com.yizhuan.xchat_android_core.manager.BaseEngine; -import com.yizhuan.xchat_android_core.music.db.bean.LocalMusicBean; -import com.yizhuan.xchat_android_core.music.model.PlayerModel; +import com.pikolive.core2.XChatConstants; +import com.pikolive.core2.manager.BaseEngine; +import com.pikolive.core.music.db.bean.LocalMusicBean; +import com.pikolive.core.music.model.PlayerModel; import com.pikolive.library.common.file.FileHelper; import com.pikolive.library.utils.config.BasicConfig; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/BaseAdapterImpl.java b/core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/BaseAdapterImpl.java similarity index 99% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/BaseAdapterImpl.java rename to core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/BaseAdapterImpl.java index fa82b9f63..b25859770 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/BaseAdapterImpl.java +++ b/core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/BaseAdapterImpl.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.manager.trtc; +package com.pikolive.core2.manager.trtc; import android.graphics.Bitmap; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/BaseAgoraHandlerInterface.java b/core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/BaseAgoraHandlerInterface.java similarity index 98% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/BaseAgoraHandlerInterface.java rename to core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/BaseAgoraHandlerInterface.java index 2a966385b..0fdbb955b 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/BaseAgoraHandlerInterface.java +++ b/core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/BaseAgoraHandlerInterface.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.manager.trtc; +package com.pikolive.core2.manager.trtc; import android.graphics.Rect; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/BaseAgoraInterface.java b/core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/BaseAgoraInterface.java similarity index 99% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/BaseAgoraInterface.java rename to core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/BaseAgoraInterface.java index e0514284a..87cded916 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/BaseAgoraInterface.java +++ b/core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/BaseAgoraInterface.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.manager.trtc; +package com.pikolive.core2.manager.trtc; import io.agora.rtc2.IAudioFrameObserver; import io.agora.rtc2.IMetadataObserver; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/IRTCEngine.java b/core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/IRTCEngine.java similarity index 96% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/IRTCEngine.java rename to core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/IRTCEngine.java index 82ef282cb..c26e1a02e 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/IRTCEngine.java +++ b/core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/IRTCEngine.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.manager.trtc; +package com.pikolive.core2.manager.trtc; import android.graphics.Bitmap; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/IRTCEngineHandler.java b/core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/IRTCEngineHandler.java similarity index 91% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/IRTCEngineHandler.java rename to core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/IRTCEngineHandler.java index e27a99c57..8031f53fd 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/IRTCEngineHandler.java +++ b/core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/IRTCEngineHandler.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.manager.trtc; +package com.pikolive.core2.manager.trtc; import com.tencent.trtc.TRTCCloudDef; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/RoomIdHelper.java b/core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/RoomIdHelper.java similarity index 73% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/RoomIdHelper.java rename to core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/RoomIdHelper.java index dcfe1e69b..850dbccba 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/RoomIdHelper.java +++ b/core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/RoomIdHelper.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.manager.trtc; +package com.pikolive.core2.manager.trtc; -import com.yizhuan.xchat_android_core.utils.StringUtils; +import com.pikolive.core.utils.StringUtils; public class RoomIdHelper { /** diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/SDKConfig.java b/core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/SDKConfig.java similarity index 95% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/SDKConfig.java rename to core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/SDKConfig.java index c0bf56da2..f7b9c3663 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/SDKConfig.java +++ b/core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/SDKConfig.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.manager.trtc; +package com.pikolive.core2.manager.trtc; public class SDKConfig { /** diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/TRTCEffectManager.java b/core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/TRTCEffectManager.java similarity index 98% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/TRTCEffectManager.java rename to core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/TRTCEffectManager.java index d2acec168..4497034f2 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/TRTCEffectManager.java +++ b/core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/TRTCEffectManager.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.manager.trtc; +package com.pikolive.core2.manager.trtc; import com.tencent.liteav.audio.TXAudioEffectManager; import com.tencent.trtc.TRTCCloud; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/TRTCEngineAdapter.java b/core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/TRTCEngineAdapter.java similarity index 99% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/TRTCEngineAdapter.java rename to core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/TRTCEngineAdapter.java index db05cfcee..4dd3a7131 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/TRTCEngineAdapter.java +++ b/core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/TRTCEngineAdapter.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.manager.trtc; +package com.pikolive.core2.manager.trtc; import static com.tencent.trtc.TRTCCloudDef.TRTCRoleAnchor; import static com.tencent.trtc.TRTCCloudDef.TRTCRoleAudience; @@ -75,8 +75,8 @@ import com.tencent.trtc.TRTCCloud; import com.tencent.trtc.TRTCCloudDef; import com.tencent.trtc.TRTCCloudListener; import com.tencent.trtc.TRTCStatistics; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.utils.LogUtils; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core.utils.LogUtils; import org.json.JSONException; import org.json.JSONObject; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/TRtcEngineEventHandler.java b/core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/TRtcEngineEventHandler.java similarity index 95% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/TRtcEngineEventHandler.java rename to core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/TRtcEngineEventHandler.java index 4499ea3dd..0af07b581 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/TRtcEngineEventHandler.java +++ b/core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/TRtcEngineEventHandler.java @@ -1,17 +1,17 @@ -package com.yizhuan.xchat_android_core.manager.trtc; +package com.pikolive.core2.manager.trtc; import android.graphics.Rect; import android.os.Message; import com.orhanobut.logger.Logger; +import com.pikolive.core2.manager.agora.RtcEngineHandler; import com.tencent.trtc.TRTCCloudDef; -import com.yizhuan.xchat_android_core.R; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomPkBean; -import com.yizhuan.xchat_android_core.manager.AudioEngineManager; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.manager.RoomEvent; -import com.yizhuan.xchat_android_core.manager.agora.RtcEngineHandler; +import com.pikolive.core.R; +import com.pikolive.core.im.custom.bean.RoomPkBean; +import com.pikolive.core2.manager.AudioEngineManager; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core2.manager.IMNetEaseManager; +import com.pikolive.core.manager.RoomEvent; import com.pikolive.library.utils.ResUtil; import com.pikolive.library.utils.SingleToastUtil; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/TRtcEngineHandler.java b/core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/TRtcEngineHandler.java similarity index 90% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/TRtcEngineHandler.java rename to core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/TRtcEngineHandler.java index d19cabb9c..1c22e9e48 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/TRtcEngineHandler.java +++ b/core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/TRtcEngineHandler.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.manager.trtc; +package com.pikolive.core2.manager.trtc; import static io.agora.rtc2.Constants.AUDIO_RECORDING_QUALITY_LOW; @@ -6,12 +6,12 @@ import android.os.Environment; import android.os.Handler; import android.os.Message; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.manager.AudioEngineManager; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.manager.RoomEvent; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core2.manager.AudioEngineManager; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core2.manager.IMNetEaseManager; +import com.pikolive.core.manager.RoomEvent; +import com.pikolive.core.room.bean.RoomInfo; import com.pikolive.library.common.file.FileHelper; import com.pikolive.library.utils.config.BasicConfig; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/TRtcEngineManager.java b/core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/TRtcEngineManager.java similarity index 95% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/TRtcEngineManager.java rename to core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/TRtcEngineManager.java index bf9d85de6..6bf7e0ad9 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/TRtcEngineManager.java +++ b/core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/TRtcEngineManager.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.manager.trtc; +package com.pikolive.core2.manager.trtc; import static io.agora.rtc2.Constants.AUDIO_PROFILE_MUSIC_STANDARD; import static io.agora.rtc2.Constants.AUDIO_SCENARIO_GAME_STREAMING; @@ -11,12 +11,12 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import com.orhanobut.logger.Logger; -import com.yizhuan.xchat_android_core.initial.InitialModel; -import com.yizhuan.xchat_android_core.initial.bean.InitInfo; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.BaseEngine; -import com.yizhuan.xchat_android_core.music.db.bean.LocalMusicBean; -import com.yizhuan.xchat_android_core.music.model.PlayerModel; +import com.pikolive.core.initial.InitialModel; +import com.pikolive.core.initial.bean.InitInfo; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core2.manager.BaseEngine; +import com.pikolive.core.music.db.bean.LocalMusicBean; +import com.pikolive.core.music.model.PlayerModel; import com.pikolive.library.utils.config.BasicConfig; import io.agora.rtc2.Constants; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/Unsupport.java b/core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/Unsupport.java similarity index 74% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/Unsupport.java rename to core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/Unsupport.java index f2fa56420..da4a94d6e 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/Unsupport.java +++ b/core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/Unsupport.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.manager.trtc; +package com.pikolive.core2.manager.trtc; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/Utils.java b/core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/Utils.java similarity index 97% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/Utils.java rename to core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/Utils.java index af5a134eb..f64b501ef 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/Utils.java +++ b/core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/Utils.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.manager.trtc; +package com.pikolive.core2.manager.trtc; import android.graphics.Bitmap; import android.graphics.BitmapFactory; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/Version.java b/core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/Version.java similarity index 80% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/Version.java rename to core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/Version.java index f10b9b9bd..56663bf24 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/Version.java +++ b/core/src/diff_src_erban/java/com/pikolive/core2/manager/trtc/Version.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.manager.trtc; +package com.pikolive.core2.manager.trtc; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/market_verify/IMarketVerifyModel.java b/core/src/diff_src_erban/java/com/pikolive/core2/market_verify/IMarketVerifyModel.java similarity index 76% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/market_verify/IMarketVerifyModel.java rename to core/src/diff_src_erban/java/com/pikolive/core2/market_verify/IMarketVerifyModel.java index b58034c0d..2d29ab92a 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/market_verify/IMarketVerifyModel.java +++ b/core/src/diff_src_erban/java/com/pikolive/core2/market_verify/IMarketVerifyModel.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.market_verify; +package com.pikolive.core2.market_verify; -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.bean.LoginTipsInfo; +import com.pikolive.core.base.IModel; +import com.pikolive.core.bean.LoginTipsInfo; import io.reactivex.Single; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/market_verify/MarketVerifyModel.java b/core/src/diff_src_erban/java/com/pikolive/core2/market_verify/MarketVerifyModel.java similarity index 89% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/market_verify/MarketVerifyModel.java rename to core/src/diff_src_erban/java/com/pikolive/core2/market_verify/MarketVerifyModel.java index 433600c76..1530a7c15 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/market_verify/MarketVerifyModel.java +++ b/core/src/diff_src_erban/java/com/pikolive/core2/market_verify/MarketVerifyModel.java @@ -1,11 +1,11 @@ -package com.yizhuan.xchat_android_core.market_verify; +package com.pikolive.core2.market_verify; -import com.yizhuan.xchat_android_core.auth.event.LoginEvent; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.LoginTipsInfo; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.market_verify.bean.VersionConfig; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core2.market_verify.bean.VersionConfig; +import com.pikolive.core.auth.event.LoginEvent; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.bean.LoginTipsInfo; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.net.rxnet.RxNet; import org.greenrobot.eventbus.EventBus; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/market_verify/bean/VersionConfig.java b/core/src/diff_src_erban/java/com/pikolive/core2/market_verify/bean/VersionConfig.java similarity index 90% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/market_verify/bean/VersionConfig.java rename to core/src/diff_src_erban/java/com/pikolive/core2/market_verify/bean/VersionConfig.java index 9a3368d5f..a587efcfe 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/market_verify/bean/VersionConfig.java +++ b/core/src/diff_src_erban/java/com/pikolive/core2/market_verify/bean/VersionConfig.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.market_verify.bean; +package com.pikolive.core2.market_verify.bean; import lombok.Data; diff --git a/core/src/diff_src_erban/java/com/pikolive/core2/market_verify/event/MarketVerifyUpdateEvent.java b/core/src/diff_src_erban/java/com/pikolive/core2/market_verify/event/MarketVerifyUpdateEvent.java new file mode 100644 index 000000000..4f95bc206 --- /dev/null +++ b/core/src/diff_src_erban/java/com/pikolive/core2/market_verify/event/MarketVerifyUpdateEvent.java @@ -0,0 +1,4 @@ +package com.pikolive.core2.market_verify.event; + +public class MarketVerifyUpdateEvent { +} diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/retry/ImRetryManager.java b/core/src/diff_src_erban/java/com/pikolive/core2/retry/ImRetryManager.java similarity index 94% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/retry/ImRetryManager.java rename to core/src/diff_src_erban/java/com/pikolive/core2/retry/ImRetryManager.java index b1dc6a462..3980450c1 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/retry/ImRetryManager.java +++ b/core/src/diff_src_erban/java/com/pikolive/core2/retry/ImRetryManager.java @@ -1,11 +1,11 @@ -package com.yizhuan.xchat_android_core.retry; +package com.pikolive.core2.retry; import android.util.Log; import com.netease.nim.uikit.common.util.log.LogUtil; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; -import com.yizhuan.xchat_android_core.R; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; +import com.pikolive.core2.manager.IMNetEaseManager; +import com.pikolive.core.R; import com.pikolive.library.utils.ResUtil; import io.reactivex.Single; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/retry/ReconnectListener.java b/core/src/diff_src_erban/java/com/pikolive/core2/retry/ReconnectListener.java similarity index 85% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/retry/ReconnectListener.java rename to core/src/diff_src_erban/java/com/pikolive/core2/retry/ReconnectListener.java index ddf389d2b..7c8e035fa 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/retry/ReconnectListener.java +++ b/core/src/diff_src_erban/java/com/pikolive/core2/retry/ReconnectListener.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.retry; +package com.pikolive.core2.retry; /** * 重发的回调，暂时引入是为了埋点 diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/retry/RetryChatRoomMessage.java b/core/src/diff_src_erban/java/com/pikolive/core2/retry/RetryChatRoomMessage.java similarity index 85% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/retry/RetryChatRoomMessage.java rename to core/src/diff_src_erban/java/com/pikolive/core2/retry/RetryChatRoomMessage.java index 087a8c12c..7b026d242 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/retry/RetryChatRoomMessage.java +++ b/core/src/diff_src_erban/java/com/pikolive/core2/retry/RetryChatRoomMessage.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.retry; +package com.pikolive.core2.retry; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/set/bean/ShieldInfo.kt b/core/src/diff_src_erban/java/com/pikolive/core2/set/bean/ShieldInfo.kt similarity index 84% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/set/bean/ShieldInfo.kt rename to core/src/diff_src_erban/java/com/pikolive/core2/set/bean/ShieldInfo.kt index 2410475d4..e04d53069 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/set/bean/ShieldInfo.kt +++ b/core/src/diff_src_erban/java/com/pikolive/core2/set/bean/ShieldInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.set.bean +package com.pikolive.core2.set.bean import lombok.Data diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/set/model/SetModel.kt b/core/src/diff_src_erban/java/com/pikolive/core2/set/model/SetModel.kt similarity index 76% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/set/model/SetModel.kt rename to core/src/diff_src_erban/java/com/pikolive/core2/set/model/SetModel.kt index b95922e15..86fd2f4b4 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/set/model/SetModel.kt +++ b/core/src/diff_src_erban/java/com/pikolive/core2/set/model/SetModel.kt @@ -1,11 +1,11 @@ -package com.yizhuan.xchat_android_core.set.model +package com.pikolive.core2.set.model -import com.yizhuan.xchat_android_core.base.BaseModel -import com.yizhuan.xchat_android_core.bean.response.ServiceResult -import com.yizhuan.xchat_android_core.home.bean.* -import com.yizhuan.xchat_android_core.set.bean.ShieldInfo -import com.yizhuan.xchat_android_core.utils.net.launchRequest +import com.pikolive.core2.home.bean.* +import com.pikolive.core2.set.bean.ShieldInfo +import com.pikolive.core.utils.net.launchRequest import com.pikolive.library.net.rxnet.RxNet +import com.pikolive.core.base.BaseModel +import com.pikolive.core.bean.response.ServiceResult import retrofit2.http.GET import retrofit2.http.POST import retrofit2.http.Query diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/sound/model/SoundModel.kt b/core/src/diff_src_erban/java/com/pikolive/core2/sound/model/SoundModel.kt similarity index 71% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/sound/model/SoundModel.kt rename to core/src/diff_src_erban/java/com/pikolive/core2/sound/model/SoundModel.kt index c8f877f75..83a512f71 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/sound/model/SoundModel.kt +++ b/core/src/diff_src_erban/java/com/pikolive/core2/sound/model/SoundModel.kt @@ -1,11 +1,12 @@ -package com.yizhuan.xchat_android_core.sound.model +package com.pikolive.core2.sound.model -import com.yizhuan.xchat_android_core.base.BaseModel -import com.yizhuan.xchat_android_core.bean.response.ServiceResult -import com.yizhuan.xchat_android_core.earn.bean.* -import com.yizhuan.xchat_android_core.home.bean.* -import com.yizhuan.xchat_android_core.utils.net.launchRequest +import com.pikolive.core2.earn.bean.* +import com.pikolive.core2.home.bean.* + +import com.pikolive.core.utils.net.launchRequest import com.pikolive.library.net.rxnet.RxNet +import com.pikolive.core.base.BaseModel +import com.pikolive.core.bean.response.ServiceResult import retrofit2.http.POST import retrofit2.http.Query diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/Compound.kt b/core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/Compound.kt similarity index 54% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/Compound.kt rename to core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/Compound.kt index 2c7c43aec..50c5cf1e2 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/Compound.kt +++ b/core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/Compound.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.treasurefairy +package com.pikolive.core2.treasurefairy data class Compound( val elfId: Long, diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/DrawInfo.kt b/core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/DrawInfo.kt similarity index 67% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/DrawInfo.kt rename to core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/DrawInfo.kt index 79c7ec6d5..2a13276e1 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/DrawInfo.kt +++ b/core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/DrawInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.treasurefairy +package com.pikolive.core2.treasurefairy data class DrawInfo( var drawTicketNum: Int = 0, diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/ExchangeGiftInfo.kt b/core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/ExchangeGiftInfo.kt similarity index 94% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/ExchangeGiftInfo.kt rename to core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/ExchangeGiftInfo.kt index cff4e4e91..a83f6044c 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/ExchangeGiftInfo.kt +++ b/core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/ExchangeGiftInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.treasurefairy +package com.pikolive.core2.treasurefairy data class ExchangeGiftInfo( val expendNum: Int = 0, diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/FairyInfo.kt b/core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/FairyInfo.kt similarity index 91% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/FairyInfo.kt rename to core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/FairyInfo.kt index 87c9bb7c5..1ea812294 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/FairyInfo.kt +++ b/core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/FairyInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.treasurefairy +package com.pikolive.core2.treasurefairy import java.io.Serializable diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/FairyMsgInfoBean.java b/core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/FairyMsgInfoBean.java similarity index 88% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/FairyMsgInfoBean.java rename to core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/FairyMsgInfoBean.java index e6eb38f6e..5e7651c07 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/FairyMsgInfoBean.java +++ b/core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/FairyMsgInfoBean.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.treasurefairy; +package com.pikolive.core2.treasurefairy; import lombok.Data; diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/FairyResolveParam.kt b/core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/FairyResolveParam.kt similarity index 62% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/FairyResolveParam.kt rename to core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/FairyResolveParam.kt index 346f26a7b..60a3534f6 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/FairyResolveParam.kt +++ b/core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/FairyResolveParam.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.treasurefairy +package com.pikolive.core2.treasurefairy data class FairyResolveParam( val expendList: MutableList = arrayListOf() diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/FairyTestParam.kt b/core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/FairyTestParam.kt similarity index 67% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/FairyTestParam.kt rename to core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/FairyTestParam.kt index b08420198..ee96ebe2f 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/FairyTestParam.kt +++ b/core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/FairyTestParam.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.treasurefairy +package com.pikolive.core2.treasurefairy data class FairyTestParam( val expendList: MutableList = arrayListOf(), diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/ForestInfo.kt b/core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/ForestInfo.kt similarity index 81% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/ForestInfo.kt rename to core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/ForestInfo.kt index 7ab08e2c2..2950c4d7c 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/ForestInfo.kt +++ b/core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/ForestInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.treasurefairy +package com.pikolive.core2.treasurefairy data class ForestInfo( val avatar: String = "", diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/MyFairyInfo.kt b/core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/MyFairyInfo.kt similarity index 82% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/MyFairyInfo.kt rename to core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/MyFairyInfo.kt index 7b03a9636..f8c01dc7f 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/MyFairyInfo.kt +++ b/core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/MyFairyInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.treasurefairy +package com.pikolive.core2.treasurefairy data class MyFairyInfo( val highElves: ArrayList? = null, diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/PrizeInfo.kt b/core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/PrizeInfo.kt similarity index 87% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/PrizeInfo.kt rename to core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/PrizeInfo.kt index d3989993e..ab05c5c0c 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/PrizeInfo.kt +++ b/core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/PrizeInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.treasurefairy +package com.pikolive.core2.treasurefairy data class PrizeInfo( val rewardId: Int = 0, diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/PropItemInfo.kt b/core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/PropItemInfo.kt similarity index 72% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/PropItemInfo.kt rename to core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/PropItemInfo.kt index 932dcd212..ae1eaf3cb 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/PropItemInfo.kt +++ b/core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/PropItemInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.treasurefairy +package com.pikolive.core2.treasurefairy data class PropItemInfo( val picUrl: String = "", diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/ResolveInfo.kt b/core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/ResolveInfo.kt similarity index 69% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/ResolveInfo.kt rename to core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/ResolveInfo.kt index 5981d7dce..1e2c4f4f2 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/ResolveInfo.kt +++ b/core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/ResolveInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.treasurefairy +package com.pikolive.core2.treasurefairy import java.io.Serializable diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/SendFairyInfo.kt b/core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/SendFairyInfo.kt similarity index 84% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/SendFairyInfo.kt rename to core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/SendFairyInfo.kt index e0c282dbc..4cd7f189d 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/SendFairyInfo.kt +++ b/core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/SendFairyInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.treasurefairy +package com.pikolive.core2.treasurefairy data class SendFairyInfo( val createTime: Long = 0, diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/TestFairyRecordInfo.kt b/core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/TestFairyRecordInfo.kt similarity index 82% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/TestFairyRecordInfo.kt rename to core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/TestFairyRecordInfo.kt index aa400ce16..2a02270cb 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/TestFairyRecordInfo.kt +++ b/core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/TestFairyRecordInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.treasurefairy +package com.pikolive.core2.treasurefairy data class TestFairyRecordInfo( val compoundLevel: Int = 0, diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/TreasureFairyModel.kt b/core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/TreasureFairyModel.kt similarity index 93% rename from core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/TreasureFairyModel.kt rename to core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/TreasureFairyModel.kt index 920614497..ec34cefbe 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/TreasureFairyModel.kt +++ b/core/src/diff_src_erban/java/com/pikolive/core2/treasurefairy/TreasureFairyModel.kt @@ -1,13 +1,13 @@ -package com.yizhuan.xchat_android_core.treasurefairy +package com.pikolive.core2.treasurefairy -import com.yizhuan.xchat_android_core.bean.response.ServiceResult -import com.yizhuan.xchat_android_core.gift.bean.SimpleUserInfo -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager -import com.yizhuan.xchat_android_core.treasurefairy.FairyInfo.Companion.LEVEL_HIGH -import com.yizhuan.xchat_android_core.treasurefairy.FairyInfo.Companion.LEVEL_LOW -import com.yizhuan.xchat_android_core.treasurefairy.FairyInfo.Companion.LEVEL_MIDDLE -import com.yizhuan.xchat_android_core.utils.net.launchRequest +import com.pikolive.core2.treasurefairy.FairyInfo.Companion.LEVEL_HIGH +import com.pikolive.core2.treasurefairy.FairyInfo.Companion.LEVEL_LOW +import com.pikolive.core2.treasurefairy.FairyInfo.Companion.LEVEL_MIDDLE +import com.pikolive.core.utils.net.launchRequest import com.pikolive.library.net.rxnet.RxNet +import com.pikolive.core.bean.response.ServiceResult +import com.pikolive.core.gift.bean.SimpleUserInfo +import com.pikolive.core.manager.AvRoomDataManager import retrofit2.http.* object TreasureFairyModel { diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/channel/IChannelModel.java b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/channel/IChannelModel.java deleted file mode 100644 index 1c971f66d..000000000 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/channel/IChannelModel.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.yizhuan.xchat_android_core.channel; - -import com.yizhuan.xchat_android_core.base.IModel; - -public interface IChannelModel extends IModel { -} diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/event/FollowRoomEvent.java b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/event/FollowRoomEvent.java deleted file mode 100644 index 13c16b0b9..000000000 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/event/FollowRoomEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.yizhuan.xchat_android_core.home.event; - -public class FollowRoomEvent { -} diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/event/RefreshHomeDataEvent.java b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/event/RefreshHomeDataEvent.java deleted file mode 100644 index 711fa8366..000000000 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/event/RefreshHomeDataEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.yizhuan.xchat_android_core.home.event; - -public class RefreshHomeDataEvent { -} diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/event/ShareRoomEvent.java b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/event/ShareRoomEvent.java deleted file mode 100644 index 0ebfd2468..000000000 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/event/ShareRoomEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.yizhuan.xchat_android_core.home.event; - -public class ShareRoomEvent { -} diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/market_verify/event/MarketVerifyUpdateEvent.java b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/market_verify/event/MarketVerifyUpdateEvent.java deleted file mode 100644 index 337574da4..000000000 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/market_verify/event/MarketVerifyUpdateEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.yizhuan.xchat_android_core.market_verify.event; - -public class MarketVerifyUpdateEvent { -} diff --git a/core/src/main/AndroidManifest.xml b/core/src/main/AndroidManifest.xml index bd738d384..7f9d397e6 100644 --- a/core/src/main/AndroidManifest.xml +++ b/core/src/main/AndroidManifest.xml @@ -1,3 +1,3 @@ - + diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/Constants.java b/core/src/main/java/com/pikolive/core/Constants.java similarity index 97% rename from core/src/main/java/com/yizhuan/xchat_android_core/Constants.java rename to core/src/main/java/com/pikolive/core/Constants.java index 9002d5c39..6dfffa457 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/Constants.java +++ b/core/src/main/java/com/pikolive/core/Constants.java @@ -1,9 +1,10 @@ -package com.yizhuan.xchat_android_core; +package com.pikolive.core; -import com.yizhuan.xchat_android_constants.XChatConstants; +import com.pikolive.core2.XChatConstants; import com.pikolive.library.common.application.Env; import com.pikolive.library.utils.config.BasicConfig; import com.pikolive.library.utils.pref.CommonPref; +import com.pikolive.core.BuildConfig; import java.io.File; import java.util.Arrays; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/DemoCache.java b/core/src/main/java/com/pikolive/core/DemoCache.java similarity index 93% rename from core/src/main/java/com/yizhuan/xchat_android_core/DemoCache.java rename to core/src/main/java/com/pikolive/core/DemoCache.java index 902ae0f94..287abb5f7 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/DemoCache.java +++ b/core/src/main/java/com/pikolive/core/DemoCache.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core; +package com.pikolive.core; import android.text.TextUtils; @@ -7,17 +7,26 @@ import androidx.annotation.Nullable; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.netease.nimlib.sdk.StatusBarNotificationConfig; -import com.yizhuan.xchat_android_constants.XChatConstants; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.auth.entity.AccountInfo; -import com.yizhuan.xchat_android_core.auth.entity.TicketInfo; -import com.yizhuan.xchat_android_core.home.bean.MainTabInfo; -import com.yizhuan.xchat_android_core.initial.SplashComponent; -import com.yizhuan.xchat_android_core.initial.bean.InitInfo; -import com.yizhuan.xchat_android_core.noble.NobleConfig; -import com.yizhuan.xchat_android_core.noble.NobleRight; -import com.yizhuan.xchat_android_core.utils.CurrentTimeUtils; -import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.auth.entity.AccountInfo; +import com.pikolive.core.auth.entity.TicketInfo; +import com.pikolive.core.initial.SplashComponent; +import com.pikolive.core.initial.bean.InitInfo; +import com.pikolive.core.noble.NobleConfig; +import com.pikolive.core.noble.NobleRight; +import com.pikolive.core.utils.CurrentTimeUtils; +import com.pikolive.core.utils.SharedPreferenceUtils; +import com.pikolive.core2.XChatConstants; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.auth.entity.AccountInfo; +import com.pikolive.core.auth.entity.TicketInfo; +import com.pikolive.core.initial.SplashComponent; +import com.pikolive.core.initial.bean.InitInfo; +import com.pikolive.core.noble.NobleConfig; +import com.pikolive.core.noble.NobleRight; +import com.pikolive.core.utils.CurrentTimeUtils; +import com.pikolive.core.utils.SharedPreferenceUtils; +import com.pikolive.core2.home.bean.MainTabInfo; import com.pikolive.library.utils.pref.ObjectPref; import com.pikolive.library.utils.pref.SettingsPref; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/OldHttpObserver.java b/core/src/main/java/com/pikolive/core/OldHttpObserver.java similarity index 78% rename from core/src/main/java/com/yizhuan/xchat_android_core/OldHttpObserver.java rename to core/src/main/java/com/pikolive/core/OldHttpObserver.java index af93c85f9..af4e67a42 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/OldHttpObserver.java +++ b/core/src/main/java/com/pikolive/core/OldHttpObserver.java @@ -1,7 +1,11 @@ -package com.yizhuan.xchat_android_core; +package com.pikolive.core; -import com.yizhuan.xchat_android_core.bean.response.RequestError; -import com.yizhuan.xchat_android_core.bean.response.ResponseData; +import com.pikolive.core.bean.response.RequestError; +import com.pikolive.core.bean.response.ResponseData; +import com.pikolive.core.bean.response.RequestError; +import com.pikolive.core.bean.response.ResponseData; +import com.pikolive.core.bean.response.RequestError; +import com.pikolive.core.bean.response.ResponseData; import io.reactivex.SingleObserver; import io.reactivex.disposables.Disposable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/PreferencesUtils.java b/core/src/main/java/com/pikolive/core/PreferencesUtils.java similarity index 92% rename from core/src/main/java/com/yizhuan/xchat_android_core/PreferencesUtils.java rename to core/src/main/java/com/pikolive/core/PreferencesUtils.java index b34cf229f..274f9109f 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/PreferencesUtils.java +++ b/core/src/main/java/com/pikolive/core/PreferencesUtils.java @@ -1,11 +1,15 @@ -package com.yizhuan.xchat_android_core; +package com.pikolive.core; import android.content.Context; import com.netease.nimlib.sdk.StatusBarNotificationConfig; import com.netease.nimlib.sdk.auth.LoginInfo; -import com.yizhuan.xchat_android_core.auth.entity.AccountInfo; -import com.yizhuan.xchat_android_core.auth.entity.TicketInfo; +import com.pikolive.core.auth.entity.AccountInfo; +import com.pikolive.core.auth.entity.TicketInfo; +import com.pikolive.core.auth.entity.AccountInfo; +import com.pikolive.core.auth.entity.TicketInfo; +import com.pikolive.core.auth.entity.AccountInfo; +import com.pikolive.core.auth.entity.TicketInfo; import com.pikolive.library.utils.config.BasicConfig; import com.pikolive.library.utils.pref.ObjectPref; import com.pikolive.library.utils.pref.SettingsPref; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/activity/bean/LotteryInfo.java b/core/src/main/java/com/pikolive/core/activity/bean/LotteryInfo.java similarity index 94% rename from core/src/main/java/com/yizhuan/xchat_android_core/activity/bean/LotteryInfo.java rename to core/src/main/java/com/pikolive/core/activity/bean/LotteryInfo.java index 83b9e81ce..7ca2b5422 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/activity/bean/LotteryInfo.java +++ b/core/src/main/java/com/pikolive/core/activity/bean/LotteryInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.activity.bean; +package com.pikolive.core.activity.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/activity/event/ActivityEvent.java b/core/src/main/java/com/pikolive/core/activity/event/ActivityEvent.java similarity index 64% rename from core/src/main/java/com/yizhuan/xchat_android_core/activity/event/ActivityEvent.java rename to core/src/main/java/com/pikolive/core/activity/event/ActivityEvent.java index 65a3fa1d6..72e468f75 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/activity/event/ActivityEvent.java +++ b/core/src/main/java/com/pikolive/core/activity/event/ActivityEvent.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.activity.event; +package com.pikolive.core.activity.event; -import com.yizhuan.xchat_android_core.activity.bean.LotteryInfo; +import com.pikolive.core.activity.bean.LotteryInfo; public class ActivityEvent { diff --git a/core/src/main/java/com/pikolive/core/activity/model/ActivityModel.java b/core/src/main/java/com/pikolive/core/activity/model/ActivityModel.java new file mode 100644 index 000000000..ba2e489d8 --- /dev/null +++ b/core/src/main/java/com/pikolive/core/activity/model/ActivityModel.java @@ -0,0 +1,7 @@ +package com.pikolive.core.activity.model; + +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.base.BaseModel; + +public class ActivityModel extends BaseModel implements IActivityModel { +} diff --git a/core/src/main/java/com/pikolive/core/activity/model/IActivityModel.java b/core/src/main/java/com/pikolive/core/activity/model/IActivityModel.java new file mode 100644 index 000000000..f325704b9 --- /dev/null +++ b/core/src/main/java/com/pikolive/core/activity/model/IActivityModel.java @@ -0,0 +1,8 @@ +package com.pikolive.core.activity.model; + +import com.pikolive.core.base.IModel; +import com.pikolive.core.base.IModel; +import com.pikolive.core.base.IModel; + +public interface IActivityModel extends IModel { +} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/audio/AudioPlayAndRecordManager.java b/core/src/main/java/com/pikolive/core/audio/AudioPlayAndRecordManager.java similarity index 98% rename from core/src/main/java/com/yizhuan/xchat_android_core/audio/AudioPlayAndRecordManager.java rename to core/src/main/java/com/pikolive/core/audio/AudioPlayAndRecordManager.java index 0b1bb5723..da5ca027c 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/audio/AudioPlayAndRecordManager.java +++ b/core/src/main/java/com/pikolive/core/audio/AudioPlayAndRecordManager.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.audio; +package com.pikolive.core.audio; import android.content.Context; import android.media.AudioManager; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/audio/bean/SysMsgVoiceInfo.java b/core/src/main/java/com/pikolive/core/audio/bean/SysMsgVoiceInfo.java similarity index 84% rename from core/src/main/java/com/yizhuan/xchat_android_core/audio/bean/SysMsgVoiceInfo.java rename to core/src/main/java/com/pikolive/core/audio/bean/SysMsgVoiceInfo.java index 326ec9a15..2952db748 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/audio/bean/SysMsgVoiceInfo.java +++ b/core/src/main/java/com/pikolive/core/audio/bean/SysMsgVoiceInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.audio.bean; +package com.pikolive.core.audio.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/audio/bean/VoiceBottleSayHiInfo.java b/core/src/main/java/com/pikolive/core/audio/bean/VoiceBottleSayHiInfo.java similarity index 77% rename from core/src/main/java/com/yizhuan/xchat_android_core/audio/bean/VoiceBottleSayHiInfo.java rename to core/src/main/java/com/pikolive/core/audio/bean/VoiceBottleSayHiInfo.java index 0e73ff44c..fca2b391e 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/audio/bean/VoiceBottleSayHiInfo.java +++ b/core/src/main/java/com/pikolive/core/audio/bean/VoiceBottleSayHiInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.audio.bean; +package com.pikolive.core.audio.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/audio/event/VoiceShakeHeartEvent.java b/core/src/main/java/com/pikolive/core/audio/event/VoiceShakeHeartEvent.java similarity index 77% rename from core/src/main/java/com/yizhuan/xchat_android_core/audio/event/VoiceShakeHeartEvent.java rename to core/src/main/java/com/pikolive/core/audio/event/VoiceShakeHeartEvent.java index 0316bd862..bde5a07c3 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/audio/event/VoiceShakeHeartEvent.java +++ b/core/src/main/java/com/pikolive/core/audio/event/VoiceShakeHeartEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.audio.event; +package com.pikolive.core.audio.event; public class VoiceShakeHeartEvent { public String showTextHint; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/auth/AuthModel.java b/core/src/main/java/com/pikolive/core/auth/AuthModel.java similarity index 96% rename from core/src/main/java/com/yizhuan/xchat_android_core/auth/AuthModel.java rename to core/src/main/java/com/pikolive/core/auth/AuthModel.java index 5fbeec863..efd47f5c7 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/auth/AuthModel.java +++ b/core/src/main/java/com/pikolive/core/auth/AuthModel.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.auth; +package com.pikolive.core.auth; import android.text.TextUtils; import android.util.Log; @@ -18,33 +18,33 @@ import com.netease.nimlib.sdk.auth.LoginInfo; import com.netease.nimlib.sdk.mixpush.MixPushService; import com.netease.nimlib.sdk.msg.MsgService; import com.orhanobut.logger.Logger; -import com.yizhuan.xchat_android_core.DemoCache; -import com.yizhuan.xchat_android_core.R; -import com.yizhuan.xchat_android_core.auth.bean.AreaInfoBean; -import com.yizhuan.xchat_android_core.auth.entity.AccountInfo; -import com.yizhuan.xchat_android_core.auth.entity.ThirdUserInfo; -import com.yizhuan.xchat_android_core.auth.entity.TicketInfo; -import com.yizhuan.xchat_android_core.auth.event.GetCurrentUidEvent; -import com.yizhuan.xchat_android_core.auth.event.KickOutEvent; -import com.yizhuan.xchat_android_core.auth.event.LoginEvent; -import com.yizhuan.xchat_android_core.auth.event.LoginReportEvent; -import com.yizhuan.xchat_android_core.auth.event.LogoutEvent; -import com.yizhuan.xchat_android_core.auth.exception.AccountCancelException; -import com.yizhuan.xchat_android_core.auth.exception.BanAccountException; -import com.yizhuan.xchat_android_core.auth.exception.IsSuperAdminException; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.bean.response.result.LoginResult; -import com.yizhuan.xchat_android_core.bean.response.result.RegisterResult; -import com.yizhuan.xchat_android_core.bean.response.result.TicketResult; -import com.yizhuan.xchat_android_core.exception.FailReasonException; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachParser; -import com.yizhuan.xchat_android_core.linked.LinkedModel; -import com.yizhuan.xchat_android_core.linked.bean.LinkedInfo; -import com.yizhuan.xchat_android_core.utils.CheckUtils; -import com.yizhuan.xchat_android_core.utils.LogUtils; -import com.yizhuan.xchat_android_core.utils.OldHttpErrorHandleUtil; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.auth.bean.AreaInfoBean; +import com.pikolive.core.auth.entity.AccountInfo; +import com.pikolive.core.auth.entity.ThirdUserInfo; +import com.pikolive.core.auth.entity.TicketInfo; +import com.pikolive.core.auth.event.GetCurrentUidEvent; +import com.pikolive.core.auth.event.KickOutEvent; +import com.pikolive.core.auth.event.LoginEvent; +import com.pikolive.core.auth.event.LoginReportEvent; +import com.pikolive.core.auth.event.LogoutEvent; +import com.pikolive.core.auth.exception.AccountCancelException; +import com.pikolive.core.auth.exception.BanAccountException; +import com.pikolive.core.auth.exception.IsSuperAdminException; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.bean.response.result.LoginResult; +import com.pikolive.core.bean.response.result.RegisterResult; +import com.pikolive.core.bean.response.result.TicketResult; +import com.pikolive.core.exception.FailReasonException; +import com.pikolive.core.im.custom.bean.CustomAttachParser; +import com.pikolive.core.linked.LinkedModel; +import com.pikolive.core.linked.bean.LinkedInfo; +import com.pikolive.core.DemoCache; +import com.pikolive.core.R; +import com.pikolive.core.utils.CheckUtils; +import com.pikolive.core.utils.LogUtils; +import com.pikolive.core.utils.OldHttpErrorHandleUtil; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.net.rxnet.RxNet; import com.pikolive.library.utils.DeviceUtils; import com.pikolive.library.utils.ResUtil; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/auth/IAuthModel.java b/core/src/main/java/com/pikolive/core/auth/IAuthModel.java similarity index 90% rename from core/src/main/java/com/yizhuan/xchat_android_core/auth/IAuthModel.java rename to core/src/main/java/com/pikolive/core/auth/IAuthModel.java index 69b0c166b..60f63ce86 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/auth/IAuthModel.java +++ b/core/src/main/java/com/pikolive/core/auth/IAuthModel.java @@ -1,8 +1,12 @@ -package com.yizhuan.xchat_android_core.auth; +package com.pikolive.core.auth; import com.facebook.CallbackManager; -import com.yizhuan.xchat_android_core.auth.entity.ThirdUserInfo; -import com.yizhuan.xchat_android_core.base.IModel; +import com.pikolive.core.auth.entity.ThirdUserInfo; +import com.pikolive.core.base.IModel; +import com.pikolive.core.auth.entity.ThirdUserInfo; +import com.pikolive.core.base.IModel; +import com.pikolive.core.auth.entity.ThirdUserInfo; +import com.pikolive.core.base.IModel; import org.json.JSONObject; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/auth/bean/AreaInfoBean.kt b/core/src/main/java/com/pikolive/core/auth/bean/AreaInfoBean.kt similarity index 85% rename from core/src/main/java/com/yizhuan/xchat_android_core/auth/bean/AreaInfoBean.kt rename to core/src/main/java/com/pikolive/core/auth/bean/AreaInfoBean.kt index 4f976b2c6..66eb8e01c 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/auth/bean/AreaInfoBean.kt +++ b/core/src/main/java/com/pikolive/core/auth/bean/AreaInfoBean.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.auth.bean +package com.pikolive.core.auth.bean import lombok.Data diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/auth/entity/AccountInfo.java b/core/src/main/java/com/pikolive/core/auth/entity/AccountInfo.java similarity index 96% rename from core/src/main/java/com/yizhuan/xchat_android_core/auth/entity/AccountInfo.java rename to core/src/main/java/com/pikolive/core/auth/entity/AccountInfo.java index 046c3393a..76043f69a 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/auth/entity/AccountInfo.java +++ b/core/src/main/java/com/pikolive/core/auth/entity/AccountInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.auth.entity; +package com.pikolive.core.auth.entity; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/auth/entity/ThirdUserInfo.java b/core/src/main/java/com/pikolive/core/auth/entity/ThirdUserInfo.java similarity index 96% rename from core/src/main/java/com/yizhuan/xchat_android_core/auth/entity/ThirdUserInfo.java rename to core/src/main/java/com/pikolive/core/auth/entity/ThirdUserInfo.java index 6d68d6e7f..b859f8b57 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/auth/entity/ThirdUserInfo.java +++ b/core/src/main/java/com/pikolive/core/auth/entity/ThirdUserInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.auth.entity; +package com.pikolive.core.auth.entity; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/auth/entity/TicketInfo.java b/core/src/main/java/com/pikolive/core/auth/entity/TicketInfo.java similarity index 95% rename from core/src/main/java/com/yizhuan/xchat_android_core/auth/entity/TicketInfo.java rename to core/src/main/java/com/pikolive/core/auth/entity/TicketInfo.java index 200c06cd5..aed0643fb 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/auth/entity/TicketInfo.java +++ b/core/src/main/java/com/pikolive/core/auth/entity/TicketInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.auth.entity; +package com.pikolive.core.auth.entity; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/auth/event/BindPhoneEvent.java b/core/src/main/java/com/pikolive/core/auth/event/BindPhoneEvent.java similarity index 64% rename from core/src/main/java/com/yizhuan/xchat_android_core/auth/event/BindPhoneEvent.java rename to core/src/main/java/com/pikolive/core/auth/event/BindPhoneEvent.java index dbcbe3bf4..e9164199d 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/auth/event/BindPhoneEvent.java +++ b/core/src/main/java/com/pikolive/core/auth/event/BindPhoneEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.auth.event; +package com.pikolive.core.auth.event; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/auth/event/GetCurrentUidEvent.java b/core/src/main/java/com/pikolive/core/auth/event/GetCurrentUidEvent.java similarity index 52% rename from core/src/main/java/com/yizhuan/xchat_android_core/auth/event/GetCurrentUidEvent.java rename to core/src/main/java/com/pikolive/core/auth/event/GetCurrentUidEvent.java index e552b7e5b..0c5c029d5 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/auth/event/GetCurrentUidEvent.java +++ b/core/src/main/java/com/pikolive/core/auth/event/GetCurrentUidEvent.java @@ -1,6 +1,8 @@ -package com.yizhuan.xchat_android_core.auth.event; +package com.pikolive.core.auth.event; -import com.yizhuan.xchat_android_core.base.BaseDataEvent; +import com.pikolive.core.base.BaseDataEvent; +import com.pikolive.core.base.BaseDataEvent; +import com.pikolive.core.base.BaseDataEvent; /** * diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/auth/event/KickOutEvent.java b/core/src/main/java/com/pikolive/core/auth/event/KickOutEvent.java similarity index 51% rename from core/src/main/java/com/yizhuan/xchat_android_core/auth/event/KickOutEvent.java rename to core/src/main/java/com/pikolive/core/auth/event/KickOutEvent.java index 4c2c0d8be..b78841fba 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/auth/event/KickOutEvent.java +++ b/core/src/main/java/com/pikolive/core/auth/event/KickOutEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.auth.event; +package com.pikolive.core.auth.event; /** * 踢出事件 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/auth/event/LoginEvent.java b/core/src/main/java/com/pikolive/core/auth/event/LoginEvent.java similarity index 67% rename from core/src/main/java/com/yizhuan/xchat_android_core/auth/event/LoginEvent.java rename to core/src/main/java/com/pikolive/core/auth/event/LoginEvent.java index 875f2bea9..3534ddaef 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/auth/event/LoginEvent.java +++ b/core/src/main/java/com/pikolive/core/auth/event/LoginEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.auth.event; +package com.pikolive.core.auth.event; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/auth/event/LoginReportEvent.java b/core/src/main/java/com/pikolive/core/auth/event/LoginReportEvent.java similarity index 80% rename from core/src/main/java/com/yizhuan/xchat_android_core/auth/event/LoginReportEvent.java rename to core/src/main/java/com/pikolive/core/auth/event/LoginReportEvent.java index 1f3b6b51c..41c580d6e 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/auth/event/LoginReportEvent.java +++ b/core/src/main/java/com/pikolive/core/auth/event/LoginReportEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.auth.event; +package com.pikolive.core.auth.event; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/auth/event/LogoutEvent.java b/core/src/main/java/com/pikolive/core/auth/event/LogoutEvent.java similarity index 54% rename from core/src/main/java/com/yizhuan/xchat_android_core/auth/event/LogoutEvent.java rename to core/src/main/java/com/pikolive/core/auth/event/LogoutEvent.java index 2a23744ad..d381ddd56 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/auth/event/LogoutEvent.java +++ b/core/src/main/java/com/pikolive/core/auth/event/LogoutEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.auth.event; +package com.pikolive.core.auth.event; /** * 退出登录事件 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/auth/exception/AccountCancelException.java b/core/src/main/java/com/pikolive/core/auth/exception/AccountCancelException.java similarity index 88% rename from core/src/main/java/com/yizhuan/xchat_android_core/auth/exception/AccountCancelException.java rename to core/src/main/java/com/pikolive/core/auth/exception/AccountCancelException.java index 4501612af..6fd23feed 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/auth/exception/AccountCancelException.java +++ b/core/src/main/java/com/pikolive/core/auth/exception/AccountCancelException.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.auth.exception; +package com.pikolive.core.auth.exception; public class AccountCancelException extends Exception { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/auth/exception/BanAccountException.java b/core/src/main/java/com/pikolive/core/auth/exception/BanAccountException.java similarity index 82% rename from core/src/main/java/com/yizhuan/xchat_android_core/auth/exception/BanAccountException.java rename to core/src/main/java/com/pikolive/core/auth/exception/BanAccountException.java index a24d409b9..303197165 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/auth/exception/BanAccountException.java +++ b/core/src/main/java/com/pikolive/core/auth/exception/BanAccountException.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.auth.exception; +package com.pikolive.core.auth.exception; public class BanAccountException extends Exception { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/auth/exception/BigHeadPhoneException.java b/core/src/main/java/com/pikolive/core/auth/exception/BigHeadPhoneException.java similarity index 71% rename from core/src/main/java/com/yizhuan/xchat_android_core/auth/exception/BigHeadPhoneException.java rename to core/src/main/java/com/pikolive/core/auth/exception/BigHeadPhoneException.java index 71e76faf9..25db8e934 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/auth/exception/BigHeadPhoneException.java +++ b/core/src/main/java/com/pikolive/core/auth/exception/BigHeadPhoneException.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.auth.exception; +package com.pikolive.core.auth.exception; public class BigHeadPhoneException extends Exception { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/auth/exception/IsSuperAdminException.java b/core/src/main/java/com/pikolive/core/auth/exception/IsSuperAdminException.java similarity index 71% rename from core/src/main/java/com/yizhuan/xchat_android_core/auth/exception/IsSuperAdminException.java rename to core/src/main/java/com/pikolive/core/auth/exception/IsSuperAdminException.java index af132b19b..186ec87e6 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/auth/exception/IsSuperAdminException.java +++ b/core/src/main/java/com/pikolive/core/auth/exception/IsSuperAdminException.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.auth.exception; +package com.pikolive.core.auth.exception; public class IsSuperAdminException extends Exception { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/base/BaseBusEvent.java b/core/src/main/java/com/pikolive/core/base/BaseBusEvent.java similarity index 81% rename from core/src/main/java/com/yizhuan/xchat_android_core/base/BaseBusEvent.java rename to core/src/main/java/com/pikolive/core/base/BaseBusEvent.java index 387d2b270..d7f32d545 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/base/BaseBusEvent.java +++ b/core/src/main/java/com/pikolive/core/base/BaseBusEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.base; +package com.pikolive.core.base; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/base/BaseDataEvent.java b/core/src/main/java/com/pikolive/core/base/BaseDataEvent.java similarity index 89% rename from core/src/main/java/com/yizhuan/xchat_android_core/base/BaseDataEvent.java rename to core/src/main/java/com/pikolive/core/base/BaseDataEvent.java index 9f5e8b471..cb6509a5a 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/base/BaseDataEvent.java +++ b/core/src/main/java/com/pikolive/core/base/BaseDataEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.base; +package com.pikolive.core.base; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/base/BaseErrorEvent.java b/core/src/main/java/com/pikolive/core/base/BaseErrorEvent.java similarity index 87% rename from core/src/main/java/com/yizhuan/xchat_android_core/base/BaseErrorEvent.java rename to core/src/main/java/com/pikolive/core/base/BaseErrorEvent.java index d16d66971..96e2a08f4 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/base/BaseErrorEvent.java +++ b/core/src/main/java/com/pikolive/core/base/BaseErrorEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.base; +package com.pikolive.core.base; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/base/BaseErrorException.java b/core/src/main/java/com/pikolive/core/base/BaseErrorException.java similarity index 78% rename from core/src/main/java/com/yizhuan/xchat_android_core/base/BaseErrorException.java rename to core/src/main/java/com/pikolive/core/base/BaseErrorException.java index 7a032be86..d85fb1965 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/base/BaseErrorException.java +++ b/core/src/main/java/com/pikolive/core/base/BaseErrorException.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.base; +package com.pikolive.core.base; /** * create by lvzebiao @2019/8/7 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/base/BaseModel.java b/core/src/main/java/com/pikolive/core/base/BaseModel.java similarity index 96% rename from core/src/main/java/com/yizhuan/xchat_android_core/base/BaseModel.java rename to core/src/main/java/com/pikolive/core/base/BaseModel.java index 735774c8d..903938764 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/base/BaseModel.java +++ b/core/src/main/java/com/pikolive/core/base/BaseModel.java @@ -1,13 +1,14 @@ -package com.yizhuan.xchat_android_core.base; +package com.pikolive.core.base; import android.content.Context; -import com.yizhuan.xchat_android_core.R; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.bean.response.ServiceResult; import com.pikolive.library.net.rxnet.callback.CallBack; import com.pikolive.library.net.rxnet.exception.ExceptionHandle; import com.pikolive.library.utils.ResUtil; import com.pikolive.library.utils.config.BasicConfig; +import com.pikolive.core.R; import java.net.UnknownHostException; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/base/CancelNoToastException.java b/core/src/main/java/com/pikolive/core/base/CancelNoToastException.java similarity index 83% rename from core/src/main/java/com/yizhuan/xchat_android_core/base/CancelNoToastException.java rename to core/src/main/java/com/pikolive/core/base/CancelNoToastException.java index 12e59afeb..0e8969e81 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/base/CancelNoToastException.java +++ b/core/src/main/java/com/pikolive/core/base/CancelNoToastException.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.base; +package com.pikolive.core.base; /** * 点击取消按钮，但是不需要toast error的情况 diff --git a/core/src/main/java/com/pikolive/core/base/IModel.java b/core/src/main/java/com/pikolive/core/base/IModel.java new file mode 100644 index 000000000..b4b51a2b9 --- /dev/null +++ b/core/src/main/java/com/pikolive/core/base/IModel.java @@ -0,0 +1,4 @@ +package com.pikolive.core.base; + +public interface IModel { +} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/BaseProtocol.java b/core/src/main/java/com/pikolive/core/bean/BaseProtocol.java similarity index 97% rename from core/src/main/java/com/yizhuan/xchat_android_core/bean/BaseProtocol.java rename to core/src/main/java/com/pikolive/core/bean/BaseProtocol.java index 0faf81ae5..dc3364c31 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/BaseProtocol.java +++ b/core/src/main/java/com/pikolive/core/bean/BaseProtocol.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.bean; +package com.pikolive.core.bean; /** * 广播通用协议 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/CarButtonInfo.java b/core/src/main/java/com/pikolive/core/bean/CarButtonInfo.java similarity index 75% rename from core/src/main/java/com/yizhuan/xchat_android_core/bean/CarButtonInfo.java rename to core/src/main/java/com/pikolive/core/bean/CarButtonInfo.java index 1964f41e2..1def43eac 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/CarButtonInfo.java +++ b/core/src/main/java/com/pikolive/core/bean/CarButtonInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.bean; +package com.pikolive.core.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/GiftTitleInfo.java b/core/src/main/java/com/pikolive/core/bean/GiftTitleInfo.java similarity index 78% rename from core/src/main/java/com/yizhuan/xchat_android_core/bean/GiftTitleInfo.java rename to core/src/main/java/com/pikolive/core/bean/GiftTitleInfo.java index 769a2a3f2..8fb99eff5 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/GiftTitleInfo.java +++ b/core/src/main/java/com/pikolive/core/bean/GiftTitleInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.bean; +package com.pikolive.core.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/LoginTipsInfo.java b/core/src/main/java/com/pikolive/core/bean/LoginTipsInfo.java similarity index 79% rename from core/src/main/java/com/yizhuan/xchat_android_core/bean/LoginTipsInfo.java rename to core/src/main/java/com/pikolive/core/bean/LoginTipsInfo.java index b3fc4166f..944b7f5e7 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/LoginTipsInfo.java +++ b/core/src/main/java/com/pikolive/core/bean/LoginTipsInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.bean; +package com.pikolive.core.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/PrivateChatLimitInfo.java b/core/src/main/java/com/pikolive/core/bean/PrivateChatLimitInfo.java similarity index 83% rename from core/src/main/java/com/yizhuan/xchat_android_core/bean/PrivateChatLimitInfo.java rename to core/src/main/java/com/pikolive/core/bean/PrivateChatLimitInfo.java index 8796b5bfd..1169e9ec4 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/PrivateChatLimitInfo.java +++ b/core/src/main/java/com/pikolive/core/bean/PrivateChatLimitInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.bean; +package com.pikolive.core.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/ProgressInfo.java b/core/src/main/java/com/pikolive/core/bean/ProgressInfo.java similarity index 94% rename from core/src/main/java/com/yizhuan/xchat_android_core/bean/ProgressInfo.java rename to core/src/main/java/com/pikolive/core/bean/ProgressInfo.java index 928698d99..db3123a23 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/ProgressInfo.java +++ b/core/src/main/java/com/pikolive/core/bean/ProgressInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.bean; +package com.pikolive.core.bean; /** * 进度信息 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/RoomHistoryInfo.java b/core/src/main/java/com/pikolive/core/bean/RoomHistoryInfo.java similarity index 86% rename from core/src/main/java/com/yizhuan/xchat_android_core/bean/RoomHistoryInfo.java rename to core/src/main/java/com/pikolive/core/bean/RoomHistoryInfo.java index 4b39cd253..a40709af5 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/RoomHistoryInfo.java +++ b/core/src/main/java/com/pikolive/core/bean/RoomHistoryInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.bean; +package com.pikolive.core.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/RoomMicInfo.java b/core/src/main/java/com/pikolive/core/bean/RoomMicInfo.java similarity index 97% rename from core/src/main/java/com/yizhuan/xchat_android_core/bean/RoomMicInfo.java rename to core/src/main/java/com/pikolive/core/bean/RoomMicInfo.java index dd0d12a9d..660e2b7aa 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/RoomMicInfo.java +++ b/core/src/main/java/com/pikolive/core/bean/RoomMicInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.bean; +package com.pikolive.core.bean; import android.os.Parcel; import android.os.Parcelable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/RoomNewbieInfo.java b/core/src/main/java/com/pikolive/core/bean/RoomNewbieInfo.java similarity index 90% rename from core/src/main/java/com/yizhuan/xchat_android_core/bean/RoomNewbieInfo.java rename to core/src/main/java/com/pikolive/core/bean/RoomNewbieInfo.java index c5cb1544c..7ac0683c0 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/RoomNewbieInfo.java +++ b/core/src/main/java/com/pikolive/core/bean/RoomNewbieInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.bean; +package com.pikolive.core.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/RoomNewbieMessageInfo.java b/core/src/main/java/com/pikolive/core/bean/RoomNewbieMessageInfo.java similarity index 97% rename from core/src/main/java/com/yizhuan/xchat_android_core/bean/RoomNewbieMessageInfo.java rename to core/src/main/java/com/pikolive/core/bean/RoomNewbieMessageInfo.java index 7879c26da..909f77203 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/RoomNewbieMessageInfo.java +++ b/core/src/main/java/com/pikolive/core/bean/RoomNewbieMessageInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.bean; +package com.pikolive.core.bean; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/RoomQueueInfo.java b/core/src/main/java/com/pikolive/core/bean/RoomQueueInfo.java similarity index 67% rename from core/src/main/java/com/yizhuan/xchat_android_core/bean/RoomQueueInfo.java rename to core/src/main/java/com/pikolive/core/bean/RoomQueueInfo.java index 277250ca2..8ab2c2a5f 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/RoomQueueInfo.java +++ b/core/src/main/java/com/pikolive/core/bean/RoomQueueInfo.java @@ -1,7 +1,11 @@ -package com.yizhuan.xchat_android_core.bean; +package com.pikolive.core.bean; -import com.yizhuan.xchat_android_core.room.giftvalue.bean.GiftValueData; -import com.yizhuan.xchat_android_core.room.queue.bean.MicMemberInfo; +import com.pikolive.core.room.giftvalue.bean.GiftValueData; +import com.pikolive.core.room.queue.bean.MicMemberInfo; +import com.pikolive.core.room.giftvalue.bean.GiftValueData; +import com.pikolive.core.room.queue.bean.MicMemberInfo; +import com.pikolive.core.room.giftvalue.bean.GiftValueData; +import com.pikolive.core.room.queue.bean.MicMemberInfo; /** *

房间麦序单个坑位信息实体，包含麦序状态，成员信息

diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/UserInfoItem.java b/core/src/main/java/com/pikolive/core/bean/UserInfoItem.java similarity index 98% rename from core/src/main/java/com/yizhuan/xchat_android_core/bean/UserInfoItem.java rename to core/src/main/java/com/pikolive/core/bean/UserInfoItem.java index b2d824f7e..613c10309 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/UserInfoItem.java +++ b/core/src/main/java/com/pikolive/core/bean/UserInfoItem.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.bean; +package com.pikolive.core.bean; import android.os.Parcel; import android.os.Parcelable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/VersionInfo.java b/core/src/main/java/com/pikolive/core/bean/VersionInfo.java similarity index 95% rename from core/src/main/java/com/yizhuan/xchat_android_core/bean/VersionInfo.java rename to core/src/main/java/com/pikolive/core/bean/VersionInfo.java index 7f47e2c9e..7089481b1 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/VersionInfo.java +++ b/core/src/main/java/com/pikolive/core/bean/VersionInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.bean; +package com.pikolive.core.bean; /** * Created by huangmeng1 on 2018/7/18. diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/attachmsg/RoomQueueMsgAttachment.java b/core/src/main/java/com/pikolive/core/bean/attachmsg/RoomQueueMsgAttachment.java similarity index 91% rename from core/src/main/java/com/yizhuan/xchat_android_core/bean/attachmsg/RoomQueueMsgAttachment.java rename to core/src/main/java/com/pikolive/core/bean/attachmsg/RoomQueueMsgAttachment.java index b3fb5534f..ae67ae569 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/attachmsg/RoomQueueMsgAttachment.java +++ b/core/src/main/java/com/pikolive/core/bean/attachmsg/RoomQueueMsgAttachment.java @@ -1,8 +1,8 @@ -package com.yizhuan.xchat_android_core.bean.attachmsg; +package com.pikolive.core.bean.attachmsg; import com.alibaba.fastjson.JSONObject; -import com.yizhuan.xchat_android_core.bean.RoomQueueInfo; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; +import com.pikolive.core.bean.RoomQueueInfo; +import com.pikolive.core.im.custom.bean.CustomAttachment; /** *

队列自定义消息

diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/BeanResult.kt b/core/src/main/java/com/pikolive/core/bean/response/BeanResult.kt similarity index 83% rename from core/src/main/java/com/yizhuan/xchat_android_core/bean/response/BeanResult.kt rename to core/src/main/java/com/pikolive/core/bean/response/BeanResult.kt index f65b00f20..ab92c0ae2 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/BeanResult.kt +++ b/core/src/main/java/com/pikolive/core/bean/response/BeanResult.kt @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.bean.response +package com.pikolive.core.bean.response -import com.yizhuan.xchat_android_core.R -import com.yizhuan.xchat_android_core.utils.net.ServerException +import com.pikolive.core.R +import com.pikolive.core.utils.net.ServerException import com.pikolive.library.utils.ResUtil data class BeanResult( diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/JsonServiceResult.java b/core/src/main/java/com/pikolive/core/bean/response/JsonServiceResult.java similarity index 75% rename from core/src/main/java/com/yizhuan/xchat_android_core/bean/response/JsonServiceResult.java rename to core/src/main/java/com/pikolive/core/bean/response/JsonServiceResult.java index 88835b638..16bf3d455 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/JsonServiceResult.java +++ b/core/src/main/java/com/pikolive/core/bean/response/JsonServiceResult.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.bean.response; +package com.pikolive.core.bean.response; import com.google.gson.JsonElement; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/ListResult.kt b/core/src/main/java/com/pikolive/core/bean/response/ListResult.kt similarity index 88% rename from core/src/main/java/com/yizhuan/xchat_android_core/bean/response/ListResult.kt rename to core/src/main/java/com/pikolive/core/bean/response/ListResult.kt index 845284d23..eeda23724 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/ListResult.kt +++ b/core/src/main/java/com/pikolive/core/bean/response/ListResult.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.bean.response +package com.pikolive.core.bean.response data class ListResult( val isSuccess: Boolean, diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/RequestError.java b/core/src/main/java/com/pikolive/core/bean/response/RequestError.java similarity index 93% rename from core/src/main/java/com/yizhuan/xchat_android_core/bean/response/RequestError.java rename to core/src/main/java/com/pikolive/core/bean/response/RequestError.java index de230803b..f917b4b7a 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/RequestError.java +++ b/core/src/main/java/com/pikolive/core/bean/response/RequestError.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.bean.response; +package com.pikolive.core.bean.response; /** * Created by zhongyongsheng on 14-6-6. diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/ResponseData.java b/core/src/main/java/com/pikolive/core/bean/response/ResponseData.java similarity index 98% rename from core/src/main/java/com/yizhuan/xchat_android_core/bean/response/ResponseData.java rename to core/src/main/java/com/pikolive/core/bean/response/ResponseData.java index affbe5532..f91199fae 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/ResponseData.java +++ b/core/src/main/java/com/pikolive/core/bean/response/ResponseData.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.yizhuan.xchat_android_core.bean.response; +package com.pikolive.core.bean.response; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.R; +import com.pikolive.core.R; import com.pikolive.library.coremanager.CoreError; import com.pikolive.library.utils.ResUtil; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/ServiceResult.java b/core/src/main/java/com/pikolive/core/bean/response/ServiceResult.java similarity index 98% rename from core/src/main/java/com/yizhuan/xchat_android_core/bean/response/ServiceResult.java rename to core/src/main/java/com/pikolive/core/bean/response/ServiceResult.java index dd11e868a..5640579d1 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/ServiceResult.java +++ b/core/src/main/java/com/pikolive/core/bean/response/ServiceResult.java @@ -1,6 +1,7 @@ -package com.yizhuan.xchat_android_core.bean.response; -import com.yizhuan.xchat_android_core.R; +package com.pikolive.core.bean.response; + import com.pikolive.library.utils.ResUtil; +import com.pikolive.core.R; import java.io.Serializable; diff --git a/core/src/main/java/com/pikolive/core/bean/response/result/ActionDialogResult.java b/core/src/main/java/com/pikolive/core/bean/response/result/ActionDialogResult.java new file mode 100644 index 000000000..6987ec587 --- /dev/null +++ b/core/src/main/java/com/pikolive/core/bean/response/result/ActionDialogResult.java @@ -0,0 +1,14 @@ +package com.pikolive.core.bean.response.result; + + +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.redPacket.bean.ActionDialogInfo; + +import java.util.List; + +/** + * Created by zhouxiangfeng on 2017/5/28. + */ + +public class ActionDialogResult extends ServiceResult> { +} diff --git a/core/src/main/java/com/pikolive/core/bean/response/result/AttentionListResult.java b/core/src/main/java/com/pikolive/core/bean/response/result/AttentionListResult.java new file mode 100644 index 000000000..dcdbaa605 --- /dev/null +++ b/core/src/main/java/com/pikolive/core/bean/response/result/AttentionListResult.java @@ -0,0 +1,15 @@ +package com.pikolive.core.bean.response.result; + +import com.pikolive.core.user.bean.AttentionInfo; +import com.pikolive.core.user.bean.AttentionInfo; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.user.bean.AttentionInfo; + +import java.util.List; + +/** + * Created by Administrator on 2017/7/5 0005. + */ + +public class AttentionListResult extends ServiceResult> { +} diff --git a/core/src/main/java/com/pikolive/core/bean/response/result/AuctionInfoResult.java b/core/src/main/java/com/pikolive/core/bean/response/result/AuctionInfoResult.java new file mode 100644 index 000000000..0d6d58083 --- /dev/null +++ b/core/src/main/java/com/pikolive/core/bean/response/result/AuctionInfoResult.java @@ -0,0 +1,13 @@ +package com.pikolive.core.bean.response.result; + +import com.pikolive.core.room.auction.bean.AuctionInfo; +import com.pikolive.core.room.auction.bean.AuctionInfo; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.room.auction.bean.AuctionInfo; + +/** + * Created by zhouxiangfeng on 2017/5/28. + */ + +public class AuctionInfoResult extends ServiceResult { +} diff --git a/core/src/main/java/com/pikolive/core/bean/response/result/AuctionListUserInfoResult.java b/core/src/main/java/com/pikolive/core/bean/response/result/AuctionListUserInfoResult.java new file mode 100644 index 000000000..c1258538c --- /dev/null +++ b/core/src/main/java/com/pikolive/core/bean/response/result/AuctionListUserInfoResult.java @@ -0,0 +1,15 @@ +package com.pikolive.core.bean.response.result; + +import com.pikolive.core.room.auction.bean.AuctionListUserInfo; +import com.pikolive.core.room.auction.bean.AuctionListUserInfo; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.room.auction.bean.AuctionListUserInfo; + +import java.util.List; + +/** + * Created by chenran on 2017/8/9. + */ + +public class AuctionListUserInfoResult extends ServiceResult> { +} diff --git a/core/src/main/java/com/pikolive/core/bean/response/result/AuctionUserListResult.java b/core/src/main/java/com/pikolive/core/bean/response/result/AuctionUserListResult.java new file mode 100644 index 000000000..4909d28fa --- /dev/null +++ b/core/src/main/java/com/pikolive/core/bean/response/result/AuctionUserListResult.java @@ -0,0 +1,15 @@ +package com.pikolive.core.bean.response.result; + +import com.pikolive.core.room.auction.bean.AuctionUser; +import com.pikolive.core.room.auction.bean.AuctionUser; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.room.auction.bean.AuctionUser; + +import java.util.List; + +/** + * Created by zhouxiangfeng on 2017/5/28. + */ + +public class AuctionUserListResult extends ServiceResult> { +} diff --git a/core/src/main/java/com/pikolive/core/bean/response/result/AuctionUserResult.java b/core/src/main/java/com/pikolive/core/bean/response/result/AuctionUserResult.java new file mode 100644 index 000000000..c46b4f61a --- /dev/null +++ b/core/src/main/java/com/pikolive/core/bean/response/result/AuctionUserResult.java @@ -0,0 +1,13 @@ +package com.pikolive.core.bean.response.result; + +import com.pikolive.core.room.auction.bean.AuctionUser; +import com.pikolive.core.room.auction.bean.AuctionUser; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.room.auction.bean.AuctionUser; + +/** + * Created by zhouxiangfeng on 2017/5/28. + */ + +public class AuctionUserResult extends ServiceResult { +} diff --git a/core/src/main/java/com/pikolive/core/bean/response/result/BoolApiResult.java b/core/src/main/java/com/pikolive/core/bean/response/result/BoolApiResult.java new file mode 100644 index 000000000..1b66d4389 --- /dev/null +++ b/core/src/main/java/com/pikolive/core/bean/response/result/BoolApiResult.java @@ -0,0 +1,11 @@ +package com.pikolive.core.bean.response.result; + +import com.pikolive.core.bean.response.ServiceResult; + +/** + * Created by chenran on 2017/2/16. + */ + +public class BoolApiResult extends ServiceResult{ + +} diff --git a/core/src/main/java/com/pikolive/core/bean/response/result/BooleanResult.java b/core/src/main/java/com/pikolive/core/bean/response/result/BooleanResult.java new file mode 100644 index 000000000..f21f89504 --- /dev/null +++ b/core/src/main/java/com/pikolive/core/bean/response/result/BooleanResult.java @@ -0,0 +1,10 @@ +package com.pikolive.core.bean.response.result; + +import com.pikolive.core.bean.response.ServiceResult; + +/** + * Created by zhouxiangfeng on 2017/5/27. + */ + +public class BooleanResult extends ServiceResult { +} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/ChargeListResult.java b/core/src/main/java/com/pikolive/core/bean/response/result/ChargeListResult.java similarity index 64% rename from core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/ChargeListResult.java rename to core/src/main/java/com/pikolive/core/bean/response/result/ChargeListResult.java index d387ccc34..3f3707e5e 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/ChargeListResult.java +++ b/core/src/main/java/com/pikolive/core/bean/response/result/ChargeListResult.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.bean.response.result; +package com.pikolive.core.bean.response.result; -import com.yizhuan.xchat_android_core.pay.bean.ChargeBean; +import com.pikolive.core.pay.bean.ChargeBean; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/bean/response/result/CheckLostUserResult.java b/core/src/main/java/com/pikolive/core/bean/response/result/CheckLostUserResult.java new file mode 100644 index 000000000..1736d2767 --- /dev/null +++ b/core/src/main/java/com/pikolive/core/bean/response/result/CheckLostUserResult.java @@ -0,0 +1,7 @@ +package com.pikolive.core.bean.response.result; + +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.recall.bean.CheckLostUserInfo; + +public class CheckLostUserResult extends ServiceResult { +} diff --git a/core/src/main/java/com/pikolive/core/bean/response/result/ExchangeInfoResult.java b/core/src/main/java/com/pikolive/core/bean/response/result/ExchangeInfoResult.java new file mode 100644 index 000000000..702510c39 --- /dev/null +++ b/core/src/main/java/com/pikolive/core/bean/response/result/ExchangeInfoResult.java @@ -0,0 +1,11 @@ +package com.pikolive.core.bean.response.result; + +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.withdraw.bean.ExchangerInfo; + +/** + * Created by Administrator on 2017/7/5 0005. + */ + +public class ExchangeInfoResult extends ServiceResult { +} diff --git a/core/src/main/java/com/pikolive/core/bean/response/result/FaceResult.java b/core/src/main/java/com/pikolive/core/bean/response/result/FaceResult.java new file mode 100644 index 000000000..87eb6010c --- /dev/null +++ b/core/src/main/java/com/pikolive/core/bean/response/result/FaceResult.java @@ -0,0 +1,13 @@ +package com.pikolive.core.bean.response.result; + +import com.pikolive.core.room.face.FaceListInfo; +import com.pikolive.core.room.face.FaceListInfo; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.room.face.FaceListInfo; + +/** + * Created by chenran on 2017/7/27. + */ + +public class FaceResult extends ServiceResult{ +} diff --git a/core/src/main/java/com/pikolive/core/bean/response/result/FansListResult.java b/core/src/main/java/com/pikolive/core/bean/response/result/FansListResult.java new file mode 100644 index 000000000..f3c3a6342 --- /dev/null +++ b/core/src/main/java/com/pikolive/core/bean/response/result/FansListResult.java @@ -0,0 +1,13 @@ +package com.pikolive.core.bean.response.result; + +import com.pikolive.core.user.bean.FansListInfo; +import com.pikolive.core.user.bean.FansListInfo; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.user.bean.FansListInfo; + +/** + * Created by Administrator on 2017/7/5 0005. + */ + +public class FansListResult extends ServiceResult { +} diff --git a/core/src/main/java/com/pikolive/core/bean/response/result/GiftInfosResult.java b/core/src/main/java/com/pikolive/core/bean/response/result/GiftInfosResult.java new file mode 100644 index 000000000..47c00b3e2 --- /dev/null +++ b/core/src/main/java/com/pikolive/core/bean/response/result/GiftInfosResult.java @@ -0,0 +1,13 @@ +package com.pikolive.core.bean.response.result; + +import com.pikolive.core.bills.bean.TextInfos; +import com.pikolive.core.bills.bean.TextInfos; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.bills.bean.TextInfos; + +/** + * Created by Seven on 2017/9/9. + */ + +public class GiftInfosResult extends ServiceResult { +} diff --git a/core/src/main/java/com/pikolive/core/bean/response/result/GiftRecieveInfoResult.java b/core/src/main/java/com/pikolive/core/bean/response/result/GiftRecieveInfoResult.java new file mode 100644 index 000000000..d100d2287 --- /dev/null +++ b/core/src/main/java/com/pikolive/core/bean/response/result/GiftRecieveInfoResult.java @@ -0,0 +1,13 @@ +package com.pikolive.core.bean.response.result; + +import com.pikolive.core.gift.bean.GiftReceiveInfo; +import com.pikolive.core.gift.bean.GiftReceiveInfo; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.gift.bean.GiftReceiveInfo; + +/** + * Created by chenran on 2017/11/25. + */ + +public class GiftRecieveInfoResult extends ServiceResult { +} diff --git a/core/src/main/java/com/pikolive/core/bean/response/result/GiftResult.java b/core/src/main/java/com/pikolive/core/bean/response/result/GiftResult.java new file mode 100644 index 000000000..2696783a1 --- /dev/null +++ b/core/src/main/java/com/pikolive/core/bean/response/result/GiftResult.java @@ -0,0 +1,13 @@ +package com.pikolive.core.bean.response.result; + +import com.pikolive.core.gift.bean.GiftListInfo; +import com.pikolive.core.gift.bean.GiftListInfo; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.gift.bean.GiftListInfo; + +/** + * Created by chenran on 2017/7/27. + */ + +public class GiftResult extends ServiceResult{ +} diff --git a/core/src/main/java/com/pikolive/core/bean/response/result/GiftWallListResult.java b/core/src/main/java/com/pikolive/core/bean/response/result/GiftWallListResult.java new file mode 100644 index 000000000..ebd538dfc --- /dev/null +++ b/core/src/main/java/com/pikolive/core/bean/response/result/GiftWallListResult.java @@ -0,0 +1,15 @@ +package com.pikolive.core.bean.response.result; + +import com.pikolive.core.user.bean.GiftWallInfo; +import com.pikolive.core.user.bean.GiftWallInfo; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.user.bean.GiftWallInfo; + +import java.util.List; + +/** + * Created by chenran on 2017/10/17. + */ + +public class GiftWallListResult extends ServiceResult> { +} diff --git a/core/src/main/java/com/pikolive/core/bean/response/result/GoBackResult.java b/core/src/main/java/com/pikolive/core/bean/response/result/GoBackResult.java new file mode 100644 index 000000000..4dd104ca7 --- /dev/null +++ b/core/src/main/java/com/pikolive/core/bean/response/result/GoBackResult.java @@ -0,0 +1,7 @@ +package com.pikolive.core.bean.response.result; + +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.recall.bean.GoBackInfo; + +public class GoBackResult extends ServiceResult { +} diff --git a/core/src/main/java/com/pikolive/core/bean/response/result/IdQueryUserInfoResult.java b/core/src/main/java/com/pikolive/core/bean/response/result/IdQueryUserInfoResult.java new file mode 100644 index 000000000..1650ad08b --- /dev/null +++ b/core/src/main/java/com/pikolive/core/bean/response/result/IdQueryUserInfoResult.java @@ -0,0 +1,12 @@ +package com.pikolive.core.bean.response.result; + +import com.pikolive.core.auth.entity.AccountInfo; +import com.pikolive.core.bean.response.ServiceResult; + +/** + * Created by chenran on 2017/2/16. + */ + +public class IdQueryUserInfoResult extends ServiceResult{ + +} diff --git a/core/src/main/java/com/pikolive/core/bean/response/result/InitResult.java b/core/src/main/java/com/pikolive/core/bean/response/result/InitResult.java new file mode 100644 index 000000000..744a067fe --- /dev/null +++ b/core/src/main/java/com/pikolive/core/bean/response/result/InitResult.java @@ -0,0 +1,12 @@ +package com.pikolive.core.bean.response.result; + +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.initial.bean.InitInfo; + +/** + * @author xiaoyu + * @date 2017/12/8 + */ + +public class InitResult extends ServiceResult { +} diff --git a/core/src/main/java/com/pikolive/core/bean/response/result/IntegerResult.java b/core/src/main/java/com/pikolive/core/bean/response/result/IntegerResult.java new file mode 100644 index 000000000..22953fdc4 --- /dev/null +++ b/core/src/main/java/com/pikolive/core/bean/response/result/IntegerResult.java @@ -0,0 +1,10 @@ +package com.pikolive.core.bean.response.result; + +import com.pikolive.core.bean.response.ServiceResult; + +/** + * Created by chenran on 2017/11/15. + */ + +public class IntegerResult extends ServiceResult { +} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/LoginResult.java b/core/src/main/java/com/pikolive/core/bean/response/result/LoginResult.java similarity index 77% rename from core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/LoginResult.java rename to core/src/main/java/com/pikolive/core/bean/response/result/LoginResult.java index 62c5ca3d2..9c62e4222 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/LoginResult.java +++ b/core/src/main/java/com/pikolive/core/bean/response/result/LoginResult.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.bean.response.result; +package com.pikolive.core.bean.response.result; -import com.yizhuan.xchat_android_core.auth.entity.AccountInfo; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; +import com.pikolive.core.auth.entity.AccountInfo; +import com.pikolive.core.bean.response.ServiceResult; import lombok.Getter; import lombok.Setter; diff --git a/core/src/main/java/com/pikolive/core/bean/response/result/MultiGiftRecieveInfoResult.java b/core/src/main/java/com/pikolive/core/bean/response/result/MultiGiftRecieveInfoResult.java new file mode 100644 index 000000000..f362ed6d9 --- /dev/null +++ b/core/src/main/java/com/pikolive/core/bean/response/result/MultiGiftRecieveInfoResult.java @@ -0,0 +1,13 @@ +package com.pikolive.core.bean.response.result; + +import com.pikolive.core.gift.bean.MultiGiftReceiveInfo; +import com.pikolive.core.gift.bean.MultiGiftReceiveInfo; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.gift.bean.MultiGiftReceiveInfo; + +/** + * Created by chenran on 2017/11/25. + */ + +public class MultiGiftRecieveInfoResult extends ServiceResult{ +} diff --git a/core/src/main/java/com/pikolive/core/bean/response/result/RedDrawListInfoResult.java b/core/src/main/java/com/pikolive/core/bean/response/result/RedDrawListInfoResult.java new file mode 100644 index 000000000..ddf9fda57 --- /dev/null +++ b/core/src/main/java/com/pikolive/core/bean/response/result/RedDrawListInfoResult.java @@ -0,0 +1,13 @@ +package com.pikolive.core.bean.response.result; + +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.redPacket.bean.RedDrawListInfo; + +import java.util.List; + +/** + * Created by chenran on 2017/12/4. + */ + +public class RedDrawListInfoResult extends ServiceResult> { +} diff --git a/core/src/main/java/com/pikolive/core/bean/response/result/RedPacketResult.java b/core/src/main/java/com/pikolive/core/bean/response/result/RedPacketResult.java new file mode 100644 index 000000000..a8be06d5b --- /dev/null +++ b/core/src/main/java/com/pikolive/core/bean/response/result/RedPacketResult.java @@ -0,0 +1,12 @@ +package com.pikolive.core.bean.response.result; + + +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.redPacket.bean.RedPacketInfo; + +/** + * Created by zhouxiangfeng on 2017/5/28. + */ + +public class RedPacketResult extends ServiceResult { +} diff --git a/core/src/main/java/com/pikolive/core/bean/response/result/RegisterResult.java b/core/src/main/java/com/pikolive/core/bean/response/result/RegisterResult.java new file mode 100644 index 000000000..1301bfb6d --- /dev/null +++ b/core/src/main/java/com/pikolive/core/bean/response/result/RegisterResult.java @@ -0,0 +1,12 @@ +package com.pikolive.core.bean.response.result; + +import com.pikolive.core.auth.entity.TicketInfo; +import com.pikolive.core.bean.response.ServiceResult; + +/** + * Created by chenran on 2017/2/16. + */ + +public class RegisterResult extends ServiceResult{ + +} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/RequestChargeResult.java b/core/src/main/java/com/pikolive/core/bean/response/result/RequestChargeResult.java similarity index 55% rename from core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/RequestChargeResult.java rename to core/src/main/java/com/pikolive/core/bean/response/result/RequestChargeResult.java index b419c657b..cb9ae0e0f 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/RequestChargeResult.java +++ b/core/src/main/java/com/pikolive/core/bean/response/result/RequestChargeResult.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.bean.response.result; +package com.pikolive.core.bean.response.result; import com.google.gson.JsonObject; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; +import com.pikolive.core.bean.response.ServiceResult; /** * Created by zhouxiangfeng on 2017/5/4. diff --git a/core/src/main/java/com/pikolive/core/bean/response/result/RoomConsumeInfoListResult.java b/core/src/main/java/com/pikolive/core/bean/response/result/RoomConsumeInfoListResult.java new file mode 100644 index 000000000..bf5d8f2d0 --- /dev/null +++ b/core/src/main/java/com/pikolive/core/bean/response/result/RoomConsumeInfoListResult.java @@ -0,0 +1,15 @@ +package com.pikolive.core.bean.response.result; + +import com.pikolive.core.room.queue.bean.RoomConsumeInfo; +import com.pikolive.core.room.queue.bean.RoomConsumeInfo; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.room.queue.bean.RoomConsumeInfo; + +import java.util.List; + +/** + * Created by chenran on 2017/10/2. + */ + +public class RoomConsumeInfoListResult extends ServiceResult> { +} diff --git a/core/src/main/java/com/pikolive/core/bean/response/result/RoomRewardResult.java b/core/src/main/java/com/pikolive/core/bean/response/result/RoomRewardResult.java new file mode 100644 index 000000000..4498a1c2e --- /dev/null +++ b/core/src/main/java/com/pikolive/core/bean/response/result/RoomRewardResult.java @@ -0,0 +1,12 @@ +package com.pikolive.core.bean.response.result; + +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.im.custom.bean.RewardBean; + +/** + * Created by zhouxiangfeng on 2017/5/4. + */ + +public class RoomRewardResult extends ServiceResult { + +} diff --git a/core/src/main/java/com/pikolive/core/bean/response/result/ShareRedPacketResult.java b/core/src/main/java/com/pikolive/core/bean/response/result/ShareRedPacketResult.java new file mode 100644 index 000000000..272326681 --- /dev/null +++ b/core/src/main/java/com/pikolive/core/bean/response/result/ShareRedPacketResult.java @@ -0,0 +1,12 @@ +package com.pikolive.core.bean.response.result; + + +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.redPacket.bean.ShareRedBagInfo; + +/** + * Created by zhouxiangfeng on 2017/5/28. + */ + +public class ShareRedPacketResult extends ServiceResult { +} diff --git a/core/src/main/java/com/pikolive/core/bean/response/result/TabResult.java b/core/src/main/java/com/pikolive/core/bean/response/result/TabResult.java new file mode 100644 index 000000000..b049b1fd9 --- /dev/null +++ b/core/src/main/java/com/pikolive/core/bean/response/result/TabResult.java @@ -0,0 +1,18 @@ +package com.pikolive.core.bean.response.result; + +import com.pikolive.core.room.bean.RoomSettingTabInfo; +import com.pikolive.core.room.bean.RoomSettingTabInfo; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.room.bean.RoomSettingTabInfo; + +import java.util.List; + +/** + *

+ * + * @author Administrator + * @date 2017/11/21 + */ +public class TabResult extends ServiceResult> { + +} diff --git a/core/src/main/java/com/pikolive/core/bean/response/result/TicketResult.java b/core/src/main/java/com/pikolive/core/bean/response/result/TicketResult.java new file mode 100644 index 000000000..559e81259 --- /dev/null +++ b/core/src/main/java/com/pikolive/core/bean/response/result/TicketResult.java @@ -0,0 +1,12 @@ +package com.pikolive.core.bean.response.result; + +import com.pikolive.core.auth.entity.TicketInfo; +import com.pikolive.core.bean.response.ServiceResult; + +/** + * Created by zhouxiangfeng on 2017/5/4. + */ + +public class TicketResult extends ServiceResult { + +} diff --git a/core/src/main/java/com/pikolive/core/bean/response/result/UserListResult.java b/core/src/main/java/com/pikolive/core/bean/response/result/UserListResult.java new file mode 100644 index 000000000..802ebf5c4 --- /dev/null +++ b/core/src/main/java/com/pikolive/core/bean/response/result/UserListResult.java @@ -0,0 +1,16 @@ +package com.pikolive.core.bean.response.result; + +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.user.bean.UserInfo; + +import java.util.List; + +/** + * Created by zhouxiangfeng on 2017/5/4. + */ + +public class UserListResult extends ServiceResult> { + +} diff --git a/core/src/main/java/com/pikolive/core/bean/response/result/UserResult.java b/core/src/main/java/com/pikolive/core/bean/response/result/UserResult.java new file mode 100644 index 000000000..38f3fef7e --- /dev/null +++ b/core/src/main/java/com/pikolive/core/bean/response/result/UserResult.java @@ -0,0 +1,14 @@ +package com.pikolive.core.bean.response.result; + +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.user.bean.UserInfo; + +/** + * Created by zhouxiangfeng on 2017/5/4. + */ + +public class UserResult extends ServiceResult { + +} diff --git a/core/src/main/java/com/pikolive/core/bean/response/result/VersionsResult.java b/core/src/main/java/com/pikolive/core/bean/response/result/VersionsResult.java new file mode 100644 index 000000000..1320ef2d8 --- /dev/null +++ b/core/src/main/java/com/pikolive/core/bean/response/result/VersionsResult.java @@ -0,0 +1,10 @@ +package com.pikolive.core.bean.response.result; + +import com.pikolive.core.bean.response.ServiceResult; + +/** + * Created by Administrator on 2017/7/12 0012. + */ + +public class VersionsResult extends ServiceResult { +} diff --git a/core/src/main/java/com/pikolive/core/bean/response/result/WalletInfoResult.java b/core/src/main/java/com/pikolive/core/bean/response/result/WalletInfoResult.java new file mode 100644 index 000000000..a7bf6c813 --- /dev/null +++ b/core/src/main/java/com/pikolive/core/bean/response/result/WalletInfoResult.java @@ -0,0 +1,12 @@ +package com.pikolive.core.bean.response.result; + +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.pay.bean.WalletInfo; + +/** + * Created by zhouxiangfeng on 2017/5/4. + */ + +public class WalletInfoResult extends ServiceResult { + +} diff --git a/core/src/main/java/com/pikolive/core/bean/response/result/WithdrawListResult.java b/core/src/main/java/com/pikolive/core/bean/response/result/WithdrawListResult.java new file mode 100644 index 000000000..1050b3a51 --- /dev/null +++ b/core/src/main/java/com/pikolive/core/bean/response/result/WithdrawListResult.java @@ -0,0 +1,13 @@ +package com.pikolive.core.bean.response.result; + +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.withdraw.bean.WithdrwaListInfo; + +import java.util.List; + +/** + * Created by Administrator on 2017/7/5 0005. + */ + +public class WithdrawListResult extends ServiceResult> { +} diff --git a/core/src/main/java/com/pikolive/core/bean/response/result/WithdrawRedListResult.java b/core/src/main/java/com/pikolive/core/bean/response/result/WithdrawRedListResult.java new file mode 100644 index 000000000..74797515b --- /dev/null +++ b/core/src/main/java/com/pikolive/core/bean/response/result/WithdrawRedListResult.java @@ -0,0 +1,14 @@ +package com.pikolive.core.bean.response.result; + + +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.redPacket.bean.WithdrawRedListInfo; + +import java.util.List; + +/** + * Created by zhouxiangfeng on 2017/5/28. + */ + +public class WithdrawRedListResult extends ServiceResult> { +} diff --git a/core/src/main/java/com/pikolive/core/bean/response/result/WithdrawRedSucceedResult.java b/core/src/main/java/com/pikolive/core/bean/response/result/WithdrawRedSucceedResult.java new file mode 100644 index 000000000..36234fdd0 --- /dev/null +++ b/core/src/main/java/com/pikolive/core/bean/response/result/WithdrawRedSucceedResult.java @@ -0,0 +1,12 @@ +package com.pikolive.core.bean.response.result; + + +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.redPacket.bean.WithdrawRedSucceedInfo; + +/** + * Created by zhouxiangfeng on 2017/5/28. + */ + +public class WithdrawRedSucceedResult extends ServiceResult { +} diff --git a/core/src/main/java/com/pikolive/core/bean/response/result/WithdrawUserInfoResult.java b/core/src/main/java/com/pikolive/core/bean/response/result/WithdrawUserInfoResult.java new file mode 100644 index 000000000..50a0b7056 --- /dev/null +++ b/core/src/main/java/com/pikolive/core/bean/response/result/WithdrawUserInfoResult.java @@ -0,0 +1,12 @@ +package com.pikolive.core.bean.response.result; + +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.withdraw.bean.WithdrawInfo; + +/** + * Created by zhouxiangfeng on 2017/5/4. + */ + +public class WithdrawUserInfoResult extends ServiceResult { + +} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bills/BillModel.java b/core/src/main/java/com/pikolive/core/bills/BillModel.java similarity index 88% rename from core/src/main/java/com/yizhuan/xchat_android_core/bills/BillModel.java rename to core/src/main/java/com/pikolive/core/bills/BillModel.java index b1f075bb2..456dd944b 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bills/BillModel.java +++ b/core/src/main/java/com/pikolive/core/bills/BillModel.java @@ -1,17 +1,29 @@ -package com.yizhuan.xchat_android_core.bills; +package com.pikolive.core.bills; import com.google.gson.Gson; import com.google.gson.JsonElement; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.bills.bean.BillType; -import com.yizhuan.xchat_android_core.bills.bean.NobleBillListInfo; -import com.yizhuan.xchat_android_core.bills.result.ChargeResult; -import com.yizhuan.xchat_android_core.bills.result.ExpendResult; -import com.yizhuan.xchat_android_core.bills.result.IncomedResult; -import com.yizhuan.xchat_android_core.bills.result.RedBagResult; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.bills.bean.BillType; +import com.pikolive.core.bills.bean.NobleBillListInfo; +import com.pikolive.core.bills.result.ChargeResult; +import com.pikolive.core.bills.result.ExpendResult; +import com.pikolive.core.bills.result.IncomedResult; +import com.pikolive.core.bills.result.RedBagResult; +import com.pikolive.core.bills.bean.BillType; +import com.pikolive.core.bills.bean.NobleBillListInfo; +import com.pikolive.core.bills.result.ChargeResult; +import com.pikolive.core.bills.result.ExpendResult; +import com.pikolive.core.bills.result.IncomedResult; +import com.pikolive.core.bills.result.RedBagResult; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.bills.bean.BillType; +import com.pikolive.core.bills.bean.NobleBillListInfo; +import com.pikolive.core.bills.result.ChargeResult; +import com.pikolive.core.bills.result.ExpendResult; +import com.pikolive.core.bills.result.IncomedResult; +import com.pikolive.core.bills.result.RedBagResult; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.net.rxnet.RxNet; import io.reactivex.Single; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bills/IBillModel.java b/core/src/main/java/com/pikolive/core/bills/IBillModel.java similarity index 62% rename from core/src/main/java/com/yizhuan/xchat_android_core/bills/IBillModel.java rename to core/src/main/java/com/pikolive/core/bills/IBillModel.java index 7fd08805a..2f87ceb85 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bills/IBillModel.java +++ b/core/src/main/java/com/pikolive/core/bills/IBillModel.java @@ -1,11 +1,21 @@ -package com.yizhuan.xchat_android_core.bills; +package com.pikolive.core.bills; -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.bills.bean.NobleBillListInfo; -import com.yizhuan.xchat_android_core.bills.result.ChargeResult; -import com.yizhuan.xchat_android_core.bills.result.ExpendResult; -import com.yizhuan.xchat_android_core.bills.result.IncomedResult; -import com.yizhuan.xchat_android_core.bills.result.RedBagResult; +import com.pikolive.core.bills.bean.NobleBillListInfo; +import com.pikolive.core.bills.result.ChargeResult; +import com.pikolive.core.bills.result.ExpendResult; +import com.pikolive.core.bills.result.IncomedResult; +import com.pikolive.core.bills.result.RedBagResult; +import com.pikolive.core.bills.bean.NobleBillListInfo; +import com.pikolive.core.bills.result.ChargeResult; +import com.pikolive.core.bills.result.ExpendResult; +import com.pikolive.core.bills.result.IncomedResult; +import com.pikolive.core.bills.result.RedBagResult; +import com.pikolive.core.base.IModel; +import com.pikolive.core.bills.bean.NobleBillListInfo; +import com.pikolive.core.bills.result.ChargeResult; +import com.pikolive.core.bills.result.ExpendResult; +import com.pikolive.core.bills.result.IncomedResult; +import com.pikolive.core.bills.result.RedBagResult; import io.reactivex.Single; diff --git a/core/src/main/java/com/pikolive/core/bills/IRadishGiftModel.java b/core/src/main/java/com/pikolive/core/bills/IRadishGiftModel.java new file mode 100644 index 000000000..2febfe914 --- /dev/null +++ b/core/src/main/java/com/pikolive/core/bills/IRadishGiftModel.java @@ -0,0 +1,16 @@ +package com.pikolive.core.bills; + +import com.pikolive.core.bills.result.RadishGiftResult; +import com.pikolive.core.bills.result.RadishGiftResult; +import com.pikolive.core.base.IModel; +import com.pikolive.core.bills.result.RadishGiftResult; +import com.pikolive.core.user.bean.RadishWallInfo; + +import java.util.List; + +import io.reactivex.Single; + +public interface IRadishGiftModel extends IModel { + Single getRadishRecord(int page, int pageSize, long date, byte type); + Single> getRadishWall(long uid); +} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bills/RadishGiftModel.java b/core/src/main/java/com/pikolive/core/bills/RadishGiftModel.java similarity index 87% rename from core/src/main/java/com/yizhuan/xchat_android_core/bills/RadishGiftModel.java rename to core/src/main/java/com/pikolive/core/bills/RadishGiftModel.java index e9f0b8534..9252f823e 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bills/RadishGiftModel.java +++ b/core/src/main/java/com/pikolive/core/bills/RadishGiftModel.java @@ -1,13 +1,15 @@ -package com.yizhuan.xchat_android_core.bills; +package com.pikolive.core.bills; import com.google.gson.Gson; import com.google.gson.JsonElement; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.bills.result.RadishGiftResult; -import com.yizhuan.xchat_android_core.user.bean.RadishWallInfo; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.bills.result.RadishGiftResult; +import com.pikolive.core.bills.result.RadishGiftResult; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.bills.result.RadishGiftResult; +import com.pikolive.core.user.bean.RadishWallInfo; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.net.rxnet.RxNet; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/BillItemEntity.java b/core/src/main/java/com/pikolive/core/bills/bean/BillItemEntity.java similarity index 95% rename from core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/BillItemEntity.java rename to core/src/main/java/com/pikolive/core/bills/bean/BillItemEntity.java index ef70d2b1b..f8ed6306d 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/BillItemEntity.java +++ b/core/src/main/java/com/pikolive/core/bills/bean/BillItemEntity.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.bills.bean; +package com.pikolive.core.bills.bean; import com.chad.library.adapter.base.entity.MultiItemEntity; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/BillType.java b/core/src/main/java/com/pikolive/core/bills/bean/BillType.java similarity index 90% rename from core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/BillType.java rename to core/src/main/java/com/pikolive/core/bills/bean/BillType.java index 9879c0c9d..4f4d58aac 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/BillType.java +++ b/core/src/main/java/com/pikolive/core/bills/bean/BillType.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.bills.bean; +package com.pikolive.core.bills.bean; public class BillType { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/ExpendInfo.java b/core/src/main/java/com/pikolive/core/bills/bean/ExpendInfo.java similarity index 98% rename from core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/ExpendInfo.java rename to core/src/main/java/com/pikolive/core/bills/bean/ExpendInfo.java index ea7b912c8..5343a9e13 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/ExpendInfo.java +++ b/core/src/main/java/com/pikolive/core/bills/bean/ExpendInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.bills.bean; +package com.pikolive.core.bills.bean; import com.google.gson.annotations.SerializedName; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/ExpendListInfo.java b/core/src/main/java/com/pikolive/core/bills/bean/ExpendListInfo.java similarity index 92% rename from core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/ExpendListInfo.java rename to core/src/main/java/com/pikolive/core/bills/bean/ExpendListInfo.java index abc6d1a2e..b4312ffe5 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/ExpendListInfo.java +++ b/core/src/main/java/com/pikolive/core/bills/bean/ExpendListInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.bills.bean; +package com.pikolive.core.bills.bean; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/IncomeInfo.java b/core/src/main/java/com/pikolive/core/bills/bean/IncomeInfo.java similarity index 98% rename from core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/IncomeInfo.java rename to core/src/main/java/com/pikolive/core/bills/bean/IncomeInfo.java index ddecdd80d..aec9a2dd1 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/IncomeInfo.java +++ b/core/src/main/java/com/pikolive/core/bills/bean/IncomeInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.bills.bean; +package com.pikolive.core.bills.bean; import com.google.gson.annotations.SerializedName; import com.netease.nim.uikit.common.ui.recyclerview.entity.MultiItemEntity; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/IncomeListInfo.java b/core/src/main/java/com/pikolive/core/bills/bean/IncomeListInfo.java similarity index 92% rename from core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/IncomeListInfo.java rename to core/src/main/java/com/pikolive/core/bills/bean/IncomeListInfo.java index e68c3f1dd..bf43ae679 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/IncomeListInfo.java +++ b/core/src/main/java/com/pikolive/core/bills/bean/IncomeListInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.bills.bean; +package com.pikolive.core.bills.bean; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/NobleBillListInfo.java b/core/src/main/java/com/pikolive/core/bills/bean/NobleBillListInfo.java similarity index 95% rename from core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/NobleBillListInfo.java rename to core/src/main/java/com/pikolive/core/bills/bean/NobleBillListInfo.java index 570674ee5..16c6add24 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/NobleBillListInfo.java +++ b/core/src/main/java/com/pikolive/core/bills/bean/NobleBillListInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.bills.bean; +package com.pikolive.core.bills.bean; import java.util.List; import java.util.Map; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/RadishGiftInfo.java b/core/src/main/java/com/pikolive/core/bills/bean/RadishGiftInfo.java similarity index 93% rename from core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/RadishGiftInfo.java rename to core/src/main/java/com/pikolive/core/bills/bean/RadishGiftInfo.java index 26aa6ca16..c862da6d8 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/RadishGiftInfo.java +++ b/core/src/main/java/com/pikolive/core/bills/bean/RadishGiftInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.bills.bean; +package com.pikolive.core.bills.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/RadishGiftListInfo.java b/core/src/main/java/com/pikolive/core/bills/bean/RadishGiftListInfo.java similarity index 92% rename from core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/RadishGiftListInfo.java rename to core/src/main/java/com/pikolive/core/bills/bean/RadishGiftListInfo.java index d6272c8da..bdfb636e4 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/RadishGiftListInfo.java +++ b/core/src/main/java/com/pikolive/core/bills/bean/RadishGiftListInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.bills.bean; +package com.pikolive.core.bills.bean; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/RadishRecordInfo.java b/core/src/main/java/com/pikolive/core/bills/bean/RadishRecordInfo.java similarity index 87% rename from core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/RadishRecordInfo.java rename to core/src/main/java/com/pikolive/core/bills/bean/RadishRecordInfo.java index 079cc8904..ceedf3d11 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/RadishRecordInfo.java +++ b/core/src/main/java/com/pikolive/core/bills/bean/RadishRecordInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.bills.bean; +package com.pikolive.core.bills.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/RadishRecordListInfo.java b/core/src/main/java/com/pikolive/core/bills/bean/RadishRecordListInfo.java similarity index 92% rename from core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/RadishRecordListInfo.java rename to core/src/main/java/com/pikolive/core/bills/bean/RadishRecordListInfo.java index 16fd65da4..de9750095 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/RadishRecordListInfo.java +++ b/core/src/main/java/com/pikolive/core/bills/bean/RadishRecordListInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.bills.bean; +package com.pikolive.core.bills.bean; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/RedBagInfo.java b/core/src/main/java/com/pikolive/core/bills/bean/RedBagInfo.java similarity index 96% rename from core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/RedBagInfo.java rename to core/src/main/java/com/pikolive/core/bills/bean/RedBagInfo.java index d50a3756f..493dca4b3 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/RedBagInfo.java +++ b/core/src/main/java/com/pikolive/core/bills/bean/RedBagInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.bills.bean; +package com.pikolive.core.bills.bean; import com.google.gson.annotations.SerializedName; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/RedBagListInfo.java b/core/src/main/java/com/pikolive/core/bills/bean/RedBagListInfo.java similarity index 92% rename from core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/RedBagListInfo.java rename to core/src/main/java/com/pikolive/core/bills/bean/RedBagListInfo.java index 5b313ffaf..1037ef9af 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/RedBagListInfo.java +++ b/core/src/main/java/com/pikolive/core/bills/bean/RedBagListInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.bills.bean; +package com.pikolive.core.bills.bean; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/TextInfos.java b/core/src/main/java/com/pikolive/core/bills/bean/TextInfos.java similarity index 92% rename from core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/TextInfos.java rename to core/src/main/java/com/pikolive/core/bills/bean/TextInfos.java index 48d50a8e7..e185fbdc2 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/TextInfos.java +++ b/core/src/main/java/com/pikolive/core/bills/bean/TextInfos.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.bills.bean; +package com.pikolive.core.bills.bean; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/TimeInfo.java b/core/src/main/java/com/pikolive/core/bills/bean/TimeInfo.java similarity index 87% rename from core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/TimeInfo.java rename to core/src/main/java/com/pikolive/core/bills/bean/TimeInfo.java index 86d25cda4..a8f873a0e 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bills/bean/TimeInfo.java +++ b/core/src/main/java/com/pikolive/core/bills/bean/TimeInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.bills.bean; +package com.pikolive.core.bills.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/pikolive/core/bills/result/ChargeResult.java b/core/src/main/java/com/pikolive/core/bills/result/ChargeResult.java new file mode 100644 index 000000000..7e5d9e363 --- /dev/null +++ b/core/src/main/java/com/pikolive/core/bills/result/ChargeResult.java @@ -0,0 +1,11 @@ +package com.pikolive.core.bills.result; + +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.bills.bean.ExpendListInfo; + +/** + * Created by Seven on 2017/9/9. + */ + +public class ChargeResult extends ServiceResult { +} diff --git a/core/src/main/java/com/pikolive/core/bills/result/ExpendResult.java b/core/src/main/java/com/pikolive/core/bills/result/ExpendResult.java new file mode 100644 index 000000000..8ab28e64b --- /dev/null +++ b/core/src/main/java/com/pikolive/core/bills/result/ExpendResult.java @@ -0,0 +1,11 @@ +package com.pikolive.core.bills.result; + +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.bills.bean.ExpendListInfo; + +/** + * Created by Seven on 2017/9/9. + */ + +public class ExpendResult extends ServiceResult { +} diff --git a/core/src/main/java/com/pikolive/core/bills/result/IncomedResult.java b/core/src/main/java/com/pikolive/core/bills/result/IncomedResult.java new file mode 100644 index 000000000..735a207c1 --- /dev/null +++ b/core/src/main/java/com/pikolive/core/bills/result/IncomedResult.java @@ -0,0 +1,11 @@ +package com.pikolive.core.bills.result; + +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.bills.bean.IncomeListInfo; + +/** + * Created by Seven on 2017/9/9. + */ + +public class IncomedResult extends ServiceResult { +} diff --git a/core/src/main/java/com/pikolive/core/bills/result/RadishGiftResult.java b/core/src/main/java/com/pikolive/core/bills/result/RadishGiftResult.java new file mode 100644 index 000000000..225e4ef88 --- /dev/null +++ b/core/src/main/java/com/pikolive/core/bills/result/RadishGiftResult.java @@ -0,0 +1,7 @@ +package com.pikolive.core.bills.result; + +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.bills.bean.RadishGiftListInfo; + +public class RadishGiftResult extends ServiceResult { +} diff --git a/core/src/main/java/com/pikolive/core/bills/result/RedBagResult.java b/core/src/main/java/com/pikolive/core/bills/result/RedBagResult.java new file mode 100644 index 000000000..24648a94d --- /dev/null +++ b/core/src/main/java/com/pikolive/core/bills/result/RedBagResult.java @@ -0,0 +1,11 @@ +package com.pikolive.core.bills.result; + +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.bills.bean.RedBagListInfo; + +/** + * Created by Seven on 2017/9/9. + */ + +public class RedBagResult extends ServiceResult { +} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/certification/CertificationModel.java b/core/src/main/java/com/pikolive/core/certification/CertificationModel.java similarity index 92% rename from core/src/main/java/com/yizhuan/xchat_android_core/certification/CertificationModel.java rename to core/src/main/java/com/pikolive/core/certification/CertificationModel.java index 23eaeb4dc..d67be191b 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/certification/CertificationModel.java +++ b/core/src/main/java/com/pikolive/core/certification/CertificationModel.java @@ -1,6 +1,7 @@ -package com.yizhuan.xchat_android_core.certification; +package com.pikolive.core.certification; -import com.yizhuan.xchat_android_core.base.BaseModel; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.base.BaseModel; public class CertificationModel extends BaseModel implements ICertificationModel { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/certification/ICertificationModel.java b/core/src/main/java/com/pikolive/core/certification/ICertificationModel.java similarity index 58% rename from core/src/main/java/com/yizhuan/xchat_android_core/certification/ICertificationModel.java rename to core/src/main/java/com/pikolive/core/certification/ICertificationModel.java index bb017a76a..ebd695805 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/certification/ICertificationModel.java +++ b/core/src/main/java/com/pikolive/core/certification/ICertificationModel.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.certification; +package com.pikolive.core.certification; -import com.yizhuan.xchat_android_core.base.IModel; +import com.pikolive.core.base.IModel; public interface ICertificationModel extends IModel { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/certification/event/CertificationResultEvent.java b/core/src/main/java/com/pikolive/core/certification/event/CertificationResultEvent.java similarity index 81% rename from core/src/main/java/com/yizhuan/xchat_android_core/certification/event/CertificationResultEvent.java rename to core/src/main/java/com/pikolive/core/certification/event/CertificationResultEvent.java index 2020569f6..5f1d1e9f4 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/certification/event/CertificationResultEvent.java +++ b/core/src/main/java/com/pikolive/core/certification/event/CertificationResultEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.certification.event; +package com.pikolive.core.certification.event; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/community/UserVo.kt b/core/src/main/java/com/pikolive/core/community/UserVo.kt similarity index 77% rename from core/src/main/java/com/yizhuan/xchat_android_core/community/UserVo.kt rename to core/src/main/java/com/pikolive/core/community/UserVo.kt index 678b53f49..ba65f7c9c 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/community/UserVo.kt +++ b/core/src/main/java/com/pikolive/core/community/UserVo.kt @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.community +package com.pikolive.core.community -import com.yizhuan.xchat_android_core.decoration.headwear.bean.HeadWearInfo -import com.yizhuan.xchat_android_core.utils.CurrentTimeUtils +import com.pikolive.core.decoration.headwear.bean.HeadWearInfo +import com.pikolive.core.utils.CurrentTimeUtils import java.io.Serializable diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/contacts/ContactModel.java b/core/src/main/java/com/pikolive/core/contacts/ContactModel.java similarity index 75% rename from core/src/main/java/com/yizhuan/xchat_android_core/contacts/ContactModel.java rename to core/src/main/java/com/pikolive/core/contacts/ContactModel.java index 84fd06ced..784830fbc 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/contacts/ContactModel.java +++ b/core/src/main/java/com/pikolive/core/contacts/ContactModel.java @@ -1,9 +1,13 @@ -package com.yizhuan.xchat_android_core.contacts; +package com.pikolive.core.contacts; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.room.bean.SearchRoomInfo; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.room.bean.SearchRoomInfo; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.room.bean.SearchRoomInfo; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.room.bean.SearchRoomInfo; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.net.rxnet.RxNet; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/contacts/IContactModel.java b/core/src/main/java/com/pikolive/core/contacts/IContactModel.java new file mode 100644 index 000000000..a47a5eb79 --- /dev/null +++ b/core/src/main/java/com/pikolive/core/contacts/IContactModel.java @@ -0,0 +1,20 @@ +package com.pikolive.core.contacts; + +import com.pikolive.core.base.IModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.room.bean.SearchRoomInfo; +import com.pikolive.core.base.IModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.room.bean.SearchRoomInfo; +import com.pikolive.core.base.IModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.room.bean.SearchRoomInfo; + +import java.util.List; + +import io.reactivex.Single; + +public interface IContactModel extends IModel { + + Single>> searchContacts(String keyword); +} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/DecorationInfo.kt b/core/src/main/java/com/pikolive/core/decoration/DecorationInfo.kt similarity index 85% rename from core/src/main/java/com/yizhuan/xchat_android_core/decoration/DecorationInfo.kt rename to core/src/main/java/com/pikolive/core/decoration/DecorationInfo.kt index 15edc3555..4cf127093 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/DecorationInfo.kt +++ b/core/src/main/java/com/pikolive/core/decoration/DecorationInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.decoration +package com.pikolive.core.decoration data class DecorationInfo( val dressDay: Int = 0, diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/DecorationInfoEvent.java b/core/src/main/java/com/pikolive/core/decoration/DecorationInfoEvent.java similarity index 83% rename from core/src/main/java/com/yizhuan/xchat_android_core/decoration/DecorationInfoEvent.java rename to core/src/main/java/com/pikolive/core/decoration/DecorationInfoEvent.java index 6e639c3ac..7f78ee046 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/DecorationInfoEvent.java +++ b/core/src/main/java/com/pikolive/core/decoration/DecorationInfoEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.decoration; +package com.pikolive.core.decoration; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/DecorationModel.kt b/core/src/main/java/com/pikolive/core/decoration/DecorationModel.kt similarity index 85% rename from core/src/main/java/com/yizhuan/xchat_android_core/decoration/DecorationModel.kt rename to core/src/main/java/com/pikolive/core/decoration/DecorationModel.kt index 86ad3628c..cc6f76557 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/DecorationModel.kt +++ b/core/src/main/java/com/pikolive/core/decoration/DecorationModel.kt @@ -1,9 +1,9 @@ -package com.yizhuan.xchat_android_core.decoration +package com.pikolive.core.decoration -import com.yizhuan.xchat_android_core.base.BaseModel -import com.yizhuan.xchat_android_core.bean.response.ServiceResult -import com.yizhuan.xchat_android_core.utils.net.RxHelper -import com.yizhuan.xchat_android_core.utils.net.launchRequest +import com.pikolive.core.base.BaseModel +import com.pikolive.core.bean.response.ServiceResult +import com.pikolive.core.utils.net.RxHelper +import com.pikolive.core.utils.net.launchRequest import com.pikolive.library.net.rxnet.RxNet import io.reactivex.Single import retrofit2.http.* diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/backgroud/BackgroundModel.java b/core/src/main/java/com/pikolive/core/decoration/backgroud/BackgroundModel.java similarity index 93% rename from core/src/main/java/com/yizhuan/xchat_android_core/decoration/backgroud/BackgroundModel.java rename to core/src/main/java/com/pikolive/core/decoration/backgroud/BackgroundModel.java index faf05da20..e9047f3e1 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/backgroud/BackgroundModel.java +++ b/core/src/main/java/com/pikolive/core/decoration/backgroud/BackgroundModel.java @@ -1,13 +1,14 @@ -package com.yizhuan.xchat_android_core.decoration.backgroud; +package com.pikolive.core.decoration.backgroud; -import com.yizhuan.xchat_android_core.R; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.decoration.backgroud.bean.BgInfo; -import com.yizhuan.xchat_android_core.decoration.headwear.throwable.HeadwearPulledOffShelvesException; -import com.yizhuan.xchat_android_core.utils.net.BalanceNotEnoughExeption; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; + +import com.pikolive.core.R; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.decoration.backgroud.bean.BgInfo; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.decoration.headwear.throwable.HeadwearPulledOffShelvesException; +import com.pikolive.core.utils.net.BalanceNotEnoughExeption; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.net.rxnet.RxNet; import com.pikolive.library.utils.ResUtil; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/backgroud/IBackgroundModel.java b/core/src/main/java/com/pikolive/core/decoration/backgroud/IBackgroundModel.java similarity index 70% rename from core/src/main/java/com/yizhuan/xchat_android_core/decoration/backgroud/IBackgroundModel.java rename to core/src/main/java/com/pikolive/core/decoration/backgroud/IBackgroundModel.java index 24ebeef9c..3f8c2963f 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/backgroud/IBackgroundModel.java +++ b/core/src/main/java/com/pikolive/core/decoration/backgroud/IBackgroundModel.java @@ -1,8 +1,12 @@ -package com.yizhuan.xchat_android_core.decoration.backgroud; +package com.pikolive.core.decoration.backgroud; -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.decoration.backgroud.bean.BgInfo; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.decoration.backgroud.bean.BgInfo; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.decoration.backgroud.bean.BgInfo; +import com.pikolive.core.base.IModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.decoration.backgroud.bean.BgInfo; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/backgroud/bean/BgInfo.java b/core/src/main/java/com/pikolive/core/decoration/backgroud/bean/BgInfo.java similarity index 98% rename from core/src/main/java/com/yizhuan/xchat_android_core/decoration/backgroud/bean/BgInfo.java rename to core/src/main/java/com/pikolive/core/decoration/backgroud/bean/BgInfo.java index a34736b5b..6a376c1b0 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/backgroud/bean/BgInfo.java +++ b/core/src/main/java/com/pikolive/core/decoration/backgroud/bean/BgInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.decoration.backgroud.bean; +package com.pikolive.core.decoration.backgroud.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/bean/BaseDecoration.java b/core/src/main/java/com/pikolive/core/decoration/bean/BaseDecoration.java similarity index 96% rename from core/src/main/java/com/yizhuan/xchat_android_core/decoration/bean/BaseDecoration.java rename to core/src/main/java/com/pikolive/core/decoration/bean/BaseDecoration.java index 711ff8140..c9c4ff2b0 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/bean/BaseDecoration.java +++ b/core/src/main/java/com/pikolive/core/decoration/bean/BaseDecoration.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.decoration.bean; +package com.pikolive.core.decoration.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/bean/CurrencyType.java b/core/src/main/java/com/pikolive/core/decoration/bean/CurrencyType.java similarity index 72% rename from core/src/main/java/com/yizhuan/xchat_android_core/decoration/bean/CurrencyType.java rename to core/src/main/java/com/pikolive/core/decoration/bean/CurrencyType.java index e67905af6..9dd8177d8 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/bean/CurrencyType.java +++ b/core/src/main/java/com/pikolive/core/decoration/bean/CurrencyType.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.decoration.bean; +package com.pikolive.core.decoration.bean; /** * 虚拟币类型 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/bean/DecorationStoreRouterType.java b/core/src/main/java/com/pikolive/core/decoration/bean/DecorationStoreRouterType.java similarity index 83% rename from core/src/main/java/com/yizhuan/xchat_android_core/decoration/bean/DecorationStoreRouterType.java rename to core/src/main/java/com/pikolive/core/decoration/bean/DecorationStoreRouterType.java index a1e70de6a..a7b3525f5 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/bean/DecorationStoreRouterType.java +++ b/core/src/main/java/com/pikolive/core/decoration/bean/DecorationStoreRouterType.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.decoration.bean; +package com.pikolive.core.decoration.bean; public class DecorationStoreRouterType { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/car/CarModel.java b/core/src/main/java/com/pikolive/core/decoration/car/CarModel.java similarity index 94% rename from core/src/main/java/com/yizhuan/xchat_android_core/decoration/car/CarModel.java rename to core/src/main/java/com/pikolive/core/decoration/car/CarModel.java index fe46384cf..50a4bbdc4 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/car/CarModel.java +++ b/core/src/main/java/com/pikolive/core/decoration/car/CarModel.java @@ -1,14 +1,15 @@ -package com.yizhuan.xchat_android_core.decoration.car; +package com.pikolive.core.decoration.car; -import com.yizhuan.xchat_android_core.R; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.decoration.car.bean.CarInfo; -import com.yizhuan.xchat_android_core.utils.net.BalanceNotEnoughExeption; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.decoration.bean.CurrencyType; +import com.pikolive.core.decoration.car.bean.CarInfo; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.utils.net.BalanceNotEnoughExeption; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.net.rxnet.RxNet; import com.pikolive.library.utils.ResUtil; +import com.pikolive.core.R; import java.util.List; @@ -190,7 +191,7 @@ public class CarModel extends BaseModel implements ICarModel { * 赠送座驾V2 * * @param targetUid 赠送人 - * @param currencyType {@link com.yizhuan.xchat_android_core.decoration.bean.CurrencyType} + * @param currencyType {@link CurrencyType} * 支付货币类型：0钻石，1萝卜 * @return */ @@ -324,7 +325,7 @@ public class CarModel extends BaseModel implements ICarModel { * 赠送座驾V2 * * @param targetUid 被赠送人 - * @param currencyType {@link com.yizhuan.xchat_android_core.decoration.bean.CurrencyType} + * @param currencyType {@link CurrencyType} */ @POST("car/pay/v2/giveCar") Single> sendCarV2(@Query("uid") String uid, diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/car/ICarModel.java b/core/src/main/java/com/pikolive/core/decoration/car/ICarModel.java similarity index 73% rename from core/src/main/java/com/yizhuan/xchat_android_core/decoration/car/ICarModel.java rename to core/src/main/java/com/pikolive/core/decoration/car/ICarModel.java index d4174654b..46b1a9b93 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/car/ICarModel.java +++ b/core/src/main/java/com/pikolive/core/decoration/car/ICarModel.java @@ -1,8 +1,16 @@ -package com.yizhuan.xchat_android_core.decoration.car; +package com.pikolive.core.decoration.car; -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.decoration.car.bean.CarInfo; +import com.pikolive.core.base.IModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.decoration.bean.CurrencyType; +import com.pikolive.core.decoration.car.bean.CarInfo; +import com.pikolive.core.base.IModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.decoration.bean.CurrencyType; +import com.pikolive.core.decoration.car.bean.CarInfo; +import com.pikolive.core.base.IModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.decoration.car.bean.CarInfo; import java.util.List; @@ -84,7 +92,7 @@ public interface ICarModel extends IModel { * 赠送座驾V2 * * @param targetUid 被赠送人 - * @param currencyType {@link com.yizhuan.xchat_android_core.decoration.bean.CurrencyType} + * @param currencyType {@link CurrencyType} * 虚拟币类型 */ Single sendCarV2(String targetUid, String carId, int currencyType); diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/car/bean/CarInfo.java b/core/src/main/java/com/pikolive/core/decoration/car/bean/CarInfo.java similarity index 94% rename from core/src/main/java/com/yizhuan/xchat_android_core/decoration/car/bean/CarInfo.java rename to core/src/main/java/com/pikolive/core/decoration/car/bean/CarInfo.java index 67bab0815..eb3a094c7 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/car/bean/CarInfo.java +++ b/core/src/main/java/com/pikolive/core/decoration/car/bean/CarInfo.java @@ -1,7 +1,9 @@ -package com.yizhuan.xchat_android_core.decoration.car.bean; +package com.pikolive.core.decoration.car.bean; import com.google.gson.annotations.SerializedName; -import com.yizhuan.xchat_android_core.decoration.bean.BaseDecoration; +import com.pikolive.core.decoration.bean.BaseDecoration; +import com.pikolive.core.decoration.bean.BaseDecoration; +import com.pikolive.core.decoration.bean.BaseDecoration; import java.io.Serializable; import java.util.HashMap; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/headwear/HeadwearModel.java b/core/src/main/java/com/pikolive/core/decoration/headwear/HeadwearModel.java similarity index 94% rename from core/src/main/java/com/yizhuan/xchat_android_core/decoration/headwear/HeadwearModel.java rename to core/src/main/java/com/pikolive/core/decoration/headwear/HeadwearModel.java index 3fe0a7b8c..4d058dfd8 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/headwear/HeadwearModel.java +++ b/core/src/main/java/com/pikolive/core/decoration/headwear/HeadwearModel.java @@ -1,19 +1,20 @@ -package com.yizhuan.xchat_android_core.decoration.headwear; +package com.pikolive.core.decoration.headwear; -import com.yizhuan.xchat_android_core.R; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.decoration.headwear.bean.ChatBubbleInfo; -import com.yizhuan.xchat_android_core.decoration.headwear.bean.HeadWearInfo; -import com.yizhuan.xchat_android_core.decoration.headwear.bean.UserCardWearInfo; -import com.yizhuan.xchat_android_core.decoration.headwear.throwable.HeadwearPulledOffShelvesException; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.utils.net.BalanceNotEnoughExeption; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.decoration.headwear.bean.ChatBubbleInfo; +import com.pikolive.core.decoration.headwear.bean.HeadWearInfo; +import com.pikolive.core.decoration.headwear.bean.UserCardWearInfo; +import com.pikolive.core.decoration.headwear.throwable.HeadwearPulledOffShelvesException; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.decoration.bean.CurrencyType; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core2.manager.IMNetEaseManager; +import com.pikolive.core.utils.net.BalanceNotEnoughExeption; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.net.rxnet.RxNet; import com.pikolive.library.utils.ResUtil; +import com.pikolive.core.R; import java.util.List; @@ -187,7 +188,7 @@ public class HeadwearModel extends BaseModel implements IHeadwearModel { /** * 购买/续费头饰 * - * @param currencyType {@link com.yizhuan.xchat_android_core.decoration.bean.CurrencyType} + * @param currencyType {@link CurrencyType} * @return */ @Override @@ -246,7 +247,7 @@ public class HeadwearModel extends BaseModel implements IHeadwearModel { /** * 赠送头饰 * - * @param currencyType {@link com.yizhuan.xchat_android_core.decoration.bean.CurrencyType} + * @param currencyType {@link CurrencyType} * 支付货币类型：0钻石，1萝卜 */ @Override diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/headwear/IHeadwearModel.java b/core/src/main/java/com/pikolive/core/decoration/headwear/IHeadwearModel.java similarity index 70% rename from core/src/main/java/com/yizhuan/xchat_android_core/decoration/headwear/IHeadwearModel.java rename to core/src/main/java/com/pikolive/core/decoration/headwear/IHeadwearModel.java index 3372d2c56..30c0a93f4 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/headwear/IHeadwearModel.java +++ b/core/src/main/java/com/pikolive/core/decoration/headwear/IHeadwearModel.java @@ -1,10 +1,21 @@ -package com.yizhuan.xchat_android_core.decoration.headwear; +package com.pikolive.core.decoration.headwear; -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.decoration.headwear.bean.ChatBubbleInfo; -import com.yizhuan.xchat_android_core.decoration.headwear.bean.HeadWearInfo; -import com.yizhuan.xchat_android_core.decoration.headwear.bean.UserCardWearInfo; +import com.pikolive.core.base.IModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.decoration.headwear.bean.ChatBubbleInfo; +import com.pikolive.core.decoration.headwear.bean.HeadWearInfo; +import com.pikolive.core.decoration.headwear.bean.UserCardWearInfo; +import com.pikolive.core.base.IModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.decoration.bean.CurrencyType; +import com.pikolive.core.decoration.headwear.bean.ChatBubbleInfo; +import com.pikolive.core.decoration.headwear.bean.HeadWearInfo; +import com.pikolive.core.decoration.headwear.bean.UserCardWearInfo; +import com.pikolive.core.base.IModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.decoration.headwear.bean.ChatBubbleInfo; +import com.pikolive.core.decoration.headwear.bean.HeadWearInfo; +import com.pikolive.core.decoration.headwear.bean.UserCardWearInfo; import java.util.List; @@ -90,7 +101,7 @@ public interface IHeadwearModel extends IModel { /** * 赠送头饰 * - * @param currencyType {@link com.yizhuan.xchat_android_core.decoration.bean.CurrencyType} + * @param currencyType {@link CurrencyType} * 支付货币类型：0钻石，1萝卜 */ Single sendHeadWearV2(int currencyType, String headwearId, String targetUid); diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/headwear/bean/ChatBubbleInfo.java b/core/src/main/java/com/pikolive/core/decoration/headwear/bean/ChatBubbleInfo.java similarity index 82% rename from core/src/main/java/com/yizhuan/xchat_android_core/decoration/headwear/bean/ChatBubbleInfo.java rename to core/src/main/java/com/pikolive/core/decoration/headwear/bean/ChatBubbleInfo.java index 279a717f1..79b40d9a3 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/headwear/bean/ChatBubbleInfo.java +++ b/core/src/main/java/com/pikolive/core/decoration/headwear/bean/ChatBubbleInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.decoration.headwear.bean; +package com.pikolive.core.decoration.headwear.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/headwear/bean/HeadWearInfo.java b/core/src/main/java/com/pikolive/core/decoration/headwear/bean/HeadWearInfo.java similarity index 95% rename from core/src/main/java/com/yizhuan/xchat_android_core/decoration/headwear/bean/HeadWearInfo.java rename to core/src/main/java/com/pikolive/core/decoration/headwear/bean/HeadWearInfo.java index c98443702..b30d093f0 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/headwear/bean/HeadWearInfo.java +++ b/core/src/main/java/com/pikolive/core/decoration/headwear/bean/HeadWearInfo.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.decoration.headwear.bean; +package com.pikolive.core.decoration.headwear.bean; -import com.yizhuan.xchat_android_core.decoration.bean.BaseDecoration; +import com.pikolive.core.decoration.bean.BaseDecoration; import java.io.Serializable; import java.util.HashMap; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/headwear/bean/UserCardWearInfo.java b/core/src/main/java/com/pikolive/core/decoration/headwear/bean/UserCardWearInfo.java similarity index 81% rename from core/src/main/java/com/yizhuan/xchat_android_core/decoration/headwear/bean/UserCardWearInfo.java rename to core/src/main/java/com/pikolive/core/decoration/headwear/bean/UserCardWearInfo.java index 2501eca51..ca3533318 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/headwear/bean/UserCardWearInfo.java +++ b/core/src/main/java/com/pikolive/core/decoration/headwear/bean/UserCardWearInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.decoration.headwear.bean; +package com.pikolive.core.decoration.headwear.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/headwear/throwable/HeadwearPulledOffShelvesException.java b/core/src/main/java/com/pikolive/core/decoration/headwear/throwable/HeadwearPulledOffShelvesException.java similarity index 76% rename from core/src/main/java/com/yizhuan/xchat_android_core/decoration/headwear/throwable/HeadwearPulledOffShelvesException.java rename to core/src/main/java/com/pikolive/core/decoration/headwear/throwable/HeadwearPulledOffShelvesException.java index 1fbb623fe..f0560f2fe 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/headwear/throwable/HeadwearPulledOffShelvesException.java +++ b/core/src/main/java/com/pikolive/core/decoration/headwear/throwable/HeadwearPulledOffShelvesException.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.decoration.headwear.throwable; +package com.pikolive.core.decoration.headwear.throwable; public class HeadwearPulledOffShelvesException extends Exception{ public final static int code = 6202;//头饰下架异常码 diff --git a/core/src/main/java/com/pikolive/core/decoration/nameplate/INamePlateModel.java b/core/src/main/java/com/pikolive/core/decoration/nameplate/INamePlateModel.java new file mode 100644 index 000000000..de7a80235 --- /dev/null +++ b/core/src/main/java/com/pikolive/core/decoration/nameplate/INamePlateModel.java @@ -0,0 +1,22 @@ +package com.pikolive.core.decoration.nameplate; + +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.decoration.nameplate.bean.NamePlateInfo; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.decoration.nameplate.bean.NamePlateInfo; +import com.pikolive.core.base.IModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.decoration.nameplate.bean.NamePlateInfo; + +import io.reactivex.Single; + +public interface INamePlateModel extends IModel { + + /** + * 获取我的铭牌列表 + * + * @return + */ + Single> getNamePlateList(long uid); + +} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/nameplate/NamePlateModel.java b/core/src/main/java/com/pikolive/core/decoration/nameplate/NamePlateModel.java similarity index 85% rename from core/src/main/java/com/yizhuan/xchat_android_core/decoration/nameplate/NamePlateModel.java rename to core/src/main/java/com/pikolive/core/decoration/nameplate/NamePlateModel.java index f1440d4b8..dc8faf08f 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/nameplate/NamePlateModel.java +++ b/core/src/main/java/com/pikolive/core/decoration/nameplate/NamePlateModel.java @@ -1,13 +1,15 @@ -package com.yizhuan.xchat_android_core.decoration.nameplate; +package com.pikolive.core.decoration.nameplate; -import com.yizhuan.xchat_android_core.R; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.decoration.nameplate.bean.NamePlateInfo; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.decoration.nameplate.bean.NamePlateInfo; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.decoration.nameplate.bean.NamePlateInfo; +import com.pikolive.core.R; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core2.manager.IMNetEaseManager; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.net.rxnet.RxNet; import com.pikolive.library.utils.ResUtil; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/nameplate/bean/NamePlateInfo.java b/core/src/main/java/com/pikolive/core/decoration/nameplate/bean/NamePlateInfo.java similarity index 98% rename from core/src/main/java/com/yizhuan/xchat_android_core/decoration/nameplate/bean/NamePlateInfo.java rename to core/src/main/java/com/pikolive/core/decoration/nameplate/bean/NamePlateInfo.java index 7188200d5..2f64b204e 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/nameplate/bean/NamePlateInfo.java +++ b/core/src/main/java/com/pikolive/core/decoration/nameplate/bean/NamePlateInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.decoration.nameplate.bean; +package com.pikolive.core.decoration.nameplate.bean; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/exception/ErrorThrowable.java b/core/src/main/java/com/pikolive/core/exception/ErrorThrowable.java similarity index 93% rename from core/src/main/java/com/yizhuan/xchat_android_core/exception/ErrorThrowable.java rename to core/src/main/java/com/pikolive/core/exception/ErrorThrowable.java index 42ab60ee9..e3a20ece0 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/exception/ErrorThrowable.java +++ b/core/src/main/java/com/pikolive/core/exception/ErrorThrowable.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.exception; +package com.pikolive.core.exception; import androidx.annotation.StringDef; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/exception/FailReasonException.java b/core/src/main/java/com/pikolive/core/exception/FailReasonException.java similarity index 90% rename from core/src/main/java/com/yizhuan/xchat_android_core/exception/FailReasonException.java rename to core/src/main/java/com/pikolive/core/exception/FailReasonException.java index ba54cc5c1..3d50baa8c 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/exception/FailReasonException.java +++ b/core/src/main/java/com/pikolive/core/exception/FailReasonException.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.exception; +package com.pikolive.core.exception; /** * 接口上返回的 error code，用这个类封装起来 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/exception/NullDataException.java b/core/src/main/java/com/pikolive/core/exception/NullDataException.java similarity index 77% rename from core/src/main/java/com/yizhuan/xchat_android_core/exception/NullDataException.java rename to core/src/main/java/com/pikolive/core/exception/NullDataException.java index db8501b13..75f90caaf 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/exception/NullDataException.java +++ b/core/src/main/java/com/pikolive/core/exception/NullDataException.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.exception; +package com.pikolive.core.exception; /** * Created by MadisonRong on 2019-08-16 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/exception/UnKnowException.java b/core/src/main/java/com/pikolive/core/exception/UnKnowException.java similarity index 69% rename from core/src/main/java/com/yizhuan/xchat_android_core/exception/UnKnowException.java rename to core/src/main/java/com/pikolive/core/exception/UnKnowException.java index 8329269b3..06fefa7ce 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/exception/UnKnowException.java +++ b/core/src/main/java/com/pikolive/core/exception/UnKnowException.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.exception; +package com.pikolive.core.exception; /** * 未知错误 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/BillDateDivInfo.java b/core/src/main/java/com/pikolive/core/family/bean/BillDateDivInfo.java similarity index 81% rename from core/src/main/java/com/yizhuan/xchat_android_core/family/bean/BillDateDivInfo.java rename to core/src/main/java/com/pikolive/core/family/bean/BillDateDivInfo.java index bd6e49253..e5f0f23b3 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/BillDateDivInfo.java +++ b/core/src/main/java/com/pikolive/core/family/bean/BillDateDivInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.family.bean; +package com.pikolive.core.family.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/CustomServiceInfo.java b/core/src/main/java/com/pikolive/core/family/bean/CustomServiceInfo.java similarity index 86% rename from core/src/main/java/com/yizhuan/xchat_android_core/family/bean/CustomServiceInfo.java rename to core/src/main/java/com/pikolive/core/family/bean/CustomServiceInfo.java index ded182486..c212e5b60 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/CustomServiceInfo.java +++ b/core/src/main/java/com/pikolive/core/family/bean/CustomServiceInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.family.bean; +package com.pikolive.core.family.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/FamilyCustomServiceInfo.java b/core/src/main/java/com/pikolive/core/family/bean/FamilyCustomServiceInfo.java similarity index 79% rename from core/src/main/java/com/yizhuan/xchat_android_core/family/bean/FamilyCustomServiceInfo.java rename to core/src/main/java/com/pikolive/core/family/bean/FamilyCustomServiceInfo.java index 933a1c56a..eba97144d 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/FamilyCustomServiceInfo.java +++ b/core/src/main/java/com/pikolive/core/family/bean/FamilyCustomServiceInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.family.bean; +package com.pikolive.core.family.bean; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/FamilyGameInfo.java b/core/src/main/java/com/pikolive/core/family/bean/FamilyGameInfo.java similarity index 83% rename from core/src/main/java/com/yizhuan/xchat_android_core/family/bean/FamilyGameInfo.java rename to core/src/main/java/com/pikolive/core/family/bean/FamilyGameInfo.java index 9cbed04f2..ac48b203c 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/FamilyGameInfo.java +++ b/core/src/main/java/com/pikolive/core/family/bean/FamilyGameInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.family.bean; +package com.pikolive.core.family.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/FamilyGroupInfo.java b/core/src/main/java/com/pikolive/core/family/bean/FamilyGroupInfo.java similarity index 94% rename from core/src/main/java/com/yizhuan/xchat_android_core/family/bean/FamilyGroupInfo.java rename to core/src/main/java/com/pikolive/core/family/bean/FamilyGroupInfo.java index 62b687448..8f0ebe59a 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/FamilyGroupInfo.java +++ b/core/src/main/java/com/pikolive/core/family/bean/FamilyGroupInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.family.bean; +package com.pikolive.core.family.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/FamilyInfo.java b/core/src/main/java/com/pikolive/core/family/bean/FamilyInfo.java similarity index 96% rename from core/src/main/java/com/yizhuan/xchat_android_core/family/bean/FamilyInfo.java rename to core/src/main/java/com/pikolive/core/family/bean/FamilyInfo.java index bdf5343f0..db776107c 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/FamilyInfo.java +++ b/core/src/main/java/com/pikolive/core/family/bean/FamilyInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.family.bean; +package com.pikolive.core.family.bean; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/FamilyManageItemInfo.java b/core/src/main/java/com/pikolive/core/family/bean/FamilyManageItemInfo.java similarity index 89% rename from core/src/main/java/com/yizhuan/xchat_android_core/family/bean/FamilyManageItemInfo.java rename to core/src/main/java/com/pikolive/core/family/bean/FamilyManageItemInfo.java index 4f8387e22..491a46b9c 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/FamilyManageItemInfo.java +++ b/core/src/main/java/com/pikolive/core/family/bean/FamilyManageItemInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.family.bean; +package com.pikolive.core.family.bean; import androidx.annotation.DrawableRes; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/FamilyMemberInfo.java b/core/src/main/java/com/pikolive/core/family/bean/FamilyMemberInfo.java similarity index 70% rename from core/src/main/java/com/yizhuan/xchat_android_core/family/bean/FamilyMemberInfo.java rename to core/src/main/java/com/pikolive/core/family/bean/FamilyMemberInfo.java index 3db6573dc..b48a956ff 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/FamilyMemberInfo.java +++ b/core/src/main/java/com/pikolive/core/family/bean/FamilyMemberInfo.java @@ -1,7 +1,11 @@ -package com.yizhuan.xchat_android_core.family.bean; +package com.pikolive.core.family.bean; -import com.yizhuan.xchat_android_core.level.UserLevelVo; -import com.yizhuan.xchat_android_core.noble.NobleInfo; +import com.pikolive.core.level.UserLevelVo; +import com.pikolive.core.noble.NobleInfo; +import com.pikolive.core.level.UserLevelVo; +import com.pikolive.core.noble.NobleInfo; +import com.pikolive.core.level.UserLevelVo; +import com.pikolive.core.noble.NobleInfo; import java.io.Serializable; diff --git a/core/src/main/java/com/pikolive/core/family/bean/FamilyPlazaInfo.java b/core/src/main/java/com/pikolive/core/family/bean/FamilyPlazaInfo.java new file mode 100644 index 000000000..991635e5a --- /dev/null +++ b/core/src/main/java/com/pikolive/core/family/bean/FamilyPlazaInfo.java @@ -0,0 +1,20 @@ +package com.pikolive.core.family.bean; + +import com.pikolive.core.family.bean.response.familyPlaza.RespFamily; +import com.pikolive.core.family.bean.response.familyPlaza.RespFamily; +import com.pikolive.core.family.bean.response.familyPlaza.RespFamily; + +import java.util.List; + +import lombok.Data; + +/** + * @author jack + * @Description + * @Date 2018/5/31 + */ +@Data +public class FamilyPlazaInfo { + private List banners; + private RespFamily familys; +} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/FindBannerInfo.java b/core/src/main/java/com/pikolive/core/family/bean/FindBannerInfo.java similarity index 97% rename from core/src/main/java/com/yizhuan/xchat_android_core/family/bean/FindBannerInfo.java rename to core/src/main/java/com/pikolive/core/family/bean/FindBannerInfo.java index 62316a381..6cf8428a5 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/FindBannerInfo.java +++ b/core/src/main/java/com/pikolive/core/family/bean/FindBannerInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.family.bean; +package com.pikolive.core.family.bean; import android.os.Parcel; import android.os.Parcelable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/HomeBannerInfo.java b/core/src/main/java/com/pikolive/core/family/bean/HomeBannerInfo.java similarity index 79% rename from core/src/main/java/com/yizhuan/xchat_android_core/family/bean/HomeBannerInfo.java rename to core/src/main/java/com/pikolive/core/family/bean/HomeBannerInfo.java index 096f9768d..1ed3a492f 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/HomeBannerInfo.java +++ b/core/src/main/java/com/pikolive/core/family/bean/HomeBannerInfo.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.family.bean; +package com.pikolive.core.family.bean; -import com.yizhuan.xchat_android_core.home.bean.BannerInfo; +import com.pikolive.core2.home.bean.BannerInfo; import com.pikolive.library.utils.ListUtils; import java.util.ArrayList; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/HomeTitleInfo.java b/core/src/main/java/com/pikolive/core/family/bean/HomeTitleInfo.java similarity index 92% rename from core/src/main/java/com/yizhuan/xchat_android_core/family/bean/HomeTitleInfo.java rename to core/src/main/java/com/pikolive/core/family/bean/HomeTitleInfo.java index 43d02c09a..256a4828b 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/HomeTitleInfo.java +++ b/core/src/main/java/com/pikolive/core/family/bean/HomeTitleInfo.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.family.bean; +package com.pikolive.core.family.bean; -import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; +import com.pikolive.core.utils.SharedPreferenceUtils; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/TransactionRecordInfo.java b/core/src/main/java/com/pikolive/core/family/bean/TransactionRecordInfo.java similarity index 86% rename from core/src/main/java/com/yizhuan/xchat_android_core/family/bean/TransactionRecordInfo.java rename to core/src/main/java/com/pikolive/core/family/bean/TransactionRecordInfo.java index 90e88e302..d85db3e0e 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/TransactionRecordInfo.java +++ b/core/src/main/java/com/pikolive/core/family/bean/TransactionRecordInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.family.bean; +package com.pikolive.core.family.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/VMBillItemInfo.java b/core/src/main/java/com/pikolive/core/family/bean/VMBillItemInfo.java similarity index 92% rename from core/src/main/java/com/yizhuan/xchat_android_core/family/bean/VMBillItemInfo.java rename to core/src/main/java/com/pikolive/core/family/bean/VMBillItemInfo.java index d1911f443..54b235c80 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/VMBillItemInfo.java +++ b/core/src/main/java/com/pikolive/core/family/bean/VMBillItemInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.family.bean; +package com.pikolive.core.family.bean; import com.chad.library.adapter.base.entity.MultiItemEntity; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/response/RankingFamilyInfo.java b/core/src/main/java/com/pikolive/core/family/bean/response/RankingFamilyInfo.java similarity index 94% rename from core/src/main/java/com/yizhuan/xchat_android_core/family/bean/response/RankingFamilyInfo.java rename to core/src/main/java/com/pikolive/core/family/bean/response/RankingFamilyInfo.java index f1883723f..7806c85fc 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/response/RankingFamilyInfo.java +++ b/core/src/main/java/com/pikolive/core/family/bean/response/RankingFamilyInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.family.bean.response; +package com.pikolive.core.family.bean.response; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/response/RespFamilyGameList.java b/core/src/main/java/com/pikolive/core/family/bean/response/RespFamilyGameList.java similarity index 59% rename from core/src/main/java/com/yizhuan/xchat_android_core/family/bean/response/RespFamilyGameList.java rename to core/src/main/java/com/pikolive/core/family/bean/response/RespFamilyGameList.java index 065ba7a96..38256bbf5 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/response/RespFamilyGameList.java +++ b/core/src/main/java/com/pikolive/core/family/bean/response/RespFamilyGameList.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.family.bean.response; +package com.pikolive.core.family.bean.response; -import com.yizhuan.xchat_android_core.family.bean.FamilyGameInfo; +import com.pikolive.core.family.bean.FamilyGameInfo; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/response/RespFamilyRankList.java b/core/src/main/java/com/pikolive/core/family/bean/response/RespFamilyRankList.java similarity index 85% rename from core/src/main/java/com/yizhuan/xchat_android_core/family/bean/response/RespFamilyRankList.java rename to core/src/main/java/com/pikolive/core/family/bean/response/RespFamilyRankList.java index de4b74a29..8cef872e4 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/response/RespFamilyRankList.java +++ b/core/src/main/java/com/pikolive/core/family/bean/response/RespFamilyRankList.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.family.bean.response; +package com.pikolive.core.family.bean.response; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/response/familyPlaza/RespFamily.java b/core/src/main/java/com/pikolive/core/family/bean/response/familyPlaza/RespFamily.java similarity index 59% rename from core/src/main/java/com/yizhuan/xchat_android_core/family/bean/response/familyPlaza/RespFamily.java rename to core/src/main/java/com/pikolive/core/family/bean/response/familyPlaza/RespFamily.java index 026a159d0..d8e94f5e9 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/response/familyPlaza/RespFamily.java +++ b/core/src/main/java/com/pikolive/core/family/bean/response/familyPlaza/RespFamily.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.family.bean.response.familyPlaza; +package com.pikolive.core.family.bean.response.familyPlaza; -import com.yizhuan.xchat_android_core.family.bean.FamilyInfo; +import com.pikolive.core.family.bean.FamilyInfo; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/response/memberList/RespFamilymember.java b/core/src/main/java/com/pikolive/core/family/bean/response/memberList/RespFamilymember.java similarity index 61% rename from core/src/main/java/com/yizhuan/xchat_android_core/family/bean/response/memberList/RespFamilymember.java rename to core/src/main/java/com/pikolive/core/family/bean/response/memberList/RespFamilymember.java index 64e86351c..ee9947b8a 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/response/memberList/RespFamilymember.java +++ b/core/src/main/java/com/pikolive/core/family/bean/response/memberList/RespFamilymember.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.family.bean.response.memberList; +package com.pikolive.core.family.bean.response.memberList; -import com.yizhuan.xchat_android_core.family.bean.FamilyMemberInfo; +import com.pikolive.core.family.bean.FamilyMemberInfo; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/response/moneyManagement/FamilyMoneyManagementInfo.java b/core/src/main/java/com/pikolive/core/family/bean/response/moneyManagement/FamilyMoneyManagementInfo.java similarity index 86% rename from core/src/main/java/com/yizhuan/xchat_android_core/family/bean/response/moneyManagement/FamilyMoneyManagementInfo.java rename to core/src/main/java/com/pikolive/core/family/bean/response/moneyManagement/FamilyMoneyManagementInfo.java index b9a6efa75..4a8be69fa 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/response/moneyManagement/FamilyMoneyManagementInfo.java +++ b/core/src/main/java/com/pikolive/core/family/bean/response/moneyManagement/FamilyMoneyManagementInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.family.bean.response.moneyManagement; +package com.pikolive.core.family.bean.response.moneyManagement; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/response/moneyManagement/MonthlyRecord.java b/core/src/main/java/com/pikolive/core/family/bean/response/moneyManagement/MonthlyRecord.java similarity index 95% rename from core/src/main/java/com/yizhuan/xchat_android_core/family/bean/response/moneyManagement/MonthlyRecord.java rename to core/src/main/java/com/pikolive/core/family/bean/response/moneyManagement/MonthlyRecord.java index e7fe0ef7b..723b1b47e 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/response/moneyManagement/MonthlyRecord.java +++ b/core/src/main/java/com/pikolive/core/family/bean/response/moneyManagement/MonthlyRecord.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.family.bean.response.moneyManagement; +package com.pikolive.core.family.bean.response.moneyManagement; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/response/moneyManagement/TradeMoneyRecord.java b/core/src/main/java/com/pikolive/core/family/bean/response/moneyManagement/TradeMoneyRecord.java similarity index 73% rename from core/src/main/java/com/yizhuan/xchat_android_core/family/bean/response/moneyManagement/TradeMoneyRecord.java rename to core/src/main/java/com/pikolive/core/family/bean/response/moneyManagement/TradeMoneyRecord.java index d264d5fb3..33bdff49d 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/response/moneyManagement/TradeMoneyRecord.java +++ b/core/src/main/java/com/pikolive/core/family/bean/response/moneyManagement/TradeMoneyRecord.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.family.bean.response.moneyManagement; +package com.pikolive.core.family.bean.response.moneyManagement; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/family/event/FamilyCurrencyUpdateEvent.java b/core/src/main/java/com/pikolive/core/family/event/FamilyCurrencyUpdateEvent.java similarity index 75% rename from core/src/main/java/com/yizhuan/xchat_android_core/family/event/FamilyCurrencyUpdateEvent.java rename to core/src/main/java/com/pikolive/core/family/event/FamilyCurrencyUpdateEvent.java index c8e9ff96d..f88ed05d8 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/family/event/FamilyCurrencyUpdateEvent.java +++ b/core/src/main/java/com/pikolive/core/family/event/FamilyCurrencyUpdateEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.family.event; +package com.pikolive.core.family.event; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/family/event/FamilyMemberUpdateEvent.java b/core/src/main/java/com/pikolive/core/family/event/FamilyMemberUpdateEvent.java similarity index 65% rename from core/src/main/java/com/yizhuan/xchat_android_core/family/event/FamilyMemberUpdateEvent.java rename to core/src/main/java/com/pikolive/core/family/event/FamilyMemberUpdateEvent.java index 32632673c..d58c3df43 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/family/event/FamilyMemberUpdateEvent.java +++ b/core/src/main/java/com/pikolive/core/family/event/FamilyMemberUpdateEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.family.event; +package com.pikolive.core.family.event; /** * @author jack diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/family/event/FamilyMineEvent.java b/core/src/main/java/com/pikolive/core/family/event/FamilyMineEvent.java similarity index 96% rename from core/src/main/java/com/yizhuan/xchat_android_core/family/event/FamilyMineEvent.java rename to core/src/main/java/com/pikolive/core/family/event/FamilyMineEvent.java index 82d09bafb..ad614592e 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/family/event/FamilyMineEvent.java +++ b/core/src/main/java/com/pikolive/core/family/event/FamilyMineEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.family.event; +package com.pikolive.core.family.event; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/family/event/FamilyUpdateEvent.java b/core/src/main/java/com/pikolive/core/family/event/FamilyUpdateEvent.java similarity index 80% rename from core/src/main/java/com/yizhuan/xchat_android_core/family/event/FamilyUpdateEvent.java rename to core/src/main/java/com/pikolive/core/family/event/FamilyUpdateEvent.java index 00a706f53..25508848a 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/family/event/FamilyUpdateEvent.java +++ b/core/src/main/java/com/pikolive/core/family/event/FamilyUpdateEvent.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.family.event; +package com.pikolive.core.family.event; -import com.yizhuan.xchat_android_core.family.bean.FamilyInfo; +import com.pikolive.core.family.bean.FamilyInfo; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/family/model/FamilyModel.java b/core/src/main/java/com/pikolive/core/family/model/FamilyModel.java similarity index 95% rename from core/src/main/java/com/yizhuan/xchat_android_core/family/model/FamilyModel.java rename to core/src/main/java/com/pikolive/core/family/model/FamilyModel.java index 394dfb96f..bb13c2f5b 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/family/model/FamilyModel.java +++ b/core/src/main/java/com/pikolive/core/family/model/FamilyModel.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.family.model; +package com.pikolive.core.family.model; import android.annotation.SuppressLint; import android.text.TextUtils; @@ -6,30 +6,39 @@ import android.text.TextUtils; import androidx.annotation.Nullable; import com.orhanobut.logger.Logger; -import com.yizhuan.xchat_android_core.R; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.auth.event.LoginEvent; -import com.yizhuan.xchat_android_core.auth.event.LogoutEvent; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.family.bean.FamilyCustomServiceInfo; -import com.yizhuan.xchat_android_core.family.bean.FamilyGameInfo; -import com.yizhuan.xchat_android_core.family.bean.FamilyInfo; -import com.yizhuan.xchat_android_core.family.bean.FamilyPlazaInfo; -import com.yizhuan.xchat_android_core.family.bean.FindBannerInfo; -import com.yizhuan.xchat_android_core.family.bean.response.RespFamilyGameList; -import com.yizhuan.xchat_android_core.family.bean.response.RespFamilyRankList; -import com.yizhuan.xchat_android_core.family.bean.response.familyPlaza.RespFamily; -import com.yizhuan.xchat_android_core.family.bean.response.memberList.RespFamilymember; -import com.yizhuan.xchat_android_core.family.bean.response.moneyManagement.FamilyMoneyManagementInfo; -import com.yizhuan.xchat_android_core.family.bean.response.moneyManagement.TradeMoneyRecord; -import com.yizhuan.xchat_android_core.family.event.FamilyCurrencyUpdateEvent; -import com.yizhuan.xchat_android_core.family.event.FamilyMineEvent; -import com.yizhuan.xchat_android_core.family.event.FamilyUpdateEvent; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.auth.event.LoginEvent; +import com.pikolive.core.auth.event.LogoutEvent; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.auth.event.LoginEvent; +import com.pikolive.core.auth.event.LogoutEvent; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.R; +import com.pikolive.core.Constants; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.auth.event.LoginEvent; +import com.pikolive.core.auth.event.LogoutEvent; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.family.bean.FamilyCustomServiceInfo; +import com.pikolive.core.family.bean.FamilyGameInfo; +import com.pikolive.core.family.bean.FamilyInfo; +import com.pikolive.core.family.bean.FamilyPlazaInfo; +import com.pikolive.core.family.bean.FindBannerInfo; +import com.pikolive.core.family.bean.response.RespFamilyGameList; +import com.pikolive.core.family.bean.response.RespFamilyRankList; +import com.pikolive.core.family.bean.response.familyPlaza.RespFamily; +import com.pikolive.core.family.bean.response.memberList.RespFamilymember; +import com.pikolive.core.family.bean.response.moneyManagement.FamilyMoneyManagementInfo; +import com.pikolive.core.family.bean.response.moneyManagement.TradeMoneyRecord; +import com.pikolive.core.family.event.FamilyCurrencyUpdateEvent; +import com.pikolive.core.family.event.FamilyMineEvent; +import com.pikolive.core.family.event.FamilyUpdateEvent; +import com.pikolive.core.user.UserModel; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.net.rxnet.RxNet; import com.pikolive.library.rxbus.RxBusHelper; import com.pikolive.library.utils.ResUtil; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/family/model/IFamilyModel.java b/core/src/main/java/com/pikolive/core/family/model/IFamilyModel.java similarity index 86% rename from core/src/main/java/com/yizhuan/xchat_android_core/family/model/IFamilyModel.java rename to core/src/main/java/com/pikolive/core/family/model/IFamilyModel.java index 71bd315f0..f1c8c4488 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/family/model/IFamilyModel.java +++ b/core/src/main/java/com/pikolive/core/family/model/IFamilyModel.java @@ -1,18 +1,20 @@ -package com.yizhuan.xchat_android_core.family.model; +package com.pikolive.core.family.model; import androidx.annotation.Nullable; -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.family.bean.FamilyCustomServiceInfo; -import com.yizhuan.xchat_android_core.family.bean.FamilyGameInfo; -import com.yizhuan.xchat_android_core.family.bean.FamilyInfo; -import com.yizhuan.xchat_android_core.family.bean.FamilyPlazaInfo; -import com.yizhuan.xchat_android_core.family.bean.FindBannerInfo; -import com.yizhuan.xchat_android_core.family.bean.response.RespFamilyRankList; -import com.yizhuan.xchat_android_core.family.bean.response.familyPlaza.RespFamily; -import com.yizhuan.xchat_android_core.family.bean.response.memberList.RespFamilymember; -import com.yizhuan.xchat_android_core.family.bean.response.moneyManagement.FamilyMoneyManagementInfo; -import com.yizhuan.xchat_android_core.family.bean.response.moneyManagement.TradeMoneyRecord; +import com.pikolive.core.base.IModel; +import com.pikolive.core.base.IModel; +import com.pikolive.core.base.IModel; +import com.pikolive.core.family.bean.FamilyCustomServiceInfo; +import com.pikolive.core.family.bean.FamilyGameInfo; +import com.pikolive.core.family.bean.FamilyInfo; +import com.pikolive.core.family.bean.FamilyPlazaInfo; +import com.pikolive.core.family.bean.FindBannerInfo; +import com.pikolive.core.family.bean.response.RespFamilyRankList; +import com.pikolive.core.family.bean.response.familyPlaza.RespFamily; +import com.pikolive.core.family.bean.response.memberList.RespFamilymember; +import com.pikolive.core.family.bean.response.moneyManagement.FamilyMoneyManagementInfo; +import com.pikolive.core.family.bean.response.moneyManagement.TradeMoneyRecord; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/fansteam/FansTeamInfo.kt b/core/src/main/java/com/pikolive/core/fansteam/FansTeamInfo.kt similarity index 75% rename from core/src/main/java/com/yizhuan/xchat_android_core/fansteam/FansTeamInfo.kt rename to core/src/main/java/com/pikolive/core/fansteam/FansTeamInfo.kt index 34ab320d3..6aa5f907f 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/fansteam/FansTeamInfo.kt +++ b/core/src/main/java/com/pikolive/core/fansteam/FansTeamInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.fansteam +package com.pikolive.core.fansteam data class FansTeamInfo( val anchorAvatar: String = "", diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/fansteam/FansTeamInitInfo.kt b/core/src/main/java/com/pikolive/core/fansteam/FansTeamInitInfo.kt similarity index 84% rename from core/src/main/java/com/yizhuan/xchat_android_core/fansteam/FansTeamInitInfo.kt rename to core/src/main/java/com/pikolive/core/fansteam/FansTeamInitInfo.kt index 3aed3f47c..8f9512412 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/fansteam/FansTeamInitInfo.kt +++ b/core/src/main/java/com/pikolive/core/fansteam/FansTeamInitInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.fansteam +package com.pikolive.core.fansteam data class FansTeamInitInfo( val anchorFansNum: Int = 0, diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/fansteam/FansTeamJoinInfo.kt b/core/src/main/java/com/pikolive/core/fansteam/FansTeamJoinInfo.kt similarity index 88% rename from core/src/main/java/com/yizhuan/xchat_android_core/fansteam/FansTeamJoinInfo.kt rename to core/src/main/java/com/pikolive/core/fansteam/FansTeamJoinInfo.kt index 49010556e..ba62aa06f 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/fansteam/FansTeamJoinInfo.kt +++ b/core/src/main/java/com/pikolive/core/fansteam/FansTeamJoinInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.fansteam +package com.pikolive.core.fansteam data class FansTeamJoinInfo( diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/fansteam/FansTeamJoinedInfo.kt b/core/src/main/java/com/pikolive/core/fansteam/FansTeamJoinedInfo.kt similarity index 89% rename from core/src/main/java/com/yizhuan/xchat_android_core/fansteam/FansTeamJoinedInfo.kt rename to core/src/main/java/com/pikolive/core/fansteam/FansTeamJoinedInfo.kt index 20f091f88..132ad9be9 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/fansteam/FansTeamJoinedInfo.kt +++ b/core/src/main/java/com/pikolive/core/fansteam/FansTeamJoinedInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.fansteam +package com.pikolive.core.fansteam data class FansTeamJoinedInfo( val anchorAvatar: String = "", diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/fansteam/FansTeamModel.kt b/core/src/main/java/com/pikolive/core/fansteam/FansTeamModel.kt similarity index 88% rename from core/src/main/java/com/yizhuan/xchat_android_core/fansteam/FansTeamModel.kt rename to core/src/main/java/com/pikolive/core/fansteam/FansTeamModel.kt index 0a852e524..83d9fcdd3 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/fansteam/FansTeamModel.kt +++ b/core/src/main/java/com/pikolive/core/fansteam/FansTeamModel.kt @@ -1,9 +1,9 @@ -package com.yizhuan.xchat_android_core.fansteam +package com.pikolive.core.fansteam -import com.yizhuan.xchat_android_core.base.BaseModel -import com.yizhuan.xchat_android_core.bean.response.ServiceResult -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager -import com.yizhuan.xchat_android_core.utils.net.launchRequest +import com.pikolive.core.base.BaseModel +import com.pikolive.core.bean.response.ServiceResult +import com.pikolive.core.manager.AvRoomDataManager +import com.pikolive.core.utils.net.launchRequest import com.pikolive.library.net.rxnet.RxNet import retrofit2.http.GET import retrofit2.http.Query diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/fansteam/FansTeamMsgInfo.kt b/core/src/main/java/com/pikolive/core/fansteam/FansTeamMsgInfo.kt similarity index 57% rename from core/src/main/java/com/yizhuan/xchat_android_core/fansteam/FansTeamMsgInfo.kt rename to core/src/main/java/com/pikolive/core/fansteam/FansTeamMsgInfo.kt index 66e733ebb..6b16882ae 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/fansteam/FansTeamMsgInfo.kt +++ b/core/src/main/java/com/pikolive/core/fansteam/FansTeamMsgInfo.kt @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.fansteam +package com.pikolive.core.fansteam -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo +import com.pikolive.core.gift.bean.GiftInfo data class FansTeamMsgInfo( val uid: Long = 0, diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/fansteam/FansTeamTaskInfo.kt b/core/src/main/java/com/pikolive/core/fansteam/FansTeamTaskInfo.kt similarity index 84% rename from core/src/main/java/com/yizhuan/xchat_android_core/fansteam/FansTeamTaskInfo.kt rename to core/src/main/java/com/pikolive/core/fansteam/FansTeamTaskInfo.kt index 47f48f40c..b6df54c09 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/fansteam/FansTeamTaskInfo.kt +++ b/core/src/main/java/com/pikolive/core/fansteam/FansTeamTaskInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.fansteam +package com.pikolive.core.fansteam data class FansTeamTaskInfo( val awardVal: Int = 0, diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/fansteam/PrivilegeConfigVo.kt b/core/src/main/java/com/pikolive/core/fansteam/PrivilegeConfigVo.kt similarity index 78% rename from core/src/main/java/com/yizhuan/xchat_android_core/fansteam/PrivilegeConfigVo.kt rename to core/src/main/java/com/pikolive/core/fansteam/PrivilegeConfigVo.kt index 9e341cdad..339b64cf4 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/fansteam/PrivilegeConfigVo.kt +++ b/core/src/main/java/com/pikolive/core/fansteam/PrivilegeConfigVo.kt @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.fansteam +package com.pikolive.core.fansteam -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo +import com.pikolive.core.gift.bean.GiftInfo data class PrivilegeConfigVo( val createTime: String = "", diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/file/FileModel.java b/core/src/main/java/com/pikolive/core/file/FileModel.java similarity index 93% rename from core/src/main/java/com/yizhuan/xchat_android_core/file/FileModel.java rename to core/src/main/java/com/pikolive/core/file/FileModel.java index 9fb1fd226..985ef19c7 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/file/FileModel.java +++ b/core/src/main/java/com/pikolive/core/file/FileModel.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.file; +package com.pikolive.core.file; import android.text.TextUtils; @@ -6,12 +6,12 @@ import com.netease.nim.uikit.common.util.log.LogUtil; import com.qiniu.android.common.FixedZone; import com.qiniu.android.storage.Configuration; import com.qiniu.android.storage.UploadManager; -import com.yizhuan.xchat_android_core.R; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.community.bean.DynamicMedia; -import com.yizhuan.xchat_android_core.exception.ErrorThrowable; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.R; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.community.bean.DynamicMedia; +import com.pikolive.core.exception.ErrorThrowable; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.net.rxnet.RxNet; import com.pikolive.library.utils.ResUtil; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/file/IFileModel.java b/core/src/main/java/com/pikolive/core/file/IFileModel.java similarity index 75% rename from core/src/main/java/com/yizhuan/xchat_android_core/file/IFileModel.java rename to core/src/main/java/com/pikolive/core/file/IFileModel.java index dcc82dafd..f934be275 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/file/IFileModel.java +++ b/core/src/main/java/com/pikolive/core/file/IFileModel.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.file; +package com.pikolive.core.file; -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.community.bean.DynamicMedia; +import com.pikolive.core.base.IModel; +import com.pikolive.core.community.bean.DynamicMedia; import io.reactivex.Single; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/file/UploadToken.java b/core/src/main/java/com/pikolive/core/file/UploadToken.java similarity index 70% rename from core/src/main/java/com/yizhuan/xchat_android_core/file/UploadToken.java rename to core/src/main/java/com/pikolive/core/file/UploadToken.java index 55a7d8ebc..be83922be 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/file/UploadToken.java +++ b/core/src/main/java/com/pikolive/core/file/UploadToken.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.file; +package com.pikolive.core.file; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/gift/ChargeListener.java b/core/src/main/java/com/pikolive/core/gift/ChargeListener.java similarity index 57% rename from core/src/main/java/com/yizhuan/xchat_android_core/gift/ChargeListener.java rename to core/src/main/java/com/pikolive/core/gift/ChargeListener.java index 40d716b0d..fc24fecec 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/ChargeListener.java +++ b/core/src/main/java/com/pikolive/core/gift/ChargeListener.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.gift; +package com.pikolive.core.gift; public interface ChargeListener { void onNeedCharge(); diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/gift/GiftModel.java b/core/src/main/java/com/pikolive/core/gift/GiftModel.java similarity index 89% rename from core/src/main/java/com/yizhuan/xchat_android_core/gift/GiftModel.java rename to core/src/main/java/com/pikolive/core/gift/GiftModel.java index abd76c08b..078cafdc5 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/GiftModel.java +++ b/core/src/main/java/com/pikolive/core/gift/GiftModel.java @@ -1,8 +1,8 @@ -package com.yizhuan.xchat_android_core.gift; +package com.pikolive.core.gift; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_ALL_MIC_LUCKY_GIFT; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_LUCKY_GIFT; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_MULTI_LUCK_GIFT; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_ALL_MIC_LUCKY_GIFT; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_LUCKY_GIFT; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_MULTI_LUCK_GIFT; import android.os.CountDownTimer; import android.os.Handler; @@ -14,48 +14,70 @@ import androidx.annotation.Nullable; import com.netease.nim.uikit.common.util.log.LogUtil; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; import com.netease.nimlib.sdk.msg.constant.MsgTypeEnum; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.gift.bean.GiftFreeInfo; -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo; -import com.yizhuan.xchat_android_core.gift.bean.GiftListInfo; -import com.yizhuan.xchat_android_core.gift.bean.GiftMultiReceiverInfo; -import com.yizhuan.xchat_android_core.gift.bean.GiftSendType; -import com.yizhuan.xchat_android_core.gift.bean.GiftSource; -import com.yizhuan.xchat_android_core.gift.bean.GiftType; -import com.yizhuan.xchat_android_core.gift.bean.LuckyBagGifts; -import com.yizhuan.xchat_android_core.gift.bean.LuckyBagNoticeInfo; -import com.yizhuan.xchat_android_core.gift.bean.MultiGiftReceiveInfo; -import com.yizhuan.xchat_android_core.gift.bean.SimpleVipInfo; -import com.yizhuan.xchat_android_core.gift.event.RoomFreeGiftEvent; -import com.yizhuan.xchat_android_core.gift.event.UpdateKnapEvent; -import com.yizhuan.xchat_android_core.gift.event.UpdateKnapFreeGiftEvent; -import com.yizhuan.xchat_android_core.gift.event.UpdateKnapFreeGiftNumEvent; -import com.yizhuan.xchat_android_core.gift.exception.GiftOutOfDateException; -import com.yizhuan.xchat_android_core.gift.toolbox.GiftToolbox; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.GiftAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.GiftBatchAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.MultiGiftAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.MultiLuckyGiftAttachment; -import com.yizhuan.xchat_android_core.initial.InitialModel; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.manager.RoomEvent; -import com.yizhuan.xchat_android_core.pay.PayModel; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.room.giftvalue.bean.GiftValueCommonUpdate; -import com.yizhuan.xchat_android_core.room.giftvalue.helper.GiftValueMrg; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.utils.Logger; -import com.yizhuan.xchat_android_core.utils.net.BalanceNotEnoughExeption; -import com.yizhuan.xchat_android_core.utils.net.RadishNotEnoughException; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_core.utils.net.VipLevelNotEnoughException; -import com.yizhuan.xchat_android_core.vip.UserVipInfo; +import com.pikolive.core.gift.bean.GiftFreeInfo; +import com.pikolive.core.gift.bean.GiftInfo; +import com.pikolive.core.gift.bean.GiftListInfo; +import com.pikolive.core.gift.bean.GiftMultiReceiverInfo; +import com.pikolive.core.gift.bean.GiftSendType; +import com.pikolive.core.gift.bean.GiftSource; +import com.pikolive.core.gift.bean.GiftType; +import com.pikolive.core.gift.bean.LuckyBagGifts; +import com.pikolive.core.gift.bean.LuckyBagNoticeInfo; +import com.pikolive.core.gift.bean.MultiGiftReceiveInfo; +import com.pikolive.core.gift.bean.SimpleVipInfo; +import com.pikolive.core.gift.event.RoomFreeGiftEvent; +import com.pikolive.core.gift.event.UpdateKnapEvent; +import com.pikolive.core.gift.event.UpdateKnapFreeGiftEvent; +import com.pikolive.core.gift.event.UpdateKnapFreeGiftNumEvent; +import com.pikolive.core.gift.exception.GiftOutOfDateException; +import com.pikolive.core.gift.toolbox.GiftToolbox; +import com.pikolive.core.room.bean.RoomInfo; +import com.pikolive.core.room.giftvalue.bean.GiftValueCommonUpdate; +import com.pikolive.core.room.giftvalue.helper.GiftValueMrg; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.vip.UserVipInfo; +import com.pikolive.core.gift.bean.GiftFreeInfo; +import com.pikolive.core.gift.bean.GiftInfo; +import com.pikolive.core.gift.bean.GiftListInfo; +import com.pikolive.core.gift.bean.GiftMultiReceiverInfo; +import com.pikolive.core.gift.bean.GiftSendType; +import com.pikolive.core.gift.bean.GiftSource; +import com.pikolive.core.gift.bean.GiftType; +import com.pikolive.core.gift.bean.LuckyBagGifts; +import com.pikolive.core.gift.bean.LuckyBagNoticeInfo; +import com.pikolive.core.gift.bean.MultiGiftReceiveInfo; +import com.pikolive.core.gift.bean.SimpleVipInfo; +import com.pikolive.core.gift.event.RoomFreeGiftEvent; +import com.pikolive.core.gift.event.UpdateKnapEvent; +import com.pikolive.core.gift.event.UpdateKnapFreeGiftEvent; +import com.pikolive.core.gift.event.UpdateKnapFreeGiftNumEvent; +import com.pikolive.core.gift.exception.GiftOutOfDateException; +import com.pikolive.core.gift.toolbox.GiftToolbox; +import com.pikolive.core.room.bean.RoomInfo; +import com.pikolive.core.room.giftvalue.bean.GiftValueCommonUpdate; +import com.pikolive.core.room.giftvalue.helper.GiftValueMrg; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.vip.UserVipInfo; +import com.pikolive.core.Constants; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.im.custom.bean.CustomAttachment; +import com.pikolive.core.im.custom.bean.GiftAttachment; +import com.pikolive.core.im.custom.bean.GiftBatchAttachment; +import com.pikolive.core.im.custom.bean.MultiGiftAttachment; +import com.pikolive.core.im.custom.bean.MultiLuckyGiftAttachment; +import com.pikolive.core.initial.InitialModel; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core2.manager.IMNetEaseManager; +import com.pikolive.core.manager.RoomEvent; +import com.pikolive.core.pay.PayModel; +import com.pikolive.core.user.UserModel; +import com.pikolive.core.utils.Logger; +import com.pikolive.core.utils.net.BalanceNotEnoughExeption; +import com.pikolive.core.utils.net.RadishNotEnoughException; +import com.pikolive.core.utils.net.RxHelper; +import com.pikolive.core.utils.net.VipLevelNotEnoughException; import com.pikolive.library.common.util.SPUtils; import com.pikolive.library.net.rxnet.RxNet; import com.pikolive.library.utils.ListUtils; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/gift/IGiftCore.java b/core/src/main/java/com/pikolive/core/gift/IGiftCore.java similarity index 86% rename from core/src/main/java/com/yizhuan/xchat_android_core/gift/IGiftCore.java rename to core/src/main/java/com/pikolive/core/gift/IGiftCore.java index b505b3634..e59e77978 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/IGiftCore.java +++ b/core/src/main/java/com/pikolive/core/gift/IGiftCore.java @@ -1,8 +1,10 @@ -package com.yizhuan.xchat_android_core.gift; +package com.pikolive.core.gift; import com.netease.nim.uikit.business.session.module.Container; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo; +import com.pikolive.core.gift.bean.GiftInfo; +import com.pikolive.core.gift.bean.GiftInfo; +import com.pikolive.core.gift.bean.GiftInfo; import com.pikolive.library.coremanager.IBaseCore; import java.lang.ref.WeakReference; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/gift/IGiftCoreClient.java b/core/src/main/java/com/pikolive/core/gift/IGiftCoreClient.java similarity index 74% rename from core/src/main/java/com/yizhuan/xchat_android_core/gift/IGiftCoreClient.java rename to core/src/main/java/com/pikolive/core/gift/IGiftCoreClient.java index 6ed1fba33..b5286f1bd 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/IGiftCoreClient.java +++ b/core/src/main/java/com/pikolive/core/gift/IGiftCoreClient.java @@ -1,8 +1,14 @@ -package com.yizhuan.xchat_android_core.gift; +package com.pikolive.core.gift; -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo; -import com.yizhuan.xchat_android_core.gift.bean.GiftReceiveInfo; -import com.yizhuan.xchat_android_core.gift.bean.MultiGiftReceiveInfo; +import com.pikolive.core.gift.bean.GiftInfo; +import com.pikolive.core.gift.bean.GiftReceiveInfo; +import com.pikolive.core.gift.bean.MultiGiftReceiveInfo; +import com.pikolive.core.gift.bean.GiftInfo; +import com.pikolive.core.gift.bean.GiftReceiveInfo; +import com.pikolive.core.gift.bean.MultiGiftReceiveInfo; +import com.pikolive.core.gift.bean.GiftInfo; +import com.pikolive.core.gift.bean.GiftReceiveInfo; +import com.pikolive.core.gift.bean.MultiGiftReceiveInfo; import com.pikolive.library.coremanager.ICoreClient; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/gift/IGiftModel.java b/core/src/main/java/com/pikolive/core/gift/IGiftModel.java similarity index 87% rename from core/src/main/java/com/yizhuan/xchat_android_core/gift/IGiftModel.java rename to core/src/main/java/com/pikolive/core/gift/IGiftModel.java index b73c5cfd4..a55bb403e 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/IGiftModel.java +++ b/core/src/main/java/com/pikolive/core/gift/IGiftModel.java @@ -1,14 +1,26 @@ -package com.yizhuan.xchat_android_core.gift; +package com.pikolive.core.gift; import androidx.annotation.Nullable; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.gift.bean.GiftFreeInfo; -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo; -import com.yizhuan.xchat_android_core.gift.bean.GiftListInfo; -import com.yizhuan.xchat_android_core.gift.bean.GiftMultiReceiverInfo; -import com.yizhuan.xchat_android_core.gift.bean.LuckyBagNoticeInfo; +import com.pikolive.core.gift.bean.GiftFreeInfo; +import com.pikolive.core.gift.bean.GiftInfo; +import com.pikolive.core.gift.bean.GiftListInfo; +import com.pikolive.core.gift.bean.GiftMultiReceiverInfo; +import com.pikolive.core.gift.bean.GiftType; +import com.pikolive.core.gift.bean.LuckyBagNoticeInfo; +import com.pikolive.core.gift.bean.GiftFreeInfo; +import com.pikolive.core.gift.bean.GiftInfo; +import com.pikolive.core.gift.bean.GiftListInfo; +import com.pikolive.core.gift.bean.GiftMultiReceiverInfo; +import com.pikolive.core.gift.bean.GiftType; +import com.pikolive.core.gift.bean.LuckyBagNoticeInfo; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.gift.bean.GiftFreeInfo; +import com.pikolive.core.gift.bean.GiftInfo; +import com.pikolive.core.gift.bean.GiftListInfo; +import com.pikolive.core.gift.bean.GiftMultiReceiverInfo; +import com.pikolive.core.gift.bean.LuckyBagNoticeInfo; import java.util.List; @@ -51,7 +63,7 @@ public interface IGiftModel { * * @param giftType 礼物类型 * @return - * @see com.yizhuan.xchat_android_core.gift.bean.GiftType + * @see GiftType */ List getGiftInfoList(int giftType); @@ -61,7 +73,7 @@ public interface IGiftModel { * @param roomUid * @param giftType * @return - * @see com.yizhuan.xchat_android_core.gift.bean.GiftType + * @see GiftType */ List getGiftInfosByType(String roomUid, int giftType); diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftEffectInfo.java b/core/src/main/java/com/pikolive/core/gift/bean/GiftEffectInfo.java similarity index 93% rename from core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftEffectInfo.java rename to core/src/main/java/com/pikolive/core/gift/bean/GiftEffectInfo.java index ec6da2401..b61de3de5 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftEffectInfo.java +++ b/core/src/main/java/com/pikolive/core/gift/bean/GiftEffectInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.gift.bean; +package com.pikolive.core.gift.bean; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftFileInfo.java b/core/src/main/java/com/pikolive/core/gift/bean/GiftFileInfo.java similarity index 80% rename from core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftFileInfo.java rename to core/src/main/java/com/pikolive/core/gift/bean/GiftFileInfo.java index ca502de81..dfaa3a96f 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftFileInfo.java +++ b/core/src/main/java/com/pikolive/core/gift/bean/GiftFileInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.gift.bean; +package com.pikolive.core.gift.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftFreeInfo.java b/core/src/main/java/com/pikolive/core/gift/bean/GiftFreeInfo.java similarity index 91% rename from core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftFreeInfo.java rename to core/src/main/java/com/pikolive/core/gift/bean/GiftFreeInfo.java index 074d4e60b..ab96e2010 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftFreeInfo.java +++ b/core/src/main/java/com/pikolive/core/gift/bean/GiftFreeInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.gift.bean; +package com.pikolive.core.gift.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftInfo.java b/core/src/main/java/com/pikolive/core/gift/bean/GiftInfo.java similarity index 97% rename from core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftInfo.java rename to core/src/main/java/com/pikolive/core/gift/bean/GiftInfo.java index 81f938daf..4a536443b 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftInfo.java +++ b/core/src/main/java/com/pikolive/core/gift/bean/GiftInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.gift.bean; +package com.pikolive.core.gift.bean; import com.google.gson.annotations.SerializedName; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftKnapInfo.java b/core/src/main/java/com/pikolive/core/gift/bean/GiftKnapInfo.java similarity index 97% rename from core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftKnapInfo.java rename to core/src/main/java/com/pikolive/core/gift/bean/GiftKnapInfo.java index fef82bd24..35d72a9f8 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftKnapInfo.java +++ b/core/src/main/java/com/pikolive/core/gift/bean/GiftKnapInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.gift.bean; +package com.pikolive.core.gift.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftList.java b/core/src/main/java/com/pikolive/core/gift/bean/GiftList.java similarity index 83% rename from core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftList.java rename to core/src/main/java/com/pikolive/core/gift/bean/GiftList.java index 435c9e36a..d4f145f9f 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftList.java +++ b/core/src/main/java/com/pikolive/core/gift/bean/GiftList.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.gift.bean; +package com.pikolive.core.gift.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftListInfo.java b/core/src/main/java/com/pikolive/core/gift/bean/GiftListInfo.java similarity index 89% rename from core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftListInfo.java rename to core/src/main/java/com/pikolive/core/gift/bean/GiftListInfo.java index 26221fcfc..568999f56 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftListInfo.java +++ b/core/src/main/java/com/pikolive/core/gift/bean/GiftListInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.gift.bean; +package com.pikolive.core.gift.bean; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/gift/bean/GiftLuckyBag.java b/core/src/main/java/com/pikolive/core/gift/bean/GiftLuckyBag.java new file mode 100644 index 000000000..63d018443 --- /dev/null +++ b/core/src/main/java/com/pikolive/core/gift/bean/GiftLuckyBag.java @@ -0,0 +1,5 @@ +package com.pikolive.core.gift.bean; + +public class GiftLuckyBag { + +} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftMultiReceiverInfo.java b/core/src/main/java/com/pikolive/core/gift/bean/GiftMultiReceiverInfo.java similarity index 73% rename from core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftMultiReceiverInfo.java rename to core/src/main/java/com/pikolive/core/gift/bean/GiftMultiReceiverInfo.java index 702e8911b..1dd4c1a40 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftMultiReceiverInfo.java +++ b/core/src/main/java/com/pikolive/core/gift/bean/GiftMultiReceiverInfo.java @@ -1,6 +1,8 @@ -package com.yizhuan.xchat_android_core.gift.bean; +package com.pikolive.core.gift.bean; -import com.yizhuan.xchat_android_core.room.giftvalue.bean.IndexGiftValue; +import com.pikolive.core.room.giftvalue.bean.IndexGiftValue; +import com.pikolive.core.room.giftvalue.bean.IndexGiftValue; +import com.pikolive.core.room.giftvalue.bean.IndexGiftValue; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftReceiveInfo.java b/core/src/main/java/com/pikolive/core/gift/bean/GiftReceiveInfo.java similarity index 74% rename from core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftReceiveInfo.java rename to core/src/main/java/com/pikolive/core/gift/bean/GiftReceiveInfo.java index 0a2f5d61f..ef9c2a1d7 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftReceiveInfo.java +++ b/core/src/main/java/com/pikolive/core/gift/bean/GiftReceiveInfo.java @@ -1,6 +1,8 @@ -package com.yizhuan.xchat_android_core.gift.bean; +package com.pikolive.core.gift.bean; -import com.yizhuan.xchat_android_core.room.giftvalue.bean.IndexGiftValue; +import com.pikolive.core.room.giftvalue.bean.IndexGiftValue; +import com.pikolive.core.room.giftvalue.bean.IndexGiftValue; +import com.pikolive.core.room.giftvalue.bean.IndexGiftValue; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftReceiver.java b/core/src/main/java/com/pikolive/core/gift/bean/GiftReceiver.java similarity index 82% rename from core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftReceiver.java rename to core/src/main/java/com/pikolive/core/gift/bean/GiftReceiver.java index f4bdab61e..289b3b260 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftReceiver.java +++ b/core/src/main/java/com/pikolive/core/gift/bean/GiftReceiver.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.gift.bean; +package com.pikolive.core.gift.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftSendType.java b/core/src/main/java/com/pikolive/core/gift/bean/GiftSendType.java similarity index 93% rename from core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftSendType.java rename to core/src/main/java/com/pikolive/core/gift/bean/GiftSendType.java index 753f424ef..0dc7db453 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftSendType.java +++ b/core/src/main/java/com/pikolive/core/gift/bean/GiftSendType.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.gift.bean; +package com.pikolive.core.gift.bean; /** * 赠送类型 1给主播直接刷礼物，2私聊送个人礼物, diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftSource.java b/core/src/main/java/com/pikolive/core/gift/bean/GiftSource.java similarity index 87% rename from core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftSource.java rename to core/src/main/java/com/pikolive/core/gift/bean/GiftSource.java index 04010fa34..5fe22b274 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftSource.java +++ b/core/src/main/java/com/pikolive/core/gift/bean/GiftSource.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.gift.bean; +package com.pikolive.core.gift.bean; /** * 礼物的来源，1:普通，2:背包，3:师徒 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftTab.java b/core/src/main/java/com/pikolive/core/gift/bean/GiftTab.java similarity index 90% rename from core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftTab.java rename to core/src/main/java/com/pikolive/core/gift/bean/GiftTab.java index f2001e284..584e7034f 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftTab.java +++ b/core/src/main/java/com/pikolive/core/gift/bean/GiftTab.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.gift.bean; +package com.pikolive.core.gift.bean; import android.view.View; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftType.java b/core/src/main/java/com/pikolive/core/gift/bean/GiftType.java similarity index 93% rename from core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftType.java rename to core/src/main/java/com/pikolive/core/gift/bean/GiftType.java index c0ede7c07..a0f51be45 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftType.java +++ b/core/src/main/java/com/pikolive/core/gift/bean/GiftType.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.gift.bean; +package com.pikolive.core.gift.bean; /** * 礼物类型 1轻聊房，2游戏轰趴房，3福袋, 4套卡 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/LuckyBagGifts.java b/core/src/main/java/com/pikolive/core/gift/bean/LuckyBagGifts.java similarity index 76% rename from core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/LuckyBagGifts.java rename to core/src/main/java/com/pikolive/core/gift/bean/LuckyBagGifts.java index 2dd271b4d..5fe9ec8c1 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/LuckyBagGifts.java +++ b/core/src/main/java/com/pikolive/core/gift/bean/LuckyBagGifts.java @@ -1,6 +1,8 @@ -package com.yizhuan.xchat_android_core.gift.bean; +package com.pikolive.core.gift.bean; -import com.yizhuan.xchat_android_core.room.giftvalue.bean.IndexGiftValue; +import com.pikolive.core.room.giftvalue.bean.IndexGiftValue; +import com.pikolive.core.room.giftvalue.bean.IndexGiftValue; +import com.pikolive.core.room.giftvalue.bean.IndexGiftValue; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/LuckyBagNoticeInfo.java b/core/src/main/java/com/pikolive/core/gift/bean/LuckyBagNoticeInfo.java similarity index 86% rename from core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/LuckyBagNoticeInfo.java rename to core/src/main/java/com/pikolive/core/gift/bean/LuckyBagNoticeInfo.java index 37fd5f7bf..388507fe9 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/LuckyBagNoticeInfo.java +++ b/core/src/main/java/com/pikolive/core/gift/bean/LuckyBagNoticeInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.gift.bean; +package com.pikolive.core.gift.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/LuckyGiftList.java b/core/src/main/java/com/pikolive/core/gift/bean/LuckyGiftList.java similarity index 75% rename from core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/LuckyGiftList.java rename to core/src/main/java/com/pikolive/core/gift/bean/LuckyGiftList.java index e13d07ea6..199d6d0e9 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/LuckyGiftList.java +++ b/core/src/main/java/com/pikolive/core/gift/bean/LuckyGiftList.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.gift.bean; +package com.pikolive.core.gift.bean; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/MultiGiftReceiveInfo.java b/core/src/main/java/com/pikolive/core/gift/bean/MultiGiftReceiveInfo.java similarity index 73% rename from core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/MultiGiftReceiveInfo.java rename to core/src/main/java/com/pikolive/core/gift/bean/MultiGiftReceiveInfo.java index c26a47620..21063b5f6 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/MultiGiftReceiveInfo.java +++ b/core/src/main/java/com/pikolive/core/gift/bean/MultiGiftReceiveInfo.java @@ -1,6 +1,8 @@ -package com.yizhuan.xchat_android_core.gift.bean; +package com.pikolive.core.gift.bean; -import com.yizhuan.xchat_android_core.room.giftvalue.bean.IndexGiftValue; +import com.pikolive.core.room.giftvalue.bean.IndexGiftValue; +import com.pikolive.core.room.giftvalue.bean.IndexGiftValue; +import com.pikolive.core.room.giftvalue.bean.IndexGiftValue; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/SendGiftScenes.java b/core/src/main/java/com/pikolive/core/gift/bean/SendGiftScenes.java similarity index 86% rename from core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/SendGiftScenes.java rename to core/src/main/java/com/pikolive/core/gift/bean/SendGiftScenes.java index 50af93e10..0e5bef8a8 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/SendGiftScenes.java +++ b/core/src/main/java/com/pikolive/core/gift/bean/SendGiftScenes.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.gift.bean; +package com.pikolive.core.gift.bean; /** * 列举送礼物使用的场景 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/SimpleUserInfo.kt b/core/src/main/java/com/pikolive/core/gift/bean/SimpleUserInfo.kt similarity index 81% rename from core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/SimpleUserInfo.kt rename to core/src/main/java/com/pikolive/core/gift/bean/SimpleUserInfo.kt index 61b7ed315..fddd06d5a 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/SimpleUserInfo.kt +++ b/core/src/main/java/com/pikolive/core/gift/bean/SimpleUserInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.gift.bean +package com.pikolive.core.gift.bean import java.io.Serializable diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/SimpleVipInfo.java b/core/src/main/java/com/pikolive/core/gift/bean/SimpleVipInfo.java similarity index 73% rename from core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/SimpleVipInfo.java rename to core/src/main/java/com/pikolive/core/gift/bean/SimpleVipInfo.java index 0478eb9ca..b7b6641da 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/SimpleVipInfo.java +++ b/core/src/main/java/com/pikolive/core/gift/bean/SimpleVipInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.gift.bean; +package com.pikolive.core.gift.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/gift/event/HideCarEffectEvent.java b/core/src/main/java/com/pikolive/core/gift/event/HideCarEffectEvent.java similarity index 74% rename from core/src/main/java/com/yizhuan/xchat_android_core/gift/event/HideCarEffectEvent.java rename to core/src/main/java/com/pikolive/core/gift/event/HideCarEffectEvent.java index a8fa012b5..41300b75c 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/event/HideCarEffectEvent.java +++ b/core/src/main/java/com/pikolive/core/gift/event/HideCarEffectEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.gift.event; +package com.pikolive.core.gift.event; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/gift/event/RoomFreeGiftEvent.java b/core/src/main/java/com/pikolive/core/gift/event/RoomFreeGiftEvent.java similarity index 67% rename from core/src/main/java/com/yizhuan/xchat_android_core/gift/event/RoomFreeGiftEvent.java rename to core/src/main/java/com/pikolive/core/gift/event/RoomFreeGiftEvent.java index e7d96185b..449f4841a 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/event/RoomFreeGiftEvent.java +++ b/core/src/main/java/com/pikolive/core/gift/event/RoomFreeGiftEvent.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.gift.event; +package com.pikolive.core.gift.event; -import com.yizhuan.xchat_android_core.gift.bean.GiftFreeInfo; +import com.pikolive.core.gift.bean.GiftFreeInfo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/gift/event/UpdateKnapEvent.java b/core/src/main/java/com/pikolive/core/gift/event/UpdateKnapEvent.java similarity index 82% rename from core/src/main/java/com/yizhuan/xchat_android_core/gift/event/UpdateKnapEvent.java rename to core/src/main/java/com/pikolive/core/gift/event/UpdateKnapEvent.java index d7dbfbe97..bede83e2b 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/event/UpdateKnapEvent.java +++ b/core/src/main/java/com/pikolive/core/gift/event/UpdateKnapEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.gift.event; +package com.pikolive.core.gift.event; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/gift/event/UpdateKnapFreeGiftDataEvent.java b/core/src/main/java/com/pikolive/core/gift/event/UpdateKnapFreeGiftDataEvent.java similarity index 68% rename from core/src/main/java/com/yizhuan/xchat_android_core/gift/event/UpdateKnapFreeGiftDataEvent.java rename to core/src/main/java/com/pikolive/core/gift/event/UpdateKnapFreeGiftDataEvent.java index f6796981d..ff638139f 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/event/UpdateKnapFreeGiftDataEvent.java +++ b/core/src/main/java/com/pikolive/core/gift/event/UpdateKnapFreeGiftDataEvent.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.gift.event; +package com.pikolive.core.gift.event; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomFreeGiftMsgBean; +import com.pikolive.core.im.custom.bean.RoomFreeGiftMsgBean; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/gift/event/UpdateKnapFreeGiftEvent.java b/core/src/main/java/com/pikolive/core/gift/event/UpdateKnapFreeGiftEvent.java similarity index 83% rename from core/src/main/java/com/yizhuan/xchat_android_core/gift/event/UpdateKnapFreeGiftEvent.java rename to core/src/main/java/com/pikolive/core/gift/event/UpdateKnapFreeGiftEvent.java index d2e26de86..d9af5473c 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/event/UpdateKnapFreeGiftEvent.java +++ b/core/src/main/java/com/pikolive/core/gift/event/UpdateKnapFreeGiftEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.gift.event; +package com.pikolive.core.gift.event; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/gift/event/UpdateKnapFreeGiftNumEvent.java b/core/src/main/java/com/pikolive/core/gift/event/UpdateKnapFreeGiftNumEvent.java similarity index 83% rename from core/src/main/java/com/yizhuan/xchat_android_core/gift/event/UpdateKnapFreeGiftNumEvent.java rename to core/src/main/java/com/pikolive/core/gift/event/UpdateKnapFreeGiftNumEvent.java index 580031d1a..2358bfb58 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/event/UpdateKnapFreeGiftNumEvent.java +++ b/core/src/main/java/com/pikolive/core/gift/event/UpdateKnapFreeGiftNumEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.gift.event; +package com.pikolive.core.gift.event; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/gift/exception/GiftOutOfDateException.java b/core/src/main/java/com/pikolive/core/gift/exception/GiftOutOfDateException.java similarity index 81% rename from core/src/main/java/com/yizhuan/xchat_android_core/gift/exception/GiftOutOfDateException.java rename to core/src/main/java/com/pikolive/core/gift/exception/GiftOutOfDateException.java index 8f53e5f82..96c18df3d 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/exception/GiftOutOfDateException.java +++ b/core/src/main/java/com/pikolive/core/gift/exception/GiftOutOfDateException.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.gift.exception; +package com.pikolive.core.gift.exception; /** * 礼物过期 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/gift/toolbox/GiftToolbox.java b/core/src/main/java/com/pikolive/core/gift/toolbox/GiftToolbox.java similarity index 94% rename from core/src/main/java/com/yizhuan/xchat_android_core/gift/toolbox/GiftToolbox.java rename to core/src/main/java/com/pikolive/core/gift/toolbox/GiftToolbox.java index 5f976964d..06af86d2f 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/toolbox/GiftToolbox.java +++ b/core/src/main/java/com/pikolive/core/gift/toolbox/GiftToolbox.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.gift.toolbox; +package com.pikolive.core.gift.toolbox; import android.text.TextUtils; @@ -10,30 +10,32 @@ import com.netease.nimlib.sdk.msg.MessageBuilder; import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum; import com.netease.nimlib.sdk.msg.model.CustomMessageConfig; import com.netease.nimlib.sdk.msg.model.IMMessage; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.gift.GiftModel; -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo; -import com.yizhuan.xchat_android_core.gift.bean.GiftMultiReceiverInfo; -import com.yizhuan.xchat_android_core.gift.bean.GiftReceiveInfo; -import com.yizhuan.xchat_android_core.gift.bean.GiftReceiver; -import com.yizhuan.xchat_android_core.gift.bean.LuckyBagGifts; -import com.yizhuan.xchat_android_core.gift.bean.MultiGiftReceiveInfo; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.DrawGiftAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.GiftAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.GiftBatchAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.MultiGiftAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.MultiLuckyGiftAttachment; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.manager.RoomEvent; -import com.yizhuan.xchat_android_core.public_chat_hall.manager.PublicChatHallDataManager; -import com.yizhuan.xchat_android_core.public_chat_hall.model.PublicChatHallModel; -import com.yizhuan.xchat_android_core.retry.ImRetryManager; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.pikolive.core.room.bean.RoomInfo; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.room.bean.RoomInfo; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.gift.GiftModel; +import com.pikolive.core.gift.bean.GiftInfo; +import com.pikolive.core.gift.bean.GiftMultiReceiverInfo; +import com.pikolive.core.gift.bean.GiftReceiveInfo; +import com.pikolive.core.gift.bean.GiftReceiver; +import com.pikolive.core.gift.bean.LuckyBagGifts; +import com.pikolive.core.gift.bean.MultiGiftReceiveInfo; +import com.pikolive.core.im.custom.bean.CustomAttachment; +import com.pikolive.core.im.custom.bean.DrawGiftAttachment; +import com.pikolive.core.im.custom.bean.GiftAttachment; +import com.pikolive.core.im.custom.bean.GiftBatchAttachment; +import com.pikolive.core.im.custom.bean.MultiGiftAttachment; +import com.pikolive.core.im.custom.bean.MultiLuckyGiftAttachment; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core2.manager.IMNetEaseManager; +import com.pikolive.core.manager.RoomEvent; +import com.pikolive.core.public_chat_hall.manager.PublicChatHallDataManager; +import com.pikolive.core.public_chat_hall.model.PublicChatHallModel; +import com.pikolive.core2.retry.ImRetryManager; +import com.pikolive.core.user.UserModel; import com.pikolive.library.utils.ListUtils; import java.util.ArrayList; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/CustomNotifyType.java b/core/src/main/java/com/pikolive/core/im/CustomNotifyType.java similarity index 69% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/CustomNotifyType.java rename to core/src/main/java/com/pikolive/core/im/CustomNotifyType.java index 870390892..e0f4bc950 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/CustomNotifyType.java +++ b/core/src/main/java/com/pikolive/core/im/CustomNotifyType.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im; +package com.pikolive.core.im; public class CustomNotifyType { //异性匹配 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/GreetModel.java b/core/src/main/java/com/pikolive/core/im/GreetModel.java similarity index 65% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/GreetModel.java rename to core/src/main/java/com/pikolive/core/im/GreetModel.java index dd0e7334f..dac42bc33 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/GreetModel.java +++ b/core/src/main/java/com/pikolive/core/im/GreetModel.java @@ -1,8 +1,14 @@ -package com.yizhuan.xchat_android_core.im; +package com.pikolive.core.im; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.utils.net.RxHelper; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.utils.net.RxHelper; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.net.rxnet.RxNet; import io.reactivex.Single; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/RefreshInRoomListEvent.java b/core/src/main/java/com/pikolive/core/im/RefreshInRoomListEvent.java similarity index 73% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/RefreshInRoomListEvent.java rename to core/src/main/java/com/pikolive/core/im/RefreshInRoomListEvent.java index 26bff9199..25f3e5332 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/RefreshInRoomListEvent.java +++ b/core/src/main/java/com/pikolive/core/im/RefreshInRoomListEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im; +package com.pikolive.core.im; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/avroom/IAVRoomCoreClient.java b/core/src/main/java/com/pikolive/core/im/avroom/IAVRoomCoreClient.java similarity index 96% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/avroom/IAVRoomCoreClient.java rename to core/src/main/java/com/pikolive/core/im/avroom/IAVRoomCoreClient.java index 988ede1b4..836d0bd15 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/avroom/IAVRoomCoreClient.java +++ b/core/src/main/java/com/pikolive/core/im/avroom/IAVRoomCoreClient.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.avroom; +package com.pikolive.core.im.avroom; import com.pikolive.library.coremanager.ICoreClient; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/chatterbox/CanSendInfo.java b/core/src/main/java/com/pikolive/core/im/chatterbox/CanSendInfo.java similarity index 67% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/chatterbox/CanSendInfo.java rename to core/src/main/java/com/pikolive/core/im/chatterbox/CanSendInfo.java index ec566d8f2..2ae2ac455 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/chatterbox/CanSendInfo.java +++ b/core/src/main/java/com/pikolive/core/im/chatterbox/CanSendInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.chatterbox; +package com.pikolive.core.im.chatterbox; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/chatterbox/ChatterBoxHelper.java b/core/src/main/java/com/pikolive/core/im/chatterbox/ChatterBoxHelper.java similarity index 89% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/chatterbox/ChatterBoxHelper.java rename to core/src/main/java/com/pikolive/core/im/chatterbox/ChatterBoxHelper.java index 45da8160c..ea158879b 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/chatterbox/ChatterBoxHelper.java +++ b/core/src/main/java/com/pikolive/core/im/chatterbox/ChatterBoxHelper.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.chatterbox; +package com.pikolive.core.im.chatterbox; import android.text.TextUtils; @@ -8,15 +8,16 @@ import com.netease.nimlib.sdk.msg.constant.MsgStatusEnum; import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum; import com.netease.nimlib.sdk.msg.model.CustomMessageConfig; import com.netease.nimlib.sdk.msg.model.IMMessage; -import com.yizhuan.xchat_android_core.R; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.im.custom.bean.ChatterBoxAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.ChatterBoxInitAttachment; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; -import com.yizhuan.xchat_android_core.utils.net.BeanObserver; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.R; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.im.custom.bean.ChatterBoxAttachment; +import com.pikolive.core.im.custom.bean.ChatterBoxInitAttachment; +import com.pikolive.core2.manager.IMNetEaseManager; +import com.pikolive.core.user.UserModel; +import com.pikolive.core.utils.SharedPreferenceUtils; +import com.pikolive.core.utils.net.BeanObserver; import com.pikolive.library.utils.ResUtil; import com.pikolive.library.utils.SingleToastUtil; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/chatterbox/ChatterBoxModel.java b/core/src/main/java/com/pikolive/core/im/chatterbox/ChatterBoxModel.java similarity index 90% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/chatterbox/ChatterBoxModel.java rename to core/src/main/java/com/pikolive/core/im/chatterbox/ChatterBoxModel.java index 5de1ece84..ad7f47d66 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/chatterbox/ChatterBoxModel.java +++ b/core/src/main/java/com/pikolive/core/im/chatterbox/ChatterBoxModel.java @@ -1,8 +1,11 @@ -package com.yizhuan.xchat_android_core.im.chatterbox; +package com.pikolive.core.im.chatterbox; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.net.rxnet.RxNet; import java.util.List; diff --git a/core/src/main/java/com/pikolive/core/im/chatterbox/HideInputEvent.java b/core/src/main/java/com/pikolive/core/im/chatterbox/HideInputEvent.java new file mode 100644 index 000000000..ae1ec1f4c --- /dev/null +++ b/core/src/main/java/com/pikolive/core/im/chatterbox/HideInputEvent.java @@ -0,0 +1,4 @@ +package com.pikolive.core.im.chatterbox; + +public class HideInputEvent { +} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/chatterbox/IChatterBoxModel.java b/core/src/main/java/com/pikolive/core/im/chatterbox/IChatterBoxModel.java similarity index 65% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/chatterbox/IChatterBoxModel.java rename to core/src/main/java/com/pikolive/core/im/chatterbox/IChatterBoxModel.java index df895972b..7780a5e4e 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/chatterbox/IChatterBoxModel.java +++ b/core/src/main/java/com/pikolive/core/im/chatterbox/IChatterBoxModel.java @@ -1,6 +1,8 @@ -package com.yizhuan.xchat_android_core.im.chatterbox; +package com.pikolive.core.im.chatterbox; -import com.yizhuan.xchat_android_core.base.IModel; +import com.pikolive.core.base.IModel; +import com.pikolive.core.base.IModel; +import com.pikolive.core.base.IModel; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/chatterbox/TopicBoxItemInfo.java b/core/src/main/java/com/pikolive/core/im/chatterbox/TopicBoxItemInfo.java similarity index 70% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/chatterbox/TopicBoxItemInfo.java rename to core/src/main/java/com/pikolive/core/im/chatterbox/TopicBoxItemInfo.java index 8d8d31bb4..d43fc2203 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/chatterbox/TopicBoxItemInfo.java +++ b/core/src/main/java/com/pikolive/core/im/chatterbox/TopicBoxItemInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.chatterbox; +package com.pikolive.core.im.chatterbox; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/AttachManager.java b/core/src/main/java/com/pikolive/core/im/custom/AttachManager.java similarity index 79% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/AttachManager.java rename to core/src/main/java/com/pikolive/core/im/custom/AttachManager.java index d6f345f41..a684a9da3 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/AttachManager.java +++ b/core/src/main/java/com/pikolive/core/im/custom/AttachManager.java @@ -1,8 +1,10 @@ -package com.yizhuan.xchat_android_core.im.custom; +package com.pikolive.core.im.custom; import android.util.SparseArray; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; +import com.pikolive.core.im.custom.bean.CustomAttachment; +import com.pikolive.core.im.custom.bean.CustomAttachment; +import com.pikolive.core.im.custom.bean.CustomAttachment; /** * diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/ActivityTimerAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/ActivityTimerAttachment.java similarity index 81% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/ActivityTimerAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/ActivityTimerAttachment.java index ed460393b..edf52a63b 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/ActivityTimerAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/ActivityTimerAttachment.java @@ -1,8 +1,10 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.room.activitytimer.TimerBean; +import com.pikolive.core.room.activitytimer.TimerBean; +import com.pikolive.core.room.activitytimer.TimerBean; +import com.pikolive.core.room.activitytimer.TimerBean; import lombok.Getter; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/AssistantAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/AssistantAttachment.java similarity index 96% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/AssistantAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/AssistantAttachment.java index 1d9bf0e8a..223348f8d 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/AssistantAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/AssistantAttachment.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/AuctionAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/AuctionAttachment.java similarity index 86% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/AuctionAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/AuctionAttachment.java index af3a3c046..38aea1462 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/AuctionAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/AuctionAttachment.java @@ -1,10 +1,14 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.room.auction.bean.AuctionInfo; -import com.yizhuan.xchat_android_core.room.auction.bean.AuctionUser; +import com.pikolive.core.room.auction.bean.AuctionInfo; +import com.pikolive.core.room.auction.bean.AuctionUser; +import com.pikolive.core.room.auction.bean.AuctionInfo; +import com.pikolive.core.room.auction.bean.AuctionUser; +import com.pikolive.core.room.auction.bean.AuctionInfo; +import com.pikolive.core.room.auction.bean.AuctionUser; import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/CarAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/CarAttachment.java similarity index 96% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/CarAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/CarAttachment.java index 7dba5c169..9b8ca8c6b 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/CarAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/CarAttachment.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/CarveUpGoldAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/CarveUpGoldAttachment.java similarity index 93% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/CarveUpGoldAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/CarveUpGoldAttachment.java index d2bb8ed35..228967214 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/CarveUpGoldAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/CarveUpGoldAttachment.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/CarveUpGoldSecondLevelAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/CarveUpGoldSecondLevelAttachment.java similarity index 83% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/CarveUpGoldSecondLevelAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/CarveUpGoldSecondLevelAttachment.java index 7e2f4bcdc..a5705440e 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/CarveUpGoldSecondLevelAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/CarveUpGoldSecondLevelAttachment.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; /** * 瓜分钻石，二级，房间公屏 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/CarveUpGoldThirdLevelAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/CarveUpGoldThirdLevelAttachment.java similarity index 83% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/CarveUpGoldThirdLevelAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/CarveUpGoldThirdLevelAttachment.java index 842afaad9..67eefcde7 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/CarveUpGoldThirdLevelAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/CarveUpGoldThirdLevelAttachment.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; /** * 瓜分钻石，三级，房间公屏+小秘书 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/ChatHintAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/ChatHintAttachment.java similarity index 91% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/ChatHintAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/ChatHintAttachment.java index d38d2cc47..0a9227e87 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/ChatHintAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/ChatHintAttachment.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/ChatterBoxAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/ChatterBoxAttachment.java similarity index 76% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/ChatterBoxAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/ChatterBoxAttachment.java index de6cbc867..8252c7801 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/ChatterBoxAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/ChatterBoxAttachment.java @@ -1,7 +1,9 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; -import com.yizhuan.xchat_android_core.im.chatterbox.TopicBoxItemInfo; +import com.pikolive.core.im.chatterbox.TopicBoxItemInfo; +import com.pikolive.core.im.chatterbox.TopicBoxItemInfo; +import com.pikolive.core.im.chatterbox.TopicBoxItemInfo; import java.util.List; @@ -11,7 +13,7 @@ public class ChatterBoxAttachment extends CustomAttachment { public long startTime; public ChatterBoxAttachment() { - super(CustomAttachment.CUSTOM_MSG_CHATTER_BOX, CustomAttachment.CUSTOM_MSG_CHATTER_BOX_ASK); + super(CUSTOM_MSG_CHATTER_BOX, CUSTOM_MSG_CHATTER_BOX_ASK); } @Override diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/ChatterBoxInitAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/ChatterBoxInitAttachment.java similarity index 71% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/ChatterBoxInitAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/ChatterBoxInitAttachment.java index 43ce1f83b..6d591ee7b 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/ChatterBoxInitAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/ChatterBoxInitAttachment.java @@ -1,11 +1,11 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; public class ChatterBoxInitAttachment extends CustomAttachment { public ChatterBoxInitAttachment() { - super(CustomAttachment.CUSTOM_MSG_CHATTER_BOX, CustomAttachment.CUSTOM_MSG_CHATTER_BOX_INIT); + super(CUSTOM_MSG_CHATTER_BOX, CUSTOM_MSG_CHATTER_BOX_INIT); } @Override diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/CleanScreenAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/CleanScreenAttachment.java similarity index 94% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/CleanScreenAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/CleanScreenAttachment.java index 00f3a4c47..d874405ce 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/CleanScreenAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/CleanScreenAttachment.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/CpInviteAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/CpInviteAttachment.java similarity index 79% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/CpInviteAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/CpInviteAttachment.java index 9fe8965ea..b338a9bac 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/CpInviteAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/CpInviteAttachment.java @@ -1,9 +1,13 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.relation.cp.CpInviteInfo; -import com.yizhuan.xchat_android_core.relation.cp.CpInviteMessage; +import com.pikolive.core.relation.cp.CpInviteInfo; +import com.pikolive.core.relation.cp.CpInviteMessage; +import com.pikolive.core.relation.cp.CpInviteInfo; +import com.pikolive.core.relation.cp.CpInviteMessage; +import com.pikolive.core.relation.cp.CpInviteInfo; +import com.pikolive.core.relation.cp.CpInviteMessage; public class CpInviteAttachment extends CustomAttachment { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/CustomAttachParser.java b/core/src/main/java/com/pikolive/core/im/custom/bean/CustomAttachParser.java similarity index 69% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/CustomAttachParser.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/CustomAttachParser.java index 53906ce16..f8202c587 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/CustomAttachParser.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/CustomAttachParser.java @@ -1,129 +1,139 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_DYNAMTC_BAN_DELETE; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_DYNAMTC_PASS; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_DYNAMTC_UNREADCOUNT; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MESS_HEAD_CAR; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MESS_HEAD_ROOM_PK; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_ASSISTANT_COMMON_MSG; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_ASSISTANT_MSG; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_BOX; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_CHARM_LEVEL_UP; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_CHATTER_BOX; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_CHATTER_BOX_ASK; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_CHATTER_BOX_DROP; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_CHATTER_BOX_INIT; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_CLAN; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_DRAGON_BAR; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_DRAW_GIFT_EFFECT; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_EXPER_LEVEL_UP; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_EXPER_LEVEL_UP_NOTICE; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_FAIRY; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_GROUP_CHAT_MEMBER_COUNT; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_GROUP_CHAT_ROOM_NOTIFY; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_GROUP_CHAT_TOPIC; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_GROUP_ROOM_JOIN_NOTICE; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_COMMON_SYSTEM_MSG; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_KICK_MIC; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_LUCKY_MONEY; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_SEND_MAGIC; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_SHARE_IN_APP; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEAD_SHIFT_OUT; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_IM_TIP; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LEAVE_MODE; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LEAVE_MODE_NOTICE; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LEVEL_UP; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_SEA; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_SEA_GIFT_ROOM_NOTIFY; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_SEA_GIFT_SERVER_NOTIFY; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_MENTORING_RELATIONSHIP; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_MINI_WORLD; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_MODULE_HALL; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_PUBLIC_CHAT_HALL; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_QUEUING_MIC; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_RADISH; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_RED_PACKAGE; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_ROOM_GIFT_VALUE; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SHARE_FAMILY; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SHARE_MINI_WORLD; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SHARE_ROOM; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SHARE_TEAM; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SIGN_IN; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_CLANAPPLY; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_CLANNORMAL; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_FAIRY_ASK_FOR; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_FAIRY_SEND; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_HALL_APPLY_EXIT; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_HALL_APPLY_JOIN; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_HALL_MANAGER_INVITE; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_HALL_NOTICE; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_HALL_TO_BE_OWNER; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_PUBLIC_CHAT_HALL_AIT; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_PUBLIC_CHAT_HALL_AIT_ME; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_PUBLIC_CHAT_HALL_FULL_SCREEN; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_PUBLIC_CHAT_HALL_GIFT; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_RED_PACKAGE_RECEIVE_ALL_DIAMOND; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_RED_PACKAGE_RECEIVE_ROOM_DIAMOND; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_RED_PACKAGE_RECEIVE_ROOM_DIAMOND2; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_RED_PACKAGE_RECEIVE_ROOM_MSG; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_DRAW_GIFT_EFFECT; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_RECEIVE_LUCKY_MONEY; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_ADD_BLACK; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_KICK_ROOM; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_LUCKY_MONEY; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_MULTI_MAGIC; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_SINGLE_MAGIC; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_UPDATE_ROOM_INFO; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_UPDATE_ROOM_INFO_AUDIO; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_UPDATE_ROOM_INFO_CLEAN_SCREEN; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_UPDATE_ROOM_INFO_CLOSE_REDPACKAGE; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_UPDATE_ROOM_INFO_CLOSE_SCREEN; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_UPDATE_ROOM_INFO_GIFT; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_UPDATE_ROOM_INFO_NOTICE; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_VOICE_BOTTLE_HEAD; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_VOICE_BOTTLE_SUB_HEART; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_VOICE_BOTTLE_SUB_HELLO; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_VOICE_BOTTLE_SUB_TO_RECORDING; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_VOICE_BOTTLE_SUB_tO_MATCHING; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_NOTI_SUB_GAME_ATTACK; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_NOTI_SUB_GAME_RESULT; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.ROOM_FREE_GIFT; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.ROOM_FREE_GIFT_CHANGE; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.ROOM_FREE_GIFT_REST; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_DYNAMTC_BAN_DELETE; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_DYNAMTC_PASS; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_DYNAMTC_UNREADCOUNT; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MESS_HEAD_CAR; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MESS_HEAD_ROOM_PK; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_ASSISTANT_COMMON_MSG; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_ASSISTANT_MSG; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_BOX; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_CHARM_LEVEL_UP; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_CHATTER_BOX; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_CHATTER_BOX_ASK; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_CHATTER_BOX_DROP; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_CHATTER_BOX_INIT; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_CLAN; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_DRAGON_BAR; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_DRAW_GIFT_EFFECT; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_EXPER_LEVEL_UP; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_EXPER_LEVEL_UP_NOTICE; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_FAIRY; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_GROUP_CHAT_MEMBER_COUNT; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_GROUP_CHAT_ROOM_NOTIFY; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_GROUP_CHAT_TOPIC; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_GROUP_ROOM_JOIN_NOTICE; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_COMMON_SYSTEM_MSG; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_KICK_MIC; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_LUCKY_MONEY; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_SEND_MAGIC; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_SHARE_IN_APP; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEAD_SHIFT_OUT; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_IM_TIP; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LEAVE_MODE; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LEAVE_MODE_NOTICE; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LEVEL_UP; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_SEA; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_SEA_GIFT_ROOM_NOTIFY; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LUCKY_SEA_GIFT_SERVER_NOTIFY; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_MENTORING_RELATIONSHIP; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_MINI_WORLD; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_MODULE_HALL; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_PUBLIC_CHAT_HALL; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_QUEUING_MIC; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_RADISH; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_RED_PACKAGE; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_ROOM_GIFT_VALUE; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SHARE_FAMILY; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SHARE_MINI_WORLD; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SHARE_ROOM; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SHARE_TEAM; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SIGN_IN; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_CLANAPPLY; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_CLANNORMAL; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_FAIRY_ASK_FOR; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_FAIRY_SEND; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_HALL_APPLY_EXIT; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_HALL_APPLY_JOIN; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_HALL_MANAGER_INVITE; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_HALL_NOTICE; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_HALL_TO_BE_OWNER; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_PUBLIC_CHAT_HALL_AIT; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_PUBLIC_CHAT_HALL_AIT_ME; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_PUBLIC_CHAT_HALL_FULL_SCREEN; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_PUBLIC_CHAT_HALL_GIFT; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_RED_PACKAGE_RECEIVE_ALL_DIAMOND; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_RED_PACKAGE_RECEIVE_ROOM_DIAMOND; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_RED_PACKAGE_RECEIVE_ROOM_DIAMOND2; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_RED_PACKAGE_RECEIVE_ROOM_MSG; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_DRAW_GIFT_EFFECT; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_RECEIVE_LUCKY_MONEY; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_ADD_BLACK; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_KICK_ROOM; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_LUCKY_MONEY; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_MULTI_MAGIC; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_SEND_SINGLE_MAGIC; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_UPDATE_ROOM_INFO; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_UPDATE_ROOM_INFO_AUDIO; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_UPDATE_ROOM_INFO_CLEAN_SCREEN; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_UPDATE_ROOM_INFO_CLOSE_REDPACKAGE; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_UPDATE_ROOM_INFO_CLOSE_SCREEN; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_UPDATE_ROOM_INFO_GIFT; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_UPDATE_ROOM_INFO_NOTICE; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_VOICE_BOTTLE_HEAD; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_VOICE_BOTTLE_SUB_HEART; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_VOICE_BOTTLE_SUB_HELLO; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_VOICE_BOTTLE_SUB_TO_RECORDING; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_VOICE_BOTTLE_SUB_tO_MATCHING; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_NOTI_SUB_GAME_ATTACK; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_NOTI_SUB_GAME_RESULT; +import static com.pikolive.core.im.custom.bean.CustomAttachment.ROOM_FREE_GIFT; +import static com.pikolive.core.im.custom.bean.CustomAttachment.ROOM_FREE_GIFT_CHANGE; +import static com.pikolive.core.im.custom.bean.CustomAttachment.ROOM_FREE_GIFT_REST; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.netease.nimlib.sdk.msg.attachment.MsgAttachment; import com.netease.nimlib.sdk.msg.attachment.MsgAttachmentParser; -import com.yizhuan.xchat_android_core.R; -import com.yizhuan.xchat_android_core.bean.attachmsg.RoomQueueMsgAttachment; -import com.yizhuan.xchat_android_core.community.attachment.DynamicSysAttachment; -import com.yizhuan.xchat_android_core.community.attachment.UnReadCountAttachment; -import com.yizhuan.xchat_android_core.community.im.WorldDynamicAttachment; -import com.yizhuan.xchat_android_core.gift.GiftModel; -import com.yizhuan.xchat_android_core.im.custom.AttachManager; -import com.yizhuan.xchat_android_core.mentoring_relationship.attachment.MentoringApprenticeMissionFourAttachment; -import com.yizhuan.xchat_android_core.mentoring_relationship.attachment.MentoringApprenticeMissionOneAttachment; -import com.yizhuan.xchat_android_core.mentoring_relationship.attachment.MentoringApprenticeMissionThreeAttachment; -import com.yizhuan.xchat_android_core.mentoring_relationship.attachment.MentoringApprenticeMissionTwoAttachment; -import com.yizhuan.xchat_android_core.mentoring_relationship.attachment.MentoringMasterMissionFourAttachment; -import com.yizhuan.xchat_android_core.mentoring_relationship.attachment.MentoringMasterMissionOneAttachment; -import com.yizhuan.xchat_android_core.mentoring_relationship.attachment.MentoringMasterMissionThreeAttachment; -import com.yizhuan.xchat_android_core.mentoring_relationship.attachment.MentoringMasterMissionTwoAttachment; -import com.yizhuan.xchat_android_core.mentoring_relationship.attachment.MentoringMissionTipsAttachment; -import com.yizhuan.xchat_android_core.mentoring_relationship.attachment.MentoringSharingRoomAttachment; -import com.yizhuan.xchat_android_core.miniworld.bean.MWChatMemberCountAttachment; -import com.yizhuan.xchat_android_core.miniworld.bean.MWChatTopicAttachment; -import com.yizhuan.xchat_android_core.miniworld.bean.OpenAudioPartyAttachment; -import com.yizhuan.xchat_android_core.module_hall.im.ClanAttachment; -import com.yizhuan.xchat_android_core.public_chat_hall.attachment.AitFriendsAttachment; -import com.yizhuan.xchat_android_core.public_chat_hall.attachment.AitMeAttachment; -import com.yizhuan.xchat_android_core.room.bean.LeaveModeAttachment; -import com.yizhuan.xchat_android_core.room.pk.attachment.RoomPkAttachment; -import com.yizhuan.xchat_android_core.room.queuing_mic.attachment.QueuingMicAttachment; -import com.yizhuan.xchat_android_core.super_admin.attachment.SuperAdminOpAttachment; -import com.yizhuan.xchat_android_core.super_admin.util.SaMsgUtil; -import com.yizhuan.xchat_android_core.utils.LogUtils; +import com.pikolive.core.bean.attachmsg.RoomQueueMsgAttachment; +import com.pikolive.core.gift.GiftModel; +import com.pikolive.core.room.bean.LeaveModeAttachment; +import com.pikolive.core.room.pk.attachment.RoomPkAttachment; +import com.pikolive.core.room.queuing_mic.attachment.QueuingMicAttachment; +import com.pikolive.core.bean.attachmsg.RoomQueueMsgAttachment; +import com.pikolive.core.gift.GiftModel; +import com.pikolive.core.room.bean.LeaveModeAttachment; +import com.pikolive.core.room.pk.attachment.RoomPkAttachment; +import com.pikolive.core.room.queuing_mic.attachment.QueuingMicAttachment; +import com.pikolive.core.R; +import com.pikolive.core.bean.attachmsg.RoomQueueMsgAttachment; +import com.pikolive.core.community.attachment.DynamicSysAttachment; +import com.pikolive.core.community.attachment.UnReadCountAttachment; +import com.pikolive.core.community.im.WorldDynamicAttachment; +import com.pikolive.core.gift.GiftModel; +import com.pikolive.core.im.custom.AttachManager; +import com.pikolive.core.mentoring_relationship.attachment.MentoringApprenticeMissionFourAttachment; +import com.pikolive.core.mentoring_relationship.attachment.MentoringApprenticeMissionOneAttachment; +import com.pikolive.core.mentoring_relationship.attachment.MentoringApprenticeMissionThreeAttachment; +import com.pikolive.core.mentoring_relationship.attachment.MentoringApprenticeMissionTwoAttachment; +import com.pikolive.core.mentoring_relationship.attachment.MentoringMasterMissionFourAttachment; +import com.pikolive.core.mentoring_relationship.attachment.MentoringMasterMissionOneAttachment; +import com.pikolive.core.mentoring_relationship.attachment.MentoringMasterMissionThreeAttachment; +import com.pikolive.core.mentoring_relationship.attachment.MentoringMasterMissionTwoAttachment; +import com.pikolive.core.mentoring_relationship.attachment.MentoringMissionTipsAttachment; +import com.pikolive.core.mentoring_relationship.attachment.MentoringSharingRoomAttachment; +import com.pikolive.core.miniworld.bean.MWChatMemberCountAttachment; +import com.pikolive.core.miniworld.bean.MWChatTopicAttachment; +import com.pikolive.core.miniworld.bean.OpenAudioPartyAttachment; +import com.pikolive.core.module_hall.im.ClanAttachment; +import com.pikolive.core.public_chat_hall.attachment.AitFriendsAttachment; +import com.pikolive.core.public_chat_hall.attachment.AitMeAttachment; +import com.pikolive.core.room.bean.LeaveModeAttachment; +import com.pikolive.core.room.pk.attachment.RoomPkAttachment; +import com.pikolive.core.room.queuing_mic.attachment.QueuingMicAttachment; +import com.pikolive.core.admin.attachment.SuperAdminOpAttachment; +import com.pikolive.core.admin.util.SaMsgUtil; +import com.pikolive.core.utils.LogUtils; import com.pikolive.library.utils.ResUtil; import com.pikolive.library.utils.log.MLog; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/CustomAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/CustomAttachment.java similarity index 99% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/CustomAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/CustomAttachment.java index eb0253bf7..060d12442 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/CustomAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/CustomAttachment.java @@ -1,9 +1,11 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.netease.nimlib.sdk.msg.attachment.MsgAttachment; -import com.yizhuan.xchat_android_core.noble.NobleInfo; +import com.pikolive.core.noble.NobleInfo; +import com.pikolive.core.noble.NobleInfo; +import com.pikolive.core.noble.NobleInfo; /** * 先定义一个自定义消息附件的基类，负责解析你的自定义消息的公用字段，比如类型等等。 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/DatingAllNotifyAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/DatingAllNotifyAttachment.java similarity index 81% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/DatingAllNotifyAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/DatingAllNotifyAttachment.java index 123268fc1..06c99266c 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/DatingAllNotifyAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/DatingAllNotifyAttachment.java @@ -1,8 +1,10 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.room.bean.DatingAllNotifyInfo; +import com.pikolive.core.room.bean.DatingAllNotifyInfo; +import com.pikolive.core.room.bean.DatingAllNotifyInfo; +import com.pikolive.core.room.bean.DatingAllNotifyInfo; /** * @author xiaoyu diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/DatingAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/DatingAttachment.java similarity index 80% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/DatingAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/DatingAttachment.java index e95b4fcf7..62365e52a 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/DatingAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/DatingAttachment.java @@ -1,8 +1,10 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.room.bean.DatingNotifyInfo; +import com.pikolive.core.room.bean.DatingNotifyInfo; +import com.pikolive.core.room.bean.DatingNotifyInfo; +import com.pikolive.core.room.bean.DatingNotifyInfo; /** * @author xiaoyu diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/DatingPublishAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/DatingPublishAttachment.java similarity index 84% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/DatingPublishAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/DatingPublishAttachment.java index 411109164..b8136f226 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/DatingPublishAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/DatingPublishAttachment.java @@ -1,9 +1,11 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -import com.yizhuan.xchat_android_core.room.bean.DatingNotifyInfo; +import com.pikolive.core.room.bean.DatingNotifyInfo; +import com.pikolive.core.room.bean.DatingNotifyInfo; +import com.pikolive.core.room.bean.DatingNotifyInfo; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/DiceThrowAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/DiceThrowAttachment.java similarity index 79% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/DiceThrowAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/DiceThrowAttachment.java index 2711d911f..5b5584e2a 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/DiceThrowAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/DiceThrowAttachment.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; @@ -6,7 +6,7 @@ public class DiceThrowAttachment extends CustomAttachment { public int pointCount = 0; public DiceThrowAttachment() { - super(CustomAttachment.CUSTOM_MSG_CHATTER_BOX, CustomAttachment.CUSTOM_MSG_CHATTER_BOX_DROP); + super(CUSTOM_MSG_CHATTER_BOX, CUSTOM_MSG_CHATTER_BOX_DROP); } @Override diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/DrawGiftAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/DrawGiftAttachment.java similarity index 95% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/DrawGiftAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/DrawGiftAttachment.java index 69a720f96..d4c263583 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/DrawGiftAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/DrawGiftAttachment.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/FaceAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/FaceAttachment.java similarity index 89% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/FaceAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/FaceAttachment.java index 8dc9b23cb..188af1037 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/FaceAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/FaceAttachment.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import android.util.Log; @@ -6,7 +6,9 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; -import com.yizhuan.xchat_android_core.room.face.FaceReceiveInfo; +import com.pikolive.core.room.face.FaceReceiveInfo; +import com.pikolive.core.room.face.FaceReceiveInfo; +import com.pikolive.core.room.face.FaceReceiveInfo; import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/FairyMsgAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/FairyMsgAttachment.java similarity index 85% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/FairyMsgAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/FairyMsgAttachment.java index b10064ef6..db46961b7 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/FairyMsgAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/FairyMsgAttachment.java @@ -1,8 +1,8 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.treasurefairy.FairyMsgInfoBean; +import com.pikolive.core2.treasurefairy.FairyMsgInfoBean; /** * Created by chenran on 2017/10/4. diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/FairySendAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/FairySendAttachment.java similarity index 97% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/FairySendAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/FairySendAttachment.java index 380cc1eb5..56c44daf6 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/FairySendAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/FairySendAttachment.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/FansTeamMsgAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/FansTeamMsgAttachment.java similarity index 79% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/FansTeamMsgAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/FansTeamMsgAttachment.java index a8beb34b5..051844e3f 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/FansTeamMsgAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/FansTeamMsgAttachment.java @@ -1,8 +1,10 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.fansteam.FansTeamMsgInfo; +import com.pikolive.core.fansteam.FansTeamMsgInfo; +import com.pikolive.core.fansteam.FansTeamMsgInfo; +import com.pikolive.core.fansteam.FansTeamMsgInfo; public class FansTeamMsgAttachment extends CustomAttachment { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/GiftAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/GiftAttachment.java similarity index 87% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/GiftAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/GiftAttachment.java index 7bfddc67c..1ebea0ea9 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/GiftAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/GiftAttachment.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import android.text.TextUtils; @@ -6,9 +6,15 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo; -import com.yizhuan.xchat_android_core.gift.bean.GiftReceiveInfo; -import com.yizhuan.xchat_android_core.room.giftvalue.bean.IndexGiftValue; +import com.pikolive.core.gift.bean.GiftInfo; +import com.pikolive.core.gift.bean.GiftReceiveInfo; +import com.pikolive.core.room.giftvalue.bean.IndexGiftValue; +import com.pikolive.core.gift.bean.GiftInfo; +import com.pikolive.core.gift.bean.GiftReceiveInfo; +import com.pikolive.core.room.giftvalue.bean.IndexGiftValue; +import com.pikolive.core.gift.bean.GiftInfo; +import com.pikolive.core.gift.bean.GiftReceiveInfo; +import com.pikolive.core.room.giftvalue.bean.IndexGiftValue; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/GiftBatchAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/GiftBatchAttachment.java similarity index 83% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/GiftBatchAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/GiftBatchAttachment.java index eeeaea117..a4c6b6b59 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/GiftBatchAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/GiftBatchAttachment.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import android.text.TextUtils; @@ -8,10 +8,18 @@ import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo; -import com.yizhuan.xchat_android_core.gift.bean.GiftMultiReceiverInfo; -import com.yizhuan.xchat_android_core.gift.bean.GiftReceiver; -import com.yizhuan.xchat_android_core.room.giftvalue.bean.IndexGiftValue; +import com.pikolive.core.gift.bean.GiftInfo; +import com.pikolive.core.gift.bean.GiftMultiReceiverInfo; +import com.pikolive.core.gift.bean.GiftReceiver; +import com.pikolive.core.room.giftvalue.bean.IndexGiftValue; +import com.pikolive.core.gift.bean.GiftInfo; +import com.pikolive.core.gift.bean.GiftMultiReceiverInfo; +import com.pikolive.core.gift.bean.GiftReceiver; +import com.pikolive.core.room.giftvalue.bean.IndexGiftValue; +import com.pikolive.core.gift.bean.GiftInfo; +import com.pikolive.core.gift.bean.GiftMultiReceiverInfo; +import com.pikolive.core.gift.bean.GiftReceiver; +import com.pikolive.core.room.giftvalue.bean.IndexGiftValue; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/GiftCompoundAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/GiftCompoundAttachment.java similarity index 92% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/GiftCompoundAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/GiftCompoundAttachment.java index ec03bc2bb..eeef016a5 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/GiftCompoundAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/GiftCompoundAttachment.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/GiftCompoundMsgBean.java b/core/src/main/java/com/pikolive/core/im/custom/bean/GiftCompoundMsgBean.java similarity index 80% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/GiftCompoundMsgBean.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/GiftCompoundMsgBean.java index 2e688c024..7d487e5f9 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/GiftCompoundMsgBean.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/GiftCompoundMsgBean.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import lombok.Data; import lombok.ToString; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/ImTipAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/ImTipAttachment.java similarity index 92% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/ImTipAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/ImTipAttachment.java index ff9ac9d59..eada67172 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/ImTipAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/ImTipAttachment.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/InAppSharingFamilyAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/InAppSharingFamilyAttachment.java similarity index 89% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/InAppSharingFamilyAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/InAppSharingFamilyAttachment.java index 837127d25..b33eeb53b 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/InAppSharingFamilyAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/InAppSharingFamilyAttachment.java @@ -1,9 +1,9 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.share.bean.InAppSharingFamilyInfo; +import com.pikolive.core.share.bean.InAppSharingFamilyInfo; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/InAppSharingMiniWorldAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/InAppSharingMiniWorldAttachment.java similarity index 89% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/InAppSharingMiniWorldAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/InAppSharingMiniWorldAttachment.java index c8f84e4e5..f77b0d3ae 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/InAppSharingMiniWorldAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/InAppSharingMiniWorldAttachment.java @@ -1,9 +1,9 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.share.bean.InAppSharingMiniWorldInfo; +import com.pikolive.core.share.bean.InAppSharingMiniWorldInfo; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/InAppSharingRoomAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/InAppSharingRoomAttachment.java similarity index 89% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/InAppSharingRoomAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/InAppSharingRoomAttachment.java index 2e2eff08a..622a61b54 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/InAppSharingRoomAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/InAppSharingRoomAttachment.java @@ -1,9 +1,9 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.share.bean.InAppSharingRoomInfo; +import com.pikolive.core.share.bean.InAppSharingRoomInfo; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/InAppSharingTeamAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/InAppSharingTeamAttachment.java similarity index 86% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/InAppSharingTeamAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/InAppSharingTeamAttachment.java index fa1aa528f..be916b7ff 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/InAppSharingTeamAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/InAppSharingTeamAttachment.java @@ -1,9 +1,9 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.share.bean.InAppSharingTeamInfo; +import com.pikolive.core.share.bean.InAppSharingTeamInfo; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/JoinMiniWorldAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/JoinMiniWorldAttachment.java similarity index 71% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/JoinMiniWorldAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/JoinMiniWorldAttachment.java index b2446a849..67fd3633a 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/JoinMiniWorldAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/JoinMiniWorldAttachment.java @@ -1,7 +1,9 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldInWorldInfo; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.pikolive.core.miniworld.bean.MiniWorldInWorldInfo; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.user.bean.UserInfo; public class JoinMiniWorldAttachment extends CustomAttachment { @@ -18,7 +20,7 @@ public class JoinMiniWorldAttachment extends CustomAttachment { } public JoinMiniWorldAttachment() { - this(CustomAttachment.CUSTOM_MSG_MINI_WORLD, CustomAttachment.CUSTOM_MSG_GROUP_CHAT_ROOM_JOIN_TIP); + this(CUSTOM_MSG_MINI_WORLD, CUSTOM_MSG_GROUP_CHAT_ROOM_JOIN_TIP); } public JoinMiniWorldAttachment(int first, int second) { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/JoinMiniWorldNoticeAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/JoinMiniWorldNoticeAttachment.java similarity index 91% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/JoinMiniWorldNoticeAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/JoinMiniWorldNoticeAttachment.java index 3d9b62875..dc2b312ff 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/JoinMiniWorldNoticeAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/JoinMiniWorldNoticeAttachment.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; @@ -46,7 +46,7 @@ public class JoinMiniWorldNoticeAttachment extends CustomAttachment { } public JoinMiniWorldNoticeAttachment() { - this(CustomAttachment.CUSTOM_MSG_MINI_WORLD, CustomAttachment.CUSTOM_MSG_GROUP_ROOM_JOIN_NOTICE); + this(CUSTOM_MSG_MINI_WORLD, CUSTOM_MSG_GROUP_ROOM_JOIN_NOTICE); } public JoinMiniWorldNoticeAttachment(int first, int second) { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/LevelUpAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/LevelUpAttachment.java similarity index 93% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/LevelUpAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/LevelUpAttachment.java index 8a6b23f31..8a5d1e459 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/LevelUpAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/LevelUpAttachment.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/LevelUpNoticeAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/LevelUpNoticeAttachment.java similarity index 95% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/LevelUpNoticeAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/LevelUpNoticeAttachment.java index efa2029e2..4b51ef679 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/LevelUpNoticeAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/LevelUpNoticeAttachment.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/LotteryAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/LotteryAttachment.java similarity index 86% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/LotteryAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/LotteryAttachment.java index 39c913aba..04cf0ff1f 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/LotteryAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/LotteryAttachment.java @@ -1,7 +1,9 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; -import com.yizhuan.xchat_android_core.activity.bean.LotteryInfo; +import com.pikolive.core.activity.bean.LotteryInfo; +import com.pikolive.core.activity.bean.LotteryInfo; +import com.pikolive.core.activity.bean.LotteryInfo; /** * Created by chenran on 2017/12/26. diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/LuckyMoneyAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/LuckyMoneyAttachment.java similarity index 87% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/LuckyMoneyAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/LuckyMoneyAttachment.java index 8d74d64de..f72b2c267 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/LuckyMoneyAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/LuckyMoneyAttachment.java @@ -1,8 +1,10 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.luckymoney.LuckyMoneyInfo; +import com.pikolive.core.luckymoney.LuckyMoneyInfo; +import com.pikolive.core.luckymoney.LuckyMoneyInfo; +import com.pikolive.core.luckymoney.LuckyMoneyInfo; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/LuckyMoneyTipsAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/LuckyMoneyTipsAttachment.java similarity index 88% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/LuckyMoneyTipsAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/LuckyMoneyTipsAttachment.java index 2f137bbc2..26d1666d6 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/LuckyMoneyTipsAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/LuckyMoneyTipsAttachment.java @@ -1,8 +1,10 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.luckymoney.LuckyMoneyInfo; +import com.pikolive.core.luckymoney.LuckyMoneyInfo; +import com.pikolive.core.luckymoney.LuckyMoneyInfo; +import com.pikolive.core.luckymoney.LuckyMoneyInfo; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/MagicAllMicAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/MagicAllMicAttachment.java similarity index 81% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/MagicAllMicAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/MagicAllMicAttachment.java index dabe8bd0a..f9ccdc480 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/MagicAllMicAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/MagicAllMicAttachment.java @@ -1,10 +1,16 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.yizhuan.xchat_android_core.magic.MagicModel; -import com.yizhuan.xchat_android_core.magic.bean.MagicInfo; -import com.yizhuan.xchat_android_core.magic.bean.MultiMagicReceivedInfo; +import com.pikolive.core.magic.MagicModel; +import com.pikolive.core.magic.bean.MagicInfo; +import com.pikolive.core.magic.bean.MultiMagicReceivedInfo; +import com.pikolive.core.magic.MagicModel; +import com.pikolive.core.magic.bean.MagicInfo; +import com.pikolive.core.magic.bean.MultiMagicReceivedInfo; +import com.pikolive.core.magic.MagicModel; +import com.pikolive.core.magic.bean.MagicInfo; +import com.pikolive.core.magic.bean.MultiMagicReceivedInfo; /** * @author xiaoyu diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/MagicAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/MagicAttachment.java similarity index 81% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/MagicAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/MagicAttachment.java index 3ad220e36..e6c47f726 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/MagicAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/MagicAttachment.java @@ -1,10 +1,16 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.yizhuan.xchat_android_core.magic.MagicModel; -import com.yizhuan.xchat_android_core.magic.bean.MagicInfo; -import com.yizhuan.xchat_android_core.magic.bean.MagicReceivedInfo; +import com.pikolive.core.magic.MagicModel; +import com.pikolive.core.magic.bean.MagicInfo; +import com.pikolive.core.magic.bean.MagicReceivedInfo; +import com.pikolive.core.magic.MagicModel; +import com.pikolive.core.magic.bean.MagicInfo; +import com.pikolive.core.magic.bean.MagicReceivedInfo; +import com.pikolive.core.magic.MagicModel; +import com.pikolive.core.magic.bean.MagicInfo; +import com.pikolive.core.magic.bean.MagicReceivedInfo; /** * @author xiaoyu diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/MagicBatchAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/MagicBatchAttachment.java similarity index 80% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/MagicBatchAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/MagicBatchAttachment.java index 60c8e3900..4bfddb7d7 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/MagicBatchAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/MagicBatchAttachment.java @@ -1,10 +1,16 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.yizhuan.xchat_android_core.magic.MagicModel; -import com.yizhuan.xchat_android_core.magic.bean.MagicInfo; -import com.yizhuan.xchat_android_core.magic.bean.MagicMultiReceiverInfo; +import com.pikolive.core.magic.MagicModel; +import com.pikolive.core.magic.bean.MagicInfo; +import com.pikolive.core.magic.bean.MagicMultiReceiverInfo; +import com.pikolive.core.magic.MagicModel; +import com.pikolive.core.magic.bean.MagicInfo; +import com.pikolive.core.magic.bean.MagicMultiReceiverInfo; +import com.pikolive.core.magic.MagicModel; +import com.pikolive.core.magic.bean.MagicInfo; +import com.pikolive.core.magic.bean.MagicMultiReceiverInfo; /** * @author xiaoyu diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/MatchAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/MatchAttachment.java similarity index 96% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/MatchAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/MatchAttachment.java index a6655f820..0827095ec 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/MatchAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/MatchAttachment.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/MatchTicketAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/MatchTicketAttachment.java similarity index 92% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/MatchTicketAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/MatchTicketAttachment.java index 0f68c9328..f9e7a5c0d 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/MatchTicketAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/MatchTicketAttachment.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/MonsterAttackAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/MonsterAttackAttachment.java similarity index 90% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/MonsterAttackAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/MonsterAttackAttachment.java index 510127f03..c26ba64e8 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/MonsterAttackAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/MonsterAttackAttachment.java @@ -1,8 +1,10 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterAttackInfo; +import com.pikolive.core.monsterhunting.bean.MonsterAttackInfo; +import com.pikolive.core.monsterhunting.bean.MonsterAttackInfo; +import com.pikolive.core.monsterhunting.bean.MonsterAttackInfo; /** * Created by MadisonRong on 31/03/2018. diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/MonsterHuntingResultAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/MonsterHuntingResultAttachment.java similarity index 81% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/MonsterHuntingResultAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/MonsterHuntingResultAttachment.java index af0e37721..df35cb136 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/MonsterHuntingResultAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/MonsterHuntingResultAttachment.java @@ -1,9 +1,11 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterHuntingResult; +import com.pikolive.core.monsterhunting.bean.MonsterHuntingResult; +import com.pikolive.core.monsterhunting.bean.MonsterHuntingResult; +import com.pikolive.core.monsterhunting.bean.MonsterHuntingResult; /** * Created by MadisonRong on 12/04/2018. diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/MonsterStatusAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/MonsterStatusAttachment.java similarity index 91% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/MonsterStatusAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/MonsterStatusAttachment.java index ccdc06d40..08d18bd8c 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/MonsterStatusAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/MonsterStatusAttachment.java @@ -1,8 +1,10 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterProtocol; +import com.pikolive.core.monsterhunting.bean.MonsterProtocol; +import com.pikolive.core.monsterhunting.bean.MonsterProtocol; +import com.pikolive.core.monsterhunting.bean.MonsterProtocol; /** * Created by MadisonRong on 11/04/2018. diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/MultiGiftAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/MultiGiftAttachment.java similarity index 86% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/MultiGiftAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/MultiGiftAttachment.java index 8ee2d0cde..a9ffd52ca 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/MultiGiftAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/MultiGiftAttachment.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import android.text.TextUtils; @@ -6,9 +6,15 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo; -import com.yizhuan.xchat_android_core.gift.bean.MultiGiftReceiveInfo; -import com.yizhuan.xchat_android_core.room.giftvalue.bean.IndexGiftValue; +import com.pikolive.core.gift.bean.GiftInfo; +import com.pikolive.core.gift.bean.MultiGiftReceiveInfo; +import com.pikolive.core.room.giftvalue.bean.IndexGiftValue; +import com.pikolive.core.gift.bean.GiftInfo; +import com.pikolive.core.gift.bean.MultiGiftReceiveInfo; +import com.pikolive.core.room.giftvalue.bean.IndexGiftValue; +import com.pikolive.core.gift.bean.GiftInfo; +import com.pikolive.core.gift.bean.MultiGiftReceiveInfo; +import com.pikolive.core.room.giftvalue.bean.IndexGiftValue; import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/MultiLuckyGiftAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/MultiLuckyGiftAttachment.java similarity index 90% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/MultiLuckyGiftAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/MultiLuckyGiftAttachment.java index cf0946567..3ae6bf621 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/MultiLuckyGiftAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/MultiLuckyGiftAttachment.java @@ -1,12 +1,16 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import android.text.TextUtils; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.gift.bean.LuckyBagGifts; -import com.yizhuan.xchat_android_core.gift.bean.LuckyGiftList; +import com.pikolive.core.gift.bean.LuckyBagGifts; +import com.pikolive.core.gift.bean.LuckyGiftList; +import com.pikolive.core.gift.bean.LuckyBagGifts; +import com.pikolive.core.gift.bean.LuckyGiftList; +import com.pikolive.core.gift.bean.LuckyBagGifts; +import com.pikolive.core.gift.bean.LuckyGiftList; /** * Created by chenran on 2017/10/25. diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/NewbieHelloAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/NewbieHelloAttachment.java similarity index 79% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/NewbieHelloAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/NewbieHelloAttachment.java index 1454cf97b..ca00d0912 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/NewbieHelloAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/NewbieHelloAttachment.java @@ -1,8 +1,10 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.newbie.NewbieHelloInfo; +import com.pikolive.core.newbie.NewbieHelloInfo; +import com.pikolive.core.newbie.NewbieHelloInfo; +import com.pikolive.core.newbie.NewbieHelloInfo; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/NobleAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/NobleAttachment.java similarity index 94% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/NobleAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/NobleAttachment.java index a0207cd3b..76d00a901 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/NobleAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/NobleAttachment.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; @@ -8,9 +8,11 @@ import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonToken; import com.google.gson.stream.JsonWriter; import com.orhanobut.logger.Logger; -import com.yizhuan.xchat_android_core.R; -import com.yizhuan.xchat_android_core.noble.NobleInfo; -import com.yizhuan.xchat_android_core.noble.NobleProtocol; +import com.pikolive.core.noble.NobleInfo; +import com.pikolive.core.noble.NobleInfo; +import com.pikolive.core.R; +import com.pikolive.core.noble.NobleInfo; +import com.pikolive.core.noble.NobleProtocol; import com.pikolive.library.rxbus.RxBusHelper; import com.pikolive.library.utils.ResUtil; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/NoticeAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/NoticeAttachment.java similarity index 96% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/NoticeAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/NoticeAttachment.java index f5c3889b0..95ab605bd 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/NoticeAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/NoticeAttachment.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/NotifyH5Attachment.kt b/core/src/main/java/com/pikolive/core/im/custom/bean/NotifyH5Attachment.kt similarity index 85% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/NotifyH5Attachment.kt rename to core/src/main/java/com/pikolive/core/im/custom/bean/NotifyH5Attachment.kt index e6e457c18..323cf9acf 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/NotifyH5Attachment.kt +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/NotifyH5Attachment.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean +package com.pikolive.core.im.custom.bean import com.alibaba.fastjson.JSONObject import com.google.gson.Gson diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/NotifyH5Info.java b/core/src/main/java/com/pikolive/core/im/custom/bean/NotifyH5Info.java similarity index 80% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/NotifyH5Info.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/NotifyH5Info.java index 51d934682..222829c3f 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/NotifyH5Info.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/NotifyH5Info.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/OpenRoomNotiAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/OpenRoomNotiAttachment.java similarity index 95% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/OpenRoomNotiAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/OpenRoomNotiAttachment.java index fd7e35cbc..9b43fe57f 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/OpenRoomNotiAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/OpenRoomNotiAttachment.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/OpenSignInAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/OpenSignInAttachment.java similarity index 80% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/OpenSignInAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/OpenSignInAttachment.java index ee5d55b2b..e0dcb72ca 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/OpenSignInAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/OpenSignInAttachment.java @@ -1,8 +1,10 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.radish.signin.bean.ImNotice; +import com.pikolive.core.radish.signin.bean.ImNotice; +import com.pikolive.core.radish.signin.bean.ImNotice; +import com.pikolive.core.radish.signin.bean.ImNotice; import lombok.Getter; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/P2PContactRechargeAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/P2PContactRechargeAttachment.java similarity index 91% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/P2PContactRechargeAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/P2PContactRechargeAttachment.java index 16eb59e64..c5a5d7623 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/P2PContactRechargeAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/P2PContactRechargeAttachment.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/PlayEffectInfo.java b/core/src/main/java/com/pikolive/core/im/custom/bean/PlayEffectInfo.java similarity index 63% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/PlayEffectInfo.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/PlayEffectInfo.java index 558dcd44c..67c80b316 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/PlayEffectInfo.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/PlayEffectInfo.java @@ -1,7 +1,8 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; -import com.yizhuan.xchat_android_core.gift.bean.LuckyBagNoticeInfo; -import com.yizhuan.xchat_android_core.treasurefairy.FairyMsgInfoBean; +import com.pikolive.core.gift.bean.LuckyBagNoticeInfo; +import com.pikolive.core.gift.bean.LuckyBagNoticeInfo; +import com.pikolive.core2.treasurefairy.FairyMsgInfoBean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RedPackageAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/RedPackageAttachment.java similarity index 78% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RedPackageAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/RedPackageAttachment.java index e48be6a34..aeb4facac 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RedPackageAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/RedPackageAttachment.java @@ -1,8 +1,10 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.redpackage.RedPackageNotifyInfo; +import com.pikolive.core.redpackage.RedPackageNotifyInfo; +import com.pikolive.core.redpackage.RedPackageNotifyInfo; +import com.pikolive.core.redpackage.RedPackageNotifyInfo; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RedPackageRoomMsgAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/RedPackageRoomMsgAttachment.java similarity index 78% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RedPackageRoomMsgAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/RedPackageRoomMsgAttachment.java index 84a407cee..a4c5d0efb 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RedPackageRoomMsgAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/RedPackageRoomMsgAttachment.java @@ -1,8 +1,10 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.redpackage.RedEnvelopeRoomMsg; +import com.pikolive.core.redpackage.RedEnvelopeRoomMsg; +import com.pikolive.core.redpackage.RedEnvelopeRoomMsg; +import com.pikolive.core.redpackage.RedEnvelopeRoomMsg; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RedPacketAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/RedPacketAttachment.java similarity index 86% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RedPacketAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/RedPacketAttachment.java index 0d109fba3..91b7e3764 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RedPacketAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/RedPacketAttachment.java @@ -1,7 +1,9 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; -import com.yizhuan.xchat_android_core.redPacket.bean.RedPacketInfoV2; +import com.pikolive.core.redPacket.bean.RedPacketInfoV2; +import com.pikolive.core.redPacket.bean.RedPacketInfoV2; +import com.pikolive.core.redPacket.bean.RedPacketInfoV2; /** * Created by chenran on 2017/10/4. diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RequestUpmicAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/RequestUpmicAttachment.java similarity index 82% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RequestUpmicAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/RequestUpmicAttachment.java index 06455d8d4..2abf19b75 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RequestUpmicAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/RequestUpmicAttachment.java @@ -1,8 +1,10 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.user.bean.UserInfo; public class RequestUpmicAttachment extends CustomAttachment { private UserInfo userInfo; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RewardBean.java b/core/src/main/java/com/pikolive/core/im/custom/bean/RewardBean.java similarity index 93% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RewardBean.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/RewardBean.java index 976239f88..8af87eed4 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RewardBean.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/RewardBean.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomAlbumAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/RoomAlbumAttachment.java similarity index 89% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomAlbumAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/RoomAlbumAttachment.java index 299dcec4c..3e7ab78f1 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomAlbumAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/RoomAlbumAttachment.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomAlbumMsgInfo.kt b/core/src/main/java/com/pikolive/core/im/custom/bean/RoomAlbumMsgInfo.kt similarity index 50% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomAlbumMsgInfo.kt rename to core/src/main/java/com/pikolive/core/im/custom/bean/RoomAlbumMsgInfo.kt index 9656cf7b1..ce569f555 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomAlbumMsgInfo.kt +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/RoomAlbumMsgInfo.kt @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.im.custom.bean +package com.pikolive.core.im.custom.bean -import com.yizhuan.xchat_android_core.level.UserLevelVo +import com.pikolive.core.level.UserLevelVo data class RoomAlbumMsgInfo( val roomPhoto: RoomPhoto, diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomBoxPrizeAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/RoomBoxPrizeAttachment.java similarity index 96% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomBoxPrizeAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/RoomBoxPrizeAttachment.java index 8fb53b386..606c18e4c 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomBoxPrizeAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/RoomBoxPrizeAttachment.java @@ -1,8 +1,8 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.netease.nim.uikit.common.util.string.StringUtil; -import com.yizhuan.xchat_android_core.R; +import com.pikolive.core.R; import com.pikolive.library.utils.ResUtil; /** diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomBoxPrizeInfo.java b/core/src/main/java/com/pikolive/core/im/custom/bean/RoomBoxPrizeInfo.java similarity index 82% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomBoxPrizeInfo.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/RoomBoxPrizeInfo.java index 1ccd83ceb..e6bfb33a0 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomBoxPrizeInfo.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/RoomBoxPrizeInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomFollowOwnerAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/RoomFollowOwnerAttachment.java similarity index 81% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomFollowOwnerAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/RoomFollowOwnerAttachment.java index 53d8ed490..35a16b5d5 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomFollowOwnerAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/RoomFollowOwnerAttachment.java @@ -1,6 +1,8 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.user.bean.UserInfo; /** * 聊天室弹出关注房主的提示 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomFollowOwnerAttachment2.java b/core/src/main/java/com/pikolive/core/im/custom/bean/RoomFollowOwnerAttachment2.java similarity index 81% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomFollowOwnerAttachment2.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/RoomFollowOwnerAttachment2.java index b9624c6ef..c978259d4 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomFollowOwnerAttachment2.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/RoomFollowOwnerAttachment2.java @@ -1,6 +1,8 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.user.bean.UserInfo; /** * 聊天室弹出关注房主的提示 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomFreeGiftAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/RoomFreeGiftAttachment.java similarity index 93% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomFreeGiftAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/RoomFreeGiftAttachment.java index 59eb59d9b..e0a479119 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomFreeGiftAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/RoomFreeGiftAttachment.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomFreeGiftMsgBean.java b/core/src/main/java/com/pikolive/core/im/custom/bean/RoomFreeGiftMsgBean.java similarity index 80% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomFreeGiftMsgBean.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/RoomFreeGiftMsgBean.java index 656306102..f5401d582 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomFreeGiftMsgBean.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/RoomFreeGiftMsgBean.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomGiftValueAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/RoomGiftValueAttachment.java similarity index 82% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomGiftValueAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/RoomGiftValueAttachment.java index 45c65015c..1bef756f2 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomGiftValueAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/RoomGiftValueAttachment.java @@ -1,9 +1,11 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.room.giftvalue.bean.RoomGiftValue; +import com.pikolive.core.room.giftvalue.bean.RoomGiftValue; +import com.pikolive.core.room.giftvalue.bean.RoomGiftValue; +import com.pikolive.core.room.giftvalue.bean.RoomGiftValue; import lombok.Getter; import lombok.Setter; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomInfoAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/RoomInfoAttachment.java similarity index 71% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomInfoAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/RoomInfoAttachment.java index 5ade16f95..947b28e91 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomInfoAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/RoomInfoAttachment.java @@ -1,7 +1,9 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; +import com.pikolive.core.room.bean.RoomInfo; +import com.pikolive.core.room.bean.RoomInfo; +import com.pikolive.core.room.bean.RoomInfo; /** * Created by huangmeng1 on 2018/6/7. diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomInviteFansAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/RoomInviteFansAttachment.java similarity index 93% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomInviteFansAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/RoomInviteFansAttachment.java index 7b2f1cc67..a8bd7d87f 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomInviteFansAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/RoomInviteFansAttachment.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomInviteFansInfo.java b/core/src/main/java/com/pikolive/core/im/custom/bean/RoomInviteFansInfo.java similarity index 89% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomInviteFansInfo.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/RoomInviteFansInfo.java index 40f7f579d..c5dccb40f 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomInviteFansInfo.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/RoomInviteFansInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomLuckySeaAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/RoomLuckySeaAttachment.java similarity index 94% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomLuckySeaAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/RoomLuckySeaAttachment.java index 4382ecc81..5d7199ef9 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomLuckySeaAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/RoomLuckySeaAttachment.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomLuckySeaMsgBean.java b/core/src/main/java/com/pikolive/core/im/custom/bean/RoomLuckySeaMsgBean.java similarity index 85% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomLuckySeaMsgBean.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/RoomLuckySeaMsgBean.java index f108e4d1f..475b88395 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomLuckySeaMsgBean.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/RoomLuckySeaMsgBean.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomNoticeAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/RoomNoticeAttachment.java similarity index 80% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomNoticeAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/RoomNoticeAttachment.java index e8e972f0c..95e5b60de 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomNoticeAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/RoomNoticeAttachment.java @@ -1,9 +1,11 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.room.bean.RoomMessageViewNoticeInfo; +import com.pikolive.core.room.bean.RoomMessageViewNoticeInfo; +import com.pikolive.core.room.bean.RoomMessageViewNoticeInfo; +import com.pikolive.core.room.bean.RoomMessageViewNoticeInfo; public class RoomNoticeAttachment extends RoomInfoAttachment { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomPKAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/RoomPKAttachment.java similarity index 92% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomPKAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/RoomPKAttachment.java index 5f22df23b..bb4755fc4 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomPKAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/RoomPKAttachment.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomPhoto.kt b/core/src/main/java/com/pikolive/core/im/custom/bean/RoomPhoto.kt similarity index 84% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomPhoto.kt rename to core/src/main/java/com/pikolive/core/im/custom/bean/RoomPhoto.kt index f93d7a863..51561f35c 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomPhoto.kt +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/RoomPhoto.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean +package com.pikolive.core.im.custom.bean data class RoomPhoto( val createTime: String, diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomPkBean.java b/core/src/main/java/com/pikolive/core/im/custom/bean/RoomPkBean.java similarity index 98% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomPkBean.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/RoomPkBean.java index f0fbcd405..d8d6b57f4 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomPkBean.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/RoomPkBean.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomRankAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/RoomRankAttachment.java similarity index 92% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomRankAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/RoomRankAttachment.java index 550424ba7..dc04c4298 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomRankAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/RoomRankAttachment.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomRankMsgBean.java b/core/src/main/java/com/pikolive/core/im/custom/bean/RoomRankMsgBean.java similarity index 74% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomRankMsgBean.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/RoomRankMsgBean.java index 5b538dd76..3bd2d4ae4 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomRankMsgBean.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/RoomRankMsgBean.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomReceivedLuckyGiftAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/RoomReceivedLuckyGiftAttachment.java similarity index 79% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomReceivedLuckyGiftAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/RoomReceivedLuckyGiftAttachment.java index edde37f6c..1c2264188 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomReceivedLuckyGiftAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/RoomReceivedLuckyGiftAttachment.java @@ -1,8 +1,10 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.gift.bean.LuckyBagNoticeInfo; +import com.pikolive.core.gift.bean.LuckyBagNoticeInfo; +import com.pikolive.core.gift.bean.LuckyBagNoticeInfo; +import com.pikolive.core.gift.bean.LuckyBagNoticeInfo; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomTipAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/RoomTipAttachment.java similarity index 95% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomTipAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/RoomTipAttachment.java index 97a95c637..8401f1b81 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RoomTipAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/RoomTipAttachment.java @@ -1,8 +1,8 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.netease.nim.uikit.common.util.string.StringUtil; -import com.yizhuan.xchat_android_core.R; +import com.pikolive.core.R; import com.pikolive.library.utils.ResUtil; /** diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RouterType.java b/core/src/main/java/com/pikolive/core/im/custom/bean/RouterType.java similarity index 98% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RouterType.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/RouterType.java index 461dfed0d..1fdd28a4b 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/RouterType.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/RouterType.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; /** * Created by MadisonRong on 08/06/2018. diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/SingleRoomRankAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/SingleRoomRankAttachment.java similarity index 92% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/SingleRoomRankAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/SingleRoomRankAttachment.java index 67e073b76..acaf15e1e 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/SingleRoomRankAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/SingleRoomRankAttachment.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/SingleRoomRankMsgBean.java b/core/src/main/java/com/pikolive/core/im/custom/bean/SingleRoomRankMsgBean.java similarity index 75% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/SingleRoomRankMsgBean.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/SingleRoomRankMsgBean.java index b2f54dbbe..d520b4feb 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/SingleRoomRankMsgBean.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/SingleRoomRankMsgBean.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/SkillMsgAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/SkillMsgAttachment.java similarity index 89% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/SkillMsgAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/SkillMsgAttachment.java index 076546775..f96b5eb71 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/SkillMsgAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/SkillMsgAttachment.java @@ -1,8 +1,8 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.skill.entity.SkillNotifyEntity; +import com.pikolive.core.skill.entity.SkillNotifyEntity; public class SkillMsgAttachment extends CustomAttachment { private SkillNotifyEntity entity; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/SysMsgAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/SysMsgAttachment.java similarity index 79% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/SysMsgAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/SysMsgAttachment.java index d2fc5cbb9..ed0bb5af5 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/SysMsgAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/SysMsgAttachment.java @@ -1,8 +1,10 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.msg.sys.ErbanSysMsgInfo; +import com.pikolive.core.msg.sys.ErbanSysMsgInfo; +import com.pikolive.core.msg.sys.ErbanSysMsgInfo; +import com.pikolive.core.msg.sys.ErbanSysMsgInfo; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/SysMsgV2Attachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/SysMsgV2Attachment.java similarity index 82% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/SysMsgV2Attachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/SysMsgV2Attachment.java index 95f26b666..6b2a5e0bb 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/SysMsgV2Attachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/SysMsgV2Attachment.java @@ -1,8 +1,10 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.msg.sysv2.ErbanSysMsgV2Info; +import com.pikolive.core.msg.sysv2.ErbanSysMsgV2Info; +import com.pikolive.core.msg.sysv2.ErbanSysMsgV2Info; +import com.pikolive.core.msg.sysv2.ErbanSysMsgV2Info; import lombok.Getter; import lombok.Setter; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/SysMsgVoiceAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/SysMsgVoiceAttachment.java similarity index 78% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/SysMsgVoiceAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/SysMsgVoiceAttachment.java index fcc45ef28..02a4c1a56 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/SysMsgVoiceAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/SysMsgVoiceAttachment.java @@ -1,10 +1,12 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.audio.bean.SysMsgVoiceInfo; +import com.pikolive.core.audio.bean.SysMsgVoiceInfo; +import com.pikolive.core.audio.bean.SysMsgVoiceInfo; +import com.pikolive.core.audio.bean.SysMsgVoiceInfo; /** * 声音瓶子审核结果的系统通知 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/TarotAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/TarotAttachment.java similarity index 95% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/TarotAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/TarotAttachment.java index 4c3f6d87e..ff0ecd513 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/TarotAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/TarotAttachment.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/TarotMsgBean.java b/core/src/main/java/com/pikolive/core/im/custom/bean/TarotMsgBean.java similarity index 91% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/TarotMsgBean.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/TarotMsgBean.java index df9136a7a..e35298351 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/TarotMsgBean.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/TarotMsgBean.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/User.kt b/core/src/main/java/com/pikolive/core/im/custom/bean/User.kt similarity index 93% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/User.kt rename to core/src/main/java/com/pikolive/core/im/custom/bean/User.kt index efa29bd9a..9650a0374 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/User.kt +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/User.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.custom.bean +package com.pikolive.core.im.custom.bean data class User( val avatar: String, diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/VipMessageAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/VipMessageAttachment.java similarity index 80% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/VipMessageAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/VipMessageAttachment.java index 15f44a9ee..b3641980b 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/VipMessageAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/VipMessageAttachment.java @@ -1,8 +1,10 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.vip.VipMessageInfo; +import com.pikolive.core.vip.VipMessageInfo; +import com.pikolive.core.vip.VipMessageInfo; +import com.pikolive.core.vip.VipMessageInfo; public class VipMessageAttachment extends CustomAttachment { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/VoiceBottleSayHiAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/VoiceBottleSayHiAttachment.java similarity index 82% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/VoiceBottleSayHiAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/VoiceBottleSayHiAttachment.java index c31957d0f..2ff6b7c86 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/VoiceBottleSayHiAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/VoiceBottleSayHiAttachment.java @@ -1,9 +1,11 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.audio.bean.VoiceBottleSayHiInfo; +import com.pikolive.core.audio.bean.VoiceBottleSayHiInfo; +import com.pikolive.core.audio.bean.VoiceBottleSayHiInfo; +import com.pikolive.core.audio.bean.VoiceBottleSayHiInfo; /** * 声音瓶子打招呼提示信息 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/VoiceBottleShakeHeartAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/VoiceBottleShakeHeartAttachment.java similarity index 77% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/VoiceBottleShakeHeartAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/VoiceBottleShakeHeartAttachment.java index c6d00ddf6..e095580c5 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/VoiceBottleShakeHeartAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/VoiceBottleShakeHeartAttachment.java @@ -1,9 +1,11 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.audio.bean.VoiceBottleSayHiInfo; +import com.pikolive.core.audio.bean.VoiceBottleSayHiInfo; +import com.pikolive.core.audio.bean.VoiceBottleSayHiInfo; +import com.pikolive.core.audio.bean.VoiceBottleSayHiInfo; /** * 声音瓶子点击打招呼：发送爱心动画 + 发送固定文本信息 @@ -19,7 +21,7 @@ public class VoiceBottleShakeHeartAttachment extends CustomAttachment { } public VoiceBottleShakeHeartAttachment(VoiceBottleSayHiInfo sayHiInfo) { - super(CustomAttachment.CUSTOM_MSG_VOICE_BOTTLE_HEAD, CustomAttachment.CUSTOM_MSG_VOICE_BOTTLE_SUB_HEART); + super(CUSTOM_MSG_VOICE_BOTTLE_HEAD, CUSTOM_MSG_VOICE_BOTTLE_SUB_HEART); this.sayHiInfo = sayHiInfo; } diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/WelcomeAttachment.java b/core/src/main/java/com/pikolive/core/im/custom/bean/WelcomeAttachment.java similarity index 80% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/WelcomeAttachment.java rename to core/src/main/java/com/pikolive/core/im/custom/bean/WelcomeAttachment.java index 7a17a0e1e..b2108d54a 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/custom/bean/WelcomeAttachment.java +++ b/core/src/main/java/com/pikolive/core/im/custom/bean/WelcomeAttachment.java @@ -1,9 +1,13 @@ -package com.yizhuan.xchat_android_core.im.custom.bean; +package com.pikolive.core.im.custom.bean; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.room.bean.WelcomeInfo; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.room.bean.WelcomeInfo; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.room.bean.WelcomeInfo; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.room.bean.WelcomeInfo; import lombok.Getter; import lombok.Setter; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/friend/IIMFriendCore.java b/core/src/main/java/com/pikolive/core/im/friend/IIMFriendCore.java similarity index 97% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/friend/IIMFriendCore.java rename to core/src/main/java/com/pikolive/core/im/friend/IIMFriendCore.java index 85909c3a6..405bfe7f1 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/friend/IIMFriendCore.java +++ b/core/src/main/java/com/pikolive/core/im/friend/IIMFriendCore.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.friend; +package com.pikolive.core.im.friend; import com.netease.nimlib.sdk.friend.constant.FriendFieldEnum; import com.pikolive.library.coremanager.IBaseCore; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/friend/IMFriendModel.java b/core/src/main/java/com/pikolive/core/im/friend/IMFriendModel.java similarity index 90% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/friend/IMFriendModel.java rename to core/src/main/java/com/pikolive/core/im/friend/IMFriendModel.java index bb2aa5d67..6ca9b89c2 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/friend/IMFriendModel.java +++ b/core/src/main/java/com/pikolive/core/im/friend/IMFriendModel.java @@ -1,17 +1,22 @@ -package com.yizhuan.xchat_android_core.im.friend; +package com.pikolive.core.im.friend; import com.netease.nimlib.sdk.NIMClient; import com.netease.nimlib.sdk.Observer; import com.netease.nimlib.sdk.friend.FriendService; import com.netease.nimlib.sdk.friend.FriendServiceObserve; import com.netease.nimlib.sdk.friend.model.FriendChangedNotify; -import com.yizhuan.xchat_android_core.R; -import com.yizhuan.xchat_android_core.bean.response.result.UserListResult; -import com.yizhuan.xchat_android_core.manager.BaseMvpModel; -import com.yizhuan.xchat_android_core.manager.IMMessageManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.manager.RelationShipEvent; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.pikolive.core.bean.response.result.UserListResult; +import com.pikolive.core.manager.BaseMvpModel; +import com.pikolive.core.manager.IMMessageManager; +import com.pikolive.core.manager.RelationShipEvent; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.bean.response.result.UserListResult; +import com.pikolive.core.manager.BaseMvpModel; +import com.pikolive.core.manager.IMMessageManager; +import com.pikolive.core.manager.RelationShipEvent; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.R; +import com.pikolive.core2.manager.IMNetEaseManager; import com.pikolive.library.net.rxnet.RxNet; import com.pikolive.library.utils.ResUtil; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/login/IIMLoginClient.java b/core/src/main/java/com/pikolive/core/im/login/IIMLoginClient.java similarity index 94% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/login/IIMLoginClient.java rename to core/src/main/java/com/pikolive/core/im/login/IIMLoginClient.java index a29effb51..31e8f7c13 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/login/IIMLoginClient.java +++ b/core/src/main/java/com/pikolive/core/im/login/IIMLoginClient.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.login; +package com.pikolive.core.im.login; import com.netease.nimlib.sdk.StatusCode; import com.netease.nimlib.sdk.auth.LoginInfo; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/login/IIMLoginCore.java b/core/src/main/java/com/pikolive/core/im/login/IIMLoginCore.java similarity index 79% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/login/IIMLoginCore.java rename to core/src/main/java/com/pikolive/core/im/login/IIMLoginCore.java index 9c721ee49..4c585cfd9 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/login/IIMLoginCore.java +++ b/core/src/main/java/com/pikolive/core/im/login/IIMLoginCore.java @@ -1,7 +1,9 @@ -package com.yizhuan.xchat_android_core.im.login; +package com.pikolive.core.im.login; import com.netease.nimlib.sdk.auth.OnlineClient; -import com.yizhuan.xchat_android_core.base.IModel; +import com.pikolive.core.base.IModel; +import com.pikolive.core.base.IModel; +import com.pikolive.core.base.IModel; /** * Created by chenran on 2017/2/16. diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/notification/INotificationCore.java b/core/src/main/java/com/pikolive/core/im/notification/INotificationCore.java similarity index 86% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/notification/INotificationCore.java rename to core/src/main/java/com/pikolive/core/im/notification/INotificationCore.java index c6cf784d2..bf1d6c5a0 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/notification/INotificationCore.java +++ b/core/src/main/java/com/pikolive/core/im/notification/INotificationCore.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.notification; +package com.pikolive.core.im.notification; import com.netease.nimlib.sdk.msg.model.CustomNotification; import com.pikolive.library.coremanager.IBaseCore; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/notification/INotificationCoreClient.java b/core/src/main/java/com/pikolive/core/im/notification/INotificationCoreClient.java similarity index 87% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/notification/INotificationCoreClient.java rename to core/src/main/java/com/pikolive/core/im/notification/INotificationCoreClient.java index d16574d45..b21089f3c 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/notification/INotificationCoreClient.java +++ b/core/src/main/java/com/pikolive/core/im/notification/INotificationCoreClient.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.notification; +package com.pikolive.core.im.notification; import com.alibaba.fastjson.JSONObject; import com.pikolive.library.coremanager.ICoreClient; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/room/IIMRoomCoreClient.java b/core/src/main/java/com/pikolive/core/im/room/IIMRoomCoreClient.java similarity index 99% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/room/IIMRoomCoreClient.java rename to core/src/main/java/com/pikolive/core/im/room/IIMRoomCoreClient.java index 93ffa9418..e7220fab5 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/room/IIMRoomCoreClient.java +++ b/core/src/main/java/com/pikolive/core/im/room/IIMRoomCoreClient.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.room; +package com.pikolive.core.im.room; import com.netease.nimlib.sdk.chatroom.model.ChatRoomKickOutEvent; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/state/IPhoneCallStateModel.java b/core/src/main/java/com/pikolive/core/im/state/IPhoneCallStateModel.java similarity index 76% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/state/IPhoneCallStateModel.java rename to core/src/main/java/com/pikolive/core/im/state/IPhoneCallStateModel.java index 10d9fe5f3..abf4ce77a 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/state/IPhoneCallStateModel.java +++ b/core/src/main/java/com/pikolive/core/im/state/IPhoneCallStateModel.java @@ -1,6 +1,8 @@ -package com.yizhuan.xchat_android_core.im.state; +package com.pikolive.core.im.state; -import com.yizhuan.xchat_android_core.base.IModel; +import com.pikolive.core.base.IModel; +import com.pikolive.core.base.IModel; +import com.pikolive.core.base.IModel; public interface IPhoneCallStateModel extends IModel { /** diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/state/PhoneCallStateModel.java b/core/src/main/java/com/pikolive/core/im/state/PhoneCallStateModel.java similarity index 94% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/state/PhoneCallStateModel.java rename to core/src/main/java/com/pikolive/core/im/state/PhoneCallStateModel.java index d10db46b1..57d5ba734 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/state/PhoneCallStateModel.java +++ b/core/src/main/java/com/pikolive/core/im/state/PhoneCallStateModel.java @@ -1,9 +1,11 @@ -package com.yizhuan.xchat_android_core.im.state; +package com.pikolive.core.im.state; import android.telephony.TelephonyManager; import android.util.Log; -import com.yizhuan.xchat_android_core.base.BaseModel; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.base.BaseModel; public class PhoneCallStateModel extends BaseModel implements IPhoneCallStateModel { private static final String TAG = "PhoneCallStateModel"; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/sysmsg/ISysMsgCore.java b/core/src/main/java/com/pikolive/core/im/sysmsg/ISysMsgCore.java similarity index 97% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/sysmsg/ISysMsgCore.java rename to core/src/main/java/com/pikolive/core/im/sysmsg/ISysMsgCore.java index 9809a46aa..3b4c26301 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/sysmsg/ISysMsgCore.java +++ b/core/src/main/java/com/pikolive/core/im/sysmsg/ISysMsgCore.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.sysmsg; +package com.pikolive.core.im.sysmsg; import com.netease.nimlib.sdk.msg.constant.SystemMessageStatus; import com.netease.nimlib.sdk.msg.constant.SystemMessageType; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/sysmsg/ISysMsgCoreClient.java b/core/src/main/java/com/pikolive/core/im/sysmsg/ISysMsgCoreClient.java similarity index 90% rename from core/src/main/java/com/yizhuan/xchat_android_core/im/sysmsg/ISysMsgCoreClient.java rename to core/src/main/java/com/pikolive/core/im/sysmsg/ISysMsgCoreClient.java index 6c22b7839..082805092 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/sysmsg/ISysMsgCoreClient.java +++ b/core/src/main/java/com/pikolive/core/im/sysmsg/ISysMsgCoreClient.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.im.sysmsg; +package com.pikolive.core.im.sysmsg; import com.netease.nimlib.sdk.msg.model.SystemMessage; import com.pikolive.library.coremanager.ICoreClient; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/initial/FaceComponent.java b/core/src/main/java/com/pikolive/core/initial/FaceComponent.java similarity index 96% rename from core/src/main/java/com/yizhuan/xchat_android_core/initial/FaceComponent.java rename to core/src/main/java/com/pikolive/core/initial/FaceComponent.java index b5f58f1c6..5d3363d3d 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/initial/FaceComponent.java +++ b/core/src/main/java/com/pikolive/core/initial/FaceComponent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.initial; +package com.pikolive.core.initial; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/initial/IInitialModel.java b/core/src/main/java/com/pikolive/core/initial/IInitialModel.java similarity index 61% rename from core/src/main/java/com/yizhuan/xchat_android_core/initial/IInitialModel.java rename to core/src/main/java/com/pikolive/core/initial/IInitialModel.java index f974a857d..768d86dfb 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/initial/IInitialModel.java +++ b/core/src/main/java/com/pikolive/core/initial/IInitialModel.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.initial; +package com.pikolive.core.initial; import android.annotation.SuppressLint; @@ -6,12 +6,22 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.lifecycle.LiveData; -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.home.bean.MainTabInfo; -import com.yizhuan.xchat_android_core.initial.bean.BoxInfo; -import com.yizhuan.xchat_android_core.initial.bean.FairyOpenInfo; -import com.yizhuan.xchat_android_core.initial.bean.InitInfo; +import com.pikolive.core.base.IModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.initial.bean.BoxInfo; +import com.pikolive.core.initial.bean.FairyOpenInfo; +import com.pikolive.core.initial.bean.InitInfo; +import com.pikolive.core.base.IModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.initial.bean.BoxInfo; +import com.pikolive.core.initial.bean.FairyOpenInfo; +import com.pikolive.core.initial.bean.InitInfo; +import com.pikolive.core.base.IModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core2.home.bean.MainTabInfo; +import com.pikolive.core.initial.bean.BoxInfo; +import com.pikolive.core.initial.bean.FairyOpenInfo; +import com.pikolive.core.initial.bean.InitInfo; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/initial/InitialModel.java b/core/src/main/java/com/pikolive/core/initial/InitialModel.java similarity index 92% rename from core/src/main/java/com/yizhuan/xchat_android_core/initial/InitialModel.java rename to core/src/main/java/com/pikolive/core/initial/InitialModel.java index 4946ef4ad..9796b8f0c 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/initial/InitialModel.java +++ b/core/src/main/java/com/pikolive/core/initial/InitialModel.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.initial; +package com.pikolive.core.initial; import android.annotation.SuppressLint; import android.content.BroadcastReceiver; @@ -15,26 +15,36 @@ import androidx.lifecycle.MutableLiveData; import com.bumptech.glide.request.FutureTarget; import com.bumptech.glide.request.target.Target; import com.netease.nim.uikit.support.glide.GlideApp; -import com.yizhuan.xchat_android_core.R; -import com.yizhuan.xchat_android_core.DemoCache; -import com.yizhuan.xchat_android_core.auth.event.LogoutEvent; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.certification.CertificationModel; -import com.yizhuan.xchat_android_core.home.bean.MainTabInfo; -import com.yizhuan.xchat_android_core.home.bean.MainTabType; -import com.yizhuan.xchat_android_core.initial.bean.BoxInfo; -import com.yizhuan.xchat_android_core.initial.bean.FairyOpenInfo; -import com.yizhuan.xchat_android_core.initial.bean.InitInfo; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.noble.NobleDataManager; -import com.yizhuan.xchat_android_core.public_chat_hall.manager.PublicChatHallDataManager; -import com.yizhuan.xchat_android_core.room.face.DynamicFaceModel; -import com.yizhuan.xchat_android_core.user.event.LoadLoginUserInfoEvent; -import com.yizhuan.xchat_android_core.utils.CurrentTimeUtils; -import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_core.withdraw.WithdrawModel; +import com.pikolive.core.auth.event.LogoutEvent; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.certification.CertificationModel; +import com.pikolive.core.initial.bean.BoxInfo; +import com.pikolive.core.initial.bean.FairyOpenInfo; +import com.pikolive.core.initial.bean.InitInfo; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core.room.face.DynamicFaceModel; +import com.pikolive.core.user.event.LoadLoginUserInfoEvent; +import com.pikolive.core.withdraw.WithdrawModel; +import com.pikolive.core.auth.event.LogoutEvent; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.certification.CertificationModel; +import com.pikolive.core.initial.bean.BoxInfo; +import com.pikolive.core.initial.bean.FairyOpenInfo; +import com.pikolive.core.initial.bean.InitInfo; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core.room.face.DynamicFaceModel; +import com.pikolive.core.user.event.LoadLoginUserInfoEvent; +import com.pikolive.core.withdraw.WithdrawModel; +import com.pikolive.core.R; +import com.pikolive.core.DemoCache; +import com.pikolive.core2.home.bean.MainTabInfo; +import com.pikolive.core2.home.bean.MainTabType; +import com.pikolive.core.noble.NobleDataManager; +import com.pikolive.core.public_chat_hall.manager.PublicChatHallDataManager; +import com.pikolive.core.utils.CurrentTimeUtils; +import com.pikolive.core.utils.SharedPreferenceUtils; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.net.rxnet.RxNet; import com.pikolive.library.utils.JavaUtil; import com.pikolive.library.utils.ListUtils; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/initial/NobleResourceComponent.java b/core/src/main/java/com/pikolive/core/initial/NobleResourceComponent.java similarity index 95% rename from core/src/main/java/com/yizhuan/xchat_android_core/initial/NobleResourceComponent.java rename to core/src/main/java/com/pikolive/core/initial/NobleResourceComponent.java index b1acb67bd..6cc3bdbb4 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/initial/NobleResourceComponent.java +++ b/core/src/main/java/com/pikolive/core/initial/NobleResourceComponent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.initial; +package com.pikolive.core.initial; import com.google.gson.annotations.SerializedName; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/initial/SplashComponent.java b/core/src/main/java/com/pikolive/core/initial/SplashComponent.java similarity index 95% rename from core/src/main/java/com/yizhuan/xchat_android_core/initial/SplashComponent.java rename to core/src/main/java/com/pikolive/core/initial/SplashComponent.java index 62bc5f22a..a09a0eed4 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/initial/SplashComponent.java +++ b/core/src/main/java/com/pikolive/core/initial/SplashComponent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.initial; +package com.pikolive.core.initial; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/initial/bean/BoxInfo.java b/core/src/main/java/com/pikolive/core/initial/bean/BoxInfo.java similarity index 76% rename from core/src/main/java/com/yizhuan/xchat_android_core/initial/bean/BoxInfo.java rename to core/src/main/java/com/pikolive/core/initial/bean/BoxInfo.java index 3ca273585..f98279303 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/initial/bean/BoxInfo.java +++ b/core/src/main/java/com/pikolive/core/initial/bean/BoxInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.initial.bean; +package com.pikolive.core.initial.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/initial/bean/FairyOpenInfo.java b/core/src/main/java/com/pikolive/core/initial/bean/FairyOpenInfo.java similarity index 87% rename from core/src/main/java/com/yizhuan/xchat_android_core/initial/bean/FairyOpenInfo.java rename to core/src/main/java/com/pikolive/core/initial/bean/FairyOpenInfo.java index 033058bf7..ccbece6e1 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/initial/bean/FairyOpenInfo.java +++ b/core/src/main/java/com/pikolive/core/initial/bean/FairyOpenInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.initial.bean; +package com.pikolive.core.initial.bean; public class FairyOpenInfo { private int levelLimit; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/initial/bean/InitInfo.java b/core/src/main/java/com/pikolive/core/initial/bean/InitInfo.java similarity index 88% rename from core/src/main/java/com/yizhuan/xchat_android_core/initial/bean/InitInfo.java rename to core/src/main/java/com/pikolive/core/initial/bean/InitInfo.java index 55e7e2378..406e7a01f 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/initial/bean/InitInfo.java +++ b/core/src/main/java/com/pikolive/core/initial/bean/InitInfo.java @@ -1,12 +1,16 @@ -package com.yizhuan.xchat_android_core.initial.bean; +package com.pikolive.core.initial.bean; import com.google.gson.annotations.SerializedName; -import com.yizhuan.xchat_android_core.initial.FaceComponent; -import com.yizhuan.xchat_android_core.initial.NobleResourceComponent; -import com.yizhuan.xchat_android_core.initial.SplashComponent; -import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterInitInfo; -import com.yizhuan.xchat_android_core.noble.NobleRight; +import com.pikolive.core.monsterhunting.bean.MonsterInitInfo; +import com.pikolive.core.noble.NobleRight; +import com.pikolive.core.monsterhunting.bean.MonsterInitInfo; +import com.pikolive.core.noble.NobleRight; +import com.pikolive.core.initial.FaceComponent; +import com.pikolive.core.initial.NobleResourceComponent; +import com.pikolive.core.initial.SplashComponent; +import com.pikolive.core.monsterhunting.bean.MonsterInitInfo; +import com.pikolive.core.noble.NobleRight; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/initial/bean/RedEnvelopeConfig.java b/core/src/main/java/com/pikolive/core/initial/bean/RedEnvelopeConfig.java similarity index 97% rename from core/src/main/java/com/yizhuan/xchat_android_core/initial/bean/RedEnvelopeConfig.java rename to core/src/main/java/com/pikolive/core/initial/bean/RedEnvelopeConfig.java index 99b14e355..c7526e53f 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/initial/bean/RedEnvelopeConfig.java +++ b/core/src/main/java/com/pikolive/core/initial/bean/RedEnvelopeConfig.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.initial.bean; +package com.pikolive.core.initial.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/initial/bean/TaxInfo.java b/core/src/main/java/com/pikolive/core/initial/bean/TaxInfo.java similarity index 81% rename from core/src/main/java/com/yizhuan/xchat_android_core/initial/bean/TaxInfo.java rename to core/src/main/java/com/pikolive/core/initial/bean/TaxInfo.java index bb14006f3..10501dd89 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/initial/bean/TaxInfo.java +++ b/core/src/main/java/com/pikolive/core/initial/bean/TaxInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.initial.bean; +package com.pikolive.core.initial.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/interceptor/MyOkHttpRetryInterceptor.java b/core/src/main/java/com/pikolive/core/interceptor/MyOkHttpRetryInterceptor.java similarity index 94% rename from core/src/main/java/com/yizhuan/xchat_android_core/interceptor/MyOkHttpRetryInterceptor.java rename to core/src/main/java/com/pikolive/core/interceptor/MyOkHttpRetryInterceptor.java index 3cb1fcf50..c907bff89 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/interceptor/MyOkHttpRetryInterceptor.java +++ b/core/src/main/java/com/pikolive/core/interceptor/MyOkHttpRetryInterceptor.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.interceptor; +package com.pikolive.core.interceptor; -import com.yizhuan.xchat_android_core.utils.Logger; +import com.pikolive.core.utils.Logger; import java.io.IOException; import java.io.InterruptedIOException; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/interceptor/NoParamsInterceptor.java b/core/src/main/java/com/pikolive/core/interceptor/NoParamsInterceptor.java similarity index 96% rename from core/src/main/java/com/yizhuan/xchat_android_core/interceptor/NoParamsInterceptor.java rename to core/src/main/java/com/pikolive/core/interceptor/NoParamsInterceptor.java index 36e8939c7..75210597e 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/interceptor/NoParamsInterceptor.java +++ b/core/src/main/java/com/pikolive/core/interceptor/NoParamsInterceptor.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.interceptor; +package com.pikolive.core.interceptor; import java.io.IOException; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/interceptor/ParamsInterceptor.java b/core/src/main/java/com/pikolive/core/interceptor/ParamsInterceptor.java similarity index 96% rename from core/src/main/java/com/yizhuan/xchat_android_core/interceptor/ParamsInterceptor.java rename to core/src/main/java/com/pikolive/core/interceptor/ParamsInterceptor.java index f6a7f4186..f7d0bba98 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/interceptor/ParamsInterceptor.java +++ b/core/src/main/java/com/pikolive/core/interceptor/ParamsInterceptor.java @@ -1,13 +1,13 @@ -package com.yizhuan.xchat_android_core.interceptor; +package com.pikolive.core.interceptor; import android.text.TextUtils; import androidx.annotation.NonNull; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.utils.APIEncryptUtil; -import com.yizhuan.xchat_android_core.utils.OaidUtil; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.utils.APIEncryptUtil; +import com.pikolive.core.utils.OaidUtil; import com.pikolive.library.utils.codec.MD5Utils; import java.io.IOException; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/interceptor/PathFilter.java b/core/src/main/java/com/pikolive/core/interceptor/PathFilter.java similarity index 94% rename from core/src/main/java/com/yizhuan/xchat_android_core/interceptor/PathFilter.java rename to core/src/main/java/com/pikolive/core/interceptor/PathFilter.java index d4211fb49..50a28dee9 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/interceptor/PathFilter.java +++ b/core/src/main/java/com/pikolive/core/interceptor/PathFilter.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.interceptor; +package com.pikolive.core.interceptor; import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/interceptor/TimeSyncInterceptor.kt b/core/src/main/java/com/pikolive/core/interceptor/TimeSyncInterceptor.kt similarity index 94% rename from core/src/main/java/com/yizhuan/xchat_android_core/interceptor/TimeSyncInterceptor.kt rename to core/src/main/java/com/pikolive/core/interceptor/TimeSyncInterceptor.kt index 5be107902..bcae33a2c 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/interceptor/TimeSyncInterceptor.kt +++ b/core/src/main/java/com/pikolive/core/interceptor/TimeSyncInterceptor.kt @@ -1,8 +1,8 @@ -package com.yizhuan.xchat_android_core.interceptor +package com.pikolive.core.interceptor import com.pikolive.utils.AppUtils import com.pikolive.utils.ServiceTime -import com.yizhuan.xchat_android_core.utils.LogUtils +import com.pikolive.core.utils.LogUtils import com.pikolive.library.utils.NetworkUtils import okhttp3.Headers import okhttp3.Interceptor diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/kick/IKickModel.java b/core/src/main/java/com/pikolive/core/kick/IKickModel.java similarity index 75% rename from core/src/main/java/com/yizhuan/xchat_android_core/kick/IKickModel.java rename to core/src/main/java/com/pikolive/core/kick/IKickModel.java index 1a26a309a..78bc9e8a9 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/kick/IKickModel.java +++ b/core/src/main/java/com/pikolive/core/kick/IKickModel.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.kick; +package com.pikolive.core.kick; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; -import com.yizhuan.xchat_android_core.base.IModel; +import com.pikolive.core.base.IModel; public interface IKickModel extends IModel { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/kick/KickModel.java b/core/src/main/java/com/pikolive/core/kick/KickModel.java similarity index 89% rename from core/src/main/java/com/yizhuan/xchat_android_core/kick/KickModel.java rename to core/src/main/java/com/pikolive/core/kick/KickModel.java index 1bcc1679e..e1dd891b5 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/kick/KickModel.java +++ b/core/src/main/java/com/pikolive/core/kick/KickModel.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.kick; +package com.pikolive.core.kick; import android.annotation.SuppressLint; import android.os.Handler; @@ -6,12 +6,12 @@ import android.os.Message; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; import com.netease.nimlib.sdk.msg.constant.MsgTypeEnum; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.manager.RoomEvent; -import com.yizhuan.xchat_android_core.super_admin.util.SaMsgUtil; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.im.custom.bean.CustomAttachment; +import com.pikolive.core2.manager.IMNetEaseManager; +import com.pikolive.core.manager.RoomEvent; +import com.pikolive.core.admin.util.SaMsgUtil; +import com.pikolive.core.utils.net.RxHelper; import java.lang.ref.WeakReference; import java.util.ArrayList; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/level/UserLevelResourceType.java b/core/src/main/java/com/pikolive/core/level/UserLevelResourceType.java similarity index 85% rename from core/src/main/java/com/yizhuan/xchat_android_core/level/UserLevelResourceType.java rename to core/src/main/java/com/pikolive/core/level/UserLevelResourceType.java index 734b404b2..138529142 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/level/UserLevelResourceType.java +++ b/core/src/main/java/com/pikolive/core/level/UserLevelResourceType.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.level; +package com.pikolive.core.level; /** *

diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/level/UserLevelVo.java b/core/src/main/java/com/pikolive/core/level/UserLevelVo.java similarity index 98% rename from core/src/main/java/com/yizhuan/xchat_android_core/level/UserLevelVo.java rename to core/src/main/java/com/pikolive/core/level/UserLevelVo.java index ec61c0150..e3e9dadf4 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/level/UserLevelVo.java +++ b/core/src/main/java/com/pikolive/core/level/UserLevelVo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.level; +package com.pikolive.core.level; import java.io.Serializable; import java.util.HashMap; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/level/event/CharmLevelUpEvent.java b/core/src/main/java/com/pikolive/core/level/event/CharmLevelUpEvent.java similarity index 83% rename from core/src/main/java/com/yizhuan/xchat_android_core/level/event/CharmLevelUpEvent.java rename to core/src/main/java/com/pikolive/core/level/event/CharmLevelUpEvent.java index 5a6d2cc1a..8d28d64e2 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/level/event/CharmLevelUpEvent.java +++ b/core/src/main/java/com/pikolive/core/level/event/CharmLevelUpEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.level.event; +package com.pikolive.core.level.event; public class CharmLevelUpEvent { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/level/event/LevelUpEvent.java b/core/src/main/java/com/pikolive/core/level/event/LevelUpEvent.java similarity index 82% rename from core/src/main/java/com/yizhuan/xchat_android_core/level/event/LevelUpEvent.java rename to core/src/main/java/com/pikolive/core/level/event/LevelUpEvent.java index 6d4eb6532..91ff7ab3c 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/level/event/LevelUpEvent.java +++ b/core/src/main/java/com/pikolive/core/level/event/LevelUpEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.level.event; +package com.pikolive.core.level.event; public class LevelUpEvent { diff --git a/core/src/main/java/com/pikolive/core/linked/ILinkedModel.java b/core/src/main/java/com/pikolive/core/linked/ILinkedModel.java new file mode 100644 index 000000000..56242aac6 --- /dev/null +++ b/core/src/main/java/com/pikolive/core/linked/ILinkedModel.java @@ -0,0 +1,17 @@ +package com.pikolive.core.linked; + +import com.pikolive.core.base.IModel; +import com.pikolive.core.linked.bean.LinkedInfo; +import com.pikolive.core.base.IModel; +import com.pikolive.core.linked.bean.LinkedInfo; +import com.pikolive.core.base.IModel; +import com.pikolive.core.linked.bean.LinkedInfo; + + +public interface ILinkedModel extends IModel { + + void setLinkedInfo(LinkedInfo linkedInfo); + + LinkedInfo getLinkedInfo(); + +} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/linked/LinkedModel.java b/core/src/main/java/com/pikolive/core/linked/LinkedModel.java similarity index 71% rename from core/src/main/java/com/yizhuan/xchat_android_core/linked/LinkedModel.java rename to core/src/main/java/com/pikolive/core/linked/LinkedModel.java index c33b0ceeb..5c7d57f3c 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/linked/LinkedModel.java +++ b/core/src/main/java/com/pikolive/core/linked/LinkedModel.java @@ -1,7 +1,10 @@ -package com.yizhuan.xchat_android_core.linked; +package com.pikolive.core.linked; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.linked.bean.LinkedInfo; +import com.pikolive.core.linked.bean.LinkedInfo; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.linked.bean.LinkedInfo; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.linked.bean.LinkedInfo; public class LinkedModel extends BaseModel implements ILinkedModel{ diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/linked/bean/LinkedInfo.java b/core/src/main/java/com/pikolive/core/linked/bean/LinkedInfo.java similarity index 90% rename from core/src/main/java/com/yizhuan/xchat_android_core/linked/bean/LinkedInfo.java rename to core/src/main/java/com/pikolive/core/linked/bean/LinkedInfo.java index a00eb1173..e41deaec0 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/linked/bean/LinkedInfo.java +++ b/core/src/main/java/com/pikolive/core/linked/bean/LinkedInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.linked.bean; +package com.pikolive.core.linked.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/linked/event/LinkMeInfoUpdateEvent.java b/core/src/main/java/com/pikolive/core/linked/event/LinkMeInfoUpdateEvent.java similarity index 69% rename from core/src/main/java/com/yizhuan/xchat_android_core/linked/event/LinkMeInfoUpdateEvent.java rename to core/src/main/java/com/pikolive/core/linked/event/LinkMeInfoUpdateEvent.java index 9027b1813..d1fe57583 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/linked/event/LinkMeInfoUpdateEvent.java +++ b/core/src/main/java/com/pikolive/core/linked/event/LinkMeInfoUpdateEvent.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.linked.event; +package com.pikolive.core.linked.event; -import com.yizhuan.xchat_android_core.linked.bean.LinkedInfo; +import com.pikolive.core.linked.bean.LinkedInfo; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/luckymoney/LuckyMoneyInfo.java b/core/src/main/java/com/pikolive/core/luckymoney/LuckyMoneyInfo.java similarity index 98% rename from core/src/main/java/com/yizhuan/xchat_android_core/luckymoney/LuckyMoneyInfo.java rename to core/src/main/java/com/pikolive/core/luckymoney/LuckyMoneyInfo.java index 094f7755e..d933ee78d 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/luckymoney/LuckyMoneyInfo.java +++ b/core/src/main/java/com/pikolive/core/luckymoney/LuckyMoneyInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.luckymoney; +package com.pikolive.core.luckymoney; import java.io.Serializable; import java.util.HashMap; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/luckymoney/LuckyMoneyRecordsInfo.java b/core/src/main/java/com/pikolive/core/luckymoney/LuckyMoneyRecordsInfo.java similarity index 81% rename from core/src/main/java/com/yizhuan/xchat_android_core/luckymoney/LuckyMoneyRecordsInfo.java rename to core/src/main/java/com/pikolive/core/luckymoney/LuckyMoneyRecordsInfo.java index 647c8988b..3e718376b 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/luckymoney/LuckyMoneyRecordsInfo.java +++ b/core/src/main/java/com/pikolive/core/luckymoney/LuckyMoneyRecordsInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.luckymoney; +package com.pikolive.core.luckymoney; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/luckymoney/LuckyMoneyUserInfo.java b/core/src/main/java/com/pikolive/core/luckymoney/LuckyMoneyUserInfo.java similarity index 87% rename from core/src/main/java/com/yizhuan/xchat_android_core/luckymoney/LuckyMoneyUserInfo.java rename to core/src/main/java/com/pikolive/core/luckymoney/LuckyMoneyUserInfo.java index 1e2a1165c..e71b56d57 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/luckymoney/LuckyMoneyUserInfo.java +++ b/core/src/main/java/com/pikolive/core/luckymoney/LuckyMoneyUserInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.luckymoney; +package com.pikolive.core.luckymoney; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/magic/IMagicModel.java b/core/src/main/java/com/pikolive/core/magic/IMagicModel.java similarity index 71% rename from core/src/main/java/com/yizhuan/xchat_android_core/magic/IMagicModel.java rename to core/src/main/java/com/pikolive/core/magic/IMagicModel.java index 286b48c95..d3bd7a59e 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/magic/IMagicModel.java +++ b/core/src/main/java/com/pikolive/core/magic/IMagicModel.java @@ -1,13 +1,19 @@ -package com.yizhuan.xchat_android_core.magic; +package com.pikolive.core.magic; import androidx.annotation.Nullable; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.magic.bean.MagicInfo; -import com.yizhuan.xchat_android_core.magic.bean.MagicMultiReceiverInfo; -import com.yizhuan.xchat_android_core.magic.bean.MagicReceivedInfo; +import com.pikolive.core.magic.bean.MagicInfo; +import com.pikolive.core.magic.bean.MagicMultiReceiverInfo; +import com.pikolive.core.magic.bean.MagicReceivedInfo; +import com.pikolive.core.magic.bean.MagicInfo; +import com.pikolive.core.magic.bean.MagicMultiReceiverInfo; +import com.pikolive.core.magic.bean.MagicReceivedInfo; +import com.pikolive.core.base.IModel; +import com.pikolive.core.im.custom.bean.CustomAttachment; +import com.pikolive.core.magic.bean.MagicInfo; +import com.pikolive.core.magic.bean.MagicMultiReceiverInfo; +import com.pikolive.core.magic.bean.MagicReceivedInfo; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/magic/MagicModel.java b/core/src/main/java/com/pikolive/core/magic/MagicModel.java similarity index 92% rename from core/src/main/java/com/yizhuan/xchat_android_core/magic/MagicModel.java rename to core/src/main/java/com/pikolive/core/magic/MagicModel.java index 9c4cf6e4d..1fc9e3311 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/magic/MagicModel.java +++ b/core/src/main/java/com/pikolive/core/magic/MagicModel.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.magic; +package com.pikolive.core.magic; import android.annotation.SuppressLint; import android.os.Handler; @@ -9,32 +9,38 @@ import androidx.annotation.Nullable; import com.netease.nimlib.sdk.chatroom.ChatRoomMessageBuilder; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; import com.netease.nimlib.sdk.msg.constant.MsgTypeEnum; -import com.yizhuan.xchat_android_core.R; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.exception.UnKnowException; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.MagicAllMicAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.MagicAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.MagicBatchAttachment; -import com.yizhuan.xchat_android_core.magic.bean.MagicInfo; -import com.yizhuan.xchat_android_core.magic.bean.MagicMultiReceiverInfo; -import com.yizhuan.xchat_android_core.magic.bean.MagicReceivedInfo; -import com.yizhuan.xchat_android_core.magic.bean.MultiMagicReceivedInfo; -import com.yizhuan.xchat_android_core.magic.exception.MagicOutOfDateException; -import com.yizhuan.xchat_android_core.magic.toolbox.MagicToolbox; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.manager.RoomEvent; -import com.yizhuan.xchat_android_core.pay.PayModel; -import com.yizhuan.xchat_android_core.retry.ImRetryManager; -import com.yizhuan.xchat_android_core.retry.RetryChatRoomMessage; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.room.giftvalue.bean.GiftValueCommonUpdate; -import com.yizhuan.xchat_android_core.room.giftvalue.helper.GiftValueMrg; -import com.yizhuan.xchat_android_core.utils.net.BalanceNotEnoughExeption; -import com.yizhuan.xchat_android_core.utils.net.FreezeException; +import com.pikolive.core.magic.bean.MagicInfo; +import com.pikolive.core.magic.bean.MagicMultiReceiverInfo; +import com.pikolive.core.magic.bean.MagicReceivedInfo; +import com.pikolive.core.magic.bean.MultiMagicReceivedInfo; +import com.pikolive.core.magic.exception.MagicOutOfDateException; +import com.pikolive.core.magic.toolbox.MagicToolbox; +import com.pikolive.core.magic.bean.MagicInfo; +import com.pikolive.core.magic.bean.MagicMultiReceiverInfo; +import com.pikolive.core.magic.bean.MagicReceivedInfo; +import com.pikolive.core.magic.bean.MultiMagicReceivedInfo; +import com.pikolive.core.magic.exception.MagicOutOfDateException; +import com.pikolive.core.magic.toolbox.MagicToolbox; +import com.pikolive.core.R; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.exception.UnKnowException; +import com.pikolive.core.im.custom.bean.CustomAttachment; +import com.pikolive.core.im.custom.bean.MagicAllMicAttachment; +import com.pikolive.core.im.custom.bean.MagicAttachment; +import com.pikolive.core.im.custom.bean.MagicBatchAttachment; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core2.manager.IMNetEaseManager; +import com.pikolive.core.manager.RoomEvent; +import com.pikolive.core.pay.PayModel; +import com.pikolive.core2.retry.ImRetryManager; +import com.pikolive.core2.retry.RetryChatRoomMessage; +import com.pikolive.core.room.bean.RoomInfo; +import com.pikolive.core.room.giftvalue.bean.GiftValueCommonUpdate; +import com.pikolive.core.room.giftvalue.helper.GiftValueMrg; +import com.pikolive.core.utils.net.BalanceNotEnoughExeption; +import com.pikolive.core.utils.net.FreezeException; import com.pikolive.library.net.rxnet.RxNet; import com.pikolive.library.utils.ListUtils; import com.pikolive.library.utils.ResUtil; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/magic/ObjectPool.java b/core/src/main/java/com/pikolive/core/magic/ObjectPool.java similarity index 98% rename from core/src/main/java/com/yizhuan/xchat_android_core/magic/ObjectPool.java rename to core/src/main/java/com/pikolive/core/magic/ObjectPool.java index c56ba915c..9d88767c2 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/magic/ObjectPool.java +++ b/core/src/main/java/com/pikolive/core/magic/ObjectPool.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.magic; +package com.pikolive.core.magic; import java.util.Queue; import java.util.concurrent.ConcurrentLinkedQueue; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/magic/bean/MagicInfo.java b/core/src/main/java/com/pikolive/core/magic/bean/MagicInfo.java similarity index 94% rename from core/src/main/java/com/yizhuan/xchat_android_core/magic/bean/MagicInfo.java rename to core/src/main/java/com/pikolive/core/magic/bean/MagicInfo.java index 86b3f5911..cbd6c2303 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/magic/bean/MagicInfo.java +++ b/core/src/main/java/com/pikolive/core/magic/bean/MagicInfo.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.magic.bean; +package com.pikolive.core.magic.bean; import com.google.gson.annotations.SerializedName; -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo; +import com.pikolive.core.gift.bean.GiftInfo; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/magic/bean/MagicMultiReceiverInfo.java b/core/src/main/java/com/pikolive/core/magic/bean/MagicMultiReceiverInfo.java similarity index 90% rename from core/src/main/java/com/yizhuan/xchat_android_core/magic/bean/MagicMultiReceiverInfo.java rename to core/src/main/java/com/pikolive/core/magic/bean/MagicMultiReceiverInfo.java index 65059c8c4..89889e1d0 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/magic/bean/MagicMultiReceiverInfo.java +++ b/core/src/main/java/com/pikolive/core/magic/bean/MagicMultiReceiverInfo.java @@ -1,8 +1,8 @@ -package com.yizhuan.xchat_android_core.magic.bean; +package com.pikolive.core.magic.bean; import com.alibaba.fastjson.annotation.JSONField; import com.google.gson.annotations.SerializedName; -import com.yizhuan.xchat_android_core.room.giftvalue.bean.RoomGiftValue; +import com.pikolive.core.room.giftvalue.bean.RoomGiftValue; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/magic/bean/MagicReceivedInfo.java b/core/src/main/java/com/pikolive/core/magic/bean/MagicReceivedInfo.java similarity index 90% rename from core/src/main/java/com/yizhuan/xchat_android_core/magic/bean/MagicReceivedInfo.java rename to core/src/main/java/com/pikolive/core/magic/bean/MagicReceivedInfo.java index d6f5a819f..25531cdf2 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/magic/bean/MagicReceivedInfo.java +++ b/core/src/main/java/com/pikolive/core/magic/bean/MagicReceivedInfo.java @@ -1,8 +1,8 @@ -package com.yizhuan.xchat_android_core.magic.bean; +package com.pikolive.core.magic.bean; import com.alibaba.fastjson.annotation.JSONField; import com.google.gson.annotations.SerializedName; -import com.yizhuan.xchat_android_core.room.giftvalue.bean.RoomGiftValue; +import com.pikolive.core.room.giftvalue.bean.RoomGiftValue; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/magic/bean/MagicReceiver.java b/core/src/main/java/com/pikolive/core/magic/bean/MagicReceiver.java similarity index 82% rename from core/src/main/java/com/yizhuan/xchat_android_core/magic/bean/MagicReceiver.java rename to core/src/main/java/com/pikolive/core/magic/bean/MagicReceiver.java index a5d0111ce..1b672c88e 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/magic/bean/MagicReceiver.java +++ b/core/src/main/java/com/pikolive/core/magic/bean/MagicReceiver.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.magic.bean; +package com.pikolive.core.magic.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/magic/bean/MultiMagicReceivedInfo.java b/core/src/main/java/com/pikolive/core/magic/bean/MultiMagicReceivedInfo.java similarity index 89% rename from core/src/main/java/com/yizhuan/xchat_android_core/magic/bean/MultiMagicReceivedInfo.java rename to core/src/main/java/com/pikolive/core/magic/bean/MultiMagicReceivedInfo.java index 7896d3815..39463fa6d 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/magic/bean/MultiMagicReceivedInfo.java +++ b/core/src/main/java/com/pikolive/core/magic/bean/MultiMagicReceivedInfo.java @@ -1,8 +1,8 @@ -package com.yizhuan.xchat_android_core.magic.bean; +package com.pikolive.core.magic.bean; import com.alibaba.fastjson.annotation.JSONField; import com.google.gson.annotations.SerializedName; -import com.yizhuan.xchat_android_core.room.giftvalue.bean.RoomGiftValue; +import com.pikolive.core.room.giftvalue.bean.RoomGiftValue; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/magic/exception/MagicOutOfDateException.java b/core/src/main/java/com/pikolive/core/magic/exception/MagicOutOfDateException.java similarity index 81% rename from core/src/main/java/com/yizhuan/xchat_android_core/magic/exception/MagicOutOfDateException.java rename to core/src/main/java/com/pikolive/core/magic/exception/MagicOutOfDateException.java index d0b4e6d53..8f4c18244 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/magic/exception/MagicOutOfDateException.java +++ b/core/src/main/java/com/pikolive/core/magic/exception/MagicOutOfDateException.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.magic.exception; +package com.pikolive.core.magic.exception; /** * 魔法礼物过期 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/magic/toolbox/MagicToolbox.java b/core/src/main/java/com/pikolive/core/magic/toolbox/MagicToolbox.java similarity index 84% rename from core/src/main/java/com/yizhuan/xchat_android_core/magic/toolbox/MagicToolbox.java rename to core/src/main/java/com/pikolive/core/magic/toolbox/MagicToolbox.java index 2e46b641c..8f2d1ea1d 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/magic/toolbox/MagicToolbox.java +++ b/core/src/main/java/com/pikolive/core/magic/toolbox/MagicToolbox.java @@ -1,8 +1,8 @@ -package com.yizhuan.xchat_android_core.magic.toolbox; +package com.pikolive.core.magic.toolbox; -import com.yizhuan.xchat_android_core.magic.bean.MagicMultiReceiverInfo; -import com.yizhuan.xchat_android_core.magic.bean.MagicReceiver; -import com.yizhuan.xchat_android_core.magic.bean.MultiMagicReceivedInfo; +import com.pikolive.core.magic.bean.MagicMultiReceiverInfo; +import com.pikolive.core.magic.bean.MagicReceiver; +import com.pikolive.core.magic.bean.MultiMagicReceivedInfo; import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/manager/AvRoomDataManager.java b/core/src/main/java/com/pikolive/core/manager/AvRoomDataManager.java similarity index 96% rename from core/src/main/java/com/yizhuan/xchat_android_core/manager/AvRoomDataManager.java rename to core/src/main/java/com/pikolive/core/manager/AvRoomDataManager.java index 0546cb4c0..a4d39231e 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/manager/AvRoomDataManager.java +++ b/core/src/main/java/com/pikolive/core/manager/AvRoomDataManager.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.manager; +package com.pikolive.core.manager; import android.annotation.SuppressLint; import android.graphics.Point; @@ -22,28 +22,40 @@ import com.netease.nimlib.sdk.chatroom.model.EnterChatRoomResultData; import com.netease.nimlib.sdk.msg.attachment.NotificationAttachment; import com.netease.nimlib.sdk.msg.constant.MsgTypeEnum; import com.netease.nimlib.sdk.msg.constant.NotificationType; -import com.yizhuan.xchat_android_core.R; -import com.yizhuan.xchat_android_constants.XChatConstants; -import com.yizhuan.xchat_android_core.DemoCache; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.bean.RoomQueueInfo; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomPkBean; -import com.yizhuan.xchat_android_core.room.bean.BoxSwitchVo; -import com.yizhuan.xchat_android_core.room.bean.FindLoveSwitchVo; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomModeType; -import com.yizhuan.xchat_android_core.room.bean.SeizeTreasureSwitchVo; -import com.yizhuan.xchat_android_core.room.bean.SimplePartyRoomInfo; -import com.yizhuan.xchat_android_core.room.event.RoomClearScreenEvent; -import com.yizhuan.xchat_android_core.room.game.GameStatus; -import com.yizhuan.xchat_android_core.room.giftvalue.helper.GiftValueMrg; -import com.yizhuan.xchat_android_core.super_admin.SuperAdminDataMrg; -import com.yizhuan.xchat_android_core.super_admin.util.SuperAdminUtil; -import com.yizhuan.xchat_android_core.support.room.RoomContext; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.utils.CurrentTimeUtils; -import com.yizhuan.xchat_android_core.utils.LogUtils; -import com.yizhuan.xchat_android_core.utils.StringUtils; +import com.pikolive.core.bean.RoomQueueInfo; +import com.pikolive.core.room.bean.BoxSwitchVo; +import com.pikolive.core.room.bean.FindLoveSwitchVo; +import com.pikolive.core.room.bean.RoomInfo; +import com.pikolive.core.room.bean.RoomModeType; +import com.pikolive.core.room.bean.SeizeTreasureSwitchVo; +import com.pikolive.core.room.bean.SimplePartyRoomInfo; +import com.pikolive.core.room.event.RoomClearScreenEvent; +import com.pikolive.core.room.game.GameStatus; +import com.pikolive.core.room.giftvalue.helper.GiftValueMrg; +import com.pikolive.core2.manager.AudioEngineManager; +import com.pikolive.core2.manager.IMNetEaseManager; +import com.pikolive.core.bean.RoomQueueInfo; +import com.pikolive.core.room.bean.BoxSwitchVo; +import com.pikolive.core.room.bean.FindLoveSwitchVo; +import com.pikolive.core.room.bean.RoomInfo; +import com.pikolive.core.room.bean.RoomModeType; +import com.pikolive.core.room.bean.SeizeTreasureSwitchVo; +import com.pikolive.core.room.bean.SimplePartyRoomInfo; +import com.pikolive.core.room.event.RoomClearScreenEvent; +import com.pikolive.core.room.game.GameStatus; +import com.pikolive.core.room.giftvalue.helper.GiftValueMrg; +import com.pikolive.core.R; +import com.pikolive.core2.XChatConstants; +import com.pikolive.core.DemoCache; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.im.custom.bean.RoomPkBean; +import com.pikolive.core.admin.SuperAdminDataMrg; +import com.pikolive.core.admin.util.SuperAdminUtil; +import com.pikolive.core.support.room.RoomContext; +import com.pikolive.core.user.UserModel; +import com.pikolive.core.utils.CurrentTimeUtils; +import com.pikolive.core.utils.LogUtils; +import com.pikolive.core.utils.StringUtils; import com.pikolive.library.utils.ListUtils; import com.pikolive.library.utils.ResUtil; @@ -528,7 +540,7 @@ public final class AvRoomDataManager { return mCurrentRoomInfo != null && mCurrentRoomInfo.getUid() == AuthModel.get().getCurrentUid(); } - void removeManagerMember(String account) { + public void removeManagerMember(String account) { if (ListUtils.isListEmpty(mRoomManagerList) || TextUtils.isEmpty(account)) return; ListIterator iterator = mRoomManagerList.listIterator(); for (; iterator.hasNext(); ) { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/manager/BaseMvpModel.java b/core/src/main/java/com/pikolive/core/manager/BaseMvpModel.java similarity index 96% rename from core/src/main/java/com/yizhuan/xchat_android_core/manager/BaseMvpModel.java rename to core/src/main/java/com/pikolive/core/manager/BaseMvpModel.java index 3589fef5a..969a521ab 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/manager/BaseMvpModel.java +++ b/core/src/main/java/com/pikolive/core/manager/BaseMvpModel.java @@ -1,8 +1,10 @@ -package com.yizhuan.xchat_android_core.manager; +package com.pikolive.core.manager; import com.netease.nimlib.sdk.util.api.RequestResult; -import com.yizhuan.xchat_android_core.R; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.R; +import com.pikolive.core.bean.response.ServiceResult; import com.pikolive.library.net.rxnet.callback.CallBack; import com.pikolive.library.utils.ResUtil; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/manager/IMBroadcastManager.java b/core/src/main/java/com/pikolive/core/manager/IMBroadcastManager.java similarity index 89% rename from core/src/main/java/com/yizhuan/xchat_android_core/manager/IMBroadcastManager.java rename to core/src/main/java/com/pikolive/core/manager/IMBroadcastManager.java index 49c25ff61..2765433dd 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/manager/IMBroadcastManager.java +++ b/core/src/main/java/com/pikolive/core/manager/IMBroadcastManager.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.manager; +package com.pikolive.core.manager; import android.text.TextUtils; @@ -7,10 +7,12 @@ import com.alibaba.fastjson.JSONObject; import com.netease.nimlib.sdk.NIMSDK; import com.netease.nimlib.sdk.Observer; import com.netease.nimlib.sdk.msg.model.BroadcastMessage; -import com.yizhuan.xchat_android_core.bean.BaseProtocol; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.upgrade.bean.NewestVersionInfo; -import com.yizhuan.xchat_android_core.upgrade.event.ImPushUpdateAppEvent; +import com.pikolive.core.bean.BaseProtocol; +import com.pikolive.core.bean.BaseProtocol; +import com.pikolive.core.bean.BaseProtocol; +import com.pikolive.core.im.custom.bean.CustomAttachment; +import com.pikolive.core.upgrade.bean.NewestVersionInfo; +import com.pikolive.core.upgrade.event.ImPushUpdateAppEvent; import org.greenrobot.eventbus.EventBus; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/manager/IMMessageManager.java b/core/src/main/java/com/pikolive/core/manager/IMMessageManager.java similarity index 88% rename from core/src/main/java/com/yizhuan/xchat_android_core/manager/IMMessageManager.java rename to core/src/main/java/com/pikolive/core/manager/IMMessageManager.java index 373fea99d..0322c2c8d 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/manager/IMMessageManager.java +++ b/core/src/main/java/com/pikolive/core/manager/IMMessageManager.java @@ -1,14 +1,14 @@ -package com.yizhuan.xchat_android_core.manager; +package com.pikolive.core.manager; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CP_INVITE_MESSAGE; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_LOTTERY; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_PACKET; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LEVEL_UP; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_MODULE_HALL; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_NEWBIE; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_RECEIV_NEWBIE_HELLO; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_HALL_NOTICE; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_HALL_TO_BE_OWNER; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CP_INVITE_MESSAGE; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_LOTTERY; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_PACKET; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_LEVEL_UP; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_MODULE_HALL; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_NEWBIE; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_RECEIV_NEWBIE_HELLO; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_HALL_NOTICE; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_HALL_TO_BE_OWNER; import android.util.Log; @@ -26,23 +26,37 @@ import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum; import com.netease.nimlib.sdk.msg.model.IMMessage; import com.netease.nimlib.sdk.msg.model.QueryDirectionEnum; import com.netease.nimlib.sdk.msg.model.RecentContact; -import com.yizhuan.xchat_android_core.activity.event.ActivityEvent; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.im.custom.bean.CpInviteAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.LevelUpAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.LotteryAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.LuckyMoneyTipsAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.NewbieHelloAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.RedPacketAttachment; -import com.yizhuan.xchat_android_core.level.event.CharmLevelUpEvent; -import com.yizhuan.xchat_android_core.level.event.LevelUpEvent; -import com.yizhuan.xchat_android_core.luckymoney.LuckyMoneyInfo; -import com.yizhuan.xchat_android_core.manager.event.HallInfoChangeEvent; -import com.yizhuan.xchat_android_core.newbie.NewbieHelloInfo; -import com.yizhuan.xchat_android_core.newbie.event.NewbieHelloDialogEvent; -import com.yizhuan.xchat_android_core.relation.cp.CpInviteInfo; -import com.yizhuan.xchat_android_core.web.event.WebViewRefreshEvent; +import com.pikolive.core.activity.event.ActivityEvent; +import com.pikolive.core.level.event.CharmLevelUpEvent; +import com.pikolive.core.level.event.LevelUpEvent; +import com.pikolive.core.luckymoney.LuckyMoneyInfo; +import com.pikolive.core.manager.event.HallInfoChangeEvent; +import com.pikolive.core.relation.cp.CpInviteInfo; +import com.pikolive.core.web.event.WebViewRefreshEvent; +import com.pikolive.core.activity.event.ActivityEvent; +import com.pikolive.core.level.event.CharmLevelUpEvent; +import com.pikolive.core.level.event.LevelUpEvent; +import com.pikolive.core.luckymoney.LuckyMoneyInfo; +import com.pikolive.core.manager.event.HallInfoChangeEvent; +import com.pikolive.core.relation.cp.CpInviteInfo; +import com.pikolive.core.web.event.WebViewRefreshEvent; +import com.pikolive.core.activity.event.ActivityEvent; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.im.custom.bean.CpInviteAttachment; +import com.pikolive.core.im.custom.bean.CustomAttachment; +import com.pikolive.core.im.custom.bean.LevelUpAttachment; +import com.pikolive.core.im.custom.bean.LotteryAttachment; +import com.pikolive.core.im.custom.bean.LuckyMoneyTipsAttachment; +import com.pikolive.core.im.custom.bean.NewbieHelloAttachment; +import com.pikolive.core.im.custom.bean.RedPacketAttachment; +import com.pikolive.core.level.event.CharmLevelUpEvent; +import com.pikolive.core.level.event.LevelUpEvent; +import com.pikolive.core.luckymoney.LuckyMoneyInfo; +import com.pikolive.core.manager.event.HallInfoChangeEvent; +import com.pikolive.core.newbie.NewbieHelloInfo; +import com.pikolive.core.newbie.event.NewbieHelloDialogEvent; +import com.pikolive.core.relation.cp.CpInviteInfo; +import com.pikolive.core.web.event.WebViewRefreshEvent; import org.greenrobot.eventbus.EventBus; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/manager/IMSystemMsgManager.java b/core/src/main/java/com/pikolive/core/manager/IMSystemMsgManager.java similarity index 79% rename from core/src/main/java/com/yizhuan/xchat_android_core/manager/IMSystemMsgManager.java rename to core/src/main/java/com/pikolive/core/manager/IMSystemMsgManager.java index ff6abeb6a..6f30f06de 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/manager/IMSystemMsgManager.java +++ b/core/src/main/java/com/pikolive/core/manager/IMSystemMsgManager.java @@ -1,19 +1,19 @@ -package com.yizhuan.xchat_android_core.manager; +package com.pikolive.core.manager; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_DYNAMTC_UNREADCOUNT; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_GROUP_CHAT_MEMBER_COUNT; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_GROUP_CHAT_ROOM_NOTIFY; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_GROUP_CHAT_TOPIC; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_ACCOUNT; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_VISITOR; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_WORLD_DYNAMIC; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_MINI_WORLD; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_ROOM_TASK_TIPS; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_ROOM_TASK_TIPS; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_VISITOR_UNREAD; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_VIP; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_VIP_SELF_OPEN; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_VIP_SELF_UPGRADE; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_DYNAMTC_UNREADCOUNT; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_GROUP_CHAT_MEMBER_COUNT; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_GROUP_CHAT_ROOM_NOTIFY; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_GROUP_CHAT_TOPIC; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_ACCOUNT; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_VISITOR; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_WORLD_DYNAMIC; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_MINI_WORLD; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_ROOM_TASK_TIPS; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_ROOM_TASK_TIPS; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_VISITOR_UNREAD; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_VIP; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_VIP_SELF_OPEN; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_VIP_SELF_UPGRADE; import android.text.TextUtils; import android.util.Log; @@ -28,37 +28,49 @@ import com.netease.nimlib.sdk.msg.constant.MsgStatusEnum; import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum; import com.netease.nimlib.sdk.msg.model.CustomNotification; import com.netease.nimlib.sdk.msg.model.IMMessage; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.community.attachment.UnReadCountAttachment; -import com.yizhuan.xchat_android_core.community.event.UnReadCountEvent; -import com.yizhuan.xchat_android_core.home.event.VisitorUnreadCountEvent; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.VoiceBottleSayHiAttachment; -import com.yizhuan.xchat_android_core.mentoring_relationship.attachment.MentoringApprenticeMissionFourAttachment; -import com.yizhuan.xchat_android_core.mentoring_relationship.attachment.MentoringApprenticeMissionOneAttachment; -import com.yizhuan.xchat_android_core.mentoring_relationship.attachment.MentoringApprenticeMissionThreeAttachment; -import com.yizhuan.xchat_android_core.mentoring_relationship.attachment.MentoringApprenticeMissionTwoAttachment; -import com.yizhuan.xchat_android_core.mentoring_relationship.attachment.MentoringGrabApprenticesAttachment; -import com.yizhuan.xchat_android_core.mentoring_relationship.attachment.MentoringMasterMissionFourAttachment; -import com.yizhuan.xchat_android_core.mentoring_relationship.attachment.MentoringMasterMissionOneAttachment; -import com.yizhuan.xchat_android_core.mentoring_relationship.attachment.MentoringMasterMissionThreeAttachment; -import com.yizhuan.xchat_android_core.mentoring_relationship.attachment.MentoringMasterMissionTwoAttachment; -import com.yizhuan.xchat_android_core.mentoring_relationship.attachment.MentoringMissionTipsAttachment; -import com.yizhuan.xchat_android_core.mentoring_relationship.event.MentoringRelationshipMissionEvent; -import com.yizhuan.xchat_android_core.miniworld.event.MWChatTopicEvent; -import com.yizhuan.xchat_android_core.miniworld.event.MWGroupChatMemberEvent; -import com.yizhuan.xchat_android_core.patriarch.bean.LimitNotice; -import com.yizhuan.xchat_android_core.patriarch.event.ImPushMsgPmLimitTimeEvent; -import com.yizhuan.xchat_android_core.pay.bean.FirstChargeGoods; -import com.yizhuan.xchat_android_core.pay.event.ChargeCustomNotificationEvent; -import com.yizhuan.xchat_android_core.pay.event.FirstChargeEvent; -import com.yizhuan.xchat_android_core.pay.event.FirstRechargeEvent; -import com.yizhuan.xchat_android_core.pay.event.NewUserChargeEvent; -import com.yizhuan.xchat_android_core.room.event.RoomTaskTipsEvent; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.vip.VipInfo; -import com.yizhuan.xchat_android_core.vip.VipOpenEvent; -import com.yizhuan.xchat_android_core.vip.VipUpgradeEvent; +import com.pikolive.core.patriarch.bean.LimitNotice; +import com.pikolive.core.patriarch.event.ImPushMsgPmLimitTimeEvent; +import com.pikolive.core.pay.bean.FirstChargeGoods; +import com.pikolive.core.pay.event.ChargeCustomNotificationEvent; +import com.pikolive.core.pay.event.FirstChargeEvent; +import com.pikolive.core.pay.event.FirstRechargeEvent; +import com.pikolive.core.pay.event.NewUserChargeEvent; +import com.pikolive.core.room.event.RoomTaskTipsEvent; +import com.pikolive.core.vip.VipInfo; +import com.pikolive.core.vip.VipOpenEvent; +import com.pikolive.core.vip.VipUpgradeEvent; +import com.pikolive.core2.manager.IMNetEaseManager; +import com.pikolive.core.patriarch.bean.LimitNotice; +import com.pikolive.core.patriarch.event.ImPushMsgPmLimitTimeEvent; +import com.pikolive.core.pay.bean.FirstChargeGoods; +import com.pikolive.core.pay.event.ChargeCustomNotificationEvent; +import com.pikolive.core.pay.event.FirstChargeEvent; +import com.pikolive.core.pay.event.FirstRechargeEvent; +import com.pikolive.core.pay.event.NewUserChargeEvent; +import com.pikolive.core.room.event.RoomTaskTipsEvent; +import com.pikolive.core.vip.VipInfo; +import com.pikolive.core.vip.VipOpenEvent; +import com.pikolive.core.vip.VipUpgradeEvent; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.community.attachment.UnReadCountAttachment; +import com.pikolive.core.community.event.UnReadCountEvent; +import com.pikolive.core2.home.event.VisitorUnreadCountEvent; +import com.pikolive.core.im.custom.bean.CustomAttachment; +import com.pikolive.core.im.custom.bean.VoiceBottleSayHiAttachment; +import com.pikolive.core.mentoring_relationship.attachment.MentoringApprenticeMissionFourAttachment; +import com.pikolive.core.mentoring_relationship.attachment.MentoringApprenticeMissionOneAttachment; +import com.pikolive.core.mentoring_relationship.attachment.MentoringApprenticeMissionThreeAttachment; +import com.pikolive.core.mentoring_relationship.attachment.MentoringApprenticeMissionTwoAttachment; +import com.pikolive.core.mentoring_relationship.attachment.MentoringGrabApprenticesAttachment; +import com.pikolive.core.mentoring_relationship.attachment.MentoringMasterMissionFourAttachment; +import com.pikolive.core.mentoring_relationship.attachment.MentoringMasterMissionOneAttachment; +import com.pikolive.core.mentoring_relationship.attachment.MentoringMasterMissionThreeAttachment; +import com.pikolive.core.mentoring_relationship.attachment.MentoringMasterMissionTwoAttachment; +import com.pikolive.core.mentoring_relationship.attachment.MentoringMissionTipsAttachment; +import com.pikolive.core.mentoring_relationship.event.MentoringRelationshipMissionEvent; +import com.pikolive.core.miniworld.event.MWChatTopicEvent; +import com.pikolive.core.miniworld.event.MWGroupChatMemberEvent; +import com.pikolive.core.user.UserModel; import org.greenrobot.eventbus.EventBus; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/manager/RelationShipEvent.java b/core/src/main/java/com/pikolive/core/manager/RelationShipEvent.java similarity index 93% rename from core/src/main/java/com/yizhuan/xchat_android_core/manager/RelationShipEvent.java rename to core/src/main/java/com/pikolive/core/manager/RelationShipEvent.java index 42559d2b8..561e84394 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/manager/RelationShipEvent.java +++ b/core/src/main/java/com/pikolive/core/manager/RelationShipEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.manager; +package com.pikolive.core.manager; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/manager/RoomEvent.java b/core/src/main/java/com/pikolive/core/manager/RoomEvent.java similarity index 86% rename from core/src/main/java/com/yizhuan/xchat_android_core/manager/RoomEvent.java rename to core/src/main/java/com/pikolive/core/manager/RoomEvent.java index 7aefa207a..e3b9859d0 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/manager/RoomEvent.java +++ b/core/src/main/java/com/pikolive/core/manager/RoomEvent.java @@ -1,25 +1,49 @@ -package com.yizhuan.xchat_android_core.manager; +package com.pikolive.core.manager; import com.netease.nimlib.sdk.chatroom.model.ChatRoomKickOutEvent; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; -import com.yizhuan.xchat_android_core.bean.RoomQueueInfo; -import com.yizhuan.xchat_android_core.bean.attachmsg.RoomQueueMsgAttachment; -import com.yizhuan.xchat_android_core.gift.bean.GiftMultiReceiverInfo; -import com.yizhuan.xchat_android_core.gift.bean.GiftReceiveInfo; -import com.yizhuan.xchat_android_core.gift.bean.LuckyBagGifts; -import com.yizhuan.xchat_android_core.gift.bean.MultiGiftReceiveInfo; -import com.yizhuan.xchat_android_core.im.custom.bean.AssistantAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.CarAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.MonsterHuntingResultAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.MonsterStatusAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.NobleAttachment; -import com.yizhuan.xchat_android_core.magic.bean.MagicReceivedInfo; -import com.yizhuan.xchat_android_core.magic.bean.MultiMagicReceivedInfo; -import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterAttackInfo; -import com.yizhuan.xchat_android_core.pay.bean.WalletInfo; -import com.yizhuan.xchat_android_core.room.auction.bean.AuctionInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; +import com.pikolive.core.bean.RoomQueueInfo; +import com.pikolive.core.bean.attachmsg.RoomQueueMsgAttachment; +import com.pikolive.core.gift.bean.GiftMultiReceiverInfo; +import com.pikolive.core.gift.bean.GiftReceiveInfo; +import com.pikolive.core.gift.bean.LuckyBagGifts; +import com.pikolive.core.gift.bean.MultiGiftReceiveInfo; +import com.pikolive.core.magic.bean.MagicReceivedInfo; +import com.pikolive.core.magic.bean.MultiMagicReceivedInfo; +import com.pikolive.core.monsterhunting.bean.MonsterAttackInfo; +import com.pikolive.core.pay.bean.WalletInfo; +import com.pikolive.core.room.auction.bean.AuctionInfo; +import com.pikolive.core.room.bean.RoomInfo; +import com.pikolive.core.bean.RoomQueueInfo; +import com.pikolive.core.bean.attachmsg.RoomQueueMsgAttachment; +import com.pikolive.core.gift.bean.GiftMultiReceiverInfo; +import com.pikolive.core.gift.bean.GiftReceiveInfo; +import com.pikolive.core.gift.bean.LuckyBagGifts; +import com.pikolive.core.gift.bean.MultiGiftReceiveInfo; +import com.pikolive.core.magic.bean.MagicReceivedInfo; +import com.pikolive.core.magic.bean.MultiMagicReceivedInfo; +import com.pikolive.core.monsterhunting.bean.MonsterAttackInfo; +import com.pikolive.core.pay.bean.WalletInfo; +import com.pikolive.core.room.auction.bean.AuctionInfo; +import com.pikolive.core.room.bean.RoomInfo; +import com.pikolive.core.bean.RoomQueueInfo; +import com.pikolive.core.bean.attachmsg.RoomQueueMsgAttachment; +import com.pikolive.core.gift.bean.GiftMultiReceiverInfo; +import com.pikolive.core.gift.bean.GiftReceiveInfo; +import com.pikolive.core.gift.bean.LuckyBagGifts; +import com.pikolive.core.gift.bean.MultiGiftReceiveInfo; +import com.pikolive.core.im.custom.bean.AssistantAttachment; +import com.pikolive.core.im.custom.bean.CarAttachment; +import com.pikolive.core.im.custom.bean.CustomAttachment; +import com.pikolive.core.im.custom.bean.MonsterHuntingResultAttachment; +import com.pikolive.core.im.custom.bean.MonsterStatusAttachment; +import com.pikolive.core.im.custom.bean.NobleAttachment; +import com.pikolive.core.magic.bean.MagicReceivedInfo; +import com.pikolive.core.magic.bean.MultiMagicReceivedInfo; +import com.pikolive.core.monsterhunting.bean.MonsterAttackInfo; +import com.pikolive.core.pay.bean.WalletInfo; +import com.pikolive.core.room.auction.bean.AuctionInfo; +import com.pikolive.core.room.bean.RoomInfo; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/manager/event/HallInfoChangeEvent.java b/core/src/main/java/com/pikolive/core/manager/event/HallInfoChangeEvent.java similarity index 67% rename from core/src/main/java/com/yizhuan/xchat_android_core/manager/event/HallInfoChangeEvent.java rename to core/src/main/java/com/pikolive/core/manager/event/HallInfoChangeEvent.java index 33c50e309..04fc4f25e 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/manager/event/HallInfoChangeEvent.java +++ b/core/src/main/java/com/pikolive/core/manager/event/HallInfoChangeEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.manager.event; +package com.pikolive.core.manager.event; /** * 模厅信息变更事件 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/manager/event/HistoryMessageEvent.java b/core/src/main/java/com/pikolive/core/manager/event/HistoryMessageEvent.java similarity index 89% rename from core/src/main/java/com/yizhuan/xchat_android_core/manager/event/HistoryMessageEvent.java rename to core/src/main/java/com/pikolive/core/manager/event/HistoryMessageEvent.java index dd9c22f44..f8a8514a1 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/manager/event/HistoryMessageEvent.java +++ b/core/src/main/java/com/pikolive/core/manager/event/HistoryMessageEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.manager.event; +package com.pikolive.core.manager.event; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/SimpleAnimationListener.java b/core/src/main/java/com/pikolive/core/monsterhunting/SimpleAnimationListener.java similarity index 88% rename from core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/SimpleAnimationListener.java rename to core/src/main/java/com/pikolive/core/monsterhunting/SimpleAnimationListener.java index 82cb438c6..d15bdaff0 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/SimpleAnimationListener.java +++ b/core/src/main/java/com/pikolive/core/monsterhunting/SimpleAnimationListener.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.monsterhunting; +package com.pikolive.core.monsterhunting; import android.view.animation.Animation; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/bean/MonsterAttackInfo.java b/core/src/main/java/com/pikolive/core/monsterhunting/bean/MonsterAttackInfo.java similarity index 99% rename from core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/bean/MonsterAttackInfo.java rename to core/src/main/java/com/pikolive/core/monsterhunting/bean/MonsterAttackInfo.java index a1ecbf427..321cc92bd 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/bean/MonsterAttackInfo.java +++ b/core/src/main/java/com/pikolive/core/monsterhunting/bean/MonsterAttackInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.monsterhunting.bean; +package com.pikolive.core.monsterhunting.bean; /** * Created by MadisonRong on 31/03/2018. diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/bean/MonsterAttackReceiveInfo.java b/core/src/main/java/com/pikolive/core/monsterhunting/bean/MonsterAttackReceiveInfo.java similarity index 96% rename from core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/bean/MonsterAttackReceiveInfo.java rename to core/src/main/java/com/pikolive/core/monsterhunting/bean/MonsterAttackReceiveInfo.java index e06be7e69..80581fb0e 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/bean/MonsterAttackReceiveInfo.java +++ b/core/src/main/java/com/pikolive/core/monsterhunting/bean/MonsterAttackReceiveInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.monsterhunting.bean; +package com.pikolive.core.monsterhunting.bean; /** * Created by MadisonRong on 01/04/2018. diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/bean/MonsterEvent.java b/core/src/main/java/com/pikolive/core/monsterhunting/bean/MonsterEvent.java similarity index 98% rename from core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/bean/MonsterEvent.java rename to core/src/main/java/com/pikolive/core/monsterhunting/bean/MonsterEvent.java index ae4184eeb..edcae4e93 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/bean/MonsterEvent.java +++ b/core/src/main/java/com/pikolive/core/monsterhunting/bean/MonsterEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.monsterhunting.bean; +package com.pikolive.core.monsterhunting.bean; /** * Created by MadisonRong on 03/04/2018. diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/bean/MonsterHunter.java b/core/src/main/java/com/pikolive/core/monsterhunting/bean/MonsterHunter.java similarity index 97% rename from core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/bean/MonsterHunter.java rename to core/src/main/java/com/pikolive/core/monsterhunting/bean/MonsterHunter.java index 6f3c3dadb..0d78df58a 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/bean/MonsterHunter.java +++ b/core/src/main/java/com/pikolive/core/monsterhunting/bean/MonsterHunter.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.monsterhunting.bean; +package com.pikolive.core.monsterhunting.bean; /** * Created by MadisonRong on 02/04/2018. diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/bean/MonsterHuntingResult.java b/core/src/main/java/com/pikolive/core/monsterhunting/bean/MonsterHuntingResult.java similarity index 97% rename from core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/bean/MonsterHuntingResult.java rename to core/src/main/java/com/pikolive/core/monsterhunting/bean/MonsterHuntingResult.java index c9532b2c5..8958f71ad 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/bean/MonsterHuntingResult.java +++ b/core/src/main/java/com/pikolive/core/monsterhunting/bean/MonsterHuntingResult.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.monsterhunting.bean; +package com.pikolive.core.monsterhunting.bean; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/bean/MonsterHuntingReward.java b/core/src/main/java/com/pikolive/core/monsterhunting/bean/MonsterHuntingReward.java similarity index 98% rename from core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/bean/MonsterHuntingReward.java rename to core/src/main/java/com/pikolive/core/monsterhunting/bean/MonsterHuntingReward.java index f38bb3262..5057cf9be 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/bean/MonsterHuntingReward.java +++ b/core/src/main/java/com/pikolive/core/monsterhunting/bean/MonsterHuntingReward.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.monsterhunting.bean; +package com.pikolive.core.monsterhunting.bean; /** * Created by MadisonRong on 02/04/2018. diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/bean/MonsterInfo.java b/core/src/main/java/com/pikolive/core/monsterhunting/bean/MonsterInfo.java similarity index 92% rename from core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/bean/MonsterInfo.java rename to core/src/main/java/com/pikolive/core/monsterhunting/bean/MonsterInfo.java index ecad75be7..5b7186767 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/bean/MonsterInfo.java +++ b/core/src/main/java/com/pikolive/core/monsterhunting/bean/MonsterInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.monsterhunting.bean; +package com.pikolive.core.monsterhunting.bean; import android.os.Parcel; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/bean/MonsterInitInfo.java b/core/src/main/java/com/pikolive/core/monsterhunting/bean/MonsterInitInfo.java similarity index 95% rename from core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/bean/MonsterInitInfo.java rename to core/src/main/java/com/pikolive/core/monsterhunting/bean/MonsterInitInfo.java index 80d86b97e..5db562d97 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/bean/MonsterInitInfo.java +++ b/core/src/main/java/com/pikolive/core/monsterhunting/bean/MonsterInitInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.monsterhunting.bean; +package com.pikolive.core.monsterhunting.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/bean/MonsterListInfo.java b/core/src/main/java/com/pikolive/core/monsterhunting/bean/MonsterListInfo.java similarity index 98% rename from core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/bean/MonsterListInfo.java rename to core/src/main/java/com/pikolive/core/monsterhunting/bean/MonsterListInfo.java index b5b56e44d..13c859d1f 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/bean/MonsterListInfo.java +++ b/core/src/main/java/com/pikolive/core/monsterhunting/bean/MonsterListInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.monsterhunting.bean; +package com.pikolive.core.monsterhunting.bean; /** * Created by huangmeng1 on 2018/4/2. diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/bean/MonsterProtocol.java b/core/src/main/java/com/pikolive/core/monsterhunting/bean/MonsterProtocol.java similarity index 98% rename from core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/bean/MonsterProtocol.java rename to core/src/main/java/com/pikolive/core/monsterhunting/bean/MonsterProtocol.java index fa2ae908f..1a3bf9315 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/bean/MonsterProtocol.java +++ b/core/src/main/java/com/pikolive/core/monsterhunting/bean/MonsterProtocol.java @@ -1,9 +1,11 @@ -package com.yizhuan.xchat_android_core.monsterhunting.bean; +package com.pikolive.core.monsterhunting.bean; import android.os.Parcel; import android.os.Parcelable; -import com.yizhuan.xchat_android_core.bean.BaseProtocol; +import com.pikolive.core.bean.BaseProtocol; +import com.pikolive.core.bean.BaseProtocol; +import com.pikolive.core.bean.BaseProtocol; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/manager/MonsterDataManager.java b/core/src/main/java/com/pikolive/core/monsterhunting/manager/MonsterDataManager.java similarity index 82% rename from core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/manager/MonsterDataManager.java rename to core/src/main/java/com/pikolive/core/monsterhunting/manager/MonsterDataManager.java index 571087123..027b6766d 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/manager/MonsterDataManager.java +++ b/core/src/main/java/com/pikolive/core/monsterhunting/manager/MonsterDataManager.java @@ -1,8 +1,8 @@ -package com.yizhuan.xchat_android_core.monsterhunting.manager; +package com.pikolive.core.monsterhunting.manager; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterInfo; -import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterInitInfo; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core.monsterhunting.bean.MonsterInfo; +import com.pikolive.core.monsterhunting.bean.MonsterInitInfo; import java.util.Hashtable; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/model/IMonsterHuntingModel.java b/core/src/main/java/com/pikolive/core/monsterhunting/model/IMonsterHuntingModel.java similarity index 63% rename from core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/model/IMonsterHuntingModel.java rename to core/src/main/java/com/pikolive/core/monsterhunting/model/IMonsterHuntingModel.java index 85d209c48..c499949eb 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/model/IMonsterHuntingModel.java +++ b/core/src/main/java/com/pikolive/core/monsterhunting/model/IMonsterHuntingModel.java @@ -1,17 +1,19 @@ -package com.yizhuan.xchat_android_core.monsterhunting.model; +package com.pikolive.core.monsterhunting.model; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterAttackInfo; -import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterHuntingResult; -import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterInfo; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.base.IModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.monsterhunting.bean.MonsterAttackInfo; +import com.pikolive.core.monsterhunting.bean.MonsterHuntingResult; +import com.pikolive.core.monsterhunting.bean.MonsterInfo; import io.reactivex.Single; public interface IMonsterHuntingModel extends IModel { - Single> attackMonster(String monsterId,String roomUid,String magicId); + Single> attackMonster(String monsterId, String roomUid, String magicId); Single> getRoomMonsterList(); diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/model/MonsterHuntingModel.java b/core/src/main/java/com/pikolive/core/monsterhunting/model/MonsterHuntingModel.java similarity index 92% rename from core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/model/MonsterHuntingModel.java rename to core/src/main/java/com/pikolive/core/monsterhunting/model/MonsterHuntingModel.java index 1c683ac65..ff9c19a35 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/model/MonsterHuntingModel.java +++ b/core/src/main/java/com/pikolive/core/monsterhunting/model/MonsterHuntingModel.java @@ -1,9 +1,9 @@ -package com.yizhuan.xchat_android_core.monsterhunting.model; +package com.pikolive.core.monsterhunting.model; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_MONSTER_HUNTING; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_MONSTER_HUNTING; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_NOTI_SUB_GAME_END; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_NOTI_SUB_GAME_RESULT; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_MONSTER_HUNTING; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_MONSTER_HUNTING; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_NOTI_SUB_GAME_END; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_NOTI_SUB_GAME_RESULT; import android.os.CountDownTimer; import android.os.Handler; @@ -21,22 +21,26 @@ import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; import com.netease.nimlib.sdk.msg.constant.MsgTypeEnum; import com.netease.nimlib.sdk.msg.model.BroadcastMessage; import com.orhanobut.logger.Logger; -import com.yizhuan.xchat_android_core.R; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.BaseProtocol; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.MonsterAttackAttachment; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.manager.RoomEvent; -import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterAttackInfo; -import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterHuntingResult; -import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterInfo; -import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterProtocol; -import com.yizhuan.xchat_android_core.monsterhunting.rxevent.MonsterUpdateEvent; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; +import com.pikolive.core.bean.BaseProtocol; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.monsterhunting.rxevent.MonsterUpdateEvent; +import com.pikolive.core.room.bean.RoomInfo; +import com.pikolive.core.bean.BaseProtocol; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.monsterhunting.rxevent.MonsterUpdateEvent; +import com.pikolive.core.room.bean.RoomInfo; +import com.pikolive.core.R; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.im.custom.bean.CustomAttachment; +import com.pikolive.core.im.custom.bean.MonsterAttackAttachment; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core2.manager.IMNetEaseManager; +import com.pikolive.core.manager.RoomEvent; +import com.pikolive.core.monsterhunting.bean.MonsterAttackInfo; +import com.pikolive.core.monsterhunting.bean.MonsterHuntingResult; +import com.pikolive.core.monsterhunting.bean.MonsterInfo; +import com.pikolive.core.monsterhunting.bean.MonsterProtocol; import com.pikolive.library.net.rxnet.RxNet; import com.pikolive.library.rxbus.RxBusHelper; import com.pikolive.library.utils.ListUtils; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/rxevent/MonsterUpdateEvent.java b/core/src/main/java/com/pikolive/core/monsterhunting/rxevent/MonsterUpdateEvent.java similarity index 73% rename from core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/rxevent/MonsterUpdateEvent.java rename to core/src/main/java/com/pikolive/core/monsterhunting/rxevent/MonsterUpdateEvent.java index a1f51faf6..84fef89ee 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/monsterhunting/rxevent/MonsterUpdateEvent.java +++ b/core/src/main/java/com/pikolive/core/monsterhunting/rxevent/MonsterUpdateEvent.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.monsterhunting.rxevent; +package com.pikolive.core.monsterhunting.rxevent; -import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterProtocol; +import com.pikolive.core.monsterhunting.bean.MonsterProtocol; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/msg/ImsgClient.java b/core/src/main/java/com/pikolive/core/msg/ImsgClient.java similarity index 84% rename from core/src/main/java/com/yizhuan/xchat_android_core/msg/ImsgClient.java rename to core/src/main/java/com/pikolive/core/msg/ImsgClient.java index ee2f5748b..16fc484c6 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/msg/ImsgClient.java +++ b/core/src/main/java/com/pikolive/core/msg/ImsgClient.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.msg; +package com.pikolive.core.msg; import com.pikolive.library.coremanager.ICoreClient; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/msg/sys/ApproveMsgInfo.java b/core/src/main/java/com/pikolive/core/msg/sys/ApproveMsgInfo.java similarity index 85% rename from core/src/main/java/com/yizhuan/xchat_android_core/msg/sys/ApproveMsgInfo.java rename to core/src/main/java/com/pikolive/core/msg/sys/ApproveMsgInfo.java index f24d1a817..00df78561 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/msg/sys/ApproveMsgInfo.java +++ b/core/src/main/java/com/pikolive/core/msg/sys/ApproveMsgInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.msg.sys; +package com.pikolive.core.msg.sys; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/msg/sys/ErbanSysMsgComponent.java b/core/src/main/java/com/pikolive/core/msg/sys/ErbanSysMsgComponent.java similarity index 85% rename from core/src/main/java/com/yizhuan/xchat_android_core/msg/sys/ErbanSysMsgComponent.java rename to core/src/main/java/com/pikolive/core/msg/sys/ErbanSysMsgComponent.java index 377bbfd58..40ff2c910 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/msg/sys/ErbanSysMsgComponent.java +++ b/core/src/main/java/com/pikolive/core/msg/sys/ErbanSysMsgComponent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.msg.sys; +package com.pikolive.core.msg.sys; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/msg/sys/ErbanSysMsgInfo.java b/core/src/main/java/com/pikolive/core/msg/sys/ErbanSysMsgInfo.java similarity index 98% rename from core/src/main/java/com/yizhuan/xchat_android_core/msg/sys/ErbanSysMsgInfo.java rename to core/src/main/java/com/pikolive/core/msg/sys/ErbanSysMsgInfo.java index 61ce9d777..0fe7aa1ec 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/msg/sys/ErbanSysMsgInfo.java +++ b/core/src/main/java/com/pikolive/core/msg/sys/ErbanSysMsgInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.msg.sys; +package com.pikolive.core.msg.sys; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/msg/sys/ErbanSysMsgLayout.java b/core/src/main/java/com/pikolive/core/msg/sys/ErbanSysMsgLayout.java similarity index 84% rename from core/src/main/java/com/yizhuan/xchat_android_core/msg/sys/ErbanSysMsgLayout.java rename to core/src/main/java/com/pikolive/core/msg/sys/ErbanSysMsgLayout.java index 17f305281..7de4b80e3 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/msg/sys/ErbanSysMsgLayout.java +++ b/core/src/main/java/com/pikolive/core/msg/sys/ErbanSysMsgLayout.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.msg.sys; +package com.pikolive.core.msg.sys; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/msg/sys/ErbanSysMsgModel.java b/core/src/main/java/com/pikolive/core/msg/sys/ErbanSysMsgModel.java similarity index 83% rename from core/src/main/java/com/yizhuan/xchat_android_core/msg/sys/ErbanSysMsgModel.java rename to core/src/main/java/com/pikolive/core/msg/sys/ErbanSysMsgModel.java index 76235dbd9..7507e8933 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/msg/sys/ErbanSysMsgModel.java +++ b/core/src/main/java/com/pikolive/core/msg/sys/ErbanSysMsgModel.java @@ -1,6 +1,8 @@ -package com.yizhuan.xchat_android_core.msg.sys; +package com.pikolive.core.msg.sys; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.bean.response.ServiceResult; import java.util.Map; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/msg/sys/ErbanSysMsgParamKey.java b/core/src/main/java/com/pikolive/core/msg/sys/ErbanSysMsgParamKey.java similarity index 86% rename from core/src/main/java/com/yizhuan/xchat_android_core/msg/sys/ErbanSysMsgParamKey.java rename to core/src/main/java/com/pikolive/core/msg/sys/ErbanSysMsgParamKey.java index c8e6071d1..39588995e 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/msg/sys/ErbanSysMsgParamKey.java +++ b/core/src/main/java/com/pikolive/core/msg/sys/ErbanSysMsgParamKey.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.msg.sys; +package com.pikolive.core.msg.sys; /** * Created by MadisonRong on 05/07/2018. diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/msg/sysv2/ErbanSysMsgV2Component.java b/core/src/main/java/com/pikolive/core/msg/sysv2/ErbanSysMsgV2Component.java similarity index 85% rename from core/src/main/java/com/yizhuan/xchat_android_core/msg/sysv2/ErbanSysMsgV2Component.java rename to core/src/main/java/com/pikolive/core/msg/sysv2/ErbanSysMsgV2Component.java index dd33f3a39..3947834cb 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/msg/sysv2/ErbanSysMsgV2Component.java +++ b/core/src/main/java/com/pikolive/core/msg/sysv2/ErbanSysMsgV2Component.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.msg.sysv2; +package com.pikolive.core.msg.sysv2; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/msg/sysv2/ErbanSysMsgV2Info.java b/core/src/main/java/com/pikolive/core/msg/sysv2/ErbanSysMsgV2Info.java similarity index 98% rename from core/src/main/java/com/yizhuan/xchat_android_core/msg/sysv2/ErbanSysMsgV2Info.java rename to core/src/main/java/com/pikolive/core/msg/sysv2/ErbanSysMsgV2Info.java index 4b8fbc5cb..1fe5eac3f 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/msg/sysv2/ErbanSysMsgV2Info.java +++ b/core/src/main/java/com/pikolive/core/msg/sysv2/ErbanSysMsgV2Info.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.msg.sysv2; +package com.pikolive.core.msg.sysv2; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/msg/sysv2/ErbanSysMsgV2Layout.java b/core/src/main/java/com/pikolive/core/msg/sysv2/ErbanSysMsgV2Layout.java similarity index 84% rename from core/src/main/java/com/yizhuan/xchat_android_core/msg/sysv2/ErbanSysMsgV2Layout.java rename to core/src/main/java/com/pikolive/core/msg/sysv2/ErbanSysMsgV2Layout.java index 20a140fd2..9517fb28e 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/msg/sysv2/ErbanSysMsgV2Layout.java +++ b/core/src/main/java/com/pikolive/core/msg/sysv2/ErbanSysMsgV2Layout.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.msg.sysv2; +package com.pikolive.core.msg.sysv2; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/newbie/NewbieHelloInfo.java b/core/src/main/java/com/pikolive/core/newbie/NewbieHelloInfo.java similarity index 84% rename from core/src/main/java/com/yizhuan/xchat_android_core/newbie/NewbieHelloInfo.java rename to core/src/main/java/com/pikolive/core/newbie/NewbieHelloInfo.java index a04b866e6..ffb9669b0 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/newbie/NewbieHelloInfo.java +++ b/core/src/main/java/com/pikolive/core/newbie/NewbieHelloInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.newbie; +package com.pikolive.core.newbie; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/newbie/event/NewbieHelloDialogEvent.java b/core/src/main/java/com/pikolive/core/newbie/event/NewbieHelloDialogEvent.java similarity index 64% rename from core/src/main/java/com/yizhuan/xchat_android_core/newbie/event/NewbieHelloDialogEvent.java rename to core/src/main/java/com/pikolive/core/newbie/event/NewbieHelloDialogEvent.java index cc9bdae5c..0365ed2ea 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/newbie/event/NewbieHelloDialogEvent.java +++ b/core/src/main/java/com/pikolive/core/newbie/event/NewbieHelloDialogEvent.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.newbie.event; +package com.pikolive.core.newbie.event; -import com.yizhuan.xchat_android_core.newbie.NewbieHelloInfo; +import com.pikolive.core.newbie.NewbieHelloInfo; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/noble/AllServiceGiftProtocol.java b/core/src/main/java/com/pikolive/core/noble/AllServiceGiftProtocol.java similarity index 97% rename from core/src/main/java/com/yizhuan/xchat_android_core/noble/AllServiceGiftProtocol.java rename to core/src/main/java/com/pikolive/core/noble/AllServiceGiftProtocol.java index fa83228f1..96a2cd048 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/noble/AllServiceGiftProtocol.java +++ b/core/src/main/java/com/pikolive/core/noble/AllServiceGiftProtocol.java @@ -1,6 +1,8 @@ -package com.yizhuan.xchat_android_core.noble; +package com.pikolive.core.noble; -import com.yizhuan.xchat_android_core.bean.BaseProtocol; +import com.pikolive.core.bean.BaseProtocol; +import com.pikolive.core.bean.BaseProtocol; +import com.pikolive.core.bean.BaseProtocol; /** * Created by MadisonRong on 09/04/2018. diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleConfig.java b/core/src/main/java/com/pikolive/core/noble/NobleConfig.java similarity index 98% rename from core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleConfig.java rename to core/src/main/java/com/pikolive/core/noble/NobleConfig.java index 57458b39e..a73326de3 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleConfig.java +++ b/core/src/main/java/com/pikolive/core/noble/NobleConfig.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.noble; +package com.pikolive.core.noble; import com.google.gson.annotations.SerializedName; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleConfig.txt b/core/src/main/java/com/pikolive/core/noble/NobleConfig.txt similarity index 100% rename from core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleConfig.txt rename to core/src/main/java/com/pikolive/core/noble/NobleConfig.txt diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleDataManager.java b/core/src/main/java/com/pikolive/core/noble/NobleDataManager.java similarity index 96% rename from core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleDataManager.java rename to core/src/main/java/com/pikolive/core/noble/NobleDataManager.java index 8581a5067..0c1460d42 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleDataManager.java +++ b/core/src/main/java/com/pikolive/core/noble/NobleDataManager.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.noble; +package com.pikolive.core.noble; import android.text.TextUtils; import android.util.Log; @@ -7,13 +7,18 @@ import androidx.collection.LongSparseArray; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -import com.yizhuan.xchat_android_core.DemoCache; -import com.yizhuan.xchat_android_core.R; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.initial.InitialModel; -import com.yizhuan.xchat_android_core.initial.NobleResourceComponent; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.manager.RoomEvent; +import com.pikolive.core.DemoCache; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.initial.InitialModel; +import com.pikolive.core.initial.NobleResourceComponent; +import com.pikolive.core.manager.RoomEvent; +import com.pikolive.core.DemoCache; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.initial.InitialModel; +import com.pikolive.core.initial.NobleResourceComponent; +import com.pikolive.core.manager.RoomEvent; +import com.pikolive.core.R; +import com.pikolive.core2.manager.IMNetEaseManager; import com.pikolive.library.net.rxnet.RxNet; import com.pikolive.library.utils.ListUtils; import com.pikolive.library.utils.ResUtil; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleInfo.java b/core/src/main/java/com/pikolive/core/noble/NobleInfo.java similarity index 99% rename from core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleInfo.java rename to core/src/main/java/com/pikolive/core/noble/NobleInfo.java index 8e892b4ff..df7420521 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleInfo.java +++ b/core/src/main/java/com/pikolive/core/noble/NobleInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.noble; +package com.pikolive.core.noble; import android.text.TextUtils; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleProtocol.java b/core/src/main/java/com/pikolive/core/noble/NobleProtocol.java similarity index 94% rename from core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleProtocol.java rename to core/src/main/java/com/pikolive/core/noble/NobleProtocol.java index 38f8014b0..4c91ca192 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleProtocol.java +++ b/core/src/main/java/com/pikolive/core/noble/NobleProtocol.java @@ -1,6 +1,8 @@ -package com.yizhuan.xchat_android_core.noble; +package com.pikolive.core.noble; -import com.yizhuan.xchat_android_core.bean.BaseProtocol; +import com.pikolive.core.bean.BaseProtocol; +import com.pikolive.core.bean.BaseProtocol; +import com.pikolive.core.bean.BaseProtocol; /** *

贵族协议

diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleResourceType.java b/core/src/main/java/com/pikolive/core/noble/NobleResourceType.java similarity index 94% rename from core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleResourceType.java rename to core/src/main/java/com/pikolive/core/noble/NobleResourceType.java index 56f1a3e42..67f24075c 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleResourceType.java +++ b/core/src/main/java/com/pikolive/core/noble/NobleResourceType.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.noble; +package com.pikolive.core.noble; /** * 所有资源的类型 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleRight.java b/core/src/main/java/com/pikolive/core/noble/NobleRight.java similarity index 99% rename from core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleRight.java rename to core/src/main/java/com/pikolive/core/noble/NobleRight.java index 91e1ca8a0..eb306660d 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleRight.java +++ b/core/src/main/java/com/pikolive/core/noble/NobleRight.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.noble; +package com.pikolive.core.noble; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleUtil.java b/core/src/main/java/com/pikolive/core/noble/NobleUtil.java similarity index 99% rename from core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleUtil.java rename to core/src/main/java/com/pikolive/core/noble/NobleUtil.java index 1fad9b3b4..3bae74940 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/noble/NobleUtil.java +++ b/core/src/main/java/com/pikolive/core/noble/NobleUtil.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.noble; +package com.pikolive.core.noble; import android.app.Activity; import android.content.Context; @@ -28,10 +28,10 @@ import com.bumptech.glide.request.transition.Transition; import com.netease.nim.uikit.support.glide.GlideApp; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; -import com.yizhuan.xchat_android_core.room.queue.bean.MicMemberInfo; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.utils.ExtensionUtil; -import com.yizhuan.xchat_android_core.utils.ImageSplitter; +import com.pikolive.core.room.queue.bean.MicMemberInfo; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.utils.ExtensionUtil; +import com.pikolive.core.utils.ImageSplitter; import com.pikolive.library.utils.ListUtils; import com.pikolive.library.utils.config.BasicConfig; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/patriarch/bean/LimitNotice.java b/core/src/main/java/com/pikolive/core/patriarch/bean/LimitNotice.java similarity index 79% rename from core/src/main/java/com/yizhuan/xchat_android_core/patriarch/bean/LimitNotice.java rename to core/src/main/java/com/pikolive/core/patriarch/bean/LimitNotice.java index 92432d62e..0b9a0eb67 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/patriarch/bean/LimitNotice.java +++ b/core/src/main/java/com/pikolive/core/patriarch/bean/LimitNotice.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.patriarch.bean; +package com.pikolive.core.patriarch.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/patriarch/event/CloseMinRoomEvent.java b/core/src/main/java/com/pikolive/core/patriarch/event/CloseMinRoomEvent.java similarity index 70% rename from core/src/main/java/com/yizhuan/xchat_android_core/patriarch/event/CloseMinRoomEvent.java rename to core/src/main/java/com/pikolive/core/patriarch/event/CloseMinRoomEvent.java index 60be427cc..2cf14c47d 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/patriarch/event/CloseMinRoomEvent.java +++ b/core/src/main/java/com/pikolive/core/patriarch/event/CloseMinRoomEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.patriarch.event; +package com.pikolive.core.patriarch.event; /** * 关闭最小化房间（如果房间存在的话） diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/patriarch/event/ImPushMsgPmLimitTimeEvent.java b/core/src/main/java/com/pikolive/core/patriarch/event/ImPushMsgPmLimitTimeEvent.java similarity index 59% rename from core/src/main/java/com/yizhuan/xchat_android_core/patriarch/event/ImPushMsgPmLimitTimeEvent.java rename to core/src/main/java/com/pikolive/core/patriarch/event/ImPushMsgPmLimitTimeEvent.java index fdfc8c811..bbc640c63 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/patriarch/event/ImPushMsgPmLimitTimeEvent.java +++ b/core/src/main/java/com/pikolive/core/patriarch/event/ImPushMsgPmLimitTimeEvent.java @@ -1,6 +1,8 @@ -package com.yizhuan.xchat_android_core.patriarch.event; +package com.pikolive.core.patriarch.event; -import com.yizhuan.xchat_android_core.base.BaseBusEvent; +import com.pikolive.core.base.BaseBusEvent; +import com.pikolive.core.base.BaseBusEvent; +import com.pikolive.core.base.BaseBusEvent; /** * im推送消息 青少年模式禁止进房事件通知 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/patriarch/event/PmDismissAllLimitDialogEvent.java b/core/src/main/java/com/pikolive/core/patriarch/event/PmDismissAllLimitDialogEvent.java similarity index 78% rename from core/src/main/java/com/yizhuan/xchat_android_core/patriarch/event/PmDismissAllLimitDialogEvent.java rename to core/src/main/java/com/pikolive/core/patriarch/event/PmDismissAllLimitDialogEvent.java index 69be68ad7..2fd48e8c9 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/patriarch/event/PmDismissAllLimitDialogEvent.java +++ b/core/src/main/java/com/pikolive/core/patriarch/event/PmDismissAllLimitDialogEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.patriarch.event; +package com.pikolive.core.patriarch.event; /** * 因为有可能存在，多个限制时长弹窗的存在， diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/patriarch/exception/PmRoomLimitException.java b/core/src/main/java/com/pikolive/core/patriarch/exception/PmRoomLimitException.java similarity index 57% rename from core/src/main/java/com/yizhuan/xchat_android_core/patriarch/exception/PmRoomLimitException.java rename to core/src/main/java/com/pikolive/core/patriarch/exception/PmRoomLimitException.java index cc25c45e1..cb9b7b9c9 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/patriarch/exception/PmRoomLimitException.java +++ b/core/src/main/java/com/pikolive/core/patriarch/exception/PmRoomLimitException.java @@ -1,7 +1,9 @@ -package com.yizhuan.xchat_android_core.patriarch.exception; +package com.pikolive.core.patriarch.exception; -import com.yizhuan.xchat_android_core.base.BaseErrorException; +import com.pikolive.core.base.BaseErrorException; +import com.pikolive.core.base.BaseErrorException; +import com.pikolive.core.base.BaseErrorException; /** * 青少年模式 限制进房/开房 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/pay/GoldGiveModel.java b/core/src/main/java/com/pikolive/core/pay/GoldGiveModel.java similarity index 71% rename from core/src/main/java/com/yizhuan/xchat_android_core/pay/GoldGiveModel.java rename to core/src/main/java/com/pikolive/core/pay/GoldGiveModel.java index a73c87041..c5e44c68c 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/pay/GoldGiveModel.java +++ b/core/src/main/java/com/pikolive/core/pay/GoldGiveModel.java @@ -1,11 +1,18 @@ -package com.yizhuan.xchat_android_core.pay; +package com.pikolive.core.pay; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.pay.bean.GiveInfo; -import com.yizhuan.xchat_android_core.pay.event.SendGoldSuccessEvent; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.pay.bean.GiveInfo; +import com.pikolive.core.pay.event.SendGoldSuccessEvent; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.pay.bean.GiveInfo; +import com.pikolive.core.pay.event.SendGoldSuccessEvent; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.pay.bean.GiveInfo; +import com.pikolive.core.pay.event.SendGoldSuccessEvent; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.net.rxnet.RxNet; import org.greenrobot.eventbus.EventBus; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/pay/IGoldGiveModel.java b/core/src/main/java/com/pikolive/core/pay/IGoldGiveModel.java similarity index 61% rename from core/src/main/java/com/yizhuan/xchat_android_core/pay/IGoldGiveModel.java rename to core/src/main/java/com/pikolive/core/pay/IGoldGiveModel.java index 055a76c96..3a9fac6e1 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/pay/IGoldGiveModel.java +++ b/core/src/main/java/com/pikolive/core/pay/IGoldGiveModel.java @@ -1,6 +1,8 @@ -package com.yizhuan.xchat_android_core.pay; +package com.pikolive.core.pay; -import com.yizhuan.xchat_android_core.pay.bean.GiveInfo; +import com.pikolive.core.pay.bean.GiveInfo; +import com.pikolive.core.pay.bean.GiveInfo; +import com.pikolive.core.pay.bean.GiveInfo; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/pay/IPayModel.java b/core/src/main/java/com/pikolive/core/pay/IPayModel.java similarity index 68% rename from core/src/main/java/com/yizhuan/xchat_android_core/pay/IPayModel.java rename to core/src/main/java/com/pikolive/core/pay/IPayModel.java index 1d524a6dd..fdb91fedc 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/pay/IPayModel.java +++ b/core/src/main/java/com/pikolive/core/pay/IPayModel.java @@ -1,17 +1,35 @@ -package com.yizhuan.xchat_android_core.pay; +package com.pikolive.core.pay; import android.content.Context; import com.google.gson.JsonObject; -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.bean.response.result.ChargeListResult; -import com.yizhuan.xchat_android_core.pay.bean.Banner; -import com.yizhuan.xchat_android_core.pay.bean.ChargeChannelInfo; -import com.yizhuan.xchat_android_core.pay.bean.FirstChargeGoods; -import com.yizhuan.xchat_android_core.pay.bean.NewUserChargeInfo; -import com.yizhuan.xchat_android_core.pay.bean.PayRecordId; -import com.yizhuan.xchat_android_core.pay.bean.WalletInfo; +import com.pikolive.core.base.IModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.bean.response.result.ChargeListResult; +import com.pikolive.core.pay.bean.Banner; +import com.pikolive.core.pay.bean.ChargeChannelInfo; +import com.pikolive.core.pay.bean.FirstChargeGoods; +import com.pikolive.core.pay.bean.NewUserChargeInfo; +import com.pikolive.core.pay.bean.PayRecordId; +import com.pikolive.core.pay.bean.WalletInfo; +import com.pikolive.core.base.IModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.bean.response.result.ChargeListResult; +import com.pikolive.core.pay.bean.Banner; +import com.pikolive.core.pay.bean.ChargeChannelInfo; +import com.pikolive.core.pay.bean.FirstChargeGoods; +import com.pikolive.core.pay.bean.NewUserChargeInfo; +import com.pikolive.core.pay.bean.PayRecordId; +import com.pikolive.core.pay.bean.WalletInfo; +import com.pikolive.core.base.IModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.bean.response.result.ChargeListResult; +import com.pikolive.core.pay.bean.Banner; +import com.pikolive.core.pay.bean.ChargeChannelInfo; +import com.pikolive.core.pay.bean.FirstChargeGoods; +import com.pikolive.core.pay.bean.NewUserChargeInfo; +import com.pikolive.core.pay.bean.PayRecordId; +import com.pikolive.core.pay.bean.WalletInfo; import java.util.List; import io.reactivex.Single; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/pay/PayModel.java b/core/src/main/java/com/pikolive/core/pay/PayModel.java similarity index 91% rename from core/src/main/java/com/yizhuan/xchat_android_core/pay/PayModel.java rename to core/src/main/java/com/pikolive/core/pay/PayModel.java index c7bc3eca4..ff1ae613d 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/pay/PayModel.java +++ b/core/src/main/java/com/pikolive/core/pay/PayModel.java @@ -1,34 +1,50 @@ -package com.yizhuan.xchat_android_core.pay; +package com.pikolive.core.pay; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_ACCOUNT; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_ACCOUNT; import android.content.Context; import com.alibaba.fastjson.JSONObject; import com.google.gson.JsonObject; -import com.yizhuan.xchat_android_constants.XChatConstants; -import com.yizhuan.xchat_android_core.R; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.bean.response.result.ChargeListResult; -import com.yizhuan.xchat_android_core.bean.response.result.WalletInfoResult; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.manager.RoomEvent; -import com.yizhuan.xchat_android_core.pay.bean.Banner; -import com.yizhuan.xchat_android_core.pay.bean.ChargeBannerInfo; -import com.yizhuan.xchat_android_core.pay.bean.ChargeChannelInfo; -import com.yizhuan.xchat_android_core.pay.bean.FirstChargeGoods; -import com.yizhuan.xchat_android_core.pay.bean.NewUserChargeInfo; -import com.yizhuan.xchat_android_core.pay.bean.PayRecordId; -import com.yizhuan.xchat_android_core.pay.bean.WalletInfo; -import com.yizhuan.xchat_android_core.pay.event.ChargeCustomNotificationEvent; -import com.yizhuan.xchat_android_core.pay.event.FirstRechargeEvent; -import com.yizhuan.xchat_android_core.pay.event.GetWalletInfoEvent; -import com.yizhuan.xchat_android_core.pay.event.UpdateWalletInfoEvent; -import com.yizhuan.xchat_android_core.user.event.LoginUserInfoUpdateEvent; -import com.yizhuan.xchat_android_core.utils.net.IgnoreException; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.bean.response.result.ChargeListResult; +import com.pikolive.core.bean.response.result.WalletInfoResult; +import com.pikolive.core.manager.RoomEvent; +import com.pikolive.core.pay.bean.Banner; +import com.pikolive.core.pay.bean.ChargeBannerInfo; +import com.pikolive.core.pay.bean.ChargeChannelInfo; +import com.pikolive.core.pay.bean.FirstChargeGoods; +import com.pikolive.core.pay.bean.NewUserChargeInfo; +import com.pikolive.core.pay.bean.PayRecordId; +import com.pikolive.core.pay.bean.WalletInfo; +import com.pikolive.core.pay.event.ChargeCustomNotificationEvent; +import com.pikolive.core.pay.event.FirstRechargeEvent; +import com.pikolive.core.pay.event.GetWalletInfoEvent; +import com.pikolive.core.pay.event.UpdateWalletInfoEvent; +import com.pikolive.core.user.event.LoginUserInfoUpdateEvent; +import com.pikolive.core2.XChatConstants; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.bean.response.result.ChargeListResult; +import com.pikolive.core.bean.response.result.WalletInfoResult; +import com.pikolive.core.manager.RoomEvent; +import com.pikolive.core.pay.bean.Banner; +import com.pikolive.core.pay.bean.ChargeBannerInfo; +import com.pikolive.core.pay.bean.ChargeChannelInfo; +import com.pikolive.core.pay.bean.FirstChargeGoods; +import com.pikolive.core.pay.bean.NewUserChargeInfo; +import com.pikolive.core.pay.bean.PayRecordId; +import com.pikolive.core.pay.bean.WalletInfo; +import com.pikolive.core.pay.event.ChargeCustomNotificationEvent; +import com.pikolive.core.pay.event.FirstRechargeEvent; +import com.pikolive.core.pay.event.GetWalletInfoEvent; +import com.pikolive.core.pay.event.UpdateWalletInfoEvent; +import com.pikolive.core.user.event.LoginUserInfoUpdateEvent; +import com.pikolive.core.R; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core2.manager.IMNetEaseManager; +import com.pikolive.core.utils.net.IgnoreException; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.net.rxnet.RxNet; import com.pikolive.library.utils.NetworkUtils; import com.pikolive.library.utils.ResUtil; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/Banner.kt b/core/src/main/java/com/pikolive/core/pay/bean/Banner.kt similarity index 60% rename from core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/Banner.kt rename to core/src/main/java/com/pikolive/core/pay/bean/Banner.kt index 108ea6d05..3e72ff84a 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/Banner.kt +++ b/core/src/main/java/com/pikolive/core/pay/bean/Banner.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.pay.bean +package com.pikolive.core.pay.bean data class Banner( val bannerUrl: String, diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/ChargeBannerInfo.kt b/core/src/main/java/com/pikolive/core/pay/bean/ChargeBannerInfo.kt similarity index 64% rename from core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/ChargeBannerInfo.kt rename to core/src/main/java/com/pikolive/core/pay/bean/ChargeBannerInfo.kt index 86692e30f..b79eaac1c 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/ChargeBannerInfo.kt +++ b/core/src/main/java/com/pikolive/core/pay/bean/ChargeBannerInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.pay.bean +package com.pikolive.core.pay.bean data class ChargeBannerInfo( val banners: List, diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/ChargeBean.java b/core/src/main/java/com/pikolive/core/pay/bean/ChargeBean.java similarity index 98% rename from core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/ChargeBean.java rename to core/src/main/java/com/pikolive/core/pay/bean/ChargeBean.java index 5f9af5ea2..00a4bf5b1 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/ChargeBean.java +++ b/core/src/main/java/com/pikolive/core/pay/bean/ChargeBean.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.pay.bean; +package com.pikolive.core.pay.bean; import com.android.billingclient.api.ProductDetails; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/ChargeChannelInfo.kt b/core/src/main/java/com/pikolive/core/pay/bean/ChargeChannelInfo.kt similarity index 54% rename from core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/ChargeChannelInfo.kt rename to core/src/main/java/com/pikolive/core/pay/bean/ChargeChannelInfo.kt index 5e4d9da10..2d5c78bd9 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/ChargeChannelInfo.kt +++ b/core/src/main/java/com/pikolive/core/pay/bean/ChargeChannelInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.pay.bean +package com.pikolive.core.pay.bean data class ChargeChannelInfo( val isNative: Boolean diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/FirstChargeGoods.java b/core/src/main/java/com/pikolive/core/pay/bean/FirstChargeGoods.java similarity index 90% rename from core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/FirstChargeGoods.java rename to core/src/main/java/com/pikolive/core/pay/bean/FirstChargeGoods.java index 9fade028a..f9aa99977 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/FirstChargeGoods.java +++ b/core/src/main/java/com/pikolive/core/pay/bean/FirstChargeGoods.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.pay.bean; +package com.pikolive.core.pay.bean; import com.android.billingclient.api.ProductDetails; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/FirstChargeReward.java b/core/src/main/java/com/pikolive/core/pay/bean/FirstChargeReward.java similarity index 97% rename from core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/FirstChargeReward.java rename to core/src/main/java/com/pikolive/core/pay/bean/FirstChargeReward.java index 8b3ad1167..fc3e718e7 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/FirstChargeReward.java +++ b/core/src/main/java/com/pikolive/core/pay/bean/FirstChargeReward.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.pay.bean; +package com.pikolive.core.pay.bean; import android.os.Parcel; import android.os.Parcelable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/GiveGoldResult.java b/core/src/main/java/com/pikolive/core/pay/bean/GiveGoldResult.java similarity index 72% rename from core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/GiveGoldResult.java rename to core/src/main/java/com/pikolive/core/pay/bean/GiveGoldResult.java index 3921e548e..7b2c66470 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/GiveGoldResult.java +++ b/core/src/main/java/com/pikolive/core/pay/bean/GiveGoldResult.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.pay.bean; +package com.pikolive.core.pay.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/GiveInfo.java b/core/src/main/java/com/pikolive/core/pay/bean/GiveInfo.java similarity index 81% rename from core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/GiveInfo.java rename to core/src/main/java/com/pikolive/core/pay/bean/GiveInfo.java index ae49f37d6..992c846bc 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/GiveInfo.java +++ b/core/src/main/java/com/pikolive/core/pay/bean/GiveInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.pay.bean; +package com.pikolive.core.pay.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/NewUserChargeInfo.java b/core/src/main/java/com/pikolive/core/pay/bean/NewUserChargeInfo.java similarity index 81% rename from core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/NewUserChargeInfo.java rename to core/src/main/java/com/pikolive/core/pay/bean/NewUserChargeInfo.java index 5dbd363a1..d5e179db2 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/NewUserChargeInfo.java +++ b/core/src/main/java/com/pikolive/core/pay/bean/NewUserChargeInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.pay.bean; +package com.pikolive.core.pay.bean; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/PayRecordId.java b/core/src/main/java/com/pikolive/core/pay/bean/PayRecordId.java similarity index 81% rename from core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/PayRecordId.java rename to core/src/main/java/com/pikolive/core/pay/bean/PayRecordId.java index 55bb2e745..ba909d5cf 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/PayRecordId.java +++ b/core/src/main/java/com/pikolive/core/pay/bean/PayRecordId.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.pay.bean; +package com.pikolive.core.pay.bean; public class PayRecordId { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/WalletInfo.java b/core/src/main/java/com/pikolive/core/pay/bean/WalletInfo.java similarity index 98% rename from core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/WalletInfo.java rename to core/src/main/java/com/pikolive/core/pay/bean/WalletInfo.java index 963ec9710..ac803afc4 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/pay/bean/WalletInfo.java +++ b/core/src/main/java/com/pikolive/core/pay/bean/WalletInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.pay.bean; +package com.pikolive.core.pay.bean; import android.os.Parcel; import android.os.Parcelable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/pay/event/ChargeCustomNotificationEvent.java b/core/src/main/java/com/pikolive/core/pay/event/ChargeCustomNotificationEvent.java similarity index 88% rename from core/src/main/java/com/yizhuan/xchat_android_core/pay/event/ChargeCustomNotificationEvent.java rename to core/src/main/java/com/pikolive/core/pay/event/ChargeCustomNotificationEvent.java index ab0199263..add675696 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/pay/event/ChargeCustomNotificationEvent.java +++ b/core/src/main/java/com/pikolive/core/pay/event/ChargeCustomNotificationEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.pay.event; +package com.pikolive.core.pay.event; import com.alibaba.fastjson.JSONObject; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/pay/event/FirstChargeEvent.java b/core/src/main/java/com/pikolive/core/pay/event/FirstChargeEvent.java similarity index 62% rename from core/src/main/java/com/yizhuan/xchat_android_core/pay/event/FirstChargeEvent.java rename to core/src/main/java/com/pikolive/core/pay/event/FirstChargeEvent.java index b39cc6751..3a21b8fb3 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/pay/event/FirstChargeEvent.java +++ b/core/src/main/java/com/pikolive/core/pay/event/FirstChargeEvent.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.pay.event; +package com.pikolive.core.pay.event; -import com.yizhuan.xchat_android_core.pay.bean.FirstChargeReward; +import com.pikolive.core.pay.bean.FirstChargeReward; import java.util.ArrayList; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/pay/event/FirstRechargeEvent.java b/core/src/main/java/com/pikolive/core/pay/event/FirstRechargeEvent.java similarity index 60% rename from core/src/main/java/com/yizhuan/xchat_android_core/pay/event/FirstRechargeEvent.java rename to core/src/main/java/com/pikolive/core/pay/event/FirstRechargeEvent.java index 6a05461ab..8e17a687f 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/pay/event/FirstRechargeEvent.java +++ b/core/src/main/java/com/pikolive/core/pay/event/FirstRechargeEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.pay.event; +package com.pikolive.core.pay.event; /** * create by lvzebiao @2020/3/23 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/pay/event/GetWalletInfoEvent.java b/core/src/main/java/com/pikolive/core/pay/event/GetWalletInfoEvent.java similarity index 61% rename from core/src/main/java/com/yizhuan/xchat_android_core/pay/event/GetWalletInfoEvent.java rename to core/src/main/java/com/pikolive/core/pay/event/GetWalletInfoEvent.java index acdfcf2d4..afb9632ee 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/pay/event/GetWalletInfoEvent.java +++ b/core/src/main/java/com/pikolive/core/pay/event/GetWalletInfoEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.pay.event; +package com.pikolive.core.pay.event; /** * create by lvzebiao on 2018/8/29 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/pay/event/NewUserChargeEvent.java b/core/src/main/java/com/pikolive/core/pay/event/NewUserChargeEvent.java similarity index 62% rename from core/src/main/java/com/yizhuan/xchat_android_core/pay/event/NewUserChargeEvent.java rename to core/src/main/java/com/pikolive/core/pay/event/NewUserChargeEvent.java index f994bb7e7..43558e7a1 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/pay/event/NewUserChargeEvent.java +++ b/core/src/main/java/com/pikolive/core/pay/event/NewUserChargeEvent.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.pay.event; +package com.pikolive.core.pay.event; -import com.yizhuan.xchat_android_core.pay.bean.FirstChargeReward; +import com.pikolive.core.pay.bean.FirstChargeReward; import java.util.ArrayList; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/pay/event/SendGoldSuccessEvent.java b/core/src/main/java/com/pikolive/core/pay/event/SendGoldSuccessEvent.java similarity index 56% rename from core/src/main/java/com/yizhuan/xchat_android_core/pay/event/SendGoldSuccessEvent.java rename to core/src/main/java/com/pikolive/core/pay/event/SendGoldSuccessEvent.java index 76ba38f49..73a8a2e61 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/pay/event/SendGoldSuccessEvent.java +++ b/core/src/main/java/com/pikolive/core/pay/event/SendGoldSuccessEvent.java @@ -1,6 +1,8 @@ -package com.yizhuan.xchat_android_core.pay.event; +package com.pikolive.core.pay.event; -import com.yizhuan.xchat_android_core.base.BaseBusEvent; +import com.pikolive.core.base.BaseBusEvent; +import com.pikolive.core.base.BaseBusEvent; +import com.pikolive.core.base.BaseBusEvent; /** * 赠送钻石成功的事件 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/pay/event/UpdateWalletInfoEvent.java b/core/src/main/java/com/pikolive/core/pay/event/UpdateWalletInfoEvent.java similarity index 62% rename from core/src/main/java/com/yizhuan/xchat_android_core/pay/event/UpdateWalletInfoEvent.java rename to core/src/main/java/com/pikolive/core/pay/event/UpdateWalletInfoEvent.java index 29bd7017a..54df0baf9 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/pay/event/UpdateWalletInfoEvent.java +++ b/core/src/main/java/com/pikolive/core/pay/event/UpdateWalletInfoEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.pay.event; +package com.pikolive.core.pay.event; /** * create by lvzebiao on 2018/8/29 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/praise/IPraiseModel.java b/core/src/main/java/com/pikolive/core/praise/IPraiseModel.java similarity index 84% rename from core/src/main/java/com/yizhuan/xchat_android_core/praise/IPraiseModel.java rename to core/src/main/java/com/pikolive/core/praise/IPraiseModel.java index d90941dd5..7daa52cb4 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/praise/IPraiseModel.java +++ b/core/src/main/java/com/pikolive/core/praise/IPraiseModel.java @@ -1,6 +1,8 @@ -package com.yizhuan.xchat_android_core.praise; +package com.pikolive.core.praise; -import com.yizhuan.xchat_android_core.base.IModel; +import com.pikolive.core.base.IModel; +import com.pikolive.core.base.IModel; +import com.pikolive.core.base.IModel; import io.reactivex.Single; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/praise/PraiseModel.java b/core/src/main/java/com/pikolive/core/praise/PraiseModel.java similarity index 90% rename from core/src/main/java/com/yizhuan/xchat_android_core/praise/PraiseModel.java rename to core/src/main/java/com/pikolive/core/praise/PraiseModel.java index db030f171..83af204b9 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/praise/PraiseModel.java +++ b/core/src/main/java/com/pikolive/core/praise/PraiseModel.java @@ -1,26 +1,33 @@ -package com.yizhuan.xchat_android_core.praise; +package com.pikolive.core.praise; import android.annotation.SuppressLint; import android.util.LongSparseArray; import com.netease.nimlib.sdk.chatroom.ChatRoomMessageBuilder; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; -import com.yizhuan.xchat_android_core.R; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.bean.response.result.BooleanResult; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomTipAttachment; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.praise.event.IsLikedEvent; -import com.yizhuan.xchat_android_core.praise.event.PraiseEvent; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.super_admin.util.SuperAdminUtil; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.bean.response.result.BooleanResult; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core.praise.event.IsLikedEvent; +import com.pikolive.core.praise.event.PraiseEvent; +import com.pikolive.core.room.bean.RoomInfo; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.bean.response.result.BooleanResult; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core.praise.event.IsLikedEvent; +import com.pikolive.core.praise.event.PraiseEvent; +import com.pikolive.core.room.bean.RoomInfo; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.R; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.im.custom.bean.CustomAttachment; +import com.pikolive.core.im.custom.bean.RoomTipAttachment; +import com.pikolive.core2.manager.IMNetEaseManager; +import com.pikolive.core.admin.util.SuperAdminUtil; +import com.pikolive.core.user.UserModel; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.net.rxnet.RxNet; import com.pikolive.library.utils.ResUtil; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/praise/event/IsLikedEvent.java b/core/src/main/java/com/pikolive/core/praise/event/IsLikedEvent.java similarity index 81% rename from core/src/main/java/com/yizhuan/xchat_android_core/praise/event/IsLikedEvent.java rename to core/src/main/java/com/pikolive/core/praise/event/IsLikedEvent.java index baa15e92a..ae859d7f9 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/praise/event/IsLikedEvent.java +++ b/core/src/main/java/com/pikolive/core/praise/event/IsLikedEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.praise.event; +package com.pikolive.core.praise.event; /** * create by lvzebiao on 2018/9/3 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/praise/event/PraiseEvent.java b/core/src/main/java/com/pikolive/core/praise/event/PraiseEvent.java similarity index 90% rename from core/src/main/java/com/yizhuan/xchat_android_core/praise/event/PraiseEvent.java rename to core/src/main/java/com/pikolive/core/praise/event/PraiseEvent.java index 668373b8a..dc032d57e 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/praise/event/PraiseEvent.java +++ b/core/src/main/java/com/pikolive/core/praise/event/PraiseEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.praise.event; +package com.pikolive.core.praise.event; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/radish/IRadishModel.java b/core/src/main/java/com/pikolive/core/radish/IRadishModel.java similarity index 67% rename from core/src/main/java/com/yizhuan/xchat_android_core/radish/IRadishModel.java rename to core/src/main/java/com/pikolive/core/radish/IRadishModel.java index f9b037de1..c00082c93 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/radish/IRadishModel.java +++ b/core/src/main/java/com/pikolive/core/radish/IRadishModel.java @@ -1,6 +1,8 @@ -package com.yizhuan.xchat_android_core.radish; +package com.pikolive.core.radish; -import com.yizhuan.xchat_android_core.base.IModel; +import com.pikolive.core.base.IModel; +import com.pikolive.core.base.IModel; +import com.pikolive.core.base.IModel; import io.reactivex.Single; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/radish/RadishModel.java b/core/src/main/java/com/pikolive/core/radish/RadishModel.java similarity index 83% rename from core/src/main/java/com/yizhuan/xchat_android_core/radish/RadishModel.java rename to core/src/main/java/com/pikolive/core/radish/RadishModel.java index f423d34f8..dc3f103f8 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/radish/RadishModel.java +++ b/core/src/main/java/com/pikolive/core/radish/RadishModel.java @@ -1,13 +1,20 @@ -package com.yizhuan.xchat_android_core.radish; +package com.pikolive.core.radish; import com.google.gson.Gson; import com.google.gson.JsonElement; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.radish.event.RadishWalletInfoUpdateEvent; -import com.yizhuan.xchat_android_core.user.event.LoadLoginUserInfoEvent; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.radish.event.RadishWalletInfoUpdateEvent; +import com.pikolive.core.user.event.LoadLoginUserInfoEvent; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.radish.event.RadishWalletInfoUpdateEvent; +import com.pikolive.core.user.event.LoadLoginUserInfoEvent; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.radish.event.RadishWalletInfoUpdateEvent; +import com.pikolive.core.user.event.LoadLoginUserInfoEvent; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.net.rxnet.RxNet; import org.greenrobot.eventbus.EventBus; diff --git a/core/src/main/java/com/pikolive/core/radish/RadishRecordResult.java b/core/src/main/java/com/pikolive/core/radish/RadishRecordResult.java new file mode 100644 index 000000000..b97974faa --- /dev/null +++ b/core/src/main/java/com/pikolive/core/radish/RadishRecordResult.java @@ -0,0 +1,11 @@ +package com.pikolive.core.radish; + +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.bills.bean.RadishRecordListInfo; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.bills.bean.RadishRecordListInfo; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.bills.bean.RadishRecordListInfo; + +public class RadishRecordResult extends ServiceResult { +} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/radish/RadishWalletInfo.java b/core/src/main/java/com/pikolive/core/radish/RadishWalletInfo.java similarity index 80% rename from core/src/main/java/com/yizhuan/xchat_android_core/radish/RadishWalletInfo.java rename to core/src/main/java/com/pikolive/core/radish/RadishWalletInfo.java index 0127e71da..7831356f3 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/radish/RadishWalletInfo.java +++ b/core/src/main/java/com/pikolive/core/radish/RadishWalletInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.radish; +package com.pikolive.core.radish; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/radish/event/RadishWalletInfoUpdateEvent.java b/core/src/main/java/com/pikolive/core/radish/event/RadishWalletInfoUpdateEvent.java similarity index 67% rename from core/src/main/java/com/yizhuan/xchat_android_core/radish/event/RadishWalletInfoUpdateEvent.java rename to core/src/main/java/com/pikolive/core/radish/event/RadishWalletInfoUpdateEvent.java index 4305fafba..6220ffa22 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/radish/event/RadishWalletInfoUpdateEvent.java +++ b/core/src/main/java/com/pikolive/core/radish/event/RadishWalletInfoUpdateEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.radish.event; +package com.pikolive.core.radish.event; /** * 萝卜钱包变更 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/radish/event/ReceivePrizeEvent.java b/core/src/main/java/com/pikolive/core/radish/event/ReceivePrizeEvent.java similarity index 65% rename from core/src/main/java/com/yizhuan/xchat_android_core/radish/event/ReceivePrizeEvent.java rename to core/src/main/java/com/pikolive/core/radish/event/ReceivePrizeEvent.java index f8e6da40d..2232d3094 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/radish/event/ReceivePrizeEvent.java +++ b/core/src/main/java/com/pikolive/core/radish/event/ReceivePrizeEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.radish.event; +package com.pikolive.core.radish.event; /** * 领取奖励事件 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/radish/event/SignInSuccessEvent.java b/core/src/main/java/com/pikolive/core/radish/event/SignInSuccessEvent.java similarity index 63% rename from core/src/main/java/com/yizhuan/xchat_android_core/radish/event/SignInSuccessEvent.java rename to core/src/main/java/com/pikolive/core/radish/event/SignInSuccessEvent.java index 29120a4a5..ca83342eb 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/radish/event/SignInSuccessEvent.java +++ b/core/src/main/java/com/pikolive/core/radish/event/SignInSuccessEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.radish.event; +package com.pikolive.core.radish.event; /** * 签到成功 diff --git a/core/src/main/java/com/pikolive/core/radish/signin/ISignInModel.java b/core/src/main/java/com/pikolive/core/radish/signin/ISignInModel.java new file mode 100644 index 000000000..9e0f045c7 --- /dev/null +++ b/core/src/main/java/com/pikolive/core/radish/signin/ISignInModel.java @@ -0,0 +1,66 @@ +package com.pikolive.core.radish.signin; + +import com.pikolive.core.radish.signin.bean.DrawNoticeInfo; +import com.pikolive.core.radish.signin.bean.ReceiveTotalRewardInfo; +import com.pikolive.core.radish.signin.bean.ReplenishSignInfo; +import com.pikolive.core.radish.signin.bean.RewardNoticeInfo; +import com.pikolive.core.radish.signin.bean.SignDetailInfo; +import com.pikolive.core.radish.signin.bean.SignDrawInfo; +import com.pikolive.core.radish.signin.bean.SignInfo; +import com.pikolive.core.radish.signin.bean.DrawNoticeInfo; +import com.pikolive.core.radish.signin.bean.ReceiveTotalRewardInfo; +import com.pikolive.core.radish.signin.bean.ReplenishSignInfo; +import com.pikolive.core.radish.signin.bean.RewardNoticeInfo; +import com.pikolive.core.radish.signin.bean.SignDetailInfo; +import com.pikolive.core.radish.signin.bean.SignDrawInfo; +import com.pikolive.core.radish.signin.bean.SignInfo; +import com.pikolive.core.radish.signin.bean.DrawNoticeInfo; +import com.pikolive.core.radish.signin.bean.ReceiveTotalRewardInfo; +import com.pikolive.core.radish.signin.bean.ReplenishSignInfo; +import com.pikolive.core.radish.signin.bean.RewardNoticeInfo; +import com.pikolive.core.radish.signin.bean.SignDetailInfo; +import com.pikolive.core.radish.signin.bean.SignDrawInfo; +import com.pikolive.core.radish.signin.bean.SignInfo; + +import java.util.List; + +import io.reactivex.Single; + +/** + * create by lvzebiao @2019/3/14 + */ +public interface ISignInModel { + + Single sign(); + + Single signDetail(); + + Single signDraw(); + + Single signRemind(); + + Single> drawNotice(); + + Single> getRewardTotalNotice(); + + Single> getRewardTodayNotice(); + + Single getShareImage(int shareType, String day, String reward); + + Single receiveTotalReward(long configId); + + void signShare(); + + Single insertSignDay(int signDay); + + /** + * 获取补签信息 + */ + Single getReplenishSignInfo(int signDay); + + /** + * 补签 + */ + Single replenishSign(int signDay); + +} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/SignInModel.java b/core/src/main/java/com/pikolive/core/radish/signin/SignInModel.java similarity index 80% rename from core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/SignInModel.java rename to core/src/main/java/com/pikolive/core/radish/signin/SignInModel.java index 23d977e4f..c312503ee 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/SignInModel.java +++ b/core/src/main/java/com/pikolive/core/radish/signin/SignInModel.java @@ -1,21 +1,38 @@ -package com.yizhuan.xchat_android_core.radish.signin; +package com.pikolive.core.radish.signin; import android.util.Log; -import com.yizhuan.xchat_android_core.BuildConfig; -import com.yizhuan.xchat_android_core.R; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.radish.event.SignInSuccessEvent; -import com.yizhuan.xchat_android_core.radish.signin.bean.DrawNoticeInfo; -import com.yizhuan.xchat_android_core.radish.signin.bean.ReceiveTotalRewardInfo; -import com.yizhuan.xchat_android_core.radish.signin.bean.ReplenishSignInfo; -import com.yizhuan.xchat_android_core.radish.signin.bean.RewardNoticeInfo; -import com.yizhuan.xchat_android_core.radish.signin.bean.SignDetailInfo; -import com.yizhuan.xchat_android_core.radish.signin.bean.SignDrawInfo; -import com.yizhuan.xchat_android_core.radish.signin.bean.SignInfo; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.radish.signin.bean.DrawNoticeInfo; +import com.pikolive.core.radish.signin.bean.ReceiveTotalRewardInfo; +import com.pikolive.core.radish.signin.bean.ReplenishSignInfo; +import com.pikolive.core.radish.signin.bean.RewardNoticeInfo; +import com.pikolive.core.radish.signin.bean.SignDetailInfo; +import com.pikolive.core.radish.signin.bean.SignDrawInfo; +import com.pikolive.core.radish.signin.bean.SignInfo; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.radish.signin.bean.DrawNoticeInfo; +import com.pikolive.core.radish.signin.bean.ReceiveTotalRewardInfo; +import com.pikolive.core.radish.signin.bean.ReplenishSignInfo; +import com.pikolive.core.radish.signin.bean.RewardNoticeInfo; +import com.pikolive.core.radish.signin.bean.SignDetailInfo; +import com.pikolive.core.radish.signin.bean.SignDrawInfo; +import com.pikolive.core.radish.signin.bean.SignInfo; +import com.pikolive.core.BuildConfig; +import com.pikolive.core.R; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.radish.event.SignInSuccessEvent; +import com.pikolive.core.radish.signin.bean.DrawNoticeInfo; +import com.pikolive.core.radish.signin.bean.ReceiveTotalRewardInfo; +import com.pikolive.core.radish.signin.bean.ReplenishSignInfo; +import com.pikolive.core.radish.signin.bean.RewardNoticeInfo; +import com.pikolive.core.radish.signin.bean.SignDetailInfo; +import com.pikolive.core.radish.signin.bean.SignDrawInfo; +import com.pikolive.core.radish.signin.bean.SignInfo; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.net.rxnet.RxNet; import com.pikolive.library.utils.ResUtil; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/bean/DrawNoticeInfo.java b/core/src/main/java/com/pikolive/core/radish/signin/bean/DrawNoticeInfo.java similarity index 69% rename from core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/bean/DrawNoticeInfo.java rename to core/src/main/java/com/pikolive/core/radish/signin/bean/DrawNoticeInfo.java index 7564a835e..9697f36dc 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/bean/DrawNoticeInfo.java +++ b/core/src/main/java/com/pikolive/core/radish/signin/bean/DrawNoticeInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.radish.signin.bean; +package com.pikolive.core.radish.signin.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/bean/ImNotice.java b/core/src/main/java/com/pikolive/core/radish/signin/bean/ImNotice.java similarity index 57% rename from core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/bean/ImNotice.java rename to core/src/main/java/com/pikolive/core/radish/signin/bean/ImNotice.java index 918814f5c..f6eaff844 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/bean/ImNotice.java +++ b/core/src/main/java/com/pikolive/core/radish/signin/bean/ImNotice.java @@ -1,11 +1,13 @@ -package com.yizhuan.xchat_android_core.radish.signin.bean; +package com.pikolive.core.radish.signin.bean; + +import com.pikolive.core.im.custom.bean.OpenSignInAttachment; import java.io.Serializable; import lombok.Data; /** - * 提醒，{@link com.yizhuan.xchat_android_core.im.custom.bean.OpenSignInAttachment} + * 提醒，{@link OpenSignInAttachment} * create by lvzebiao @2019/3/20 */ @Data diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/bean/ReceiveTotalRewardInfo.java b/core/src/main/java/com/pikolive/core/radish/signin/bean/ReceiveTotalRewardInfo.java similarity index 86% rename from core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/bean/ReceiveTotalRewardInfo.java rename to core/src/main/java/com/pikolive/core/radish/signin/bean/ReceiveTotalRewardInfo.java index 119f63ddf..f266bb8c7 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/bean/ReceiveTotalRewardInfo.java +++ b/core/src/main/java/com/pikolive/core/radish/signin/bean/ReceiveTotalRewardInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.radish.signin.bean; +package com.pikolive.core.radish.signin.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/bean/ReplenishSignInfo.java b/core/src/main/java/com/pikolive/core/radish/signin/bean/ReplenishSignInfo.java similarity index 84% rename from core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/bean/ReplenishSignInfo.java rename to core/src/main/java/com/pikolive/core/radish/signin/bean/ReplenishSignInfo.java index 49a6ba86a..abfc01744 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/bean/ReplenishSignInfo.java +++ b/core/src/main/java/com/pikolive/core/radish/signin/bean/ReplenishSignInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.radish.signin.bean; +package com.pikolive.core.radish.signin.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/bean/Reward.java b/core/src/main/java/com/pikolive/core/radish/signin/bean/Reward.java similarity index 64% rename from core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/bean/Reward.java rename to core/src/main/java/com/pikolive/core/radish/signin/bean/Reward.java index 0e5b4f73a..49b99a8d4 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/bean/Reward.java +++ b/core/src/main/java/com/pikolive/core/radish/signin/bean/Reward.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.radish.signin.bean; +package com.pikolive.core.radish.signin.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/bean/RewardNoticeInfo.java b/core/src/main/java/com/pikolive/core/radish/signin/bean/RewardNoticeInfo.java similarity index 94% rename from core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/bean/RewardNoticeInfo.java rename to core/src/main/java/com/pikolive/core/radish/signin/bean/RewardNoticeInfo.java index 9a8bf17de..d6fbda60e 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/bean/RewardNoticeInfo.java +++ b/core/src/main/java/com/pikolive/core/radish/signin/bean/RewardNoticeInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.radish.signin.bean; +package com.pikolive.core.radish.signin.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/bean/RsPlatformType.java b/core/src/main/java/com/pikolive/core/radish/signin/bean/RsPlatformType.java similarity index 81% rename from core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/bean/RsPlatformType.java rename to core/src/main/java/com/pikolive/core/radish/signin/bean/RsPlatformType.java index e46d2263b..eee0bff5a 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/bean/RsPlatformType.java +++ b/core/src/main/java/com/pikolive/core/radish/signin/bean/RsPlatformType.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.radish.signin.bean; +package com.pikolive.core.radish.signin.bean; import cn.sharesdk.framework.Platform; import lombok.AllArgsConstructor; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/bean/SignDetailInfo.java b/core/src/main/java/com/pikolive/core/radish/signin/bean/SignDetailInfo.java similarity index 96% rename from core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/bean/SignDetailInfo.java rename to core/src/main/java/com/pikolive/core/radish/signin/bean/SignDetailInfo.java index 91b2d9b5d..daf213033 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/bean/SignDetailInfo.java +++ b/core/src/main/java/com/pikolive/core/radish/signin/bean/SignDetailInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.radish.signin.bean; +package com.pikolive.core.radish.signin.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/bean/SignDrawInfo.java b/core/src/main/java/com/pikolive/core/radish/signin/bean/SignDrawInfo.java similarity index 90% rename from core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/bean/SignDrawInfo.java rename to core/src/main/java/com/pikolive/core/radish/signin/bean/SignDrawInfo.java index ae4487e41..7b439c9b3 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/bean/SignDrawInfo.java +++ b/core/src/main/java/com/pikolive/core/radish/signin/bean/SignDrawInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.radish.signin.bean; +package com.pikolive.core.radish.signin.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/bean/SignInfo.java b/core/src/main/java/com/pikolive/core/radish/signin/bean/SignInfo.java similarity index 76% rename from core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/bean/SignInfo.java rename to core/src/main/java/com/pikolive/core/radish/signin/bean/SignInfo.java index 76ab9af5c..c635a093c 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/bean/SignInfo.java +++ b/core/src/main/java/com/pikolive/core/radish/signin/bean/SignInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.radish.signin.bean; +package com.pikolive.core.radish.signin.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/radish/task/ITaskModel.java b/core/src/main/java/com/pikolive/core/radish/task/ITaskModel.java similarity index 60% rename from core/src/main/java/com/yizhuan/xchat_android_core/radish/task/ITaskModel.java rename to core/src/main/java/com/pikolive/core/radish/task/ITaskModel.java index 1d757869a..42c2b28b5 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/radish/task/ITaskModel.java +++ b/core/src/main/java/com/pikolive/core/radish/task/ITaskModel.java @@ -1,7 +1,11 @@ -package com.yizhuan.xchat_android_core.radish.task; +package com.pikolive.core.radish.task; -import com.yizhuan.xchat_android_core.radish.task.bean.CheckNewUserTaskInfo; -import com.yizhuan.xchat_android_core.radish.task.bean.TaskInfo; +import com.pikolive.core.radish.task.bean.CheckNewUserTaskInfo; +import com.pikolive.core.radish.task.bean.TaskInfo; +import com.pikolive.core.radish.task.bean.CheckNewUserTaskInfo; +import com.pikolive.core.radish.task.bean.TaskInfo; +import com.pikolive.core.radish.task.bean.CheckNewUserTaskInfo; +import com.pikolive.core.radish.task.bean.TaskInfo; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/radish/task/TaskModel.java b/core/src/main/java/com/pikolive/core/radish/task/TaskModel.java similarity index 73% rename from core/src/main/java/com/yizhuan/xchat_android_core/radish/task/TaskModel.java rename to core/src/main/java/com/pikolive/core/radish/task/TaskModel.java index 60cbf2b36..d3d2d51e3 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/radish/task/TaskModel.java +++ b/core/src/main/java/com/pikolive/core/radish/task/TaskModel.java @@ -1,16 +1,27 @@ -package com.yizhuan.xchat_android_core.radish.task; +package com.pikolive.core.radish.task; import com.google.gson.JsonElement; -import com.yizhuan.xchat_android_core.R; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.radish.RadishModel; -import com.yizhuan.xchat_android_core.radish.event.ReceivePrizeEvent; -import com.yizhuan.xchat_android_core.radish.task.bean.CheckNewUserTaskInfo; -import com.yizhuan.xchat_android_core.radish.task.bean.PrizeType; -import com.yizhuan.xchat_android_core.radish.task.bean.TaskInfo; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.radish.event.ReceivePrizeEvent; +import com.pikolive.core.radish.task.bean.CheckNewUserTaskInfo; +import com.pikolive.core.radish.task.bean.PrizeType; +import com.pikolive.core.radish.task.bean.TaskInfo; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.radish.event.ReceivePrizeEvent; +import com.pikolive.core.radish.task.bean.CheckNewUserTaskInfo; +import com.pikolive.core.radish.task.bean.PrizeType; +import com.pikolive.core.radish.task.bean.TaskInfo; +import com.pikolive.core.R; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.radish.RadishModel; +import com.pikolive.core.radish.event.ReceivePrizeEvent; +import com.pikolive.core.radish.task.bean.CheckNewUserTaskInfo; +import com.pikolive.core.radish.task.bean.PrizeType; +import com.pikolive.core.radish.task.bean.TaskInfo; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.net.rxnet.RxNet; import com.pikolive.library.utils.ResUtil; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/radish/task/bean/CheckNewUserTaskInfo.java b/core/src/main/java/com/pikolive/core/radish/task/bean/CheckNewUserTaskInfo.java similarity index 77% rename from core/src/main/java/com/yizhuan/xchat_android_core/radish/task/bean/CheckNewUserTaskInfo.java rename to core/src/main/java/com/pikolive/core/radish/task/bean/CheckNewUserTaskInfo.java index 032f72ed5..ce4c7d718 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/radish/task/bean/CheckNewUserTaskInfo.java +++ b/core/src/main/java/com/pikolive/core/radish/task/bean/CheckNewUserTaskInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.radish.task.bean; +package com.pikolive.core.radish.task.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/radish/task/bean/PrizeAnim.java b/core/src/main/java/com/pikolive/core/radish/task/bean/PrizeAnim.java similarity index 78% rename from core/src/main/java/com/yizhuan/xchat_android_core/radish/task/bean/PrizeAnim.java rename to core/src/main/java/com/pikolive/core/radish/task/bean/PrizeAnim.java index 6fa0b89eb..8b555d8f4 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/radish/task/bean/PrizeAnim.java +++ b/core/src/main/java/com/pikolive/core/radish/task/bean/PrizeAnim.java @@ -1,8 +1,12 @@ -package com.yizhuan.xchat_android_core.radish.task.bean; +package com.pikolive.core.radish.task.bean; -import com.yizhuan.xchat_android_core.R; -import com.yizhuan.xchat_android_core.radish.signin.bean.ReceiveTotalRewardInfo; -import com.yizhuan.xchat_android_core.radish.signin.bean.SignDrawInfo; +import com.pikolive.core.radish.signin.bean.ReceiveTotalRewardInfo; +import com.pikolive.core.radish.signin.bean.SignDrawInfo; +import com.pikolive.core.radish.signin.bean.ReceiveTotalRewardInfo; +import com.pikolive.core.radish.signin.bean.SignDrawInfo; +import com.pikolive.core.R; +import com.pikolive.core.radish.signin.bean.ReceiveTotalRewardInfo; +import com.pikolive.core.radish.signin.bean.SignDrawInfo; import com.pikolive.library.utils.ResUtil; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/radish/task/bean/PrizeType.java b/core/src/main/java/com/pikolive/core/radish/task/bean/PrizeType.java similarity index 68% rename from core/src/main/java/com/yizhuan/xchat_android_core/radish/task/bean/PrizeType.java rename to core/src/main/java/com/pikolive/core/radish/task/bean/PrizeType.java index 405483ce3..44755c48e 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/radish/task/bean/PrizeType.java +++ b/core/src/main/java/com/pikolive/core/radish/task/bean/PrizeType.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.radish.task.bean; +package com.pikolive.core.radish.task.bean; /** * create by lvzebiao @2019/3/29 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/radish/task/bean/TaskInfo.java b/core/src/main/java/com/pikolive/core/radish/task/bean/TaskInfo.java similarity index 96% rename from core/src/main/java/com/yizhuan/xchat_android_core/radish/task/bean/TaskInfo.java rename to core/src/main/java/com/pikolive/core/radish/task/bean/TaskInfo.java index 7de128ffa..72a167c99 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/radish/task/bean/TaskInfo.java +++ b/core/src/main/java/com/pikolive/core/radish/task/bean/TaskInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.radish.task.bean; +package com.pikolive.core.radish.task.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/realm/IRealmCore.java b/core/src/main/java/com/pikolive/core/realm/IRealmCore.java similarity index 80% rename from core/src/main/java/com/yizhuan/xchat_android_core/realm/IRealmCore.java rename to core/src/main/java/com/pikolive/core/realm/IRealmCore.java index 00b1a7210..0b8182dd8 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/realm/IRealmCore.java +++ b/core/src/main/java/com/pikolive/core/realm/IRealmCore.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.realm; +package com.pikolive.core.realm; import com.pikolive.library.coremanager.IBaseCore; diff --git a/core/src/main/java/com/pikolive/core/recall/IRecallModel.java b/core/src/main/java/com/pikolive/core/recall/IRecallModel.java new file mode 100644 index 000000000..aa8e5cc9f --- /dev/null +++ b/core/src/main/java/com/pikolive/core/recall/IRecallModel.java @@ -0,0 +1,18 @@ +package com.pikolive.core.recall; + +import com.pikolive.core.base.IModel; +import com.pikolive.core.recall.bean.CheckLostUserInfo; +import com.pikolive.core.base.IModel; +import com.pikolive.core.recall.bean.CheckLostUserInfo; +import com.pikolive.core.base.IModel; +import com.pikolive.core.recall.bean.CheckLostUserInfo; + +import io.reactivex.Single; + +public interface IRecallModel extends IModel { + + // 查询是否是回归状态 + Single checkLostUser(long uid); + // 接收回归礼物 + void goBack(String uid, String inviteCode); +} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/recall/RecallModel.java b/core/src/main/java/com/pikolive/core/recall/RecallModel.java similarity index 72% rename from core/src/main/java/com/yizhuan/xchat_android_core/recall/RecallModel.java rename to core/src/main/java/com/pikolive/core/recall/RecallModel.java index 0008a2dd9..4387ce4c1 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/recall/RecallModel.java +++ b/core/src/main/java/com/pikolive/core/recall/RecallModel.java @@ -1,14 +1,27 @@ -package com.yizhuan.xchat_android_core.recall; +package com.pikolive.core.recall; -import com.yizhuan.xchat_android_core.R; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.bean.response.result.CheckLostUserResult; -import com.yizhuan.xchat_android_core.recall.bean.CheckLostUserInfo; -import com.yizhuan.xchat_android_core.recall.bean.GoBackInfo; -import com.yizhuan.xchat_android_core.recall.event.CheckLostUserEvent; -import com.yizhuan.xchat_android_core.recall.event.GoBackEvent; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.bean.response.result.CheckLostUserResult; +import com.pikolive.core.recall.bean.CheckLostUserInfo; +import com.pikolive.core.recall.bean.GoBackInfo; +import com.pikolive.core.recall.event.CheckLostUserEvent; +import com.pikolive.core.recall.event.GoBackEvent; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.bean.response.result.CheckLostUserResult; +import com.pikolive.core.recall.bean.CheckLostUserInfo; +import com.pikolive.core.recall.bean.GoBackInfo; +import com.pikolive.core.recall.event.CheckLostUserEvent; +import com.pikolive.core.recall.event.GoBackEvent; +import com.pikolive.core.R; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.bean.response.result.CheckLostUserResult; +import com.pikolive.core.recall.bean.CheckLostUserInfo; +import com.pikolive.core.recall.bean.GoBackInfo; +import com.pikolive.core.recall.event.CheckLostUserEvent; +import com.pikolive.core.recall.event.GoBackEvent; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.net.rxnet.RxNet; import com.pikolive.library.utils.ResUtil; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/recall/bean/CheckLostUserInfo.java b/core/src/main/java/com/pikolive/core/recall/bean/CheckLostUserInfo.java similarity index 91% rename from core/src/main/java/com/yizhuan/xchat_android_core/recall/bean/CheckLostUserInfo.java rename to core/src/main/java/com/pikolive/core/recall/bean/CheckLostUserInfo.java index e084ffbcf..4ce953c2a 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/recall/bean/CheckLostUserInfo.java +++ b/core/src/main/java/com/pikolive/core/recall/bean/CheckLostUserInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.recall.bean; +package com.pikolive.core.recall.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/recall/bean/GoBackInfo.java b/core/src/main/java/com/pikolive/core/recall/bean/GoBackInfo.java similarity index 89% rename from core/src/main/java/com/yizhuan/xchat_android_core/recall/bean/GoBackInfo.java rename to core/src/main/java/com/pikolive/core/recall/bean/GoBackInfo.java index fb290d36f..22f0d2999 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/recall/bean/GoBackInfo.java +++ b/core/src/main/java/com/pikolive/core/recall/bean/GoBackInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.recall.bean; +package com.pikolive.core.recall.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/recall/event/CheckLostUserEvent.java b/core/src/main/java/com/pikolive/core/recall/event/CheckLostUserEvent.java similarity index 50% rename from core/src/main/java/com/yizhuan/xchat_android_core/recall/event/CheckLostUserEvent.java rename to core/src/main/java/com/pikolive/core/recall/event/CheckLostUserEvent.java index fbd0a411b..be8628d60 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/recall/event/CheckLostUserEvent.java +++ b/core/src/main/java/com/pikolive/core/recall/event/CheckLostUserEvent.java @@ -1,7 +1,9 @@ -package com.yizhuan.xchat_android_core.recall.event; +package com.pikolive.core.recall.event; -import com.yizhuan.xchat_android_core.base.BaseDataEvent; -import com.yizhuan.xchat_android_core.recall.bean.CheckLostUserInfo; +import com.pikolive.core.base.BaseDataEvent; +import com.pikolive.core.base.BaseDataEvent; +import com.pikolive.core.base.BaseDataEvent; +import com.pikolive.core.recall.bean.CheckLostUserInfo; public class CheckLostUserEvent extends BaseDataEvent { diff --git a/core/src/main/java/com/pikolive/core/recall/event/GoBackEvent.java b/core/src/main/java/com/pikolive/core/recall/event/GoBackEvent.java new file mode 100644 index 000000000..2e64913f6 --- /dev/null +++ b/core/src/main/java/com/pikolive/core/recall/event/GoBackEvent.java @@ -0,0 +1,17 @@ +package com.pikolive.core.recall.event; + +import com.pikolive.core.base.BaseDataEvent; +import com.pikolive.core.base.BaseDataEvent; +import com.pikolive.core.base.BaseDataEvent; +import com.pikolive.core.recall.bean.GoBackInfo; + +public class GoBackEvent extends BaseDataEvent { + + public GoBackEvent(GoBackInfo goBackInfo) { + super(goBackInfo); + } + + public GoBackEvent(String error) { + super(error); + } +} diff --git a/core/src/main/java/com/pikolive/core/redPacket/IRedPacketModel.java b/core/src/main/java/com/pikolive/core/redPacket/IRedPacketModel.java new file mode 100644 index 000000000..ab9e81486 --- /dev/null +++ b/core/src/main/java/com/pikolive/core/redPacket/IRedPacketModel.java @@ -0,0 +1,41 @@ +package com.pikolive.core.redPacket; + +import com.pikolive.core.base.IModel; +import com.pikolive.core.redPacket.bean.ActionDialogInfo; +import com.pikolive.core.redPacket.bean.RedDrawListInfo; +import com.pikolive.core.redPacket.bean.RedPacketInfo; +import com.pikolive.core.redPacket.bean.WithdrawRedListInfo; +import com.pikolive.core.redPacket.bean.WithdrawRedSucceedInfo; +import com.pikolive.core.base.IModel; +import com.pikolive.core.redPacket.bean.ActionDialogInfo; +import com.pikolive.core.redPacket.bean.RedDrawListInfo; +import com.pikolive.core.redPacket.bean.RedPacketInfo; +import com.pikolive.core.redPacket.bean.WithdrawRedListInfo; +import com.pikolive.core.redPacket.bean.WithdrawRedSucceedInfo; +import com.pikolive.core.base.IModel; +import com.pikolive.core.redPacket.bean.ActionDialogInfo; +import com.pikolive.core.redPacket.bean.RedDrawListInfo; +import com.pikolive.core.redPacket.bean.RedPacketInfo; +import com.pikolive.core.redPacket.bean.WithdrawRedListInfo; +import com.pikolive.core.redPacket.bean.WithdrawRedSucceedInfo; + +import java.util.List; + +import io.reactivex.Single; + +/** + * Created by ${Seven} on 2017/9/20. + */ + +public interface IRedPacketModel extends IModel { + //获取红包页面信息 + Single getRedPacketInfo(); + //进入主界面有红包后设置弹窗类型 1，首页 2直播间 + Single> getActionDialog(int type); + //获取红包提现列表 + Single> getRedList(); + //发起红包提现 + Single getRedWithdraw(long uid, int packetId, String pwd); + //获取红包提现列表 + Single> getRedDrawList(); +} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/redPacket/RedPacketModel.java b/core/src/main/java/com/pikolive/core/redPacket/RedPacketModel.java similarity index 72% rename from core/src/main/java/com/yizhuan/xchat_android_core/redPacket/RedPacketModel.java rename to core/src/main/java/com/pikolive/core/redPacket/RedPacketModel.java index 38d183354..0f7cb8ff4 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/redPacket/RedPacketModel.java +++ b/core/src/main/java/com/pikolive/core/redPacket/RedPacketModel.java @@ -1,19 +1,42 @@ -package com.yizhuan.xchat_android_core.redPacket; +package com.pikolive.core.redPacket; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.result.ActionDialogResult; -import com.yizhuan.xchat_android_core.bean.response.result.RedDrawListInfoResult; -import com.yizhuan.xchat_android_core.bean.response.result.RedPacketResult; -import com.yizhuan.xchat_android_core.bean.response.result.WithdrawRedListResult; -import com.yizhuan.xchat_android_core.bean.response.result.WithdrawRedSucceedResult; -import com.yizhuan.xchat_android_core.redPacket.bean.ActionDialogInfo; -import com.yizhuan.xchat_android_core.redPacket.bean.RedDrawListInfo; -import com.yizhuan.xchat_android_core.redPacket.bean.RedPacketInfo; -import com.yizhuan.xchat_android_core.redPacket.bean.WithdrawRedListInfo; -import com.yizhuan.xchat_android_core.redPacket.bean.WithdrawRedSucceedInfo; -import com.yizhuan.xchat_android_core.redPacket.event.GetRedInfoEvent; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.bean.response.result.ActionDialogResult; +import com.pikolive.core.bean.response.result.RedDrawListInfoResult; +import com.pikolive.core.bean.response.result.RedPacketResult; +import com.pikolive.core.bean.response.result.WithdrawRedListResult; +import com.pikolive.core.bean.response.result.WithdrawRedSucceedResult; +import com.pikolive.core.redPacket.bean.ActionDialogInfo; +import com.pikolive.core.redPacket.bean.RedDrawListInfo; +import com.pikolive.core.redPacket.bean.RedPacketInfo; +import com.pikolive.core.redPacket.bean.WithdrawRedListInfo; +import com.pikolive.core.redPacket.bean.WithdrawRedSucceedInfo; +import com.pikolive.core.redPacket.event.GetRedInfoEvent; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.bean.response.result.ActionDialogResult; +import com.pikolive.core.bean.response.result.RedDrawListInfoResult; +import com.pikolive.core.bean.response.result.RedPacketResult; +import com.pikolive.core.bean.response.result.WithdrawRedListResult; +import com.pikolive.core.bean.response.result.WithdrawRedSucceedResult; +import com.pikolive.core.redPacket.bean.ActionDialogInfo; +import com.pikolive.core.redPacket.bean.RedDrawListInfo; +import com.pikolive.core.redPacket.bean.RedPacketInfo; +import com.pikolive.core.redPacket.bean.WithdrawRedListInfo; +import com.pikolive.core.redPacket.bean.WithdrawRedSucceedInfo; +import com.pikolive.core.redPacket.event.GetRedInfoEvent; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.bean.response.result.ActionDialogResult; +import com.pikolive.core.bean.response.result.RedDrawListInfoResult; +import com.pikolive.core.bean.response.result.RedPacketResult; +import com.pikolive.core.bean.response.result.WithdrawRedListResult; +import com.pikolive.core.bean.response.result.WithdrawRedSucceedResult; +import com.pikolive.core.redPacket.bean.ActionDialogInfo; +import com.pikolive.core.redPacket.bean.RedDrawListInfo; +import com.pikolive.core.redPacket.bean.RedPacketInfo; +import com.pikolive.core.redPacket.bean.WithdrawRedListInfo; +import com.pikolive.core.redPacket.bean.WithdrawRedSucceedInfo; +import com.pikolive.core.redPacket.event.GetRedInfoEvent; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.net.rxnet.RxNet; import org.greenrobot.eventbus.EventBus; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/redPacket/bean/ActionDialogInfo.java b/core/src/main/java/com/pikolive/core/redPacket/bean/ActionDialogInfo.java similarity index 95% rename from core/src/main/java/com/yizhuan/xchat_android_core/redPacket/bean/ActionDialogInfo.java rename to core/src/main/java/com/pikolive/core/redPacket/bean/ActionDialogInfo.java index 81f891c3f..dfb785590 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/redPacket/bean/ActionDialogInfo.java +++ b/core/src/main/java/com/pikolive/core/redPacket/bean/ActionDialogInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.redPacket.bean; +package com.pikolive.core.redPacket.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/redPacket/bean/RedDrawListInfo.java b/core/src/main/java/com/pikolive/core/redPacket/bean/RedDrawListInfo.java similarity index 95% rename from core/src/main/java/com/yizhuan/xchat_android_core/redPacket/bean/RedDrawListInfo.java rename to core/src/main/java/com/pikolive/core/redPacket/bean/RedDrawListInfo.java index 31abd4168..b78097047 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/redPacket/bean/RedDrawListInfo.java +++ b/core/src/main/java/com/pikolive/core/redPacket/bean/RedDrawListInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.redPacket.bean; +package com.pikolive.core.redPacket.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/redPacket/bean/RedPacketInfo.java b/core/src/main/java/com/pikolive/core/redPacket/bean/RedPacketInfo.java similarity index 96% rename from core/src/main/java/com/yizhuan/xchat_android_core/redPacket/bean/RedPacketInfo.java rename to core/src/main/java/com/pikolive/core/redPacket/bean/RedPacketInfo.java index 986cda537..55251b475 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/redPacket/bean/RedPacketInfo.java +++ b/core/src/main/java/com/pikolive/core/redPacket/bean/RedPacketInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.redPacket.bean; +package com.pikolive.core.redPacket.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/redPacket/bean/RedPacketInfoV2.java b/core/src/main/java/com/pikolive/core/redPacket/bean/RedPacketInfoV2.java similarity index 94% rename from core/src/main/java/com/yizhuan/xchat_android_core/redPacket/bean/RedPacketInfoV2.java rename to core/src/main/java/com/pikolive/core/redPacket/bean/RedPacketInfoV2.java index cfdf80675..49f132a00 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/redPacket/bean/RedPacketInfoV2.java +++ b/core/src/main/java/com/pikolive/core/redPacket/bean/RedPacketInfoV2.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.redPacket.bean; +package com.pikolive.core.redPacket.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/redPacket/bean/ShareRedBagInfo.java b/core/src/main/java/com/pikolive/core/redPacket/bean/ShareRedBagInfo.java similarity index 90% rename from core/src/main/java/com/yizhuan/xchat_android_core/redPacket/bean/ShareRedBagInfo.java rename to core/src/main/java/com/pikolive/core/redPacket/bean/ShareRedBagInfo.java index 52238b9b7..2b750a11e 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/redPacket/bean/ShareRedBagInfo.java +++ b/core/src/main/java/com/pikolive/core/redPacket/bean/ShareRedBagInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.redPacket.bean; +package com.pikolive.core.redPacket.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/redPacket/bean/WithdrawRedListInfo.java b/core/src/main/java/com/pikolive/core/redPacket/bean/WithdrawRedListInfo.java similarity index 94% rename from core/src/main/java/com/yizhuan/xchat_android_core/redPacket/bean/WithdrawRedListInfo.java rename to core/src/main/java/com/pikolive/core/redPacket/bean/WithdrawRedListInfo.java index 5e0de9721..92b1aa959 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/redPacket/bean/WithdrawRedListInfo.java +++ b/core/src/main/java/com/pikolive/core/redPacket/bean/WithdrawRedListInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.redPacket.bean; +package com.pikolive.core.redPacket.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/redPacket/bean/WithdrawRedSucceedInfo.java b/core/src/main/java/com/pikolive/core/redPacket/bean/WithdrawRedSucceedInfo.java similarity index 89% rename from core/src/main/java/com/yizhuan/xchat_android_core/redPacket/bean/WithdrawRedSucceedInfo.java rename to core/src/main/java/com/pikolive/core/redPacket/bean/WithdrawRedSucceedInfo.java index 563bfd2e1..e7e2529a4 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/redPacket/bean/WithdrawRedSucceedInfo.java +++ b/core/src/main/java/com/pikolive/core/redPacket/bean/WithdrawRedSucceedInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.redPacket.bean; +package com.pikolive.core.redPacket.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/redPacket/event/GetRedInfoEvent.java b/core/src/main/java/com/pikolive/core/redPacket/event/GetRedInfoEvent.java similarity index 52% rename from core/src/main/java/com/yizhuan/xchat_android_core/redPacket/event/GetRedInfoEvent.java rename to core/src/main/java/com/pikolive/core/redPacket/event/GetRedInfoEvent.java index f96c8e644..512fa78cc 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/redPacket/event/GetRedInfoEvent.java +++ b/core/src/main/java/com/pikolive/core/redPacket/event/GetRedInfoEvent.java @@ -1,7 +1,9 @@ -package com.yizhuan.xchat_android_core.redPacket.event; +package com.pikolive.core.redPacket.event; -import com.yizhuan.xchat_android_core.base.BaseDataEvent; -import com.yizhuan.xchat_android_core.redPacket.bean.RedPacketInfo; +import com.pikolive.core.base.BaseDataEvent; +import com.pikolive.core.base.BaseDataEvent; +import com.pikolive.core.base.BaseDataEvent; +import com.pikolive.core.redPacket.bean.RedPacketInfo; /** * create by lvzebiao on 2018/9/5 diff --git a/core/src/main/java/com/pikolive/core/redpackage/RedEnvelopeGiftItemVO.kt b/core/src/main/java/com/pikolive/core/redpackage/RedEnvelopeGiftItemVO.kt new file mode 100644 index 000000000..249126782 --- /dev/null +++ b/core/src/main/java/com/pikolive/core/redpackage/RedEnvelopeGiftItemVO.kt @@ -0,0 +1,9 @@ +package com.pikolive.core.redpackage + +import com.pikolive.core.gift.bean.GiftInfo + + +data class RedEnvelopeGiftItemVO( + var giftNum: Int = 0, + var giftVo: GiftInfo? = null +) \ No newline at end of file diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/redpackage/RedEnvelopeItemVO.kt b/core/src/main/java/com/pikolive/core/redpackage/RedEnvelopeItemVO.kt similarity index 64% rename from core/src/main/java/com/yizhuan/xchat_android_core/redpackage/RedEnvelopeItemVO.kt rename to core/src/main/java/com/pikolive/core/redpackage/RedEnvelopeItemVO.kt index 9a2ff53fa..80953cd2c 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/redpackage/RedEnvelopeItemVO.kt +++ b/core/src/main/java/com/pikolive/core/redpackage/RedEnvelopeItemVO.kt @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.redpackage +package com.pikolive.core.redpackage -import com.yizhuan.xchat_android_core.community.UserVo +import com.pikolive.core.community.UserVo class RedEnvelopeItemVO( diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/redpackage/RedEnvelopeRoomMsg.kt b/core/src/main/java/com/pikolive/core/redpackage/RedEnvelopeRoomMsg.kt similarity index 93% rename from core/src/main/java/com/yizhuan/xchat_android_core/redpackage/RedEnvelopeRoomMsg.kt rename to core/src/main/java/com/pikolive/core/redpackage/RedEnvelopeRoomMsg.kt index 13ec30be7..02f0322e1 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/redpackage/RedEnvelopeRoomMsg.kt +++ b/core/src/main/java/com/pikolive/core/redpackage/RedEnvelopeRoomMsg.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.redpackage +package com.pikolive.core.redpackage import java.io.Serializable diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/redpackage/RedEnvelopeState.kt b/core/src/main/java/com/pikolive/core/redpackage/RedEnvelopeState.kt similarity index 91% rename from core/src/main/java/com/yizhuan/xchat_android_core/redpackage/RedEnvelopeState.kt rename to core/src/main/java/com/pikolive/core/redpackage/RedEnvelopeState.kt index fa64a1fab..fd6335592 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/redpackage/RedEnvelopeState.kt +++ b/core/src/main/java/com/pikolive/core/redpackage/RedEnvelopeState.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.redpackage +package com.pikolive.core.redpackage /** * 红包状态 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/redpackage/RedEnvelopeVO.kt b/core/src/main/java/com/pikolive/core/redpackage/RedEnvelopeVO.kt similarity index 89% rename from core/src/main/java/com/yizhuan/xchat_android_core/redpackage/RedEnvelopeVO.kt rename to core/src/main/java/com/pikolive/core/redpackage/RedEnvelopeVO.kt index c1ecbe5a0..0014ac15a 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/redpackage/RedEnvelopeVO.kt +++ b/core/src/main/java/com/pikolive/core/redpackage/RedEnvelopeVO.kt @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.redpackage +package com.pikolive.core.redpackage -import com.yizhuan.xchat_android_core.community.UserVo +import com.pikolive.core.community.UserVo data class RedEnvelopeVO( diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/redpackage/RedPackageData.kt b/core/src/main/java/com/pikolive/core/redpackage/RedPackageData.kt similarity index 94% rename from core/src/main/java/com/yizhuan/xchat_android_core/redpackage/RedPackageData.kt rename to core/src/main/java/com/pikolive/core/redpackage/RedPackageData.kt index 7578ece37..cc1912cab 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/redpackage/RedPackageData.kt +++ b/core/src/main/java/com/pikolive/core/redpackage/RedPackageData.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.redpackage +package com.pikolive.core.redpackage import java.io.Serializable diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/redpackage/RedPackageInfo.kt b/core/src/main/java/com/pikolive/core/redpackage/RedPackageInfo.kt similarity index 90% rename from core/src/main/java/com/yizhuan/xchat_android_core/redpackage/RedPackageInfo.kt rename to core/src/main/java/com/pikolive/core/redpackage/RedPackageInfo.kt index 832d42bcd..663f81947 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/redpackage/RedPackageInfo.kt +++ b/core/src/main/java/com/pikolive/core/redpackage/RedPackageInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.redpackage +package com.pikolive.core.redpackage data class RedPackageInfo( diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/redpackage/RedPackageModel.kt b/core/src/main/java/com/pikolive/core/redpackage/RedPackageModel.kt similarity index 92% rename from core/src/main/java/com/yizhuan/xchat_android_core/redpackage/RedPackageModel.kt rename to core/src/main/java/com/pikolive/core/redpackage/RedPackageModel.kt index 3a46e64fc..89cd718cb 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/redpackage/RedPackageModel.kt +++ b/core/src/main/java/com/pikolive/core/redpackage/RedPackageModel.kt @@ -1,10 +1,10 @@ -package com.yizhuan.xchat_android_core.redpackage +package com.pikolive.core.redpackage -import com.yizhuan.xchat_android_core.bean.response.ServiceResult -import com.yizhuan.xchat_android_core.utils.net.handleBeanData -import com.yizhuan.xchat_android_core.utils.net.handleStringData -import com.yizhuan.xchat_android_core.utils.net.io2main +import com.pikolive.core.bean.response.ServiceResult +import com.pikolive.core.utils.net.handleBeanData +import com.pikolive.core.utils.net.handleStringData +import com.pikolive.core.utils.net.io2main import com.pikolive.library.net.rxnet.RxNet import io.reactivex.Observable import io.reactivex.Single diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/redpackage/RedPackageNotifyInfo.kt b/core/src/main/java/com/pikolive/core/redpackage/RedPackageNotifyInfo.kt similarity index 95% rename from core/src/main/java/com/yizhuan/xchat_android_core/redpackage/RedPackageNotifyInfo.kt rename to core/src/main/java/com/pikolive/core/redpackage/RedPackageNotifyInfo.kt index a2d4bb783..fe7b06101 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/redpackage/RedPackageNotifyInfo.kt +++ b/core/src/main/java/com/pikolive/core/redpackage/RedPackageNotifyInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.redpackage +package com.pikolive.core.redpackage import java.io.Serializable diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/redpackage/RedPackageType.kt b/core/src/main/java/com/pikolive/core/redpackage/RedPackageType.kt similarity index 66% rename from core/src/main/java/com/yizhuan/xchat_android_core/redpackage/RedPackageType.kt rename to core/src/main/java/com/pikolive/core/redpackage/RedPackageType.kt index 3b6702e51..7c3ed92f5 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/redpackage/RedPackageType.kt +++ b/core/src/main/java/com/pikolive/core/redpackage/RedPackageType.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.redpackage +package com.pikolive.core.redpackage const val ROOM_DIAMOND = 1 const val ROOM_GIFT = 3 diff --git a/core/src/main/java/com/pikolive/core/relation/cp/CpBindUnbindEvent.java b/core/src/main/java/com/pikolive/core/relation/cp/CpBindUnbindEvent.java new file mode 100644 index 000000000..ba311d1dc --- /dev/null +++ b/core/src/main/java/com/pikolive/core/relation/cp/CpBindUnbindEvent.java @@ -0,0 +1,4 @@ +package com.pikolive.core.relation.cp; + +public class CpBindUnbindEvent { +} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/relation/cp/CpInviteDetailEntity.kt b/core/src/main/java/com/pikolive/core/relation/cp/CpInviteDetailEntity.kt similarity index 91% rename from core/src/main/java/com/yizhuan/xchat_android_core/relation/cp/CpInviteDetailEntity.kt rename to core/src/main/java/com/pikolive/core/relation/cp/CpInviteDetailEntity.kt index 2f1cf8625..70e38ecdb 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/relation/cp/CpInviteDetailEntity.kt +++ b/core/src/main/java/com/pikolive/core/relation/cp/CpInviteDetailEntity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.relation.cp +package com.pikolive.core.relation.cp data class CpInviteDetailEntity( val acceptAvatar: String? = "", diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/relation/cp/CpInviteInfo.kt b/core/src/main/java/com/pikolive/core/relation/cp/CpInviteInfo.kt similarity index 93% rename from core/src/main/java/com/yizhuan/xchat_android_core/relation/cp/CpInviteInfo.kt rename to core/src/main/java/com/pikolive/core/relation/cp/CpInviteInfo.kt index 112799cb6..814f9fa94 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/relation/cp/CpInviteInfo.kt +++ b/core/src/main/java/com/pikolive/core/relation/cp/CpInviteInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.relation.cp +package com.pikolive.core.relation.cp data class CpInviteMessage( val msg: String = "", diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/relation/cp/CpInvitePageEntity.kt b/core/src/main/java/com/pikolive/core/relation/cp/CpInvitePageEntity.kt similarity index 91% rename from core/src/main/java/com/yizhuan/xchat_android_core/relation/cp/CpInvitePageEntity.kt rename to core/src/main/java/com/pikolive/core/relation/cp/CpInvitePageEntity.kt index 8f8f85b9f..7bee0ca76 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/relation/cp/CpInvitePageEntity.kt +++ b/core/src/main/java/com/pikolive/core/relation/cp/CpInvitePageEntity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.relation.cp +package com.pikolive.core.relation.cp /** * 邀请CP弹窗信息 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/relation/cp/CpMpApplyListEntity.kt b/core/src/main/java/com/pikolive/core/relation/cp/CpMpApplyListEntity.kt similarity index 86% rename from core/src/main/java/com/yizhuan/xchat_android_core/relation/cp/CpMpApplyListEntity.kt rename to core/src/main/java/com/pikolive/core/relation/cp/CpMpApplyListEntity.kt index c00cc895d..a694b0824 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/relation/cp/CpMpApplyListEntity.kt +++ b/core/src/main/java/com/pikolive/core/relation/cp/CpMpApplyListEntity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.relation.cp +package com.pikolive.core.relation.cp /** * diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/relation/cp/CpRelation.kt b/core/src/main/java/com/pikolive/core/relation/cp/CpRelation.kt similarity index 92% rename from core/src/main/java/com/yizhuan/xchat_android_core/relation/cp/CpRelation.kt rename to core/src/main/java/com/pikolive/core/relation/cp/CpRelation.kt index ee1c9e606..3fda7f802 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/relation/cp/CpRelation.kt +++ b/core/src/main/java/com/pikolive/core/relation/cp/CpRelation.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.relation.cp +package com.pikolive.core.relation.cp data class CpRelation( /** diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/relation/cp/CpTaskEntity.kt b/core/src/main/java/com/pikolive/core/relation/cp/CpTaskEntity.kt similarity index 96% rename from core/src/main/java/com/yizhuan/xchat_android_core/relation/cp/CpTaskEntity.kt rename to core/src/main/java/com/pikolive/core/relation/cp/CpTaskEntity.kt index 4e4a00e1d..a9c253be9 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/relation/cp/CpTaskEntity.kt +++ b/core/src/main/java/com/pikolive/core/relation/cp/CpTaskEntity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.relation.cp +package com.pikolive.core.relation.cp data class CpTaskEntity( val avatar: String = "", diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/relation/cp/UserCpLevelMpEntity.kt b/core/src/main/java/com/pikolive/core/relation/cp/UserCpLevelMpEntity.kt similarity index 86% rename from core/src/main/java/com/yizhuan/xchat_android_core/relation/cp/UserCpLevelMpEntity.kt rename to core/src/main/java/com/pikolive/core/relation/cp/UserCpLevelMpEntity.kt index 6b363b5f8..d6b1b7371 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/relation/cp/UserCpLevelMpEntity.kt +++ b/core/src/main/java/com/pikolive/core/relation/cp/UserCpLevelMpEntity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.relation.cp +package com.pikolive.core.relation.cp data class UserCpLevelMpRootEntity( val haveCp: Boolean = false, diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/relation/cp/UserCpListEntity.kt b/core/src/main/java/com/pikolive/core/relation/cp/UserCpListEntity.kt similarity index 94% rename from core/src/main/java/com/yizhuan/xchat_android_core/relation/cp/UserCpListEntity.kt rename to core/src/main/java/com/pikolive/core/relation/cp/UserCpListEntity.kt index 039411d7e..4488acbaa 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/relation/cp/UserCpListEntity.kt +++ b/core/src/main/java/com/pikolive/core/relation/cp/UserCpListEntity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.relation.cp +package com.pikolive.core.relation.cp data class UserCpListEntity( val acceptUid: Long = 0, diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/IRoomCoreClient.java b/core/src/main/java/com/pikolive/core/room/IRoomCoreClient.java similarity index 87% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/IRoomCoreClient.java rename to core/src/main/java/com/pikolive/core/room/IRoomCoreClient.java index 63cb08601..216adf228 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/IRoomCoreClient.java +++ b/core/src/main/java/com/pikolive/core/room/IRoomCoreClient.java @@ -1,10 +1,16 @@ -package com.yizhuan.xchat_android_core.room; +package com.pikolive.core.room; import com.netease.nimlib.sdk.chatroom.model.ChatRoomKickOutEvent; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.room.bean.SearchRoomInfo; -import com.yizhuan.xchat_android_core.room.queue.bean.RoomConsumeInfo; +import com.pikolive.core.room.bean.RoomInfo; +import com.pikolive.core.room.bean.SearchRoomInfo; +import com.pikolive.core.room.queue.bean.RoomConsumeInfo; +import com.pikolive.core.room.bean.RoomInfo; +import com.pikolive.core.room.bean.SearchRoomInfo; +import com.pikolive.core.room.queue.bean.RoomConsumeInfo; +import com.pikolive.core.room.bean.RoomInfo; +import com.pikolive.core.room.bean.SearchRoomInfo; +import com.pikolive.core.room.queue.bean.RoomConsumeInfo; import com.pikolive.library.coremanager.ICoreClient; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/activitytimer/ActivityTimerEvent.java b/core/src/main/java/com/pikolive/core/room/activitytimer/ActivityTimerEvent.java similarity index 61% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/activitytimer/ActivityTimerEvent.java rename to core/src/main/java/com/pikolive/core/room/activitytimer/ActivityTimerEvent.java index 5a20d1e1c..5d773a4b5 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/activitytimer/ActivityTimerEvent.java +++ b/core/src/main/java/com/pikolive/core/room/activitytimer/ActivityTimerEvent.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.room.activitytimer; +package com.pikolive.core.room.activitytimer; -import com.yizhuan.xchat_android_core.base.BaseBusEvent; +import com.pikolive.core.base.BaseBusEvent; /** * create by lvzebiao @2020/2/24 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/activitytimer/TimerBean.java b/core/src/main/java/com/pikolive/core/room/activitytimer/TimerBean.java similarity index 82% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/activitytimer/TimerBean.java rename to core/src/main/java/com/pikolive/core/room/activitytimer/TimerBean.java index 1b40b8c26..6782fce04 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/activitytimer/TimerBean.java +++ b/core/src/main/java/com/pikolive/core/room/activitytimer/TimerBean.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.activitytimer; +package com.pikolive.core.room.activitytimer; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/anotherroompk/RoomPKModel.kt b/core/src/main/java/com/pikolive/core/room/anotherroompk/RoomPKModel.kt similarity index 93% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/anotherroompk/RoomPKModel.kt rename to core/src/main/java/com/pikolive/core/room/anotherroompk/RoomPKModel.kt index ac0b1968f..f05115f25 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/anotherroompk/RoomPKModel.kt +++ b/core/src/main/java/com/pikolive/core/room/anotherroompk/RoomPKModel.kt @@ -1,8 +1,8 @@ -package com.yizhuan.xchat_android_core.room.anotherroompk +package com.pikolive.core.room.anotherroompk -import com.yizhuan.xchat_android_core.bean.response.ServiceResult -import com.yizhuan.xchat_android_core.im.custom.bean.RoomPkBean -import com.yizhuan.xchat_android_core.utils.net.RxHelper +import com.pikolive.core.bean.response.ServiceResult +import com.pikolive.core.im.custom.bean.RoomPkBean +import com.pikolive.core.utils.net.RxHelper import com.pikolive.library.net.rxnet.RxNet import io.reactivex.Single import retrofit2.http.* diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/anotherroompk/ShowGiftDialogEvent.java b/core/src/main/java/com/pikolive/core/room/anotherroompk/ShowGiftDialogEvent.java similarity index 79% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/anotherroompk/ShowGiftDialogEvent.java rename to core/src/main/java/com/pikolive/core/room/anotherroompk/ShowGiftDialogEvent.java index 6975d1848..c353dcedf 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/anotherroompk/ShowGiftDialogEvent.java +++ b/core/src/main/java/com/pikolive/core/room/anotherroompk/ShowGiftDialogEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.anotherroompk; +package com.pikolive.core.room.anotherroompk; public class ShowGiftDialogEvent { private int giftId; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/anotherroompk/ShowUserInfoDialogEvent.java b/core/src/main/java/com/pikolive/core/room/anotherroompk/ShowUserInfoDialogEvent.java similarity index 71% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/anotherroompk/ShowUserInfoDialogEvent.java rename to core/src/main/java/com/pikolive/core/room/anotherroompk/ShowUserInfoDialogEvent.java index d4f40cabb..3bcd558a2 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/anotherroompk/ShowUserInfoDialogEvent.java +++ b/core/src/main/java/com/pikolive/core/room/anotherroompk/ShowUserInfoDialogEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.anotherroompk; +package com.pikolive.core.room.anotherroompk; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/anotherroompk/SimpleRoomInfo.kt b/core/src/main/java/com/pikolive/core/room/anotherroompk/SimpleRoomInfo.kt similarity index 84% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/anotherroompk/SimpleRoomInfo.kt rename to core/src/main/java/com/pikolive/core/room/anotherroompk/SimpleRoomInfo.kt index 8c6a5463c..38f0916ae 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/anotherroompk/SimpleRoomInfo.kt +++ b/core/src/main/java/com/pikolive/core/room/anotherroompk/SimpleRoomInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.anotherroompk +package com.pikolive.core.room.anotherroompk import java.io.Serializable diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/anotherroompk/SingleRoomPKModel.kt b/core/src/main/java/com/pikolive/core/room/anotherroompk/SingleRoomPKModel.kt similarity index 94% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/anotherroompk/SingleRoomPKModel.kt rename to core/src/main/java/com/pikolive/core/room/anotherroompk/SingleRoomPKModel.kt index 58a0ab56f..45f018793 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/anotherroompk/SingleRoomPKModel.kt +++ b/core/src/main/java/com/pikolive/core/room/anotherroompk/SingleRoomPKModel.kt @@ -1,8 +1,8 @@ -package com.yizhuan.xchat_android_core.room.anotherroompk +package com.pikolive.core.room.anotherroompk -import com.yizhuan.xchat_android_core.bean.response.ServiceResult -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager -import com.yizhuan.xchat_android_core.utils.net.RxHelper +import com.pikolive.core.bean.response.ServiceResult +import com.pikolive.core.manager.AvRoomDataManager +import com.pikolive.core.utils.net.RxHelper import com.pikolive.library.net.rxnet.RxNet import io.reactivex.Single import retrofit2.http.* diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/auction/IAuctionCore.java b/core/src/main/java/com/pikolive/core/room/auction/IAuctionCore.java similarity index 87% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/auction/IAuctionCore.java rename to core/src/main/java/com/pikolive/core/room/auction/IAuctionCore.java index c1bafd82f..6f320d5ae 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/auction/IAuctionCore.java +++ b/core/src/main/java/com/pikolive/core/room/auction/IAuctionCore.java @@ -1,6 +1,8 @@ -package com.yizhuan.xchat_android_core.room.auction; +package com.pikolive.core.room.auction; -import com.yizhuan.xchat_android_core.room.auction.bean.AuctionInfo; +import com.pikolive.core.room.auction.bean.AuctionInfo; +import com.pikolive.core.room.auction.bean.AuctionInfo; +import com.pikolive.core.room.auction.bean.AuctionInfo; import com.pikolive.library.coremanager.IBaseCore; /** diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/auction/IAuctionCoreClient.java b/core/src/main/java/com/pikolive/core/room/auction/IAuctionCoreClient.java similarity index 80% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/auction/IAuctionCoreClient.java rename to core/src/main/java/com/pikolive/core/room/auction/IAuctionCoreClient.java index 8ed4f85e4..543594471 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/auction/IAuctionCoreClient.java +++ b/core/src/main/java/com/pikolive/core/room/auction/IAuctionCoreClient.java @@ -1,7 +1,11 @@ -package com.yizhuan.xchat_android_core.room.auction; +package com.pikolive.core.room.auction; -import com.yizhuan.xchat_android_core.room.auction.bean.AuctionInfo; -import com.yizhuan.xchat_android_core.room.auction.bean.AuctionListUserInfo; +import com.pikolive.core.room.auction.bean.AuctionInfo; +import com.pikolive.core.room.auction.bean.AuctionListUserInfo; +import com.pikolive.core.room.auction.bean.AuctionInfo; +import com.pikolive.core.room.auction.bean.AuctionListUserInfo; +import com.pikolive.core.room.auction.bean.AuctionInfo; +import com.pikolive.core.room.auction.bean.AuctionListUserInfo; import com.pikolive.library.coremanager.ICoreClient; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/auction/bean/AuctionInfo.java b/core/src/main/java/com/pikolive/core/room/auction/bean/AuctionInfo.java similarity index 97% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/auction/bean/AuctionInfo.java rename to core/src/main/java/com/pikolive/core/room/auction/bean/AuctionInfo.java index a82cc47cd..136674ef3 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/auction/bean/AuctionInfo.java +++ b/core/src/main/java/com/pikolive/core/room/auction/bean/AuctionInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.auction.bean; +package com.pikolive.core.room.auction.bean; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/auction/bean/AuctionListUserInfo.java b/core/src/main/java/com/pikolive/core/room/auction/bean/AuctionListUserInfo.java similarity index 95% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/auction/bean/AuctionListUserInfo.java rename to core/src/main/java/com/pikolive/core/room/auction/bean/AuctionListUserInfo.java index 88d766e2a..fd2125a11 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/auction/bean/AuctionListUserInfo.java +++ b/core/src/main/java/com/pikolive/core/room/auction/bean/AuctionListUserInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.auction.bean; +package com.pikolive.core.room.auction.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/auction/bean/AuctionUser.java b/core/src/main/java/com/pikolive/core/room/auction/bean/AuctionUser.java similarity index 94% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/auction/bean/AuctionUser.java rename to core/src/main/java/com/pikolive/core/room/auction/bean/AuctionUser.java index 19e5e7b8c..5be70cdcf 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/auction/bean/AuctionUser.java +++ b/core/src/main/java/com/pikolive/core/room/auction/bean/AuctionUser.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.auction.bean; +package com.pikolive.core.room.auction.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/AnchorInfo.kt b/core/src/main/java/com/pikolive/core/room/bean/AnchorInfo.kt similarity index 72% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/bean/AnchorInfo.kt rename to core/src/main/java/com/pikolive/core/room/bean/AnchorInfo.kt index 299c6fc5e..5770e469d 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/AnchorInfo.kt +++ b/core/src/main/java/com/pikolive/core/room/bean/AnchorInfo.kt @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.room.bean +package com.pikolive.core.room.bean -import com.yizhuan.xchat_android_core.user.bean.UserInfoSkillEntity +import com.pikolive.core.user.bean.UserInfoSkillEntity data class AnchorInfo( val absCardPics: List? = null, diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/BoxSwitchVo.java b/core/src/main/java/com/pikolive/core/room/bean/BoxSwitchVo.java similarity index 97% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/bean/BoxSwitchVo.java rename to core/src/main/java/com/pikolive/core/room/bean/BoxSwitchVo.java index db78f9b4c..26e3cc1ad 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/BoxSwitchVo.java +++ b/core/src/main/java/com/pikolive/core/room/bean/BoxSwitchVo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.bean; +package com.pikolive.core.room.bean; import android.os.Parcel; import android.os.Parcelable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/BroadcastInfo.kt b/core/src/main/java/com/pikolive/core/room/bean/BroadcastInfo.kt similarity index 82% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/bean/BroadcastInfo.kt rename to core/src/main/java/com/pikolive/core/room/bean/BroadcastInfo.kt index 5f1786d4a..4aa954a30 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/BroadcastInfo.kt +++ b/core/src/main/java/com/pikolive/core/room/bean/BroadcastInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.bean +package com.pikolive.core.room.bean data class BroadcastInfo( val availableTimes: Long = 0, diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/DatingAllNotifyInfo.kt b/core/src/main/java/com/pikolive/core/room/bean/DatingAllNotifyInfo.kt similarity index 93% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/bean/DatingAllNotifyInfo.kt rename to core/src/main/java/com/pikolive/core/room/bean/DatingAllNotifyInfo.kt index a37fa6cc9..2eb8ce4a9 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/DatingAllNotifyInfo.kt +++ b/core/src/main/java/com/pikolive/core/room/bean/DatingAllNotifyInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.bean +package com.pikolive.core.room.bean import java.io.Serializable diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/DatingNotifyInfo.kt b/core/src/main/java/com/pikolive/core/room/bean/DatingNotifyInfo.kt similarity index 95% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/bean/DatingNotifyInfo.kt rename to core/src/main/java/com/pikolive/core/room/bean/DatingNotifyInfo.kt index 48a71dfc4..dd1eb65b4 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/DatingNotifyInfo.kt +++ b/core/src/main/java/com/pikolive/core/room/bean/DatingNotifyInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.bean +package com.pikolive.core.room.bean import java.io.Serializable diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/DragonBarInfo.java b/core/src/main/java/com/pikolive/core/room/bean/DragonBarInfo.java similarity index 90% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/bean/DragonBarInfo.java rename to core/src/main/java/com/pikolive/core/room/bean/DragonBarInfo.java index 3d68f4232..c3f260370 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/DragonBarInfo.java +++ b/core/src/main/java/com/pikolive/core/room/bean/DragonBarInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.bean; +package com.pikolive.core.room.bean; /** * Created by huangmeng1 on 2018/7/12. diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/FindLoveSwitchVo.java b/core/src/main/java/com/pikolive/core/room/bean/FindLoveSwitchVo.java similarity index 97% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/bean/FindLoveSwitchVo.java rename to core/src/main/java/com/pikolive/core/room/bean/FindLoveSwitchVo.java index d8e8914b8..e72da1ea9 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/FindLoveSwitchVo.java +++ b/core/src/main/java/com/pikolive/core/room/bean/FindLoveSwitchVo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.bean; +package com.pikolive.core.room.bean; import android.os.Parcel; import android.os.Parcelable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/HomeLiveTopInfo.kt b/core/src/main/java/com/pikolive/core/room/bean/HomeLiveTopInfo.kt similarity index 86% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/bean/HomeLiveTopInfo.kt rename to core/src/main/java/com/pikolive/core/room/bean/HomeLiveTopInfo.kt index 97cb5aedf..b65522c8e 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/HomeLiveTopInfo.kt +++ b/core/src/main/java/com/pikolive/core/room/bean/HomeLiveTopInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.bean +package com.pikolive.core.room.bean data class HomeLiveTopInfo( val onceLookStatus: Boolean = false, diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/LeaveModeAttachment.java b/core/src/main/java/com/pikolive/core/room/bean/LeaveModeAttachment.java similarity index 90% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/bean/LeaveModeAttachment.java rename to core/src/main/java/com/pikolive/core/room/bean/LeaveModeAttachment.java index dfb5c7481..629c65ea5 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/LeaveModeAttachment.java +++ b/core/src/main/java/com/pikolive/core/room/bean/LeaveModeAttachment.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.room.bean; +package com.pikolive.core.room.bean; import com.alibaba.fastjson.JSONObject; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; +import com.pikolive.core.im.custom.bean.CustomAttachment; public class LeaveModeAttachment extends CustomAttachment { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/MeCenterInfo.kt b/core/src/main/java/com/pikolive/core/room/bean/MeCenterInfo.kt similarity index 84% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/bean/MeCenterInfo.kt rename to core/src/main/java/com/pikolive/core/room/bean/MeCenterInfo.kt index f2c68204a..152e4d3da 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/MeCenterInfo.kt +++ b/core/src/main/java/com/pikolive/core/room/bean/MeCenterInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.bean +package com.pikolive.core.room.bean data class MeCenterInfo( val centerBadge: String?= null, diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/OnlineChatMember.java b/core/src/main/java/com/pikolive/core/room/bean/OnlineChatMember.java similarity index 90% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/bean/OnlineChatMember.java rename to core/src/main/java/com/pikolive/core/room/bean/OnlineChatMember.java index 466da3331..7b2ac01f7 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/OnlineChatMember.java +++ b/core/src/main/java/com/pikolive/core/room/bean/OnlineChatMember.java @@ -1,12 +1,18 @@ -package com.yizhuan.xchat_android_core.room.bean; +package com.pikolive.core.room.bean; import androidx.annotation.NonNull; import com.chad.library.adapter.base.entity.MultiItemEntity; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember; -import com.yizhuan.xchat_android_core.noble.NobleResourceType; -import com.yizhuan.xchat_android_core.noble.NobleUtil; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.pikolive.core.noble.NobleResourceType; +import com.pikolive.core.noble.NobleUtil; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.noble.NobleResourceType; +import com.pikolive.core.noble.NobleUtil; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.noble.NobleResourceType; +import com.pikolive.core.noble.NobleUtil; +import com.pikolive.core.user.bean.UserInfo; import com.pikolive.library.utils.ListUtils; import java.util.ArrayList; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomAudioSdkType.java b/core/src/main/java/com/pikolive/core/room/bean/RoomAudioSdkType.java similarity index 74% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomAudioSdkType.java rename to core/src/main/java/com/pikolive/core/room/bean/RoomAudioSdkType.java index 7caf13d00..080481671 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomAudioSdkType.java +++ b/core/src/main/java/com/pikolive/core/room/bean/RoomAudioSdkType.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.bean; +package com.pikolive.core.room.bean; /** *房间语音SDK类型 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomContributeDataInfo.java b/core/src/main/java/com/pikolive/core/room/bean/RoomContributeDataInfo.java similarity index 99% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomContributeDataInfo.java rename to core/src/main/java/com/pikolive/core/room/bean/RoomContributeDataInfo.java index 537fdd85a..47b9e3b16 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomContributeDataInfo.java +++ b/core/src/main/java/com/pikolive/core/room/bean/RoomContributeDataInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.bean; +package com.pikolive.core.room.bean; import android.os.Parcel; import android.os.Parcelable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomContributeRoomInfo.java b/core/src/main/java/com/pikolive/core/room/bean/RoomContributeRoomInfo.java similarity index 98% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomContributeRoomInfo.java rename to core/src/main/java/com/pikolive/core/room/bean/RoomContributeRoomInfo.java index c406a7939..9566e02ea 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomContributeRoomInfo.java +++ b/core/src/main/java/com/pikolive/core/room/bean/RoomContributeRoomInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.bean; +package com.pikolive.core.room.bean; import android.os.Parcel; import android.os.Parcelable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomContributeUserInfo.java b/core/src/main/java/com/pikolive/core/room/bean/RoomContributeUserInfo.java similarity index 99% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomContributeUserInfo.java rename to core/src/main/java/com/pikolive/core/room/bean/RoomContributeUserInfo.java index 0f76adf77..49c769a17 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomContributeUserInfo.java +++ b/core/src/main/java/com/pikolive/core/room/bean/RoomContributeUserInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.bean; +package com.pikolive.core.room.bean; import android.os.Parcel; import android.os.Parcelable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomInfo.java b/core/src/main/java/com/pikolive/core/room/bean/RoomInfo.java similarity index 99% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomInfo.java rename to core/src/main/java/com/pikolive/core/room/bean/RoomInfo.java index 5e10a10c8..e1b82fb76 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomInfo.java +++ b/core/src/main/java/com/pikolive/core/room/bean/RoomInfo.java @@ -1,9 +1,9 @@ -package com.yizhuan.xchat_android_core.room.bean; +package com.pikolive.core.room.bean; import android.os.Parcel; import android.os.Parcelable; -import com.yizhuan.xchat_android_core.R; +import com.pikolive.core.R; import com.pikolive.library.utils.ResUtil; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomInviteFansInfo.kt b/core/src/main/java/com/pikolive/core/room/bean/RoomInviteFansInfo.kt similarity index 79% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomInviteFansInfo.kt rename to core/src/main/java/com/pikolive/core/room/bean/RoomInviteFansInfo.kt index 0199058ed..24b37e96c 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomInviteFansInfo.kt +++ b/core/src/main/java/com/pikolive/core/room/bean/RoomInviteFansInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.bean +package com.pikolive.core.room.bean data class RoomInviteFansInfo( diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomListResult.java b/core/src/main/java/com/pikolive/core/room/bean/RoomListResult.java similarity index 56% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomListResult.java rename to core/src/main/java/com/pikolive/core/room/bean/RoomListResult.java index 9a4d1f833..4bdd0c674 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomListResult.java +++ b/core/src/main/java/com/pikolive/core/room/bean/RoomListResult.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.room.bean; +package com.pikolive.core.room.bean; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; +import com.pikolive.core.bean.response.ServiceResult; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomMessageViewNoticeInfo.java b/core/src/main/java/com/pikolive/core/room/bean/RoomMessageViewNoticeInfo.java similarity index 75% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomMessageViewNoticeInfo.java rename to core/src/main/java/com/pikolive/core/room/bean/RoomMessageViewNoticeInfo.java index 11c09e526..5a9b5a4b4 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomMessageViewNoticeInfo.java +++ b/core/src/main/java/com/pikolive/core/room/bean/RoomMessageViewNoticeInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.bean; +package com.pikolive.core.room.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomModeType.java b/core/src/main/java/com/pikolive/core/room/bean/RoomModeType.java similarity index 85% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomModeType.java rename to core/src/main/java/com/pikolive/core/room/bean/RoomModeType.java index ae4b462b9..456d54c87 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomModeType.java +++ b/core/src/main/java/com/pikolive/core/room/bean/RoomModeType.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.bean; +package com.pikolive.core.room.bean; /** * 房间各种模式的设定 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomRankHalfHourDataInfo.java b/core/src/main/java/com/pikolive/core/room/bean/RoomRankHalfHourDataInfo.java similarity index 97% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomRankHalfHourDataInfo.java rename to core/src/main/java/com/pikolive/core/room/bean/RoomRankHalfHourDataInfo.java index 3ccabac36..d4086faf6 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomRankHalfHourDataInfo.java +++ b/core/src/main/java/com/pikolive/core/room/bean/RoomRankHalfHourDataInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.bean; +package com.pikolive.core.room.bean; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomRankHalfHourMeInfo.java b/core/src/main/java/com/pikolive/core/room/bean/RoomRankHalfHourMeInfo.java similarity index 98% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomRankHalfHourMeInfo.java rename to core/src/main/java/com/pikolive/core/room/bean/RoomRankHalfHourMeInfo.java index 4a5d76736..7165c4b7e 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomRankHalfHourMeInfo.java +++ b/core/src/main/java/com/pikolive/core/room/bean/RoomRankHalfHourMeInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.bean; +package com.pikolive.core.room.bean; public class RoomRankHalfHourMeInfo { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomRankHalfHourRankInfo.java b/core/src/main/java/com/pikolive/core/room/bean/RoomRankHalfHourRankInfo.java similarity index 97% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomRankHalfHourRankInfo.java rename to core/src/main/java/com/pikolive/core/room/bean/RoomRankHalfHourRankInfo.java index 471d0ce06..9e6498852 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomRankHalfHourRankInfo.java +++ b/core/src/main/java/com/pikolive/core/room/bean/RoomRankHalfHourRankInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.bean; +package com.pikolive.core.room.bean; public class RoomRankHalfHourRankInfo { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomRankMultiItem.java b/core/src/main/java/com/pikolive/core/room/bean/RoomRankMultiItem.java similarity index 92% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomRankMultiItem.java rename to core/src/main/java/com/pikolive/core/room/bean/RoomRankMultiItem.java index 9980f8460..9725df29b 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomRankMultiItem.java +++ b/core/src/main/java/com/pikolive/core/room/bean/RoomRankMultiItem.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.bean; +package com.pikolive.core.room.bean; import com.chad.library.adapter.base.entity.MultiItemEntity; diff --git a/core/src/main/java/com/pikolive/core/room/bean/RoomResult.java b/core/src/main/java/com/pikolive/core/room/bean/RoomResult.java new file mode 100644 index 000000000..04427df29 --- /dev/null +++ b/core/src/main/java/com/pikolive/core/room/bean/RoomResult.java @@ -0,0 +1,11 @@ +package com.pikolive.core.room.bean; + +import com.pikolive.core.bean.response.ServiceResult; + +/** + * Created by zhouxiangfeng on 2017/5/4. + */ + +public class RoomResult extends ServiceResult { + +} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomSettingTabInfo.java b/core/src/main/java/com/pikolive/core/room/bean/RoomSettingTabInfo.java similarity index 97% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomSettingTabInfo.java rename to core/src/main/java/com/pikolive/core/room/bean/RoomSettingTabInfo.java index b077f7608..d4606054c 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomSettingTabInfo.java +++ b/core/src/main/java/com/pikolive/core/room/bean/RoomSettingTabInfo.java @@ -1,9 +1,9 @@ -package com.yizhuan.xchat_android_core.room.bean; +package com.pikolive.core.room.bean; import android.os.Parcel; import android.os.Parcelable; -import com.yizhuan.xchat_android_core.R; +import com.pikolive.core.R; import com.pikolive.library.utils.ResUtil; import java.util.ArrayList; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomWelcomeConfig.java b/core/src/main/java/com/pikolive/core/room/bean/RoomWelcomeConfig.java similarity index 84% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomWelcomeConfig.java rename to core/src/main/java/com/pikolive/core/room/bean/RoomWelcomeConfig.java index 416631358..cad8f41fa 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomWelcomeConfig.java +++ b/core/src/main/java/com/pikolive/core/room/bean/RoomWelcomeConfig.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.bean; +package com.pikolive.core.room.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/SearchRoomInfo.java b/core/src/main/java/com/pikolive/core/room/bean/SearchRoomInfo.java similarity index 92% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/bean/SearchRoomInfo.java rename to core/src/main/java/com/pikolive/core/room/bean/SearchRoomInfo.java index 7159af041..04860b42f 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/SearchRoomInfo.java +++ b/core/src/main/java/com/pikolive/core/room/bean/SearchRoomInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.bean; +package com.pikolive.core.room.bean; import android.graphics.Color; import android.os.Parcel; @@ -9,10 +9,13 @@ import android.text.TextUtils; import android.text.style.ForegroundColorSpan; import com.chad.library.adapter.base.entity.MultiItemEntity; -import com.yizhuan.xchat_android_core.home.bean.BannerInfo; -import com.yizhuan.xchat_android_core.level.UserLevelVo; -import com.yizhuan.xchat_android_core.noble.NobleInfo; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.pikolive.core.level.UserLevelVo; +import com.pikolive.core.noble.NobleInfo; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core2.home.bean.BannerInfo; +import com.pikolive.core.level.UserLevelVo; +import com.pikolive.core.noble.NobleInfo; +import com.pikolive.core.user.bean.UserInfo; import com.pikolive.library.utils.ListUtils; import java.util.ArrayList; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/SeizeTreasureSwitchVo.kt b/core/src/main/java/com/pikolive/core/room/bean/SeizeTreasureSwitchVo.kt similarity index 79% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/bean/SeizeTreasureSwitchVo.kt rename to core/src/main/java/com/pikolive/core/room/bean/SeizeTreasureSwitchVo.kt index f8774cf84..2e69b7c2b 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/SeizeTreasureSwitchVo.kt +++ b/core/src/main/java/com/pikolive/core/room/bean/SeizeTreasureSwitchVo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.bean +package com.pikolive.core.room.bean import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/ShowUserInfoDialog.java b/core/src/main/java/com/pikolive/core/room/bean/ShowUserInfoDialog.java similarity index 90% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/bean/ShowUserInfoDialog.java rename to core/src/main/java/com/pikolive/core/room/bean/ShowUserInfoDialog.java index 43b527265..c8c676541 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/ShowUserInfoDialog.java +++ b/core/src/main/java/com/pikolive/core/room/bean/ShowUserInfoDialog.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.bean; +package com.pikolive.core.room.bean; /** * Created by huangmeng1 on 2018/8/6. diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/SimplePartyRoomInfo.java b/core/src/main/java/com/pikolive/core/room/bean/SimplePartyRoomInfo.java similarity index 73% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/bean/SimplePartyRoomInfo.java rename to core/src/main/java/com/pikolive/core/room/bean/SimplePartyRoomInfo.java index f93167465..12a9f25de 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/SimplePartyRoomInfo.java +++ b/core/src/main/java/com/pikolive/core/room/bean/SimplePartyRoomInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.bean; +package com.pikolive.core.room.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/SingleRoomSortInfo.kt b/core/src/main/java/com/pikolive/core/room/bean/SingleRoomSortInfo.kt similarity index 63% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/bean/SingleRoomSortInfo.kt rename to core/src/main/java/com/pikolive/core/room/bean/SingleRoomSortInfo.kt index 159d76fee..9c4eb2770 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/SingleRoomSortInfo.kt +++ b/core/src/main/java/com/pikolive/core/room/bean/SingleRoomSortInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.bean +package com.pikolive.core.room.bean data class SingleRoomSortInfo( val id: Long? = 0, diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/UpMic.java b/core/src/main/java/com/pikolive/core/room/bean/UpMic.java similarity index 77% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/bean/UpMic.java rename to core/src/main/java/com/pikolive/core/room/bean/UpMic.java index 97829a977..598f7b46e 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/UpMic.java +++ b/core/src/main/java/com/pikolive/core/room/bean/UpMic.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.bean; +package com.pikolive.core.room.bean; /** * Created by huangmeng1 on 2018/7/27. diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/WelcomeInfo.java b/core/src/main/java/com/pikolive/core/room/bean/WelcomeInfo.java similarity index 95% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/bean/WelcomeInfo.java rename to core/src/main/java/com/pikolive/core/room/bean/WelcomeInfo.java index 57f43c7da..6caa0deb3 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/WelcomeInfo.java +++ b/core/src/main/java/com/pikolive/core/room/bean/WelcomeInfo.java @@ -1,9 +1,9 @@ -package com.yizhuan.xchat_android_core.room.bean; +package com.pikolive.core.room.bean; import android.text.TextUtils; import com.netease.nim.uikit.common.util.log.LogUtil; -import com.yizhuan.xchat_android_core.R; +import com.pikolive.core.R; import com.pikolive.library.utils.ResUtil; import lombok.Getter; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/core/RoomDataService.kt b/core/src/main/java/com/pikolive/core/room/core/RoomDataService.kt similarity index 51% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/core/RoomDataService.kt rename to core/src/main/java/com/pikolive/core/room/core/RoomDataService.kt index 63a323cf5..4a7b6484b 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/core/RoomDataService.kt +++ b/core/src/main/java/com/pikolive/core/room/core/RoomDataService.kt @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.room.core +package com.pikolive.core.room.core -import com.yizhuan.xchat_android_core.support.room.RoomService +import com.pikolive.core.support.room.RoomService /** * Created by Max on 2023/10/26 12:36 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/dragonball/DragonBallModel.java b/core/src/main/java/com/pikolive/core/room/dragonball/DragonBallModel.java similarity index 84% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/dragonball/DragonBallModel.java rename to core/src/main/java/com/pikolive/core/room/dragonball/DragonBallModel.java index a6fba929c..9f66109f8 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/dragonball/DragonBallModel.java +++ b/core/src/main/java/com/pikolive/core/room/dragonball/DragonBallModel.java @@ -1,12 +1,12 @@ -package com.yizhuan.xchat_android_core.room.dragonball; +package com.pikolive.core.room.dragonball; -import com.yizhuan.xchat_android_core.R; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.room.bean.DragonBarInfo; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.R; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core.room.bean.DragonBarInfo; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.net.rxnet.RxNet; import com.pikolive.library.utils.ResUtil; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/dragonball/IDragonBallModel.java b/core/src/main/java/com/pikolive/core/room/dragonball/IDragonBallModel.java similarity index 61% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/dragonball/IDragonBallModel.java rename to core/src/main/java/com/pikolive/core/room/dragonball/IDragonBallModel.java index bd9602581..35b2855c0 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/dragonball/IDragonBallModel.java +++ b/core/src/main/java/com/pikolive/core/room/dragonball/IDragonBallModel.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.room.dragonball; +package com.pikolive.core.room.dragonball; -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.room.bean.DragonBarInfo; +import com.pikolive.core.base.IModel; +import com.pikolive.core.room.bean.DragonBarInfo; import io.reactivex.Single; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/event/DatingSelectUserEvent.java b/core/src/main/java/com/pikolive/core/room/event/DatingSelectUserEvent.java similarity index 91% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/event/DatingSelectUserEvent.java rename to core/src/main/java/com/pikolive/core/room/event/DatingSelectUserEvent.java index 7d2351b63..5b699433f 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/event/DatingSelectUserEvent.java +++ b/core/src/main/java/com/pikolive/core/room/event/DatingSelectUserEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.event; +package com.pikolive.core.room.event; public class DatingSelectUserEvent { diff --git a/core/src/main/java/com/pikolive/core/room/event/EixtCountDownEvent.java b/core/src/main/java/com/pikolive/core/room/event/EixtCountDownEvent.java new file mode 100644 index 000000000..93cf924a3 --- /dev/null +++ b/core/src/main/java/com/pikolive/core/room/event/EixtCountDownEvent.java @@ -0,0 +1,4 @@ +package com.pikolive.core.room.event; + +public class EixtCountDownEvent { +} diff --git a/core/src/main/java/com/pikolive/core/room/event/FaceIsReadyEvent.java b/core/src/main/java/com/pikolive/core/room/event/FaceIsReadyEvent.java new file mode 100644 index 000000000..a1675fb08 --- /dev/null +++ b/core/src/main/java/com/pikolive/core/room/event/FaceIsReadyEvent.java @@ -0,0 +1,4 @@ +package com.pikolive.core.room.event; + +public class FaceIsReadyEvent { +} diff --git a/core/src/main/java/com/pikolive/core/room/event/FinishAvRoomEvent.java b/core/src/main/java/com/pikolive/core/room/event/FinishAvRoomEvent.java new file mode 100644 index 000000000..4cb517afb --- /dev/null +++ b/core/src/main/java/com/pikolive/core/room/event/FinishAvRoomEvent.java @@ -0,0 +1,4 @@ +package com.pikolive.core.room.event; + +public class FinishAvRoomEvent { +} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/event/MessageSizeEvent.java b/core/src/main/java/com/pikolive/core/room/event/MessageSizeEvent.java similarity index 85% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/event/MessageSizeEvent.java rename to core/src/main/java/com/pikolive/core/room/event/MessageSizeEvent.java index 8268016cf..820214e1a 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/event/MessageSizeEvent.java +++ b/core/src/main/java/com/pikolive/core/room/event/MessageSizeEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.event; +package com.pikolive.core.room.event; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/event/ReceiveFaceEvent.java b/core/src/main/java/com/pikolive/core/room/event/ReceiveFaceEvent.java similarity index 69% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/event/ReceiveFaceEvent.java rename to core/src/main/java/com/pikolive/core/room/event/ReceiveFaceEvent.java index 32006543b..3707a97ad 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/event/ReceiveFaceEvent.java +++ b/core/src/main/java/com/pikolive/core/room/event/ReceiveFaceEvent.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.room.event; +package com.pikolive.core.room.event; -import com.yizhuan.xchat_android_core.room.face.FaceReceiveInfo; +import com.pikolive.core.room.face.FaceReceiveInfo; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/event/RoomAtEvent.java b/core/src/main/java/com/pikolive/core/room/event/RoomAtEvent.java similarity index 76% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/event/RoomAtEvent.java rename to core/src/main/java/com/pikolive/core/room/event/RoomAtEvent.java index 551d16d36..9c33d9bec 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/event/RoomAtEvent.java +++ b/core/src/main/java/com/pikolive/core/room/event/RoomAtEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.event; +package com.pikolive.core.room.event; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/core/src/main/java/com/pikolive/core/room/event/RoomClearScreenEvent.java b/core/src/main/java/com/pikolive/core/room/event/RoomClearScreenEvent.java new file mode 100644 index 000000000..02cb69ff8 --- /dev/null +++ b/core/src/main/java/com/pikolive/core/room/event/RoomClearScreenEvent.java @@ -0,0 +1,4 @@ +package com.pikolive.core.room.event; + +public class RoomClearScreenEvent { +} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/event/RoomExitEvent.java b/core/src/main/java/com/pikolive/core/room/event/RoomExitEvent.java similarity index 54% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/event/RoomExitEvent.java rename to core/src/main/java/com/pikolive/core/room/event/RoomExitEvent.java index 3cb3cdc7d..06956f330 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/event/RoomExitEvent.java +++ b/core/src/main/java/com/pikolive/core/room/event/RoomExitEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.event; +package com.pikolive.core.room.event; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/event/RoomInfoEvent.java b/core/src/main/java/com/pikolive/core/room/event/RoomInfoEvent.java similarity index 53% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/event/RoomInfoEvent.java rename to core/src/main/java/com/pikolive/core/room/event/RoomInfoEvent.java index 50560fecc..80db76347 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/event/RoomInfoEvent.java +++ b/core/src/main/java/com/pikolive/core/room/event/RoomInfoEvent.java @@ -1,6 +1,7 @@ -package com.yizhuan.xchat_android_core.room.event; +package com.pikolive.core.room.event; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; +import com.pikolive.core.Constants; +import com.pikolive.core.room.bean.RoomInfo; import lombok.AllArgsConstructor; import lombok.Data; @@ -11,7 +12,7 @@ public class RoomInfoEvent { /** * 已知取值： - * @see com.yizhuan.xchat_android_core.Constants#PAGE_TYPE_MAIN_FRAGMENT + * @see Constants#PAGE_TYPE_MAIN_FRAGMENT */ private int pageType; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/event/RoomShieldEvent.java b/core/src/main/java/com/pikolive/core/room/event/RoomShieldEvent.java similarity index 54% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/event/RoomShieldEvent.java rename to core/src/main/java/com/pikolive/core/room/event/RoomShieldEvent.java index 467b667bd..3aef07f45 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/event/RoomShieldEvent.java +++ b/core/src/main/java/com/pikolive/core/room/event/RoomShieldEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.event; +package com.pikolive.core.room.event; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/event/RoomTaskTipsEvent.java b/core/src/main/java/com/pikolive/core/room/event/RoomTaskTipsEvent.java similarity index 71% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/event/RoomTaskTipsEvent.java rename to core/src/main/java/com/pikolive/core/room/event/RoomTaskTipsEvent.java index 113aa2b16..5ef2369cc 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/event/RoomTaskTipsEvent.java +++ b/core/src/main/java/com/pikolive/core/room/event/RoomTaskTipsEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.event; +package com.pikolive.core.room.event; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/event/SwitchRoomEvent.java b/core/src/main/java/com/pikolive/core/room/event/SwitchRoomEvent.java similarity index 57% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/event/SwitchRoomEvent.java rename to core/src/main/java/com/pikolive/core/room/event/SwitchRoomEvent.java index 91922b213..fb45ad21c 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/event/SwitchRoomEvent.java +++ b/core/src/main/java/com/pikolive/core/room/event/SwitchRoomEvent.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.room.event; +package com.pikolive.core.room.event; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; +import com.pikolive.core.room.bean.RoomInfo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/exception/AntiSpamHitException.java b/core/src/main/java/com/pikolive/core/room/exception/AntiSpamHitException.java similarity index 71% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/exception/AntiSpamHitException.java rename to core/src/main/java/com/pikolive/core/room/exception/AntiSpamHitException.java index 5db532a7b..9773636a4 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/exception/AntiSpamHitException.java +++ b/core/src/main/java/com/pikolive/core/room/exception/AntiSpamHitException.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.exception; +package com.pikolive.core.room.exception; public class AntiSpamHitException extends Exception { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/face/DynamicFaceModel.java b/core/src/main/java/com/pikolive/core/room/face/DynamicFaceModel.java similarity index 95% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/face/DynamicFaceModel.java rename to core/src/main/java/com/pikolive/core/room/face/DynamicFaceModel.java index 131c5b779..05ab9ffc5 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/face/DynamicFaceModel.java +++ b/core/src/main/java/com/pikolive/core/room/face/DynamicFaceModel.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.room.face; +package com.pikolive.core.room.face; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_FACE; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_FACE_SEND; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_FACE; +import static com.pikolive.core.im.custom.bean.CustomAttachment.CUSTOM_MSG_SUB_TYPE_FACE_SEND; import android.annotation.SuppressLint; import android.text.TextUtils; @@ -19,26 +19,30 @@ import com.netease.nimlib.sdk.chatroom.ChatRoomMessageBuilder; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; import com.netease.nimlib.sdk.msg.constant.MsgTypeEnum; import com.orhanobut.logger.Logger; -import com.yizhuan.xchat_android_core.DemoCache; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.RoomQueueInfo; -import com.yizhuan.xchat_android_core.gift.bean.SimpleVipInfo; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.FaceAttachment; -import com.yizhuan.xchat_android_core.initial.InitialModel; -import com.yizhuan.xchat_android_core.initial.bean.InitInfo; -import com.yizhuan.xchat_android_core.interceptor.NoParamsInterceptor; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.room.event.FaceIsReadyEvent; -import com.yizhuan.xchat_android_core.room.event.ReceiveFaceEvent; -import com.yizhuan.xchat_android_core.room.queue.bean.MicMemberInfo; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.utils.LogUtils; -import com.yizhuan.xchat_android_core.vip.UserVipInfo; +import com.pikolive.core.room.event.FaceIsReadyEvent; +import com.pikolive.core.room.event.ReceiveFaceEvent; +import com.pikolive.core.room.queue.bean.MicMemberInfo; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.room.event.FaceIsReadyEvent; +import com.pikolive.core.room.event.ReceiveFaceEvent; +import com.pikolive.core.room.queue.bean.MicMemberInfo; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.DemoCache; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.bean.RoomQueueInfo; +import com.pikolive.core.gift.bean.SimpleVipInfo; +import com.pikolive.core.im.custom.bean.CustomAttachment; +import com.pikolive.core.im.custom.bean.FaceAttachment; +import com.pikolive.core.initial.InitialModel; +import com.pikolive.core.initial.bean.InitInfo; +import com.pikolive.core.interceptor.NoParamsInterceptor; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core.vip.UserVipInfo; +import com.pikolive.core2.manager.IMNetEaseManager; +import com.pikolive.core.room.bean.RoomInfo; +import com.pikolive.core.user.UserModel; +import com.pikolive.core.utils.LogUtils; import com.pikolive.library.utils.ListUtils; import com.pikolive.library.utils.NetworkUtils; import com.pikolive.library.utils.codec.DESUtils; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/face/FaceInfo.java b/core/src/main/java/com/pikolive/core/room/face/FaceInfo.java similarity index 98% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/face/FaceInfo.java rename to core/src/main/java/com/pikolive/core/room/face/FaceInfo.java index cc6576b23..95d10bccb 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/face/FaceInfo.java +++ b/core/src/main/java/com/pikolive/core/room/face/FaceInfo.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.room.face; +package com.pikolive.core.room.face; import com.google.gson.annotations.SerializedName; -import com.yizhuan.xchat_android_core.gift.bean.SimpleVipInfo; +import com.pikolive.core.gift.bean.SimpleVipInfo; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/face/FaceListInfo.java b/core/src/main/java/com/pikolive/core/room/face/FaceListInfo.java similarity index 96% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/face/FaceListInfo.java rename to core/src/main/java/com/pikolive/core/room/face/FaceListInfo.java index e510a6b22..af9096924 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/face/FaceListInfo.java +++ b/core/src/main/java/com/pikolive/core/room/face/FaceListInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.face; +package com.pikolive.core.room.face; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/face/FaceReceiveInfo.java b/core/src/main/java/com/pikolive/core/room/face/FaceReceiveInfo.java similarity index 96% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/face/FaceReceiveInfo.java rename to core/src/main/java/com/pikolive/core/room/face/FaceReceiveInfo.java index 1294a649a..c4b2f0b1e 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/face/FaceReceiveInfo.java +++ b/core/src/main/java/com/pikolive/core/room/face/FaceReceiveInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.face; +package com.pikolive.core.room.face; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/face/IDynamicFaceModel.java b/core/src/main/java/com/pikolive/core/room/face/IDynamicFaceModel.java similarity index 94% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/face/IDynamicFaceModel.java rename to core/src/main/java/com/pikolive/core/room/face/IDynamicFaceModel.java index 2147e330a..de0ba1773 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/face/IDynamicFaceModel.java +++ b/core/src/main/java/com/pikolive/core/room/face/IDynamicFaceModel.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.room.face; +package com.pikolive.core.room.face; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; -import com.yizhuan.xchat_android_core.base.IModel; +import com.pikolive.core.base.IModel; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/face/IFaceCore.java b/core/src/main/java/com/pikolive/core/room/face/IFaceCore.java similarity index 97% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/face/IFaceCore.java rename to core/src/main/java/com/pikolive/core/room/face/IFaceCore.java index 809fd0f8c..df508427d 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/face/IFaceCore.java +++ b/core/src/main/java/com/pikolive/core/room/face/IFaceCore.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.face; +package com.pikolive.core.room.face; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; import com.pikolive.library.coremanager.IBaseCore; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/face/IFaceCoreClient.java b/core/src/main/java/com/pikolive/core/room/face/IFaceCoreClient.java similarity index 91% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/face/IFaceCoreClient.java rename to core/src/main/java/com/pikolive/core/room/face/IFaceCoreClient.java index f54e21664..78065e20b 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/face/IFaceCoreClient.java +++ b/core/src/main/java/com/pikolive/core/room/face/IFaceCoreClient.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.face; +package com.pikolive.core.room.face; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; import com.pikolive.library.coremanager.ICoreClient; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/game/GameCfg.kt b/core/src/main/java/com/pikolive/core/room/game/GameCfg.kt similarity index 98% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/game/GameCfg.kt rename to core/src/main/java/com/pikolive/core/room/game/GameCfg.kt index 65f47ad14..c160984a6 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/game/GameCfg.kt +++ b/core/src/main/java/com/pikolive/core/room/game/GameCfg.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.game +package com.pikolive.core.room.game /*** * diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/game/GameCodeInfo.kt b/core/src/main/java/com/pikolive/core/room/game/GameCodeInfo.kt similarity index 60% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/game/GameCodeInfo.kt rename to core/src/main/java/com/pikolive/core/room/game/GameCodeInfo.kt index 8a155d344..af876bf06 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/game/GameCodeInfo.kt +++ b/core/src/main/java/com/pikolive/core/room/game/GameCodeInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.game +package com.pikolive.core.room.game data class GameCodeInfo( val code: String, diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/game/GameInfo.kt b/core/src/main/java/com/pikolive/core/room/game/GameInfo.kt similarity index 81% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/game/GameInfo.kt rename to core/src/main/java/com/pikolive/core/room/game/GameInfo.kt index 1b279dc03..161c751f1 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/game/GameInfo.kt +++ b/core/src/main/java/com/pikolive/core/room/game/GameInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.game +package com.pikolive.core.room.game data class GameInfo( val isShow: Boolean = false, diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/game/GameModel.kt b/core/src/main/java/com/pikolive/core/room/game/GameModel.kt similarity index 79% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/game/GameModel.kt rename to core/src/main/java/com/pikolive/core/room/game/GameModel.kt index 082580531..711ca6d1c 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/game/GameModel.kt +++ b/core/src/main/java/com/pikolive/core/room/game/GameModel.kt @@ -1,9 +1,9 @@ -package com.yizhuan.xchat_android_core.room.game +package com.pikolive.core.room.game -import com.yizhuan.xchat_android_core.auth.AuthModel -import com.yizhuan.xchat_android_core.base.BaseModel -import com.yizhuan.xchat_android_core.bean.response.ServiceResult -import com.yizhuan.xchat_android_core.utils.net.RxHelper +import com.pikolive.core.auth.AuthModel +import com.pikolive.core.base.BaseModel +import com.pikolive.core.bean.response.ServiceResult +import com.pikolive.core.utils.net.RxHelper import com.pikolive.library.net.rxnet.RxNet import io.reactivex.Single import retrofit2.http.* diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/game/GameStatus.java b/core/src/main/java/com/pikolive/core/room/game/GameStatus.java similarity index 73% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/game/GameStatus.java rename to core/src/main/java/com/pikolive/core/room/game/GameStatus.java index 09520854b..96a05a815 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/game/GameStatus.java +++ b/core/src/main/java/com/pikolive/core/room/game/GameStatus.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.game; +package com.pikolive.core.room.game; public interface GameStatus { int STATUS_NOT_JOIN = 0; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/GiftValueModel.java b/core/src/main/java/com/pikolive/core/room/giftvalue/GiftValueModel.java similarity index 91% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/GiftValueModel.java rename to core/src/main/java/com/pikolive/core/room/giftvalue/GiftValueModel.java index 5ca880466..2299a5ae2 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/GiftValueModel.java +++ b/core/src/main/java/com/pikolive/core/room/giftvalue/GiftValueModel.java @@ -1,11 +1,13 @@ -package com.yizhuan.xchat_android_core.room.giftvalue; +package com.pikolive.core.room.giftvalue; import com.google.gson.JsonElement; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.room.giftvalue.bean.RoomGiftValue; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.room.giftvalue.bean.RoomGiftValue; +import com.pikolive.core.room.giftvalue.bean.RoomGiftValue; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core.room.giftvalue.bean.RoomGiftValue; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.net.rxnet.RxNet; import com.pikolive.library.utils.JavaUtil; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/IGiftValueModel.java b/core/src/main/java/com/pikolive/core/room/giftvalue/IGiftValueModel.java similarity index 75% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/IGiftValueModel.java rename to core/src/main/java/com/pikolive/core/room/giftvalue/IGiftValueModel.java index 9c7cb3ebf..c718be408 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/IGiftValueModel.java +++ b/core/src/main/java/com/pikolive/core/room/giftvalue/IGiftValueModel.java @@ -1,6 +1,8 @@ -package com.yizhuan.xchat_android_core.room.giftvalue; +package com.pikolive.core.room.giftvalue; -import com.yizhuan.xchat_android_core.room.giftvalue.bean.RoomGiftValue; +import com.pikolive.core.room.giftvalue.bean.RoomGiftValue; +import com.pikolive.core.room.giftvalue.bean.RoomGiftValue; +import com.pikolive.core.room.giftvalue.bean.RoomGiftValue; import io.reactivex.Single; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/bean/GiftValueCommonUpdate.java b/core/src/main/java/com/pikolive/core/room/giftvalue/bean/GiftValueCommonUpdate.java similarity index 91% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/bean/GiftValueCommonUpdate.java rename to core/src/main/java/com/pikolive/core/room/giftvalue/bean/GiftValueCommonUpdate.java index d3d4ace9e..a56babc84 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/bean/GiftValueCommonUpdate.java +++ b/core/src/main/java/com/pikolive/core/room/giftvalue/bean/GiftValueCommonUpdate.java @@ -1,11 +1,11 @@ -package com.yizhuan.xchat_android_core.room.giftvalue.bean; +package com.pikolive.core.room.giftvalue.bean; -import com.yizhuan.xchat_android_core.gift.GiftModel; -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo; -import com.yizhuan.xchat_android_core.gift.bean.GiftMultiReceiverInfo; -import com.yizhuan.xchat_android_core.gift.bean.GiftReceiveInfo; -import com.yizhuan.xchat_android_core.gift.bean.LuckyBagGifts; -import com.yizhuan.xchat_android_core.gift.bean.MultiGiftReceiveInfo; +import com.pikolive.core.gift.GiftModel; +import com.pikolive.core.gift.bean.GiftInfo; +import com.pikolive.core.gift.bean.GiftMultiReceiverInfo; +import com.pikolive.core.gift.bean.GiftReceiveInfo; +import com.pikolive.core.gift.bean.LuckyBagGifts; +import com.pikolive.core.gift.bean.MultiGiftReceiveInfo; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/bean/GiftValueData.java b/core/src/main/java/com/pikolive/core/room/giftvalue/bean/GiftValueData.java similarity index 94% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/bean/GiftValueData.java rename to core/src/main/java/com/pikolive/core/room/giftvalue/bean/GiftValueData.java index 7fea75685..90d823862 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/bean/GiftValueData.java +++ b/core/src/main/java/com/pikolive/core/room/giftvalue/bean/GiftValueData.java @@ -1,9 +1,9 @@ -package com.yizhuan.xchat_android_core.room.giftvalue.bean; +package com.pikolive.core.room.giftvalue.bean; import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.Observer; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; +import com.pikolive.core.manager.AvRoomDataManager; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/bean/GiftValueNetData.java b/core/src/main/java/com/pikolive/core/room/giftvalue/bean/GiftValueNetData.java similarity index 68% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/bean/GiftValueNetData.java rename to core/src/main/java/com/pikolive/core/room/giftvalue/bean/GiftValueNetData.java index c35763015..19267680a 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/bean/GiftValueNetData.java +++ b/core/src/main/java/com/pikolive/core/room/giftvalue/bean/GiftValueNetData.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.giftvalue.bean; +package com.pikolive.core.room.giftvalue.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/bean/IndexGiftValue.java b/core/src/main/java/com/pikolive/core/room/giftvalue/bean/IndexGiftValue.java similarity index 78% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/bean/IndexGiftValue.java rename to core/src/main/java/com/pikolive/core/room/giftvalue/bean/IndexGiftValue.java index 0a69a8f21..a87346213 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/bean/IndexGiftValue.java +++ b/core/src/main/java/com/pikolive/core/room/giftvalue/bean/IndexGiftValue.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.giftvalue.bean; +package com.pikolive.core.room.giftvalue.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/bean/RoomGiftValue.java b/core/src/main/java/com/pikolive/core/room/giftvalue/bean/RoomGiftValue.java similarity index 86% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/bean/RoomGiftValue.java rename to core/src/main/java/com/pikolive/core/room/giftvalue/bean/RoomGiftValue.java index 9f7a81b0d..b713ec068 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/bean/RoomGiftValue.java +++ b/core/src/main/java/com/pikolive/core/room/giftvalue/bean/RoomGiftValue.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.giftvalue.bean; +package com.pikolive.core.room.giftvalue.bean; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/helper/GiftValueFormat.java b/core/src/main/java/com/pikolive/core/room/giftvalue/helper/GiftValueFormat.java similarity index 83% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/helper/GiftValueFormat.java rename to core/src/main/java/com/pikolive/core/room/giftvalue/helper/GiftValueFormat.java index 9da56f598..4b102977f 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/helper/GiftValueFormat.java +++ b/core/src/main/java/com/pikolive/core/room/giftvalue/helper/GiftValueFormat.java @@ -1,5 +1,5 @@ -package com.yizhuan.xchat_android_core.room.giftvalue.helper; -import com.yizhuan.xchat_android_core.R; +package com.pikolive.core.room.giftvalue.helper; +import com.pikolive.core.R; import com.pikolive.library.utils.ResUtil; /** diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/helper/GiftValueMrg.java b/core/src/main/java/com/pikolive/core/room/giftvalue/helper/GiftValueMrg.java similarity index 96% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/helper/GiftValueMrg.java rename to core/src/main/java/com/pikolive/core/room/giftvalue/helper/GiftValueMrg.java index 477e98837..7148a48e7 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/giftvalue/helper/GiftValueMrg.java +++ b/core/src/main/java/com/pikolive/core/room/giftvalue/helper/GiftValueMrg.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.giftvalue.helper; +package com.pikolive.core.room.giftvalue.helper; import android.annotation.SuppressLint; import android.os.Handler; @@ -9,17 +9,17 @@ import android.util.SparseArray; import com.netease.nimlib.sdk.chatroom.ChatRoomMessageBuilder; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; import com.orhanobut.logger.Logger; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.bean.RoomQueueInfo; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomGiftValueAttachment; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.room.giftvalue.GiftValueModel; -import com.yizhuan.xchat_android_core.room.giftvalue.bean.GiftValueCommonUpdate; -import com.yizhuan.xchat_android_core.room.giftvalue.bean.GiftValueData; -import com.yizhuan.xchat_android_core.room.giftvalue.bean.IndexGiftValue; -import com.yizhuan.xchat_android_core.room.giftvalue.bean.RoomGiftValue; -import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.bean.RoomQueueInfo; +import com.pikolive.core.im.custom.bean.RoomGiftValueAttachment; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core2.manager.IMNetEaseManager; +import com.pikolive.core.room.giftvalue.GiftValueModel; +import com.pikolive.core.room.giftvalue.bean.GiftValueCommonUpdate; +import com.pikolive.core.room.giftvalue.bean.GiftValueData; +import com.pikolive.core.room.giftvalue.bean.IndexGiftValue; +import com.pikolive.core.room.giftvalue.bean.RoomGiftValue; +import com.pikolive.core.utils.net.DontWarnObserver; import com.pikolive.library.net.rxnet.callback.CallBack; import com.pikolive.library.utils.JavaUtil; import com.pikolive.library.utils.ListUtils; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/AvRoomModel.java b/core/src/main/java/com/pikolive/core/room/model/AvRoomModel.java similarity index 89% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/model/AvRoomModel.java rename to core/src/main/java/com/pikolive/core/room/model/AvRoomModel.java index d5eb4891e..37b8cde04 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/AvRoomModel.java +++ b/core/src/main/java/com/pikolive/core/room/model/AvRoomModel.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.model; +package com.pikolive.core.room.model; import android.annotation.SuppressLint; import android.text.TextUtils; @@ -22,40 +22,69 @@ import com.netease.nimlib.sdk.msg.attachment.MsgAttachment; import com.netease.nimlib.sdk.msg.constant.MsgTypeEnum; import com.netease.nimlib.sdk.msg.model.QueryDirectionEnum; import com.orhanobut.logger.Logger; -import com.yizhuan.xchat_android_core.R; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.decoration.car.bean.CarInfo; -import com.yizhuan.xchat_android_core.decoration.headwear.bean.HeadWearInfo; -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo; -import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.initial.InitialModel; -import com.yizhuan.xchat_android_core.initial.bean.InitInfo; -import com.yizhuan.xchat_android_core.level.UserLevelVo; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.manager.RoomEvent; -import com.yizhuan.xchat_android_core.noble.NobleInfo; -import com.yizhuan.xchat_android_core.patriarch.exception.PmRoomLimitException; -import com.yizhuan.xchat_android_core.room.activitytimer.ActivityTimerEvent; -import com.yizhuan.xchat_android_core.room.activitytimer.TimerBean; -import com.yizhuan.xchat_android_core.room.bean.BroadcastInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomResult; -import com.yizhuan.xchat_android_core.room.bean.RoomWelcomeConfig; -import com.yizhuan.xchat_android_core.room.bean.SearchRoomInfo; -import com.yizhuan.xchat_android_core.room.bean.SimplePartyRoomInfo; -import com.yizhuan.xchat_android_core.room.event.RoomInfoEvent; -import com.yizhuan.xchat_android_core.room.giftvalue.helper.GiftValueMrg; -import com.yizhuan.xchat_android_core.room.model.inteface.IAvRoomModel; -import com.yizhuan.xchat_android_core.room.pk.model.PkModel; -import com.yizhuan.xchat_android_core.super_admin.bean.KickOutExtBean; -import com.yizhuan.xchat_android_core.super_admin.util.SuperAdminUtil; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.FirstChargeInfo; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.decoration.car.bean.CarInfo; +import com.pikolive.core.decoration.headwear.bean.HeadWearInfo; +import com.pikolive.core.gift.bean.GiftInfo; +import com.pikolive.core.im.custom.bean.CustomAttachment; +import com.pikolive.core.initial.InitialModel; +import com.pikolive.core.initial.bean.InitInfo; +import com.pikolive.core.level.UserLevelVo; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core.manager.RoomEvent; +import com.pikolive.core.noble.NobleInfo; +import com.pikolive.core.patriarch.exception.PmRoomLimitException; +import com.pikolive.core.room.activitytimer.ActivityTimerEvent; +import com.pikolive.core.room.activitytimer.TimerBean; +import com.pikolive.core.room.bean.BroadcastInfo; +import com.pikolive.core.room.bean.RoomInfo; +import com.pikolive.core.room.bean.RoomResult; +import com.pikolive.core.room.bean.RoomWelcomeConfig; +import com.pikolive.core.room.bean.SearchRoomInfo; +import com.pikolive.core.room.bean.SimplePartyRoomInfo; +import com.pikolive.core.room.event.RoomInfoEvent; +import com.pikolive.core.room.giftvalue.helper.GiftValueMrg; +import com.pikolive.core.room.model.inteface.IAvRoomModel; +import com.pikolive.core.room.pk.model.PkModel; +import com.pikolive.core.user.UserModel; +import com.pikolive.core.user.bean.FirstChargeInfo; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.utils.net.RxHelper; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.decoration.car.bean.CarInfo; +import com.pikolive.core.decoration.headwear.bean.HeadWearInfo; +import com.pikolive.core.gift.bean.GiftInfo; +import com.pikolive.core.im.custom.bean.CustomAttachment; +import com.pikolive.core.initial.InitialModel; +import com.pikolive.core.initial.bean.InitInfo; +import com.pikolive.core.level.UserLevelVo; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core.manager.RoomEvent; +import com.pikolive.core.noble.NobleInfo; +import com.pikolive.core.patriarch.exception.PmRoomLimitException; +import com.pikolive.core.room.activitytimer.ActivityTimerEvent; +import com.pikolive.core.room.activitytimer.TimerBean; +import com.pikolive.core.room.bean.BroadcastInfo; +import com.pikolive.core.room.bean.RoomInfo; +import com.pikolive.core.room.bean.RoomResult; +import com.pikolive.core.room.bean.RoomWelcomeConfig; +import com.pikolive.core.room.bean.SearchRoomInfo; +import com.pikolive.core.room.bean.SimplePartyRoomInfo; +import com.pikolive.core.room.event.RoomInfoEvent; +import com.pikolive.core.room.giftvalue.helper.GiftValueMrg; +import com.pikolive.core.room.model.inteface.IAvRoomModel; +import com.pikolive.core.room.pk.model.PkModel; +import com.pikolive.core.user.UserModel; +import com.pikolive.core.user.bean.FirstChargeInfo; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.utils.net.RxHelper; +import com.pikolive.core.R; +import com.pikolive.core2.home.bean.HomeRoomInfo; +import com.pikolive.core2.manager.IMNetEaseManager; +import com.pikolive.core.admin.bean.KickOutExtBean; +import com.pikolive.core.admin.util.SuperAdminUtil; import com.pikolive.library.net.rxnet.callback.CallBack; import com.pikolive.library.utils.JavaUtil; import com.pikolive.library.utils.ListUtils; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/HomePartyModel.java b/core/src/main/java/com/pikolive/core/room/model/HomePartyModel.java similarity index 93% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/model/HomePartyModel.java rename to core/src/main/java/com/pikolive/core/room/model/HomePartyModel.java index 060e7ed36..57d052cc4 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/HomePartyModel.java +++ b/core/src/main/java/com/pikolive/core/room/model/HomePartyModel.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.model; +package com.pikolive.core.room.model; import android.text.TextUtils; import android.util.SparseArray; @@ -9,18 +9,21 @@ import com.netease.nimlib.sdk.chatroom.constant.MemberQueryType; import com.netease.nimlib.sdk.chatroom.constant.MemberType; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember; import com.orhanobut.logger.Logger; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.bean.RoomQueueInfo; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.kick.KickModel; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.noble.NobleResourceType; -import com.yizhuan.xchat_android_core.noble.NobleUtil; -import com.yizhuan.xchat_android_core.room.model.inteface.IHomePartyModel; -import com.yizhuan.xchat_android_core.super_admin.util.SaAttachmentFactory; -import com.yizhuan.xchat_android_core.super_admin.util.SuperAdminUtil; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.noble.NobleResourceType; +import com.pikolive.core.noble.NobleUtil; +import com.pikolive.core.room.model.inteface.IHomePartyModel; +import com.pikolive.core.noble.NobleResourceType; +import com.pikolive.core.noble.NobleUtil; +import com.pikolive.core.room.model.inteface.IHomePartyModel; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.bean.RoomQueueInfo; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.kick.KickModel; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core2.manager.IMNetEaseManager; +import com.pikolive.core.admin.util.SaAttachmentFactory; +import com.pikolive.core.admin.util.SuperAdminUtil; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.net.rxnet.RxNet; import com.pikolive.library.net.rxnet.callback.CallBack; import com.pikolive.library.utils.ListUtils; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/HomePartyUserListModel.java b/core/src/main/java/com/pikolive/core/room/model/HomePartyUserListModel.java similarity index 95% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/model/HomePartyUserListModel.java rename to core/src/main/java/com/pikolive/core/room/model/HomePartyUserListModel.java index ef8e203ec..7967e8a50 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/HomePartyUserListModel.java +++ b/core/src/main/java/com/pikolive/core/room/model/HomePartyUserListModel.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.model; +package com.pikolive.core.room.model; import android.text.TextUtils; @@ -7,13 +7,15 @@ import androidx.annotation.NonNull; import com.netease.nimlib.sdk.chatroom.constant.MemberType; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember; import com.orhanobut.logger.Logger; -import com.yizhuan.xchat_android_core.R; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.bean.RoomQueueInfo; -import com.yizhuan.xchat_android_core.exception.ErrorThrowable; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.room.bean.OnlineChatMember; -import com.yizhuan.xchat_android_core.room.model.inteface.IHomePartyUserListModel; +import com.pikolive.core.room.model.inteface.IHomePartyUserListModel; +import com.pikolive.core.room.model.inteface.IHomePartyUserListModel; +import com.pikolive.core.R; +import com.pikolive.core.Constants; +import com.pikolive.core.bean.RoomQueueInfo; +import com.pikolive.core.exception.ErrorThrowable; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core.room.bean.OnlineChatMember; +import com.pikolive.core.room.model.inteface.IHomePartyUserListModel; import com.pikolive.library.utils.ListUtils; import com.pikolive.library.utils.ResUtil; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/MicQueueModel.java b/core/src/main/java/com/pikolive/core/room/model/MicQueueModel.java similarity index 91% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/model/MicQueueModel.java rename to core/src/main/java/com/pikolive/core/room/model/MicQueueModel.java index 123a99ad1..1b4cb30db 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/MicQueueModel.java +++ b/core/src/main/java/com/pikolive/core/room/model/MicQueueModel.java @@ -1,12 +1,16 @@ -package com.yizhuan.xchat_android_core.room.model; +package com.pikolive.core.room.model; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.room.model.inteface.IMicQueueModel; -import com.yizhuan.xchat_android_core.room.queuing_mic.bean.RespQueuingMicListInfo; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.room.model.inteface.IMicQueueModel; +import com.pikolive.core.room.queuing_mic.bean.RespQueuingMicListInfo; +import com.pikolive.core.room.model.inteface.IMicQueueModel; +import com.pikolive.core.room.queuing_mic.bean.RespQueuingMicListInfo; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core.room.model.inteface.IMicQueueModel; +import com.pikolive.core.room.queuing_mic.bean.RespQueuingMicListInfo; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.net.rxnet.RxNet; import io.reactivex.Single; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/RoomBaseModel.java b/core/src/main/java/com/pikolive/core/room/model/RoomBaseModel.java similarity index 95% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/model/RoomBaseModel.java rename to core/src/main/java/com/pikolive/core/room/model/RoomBaseModel.java index dc273f52c..0ae7f445c 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/RoomBaseModel.java +++ b/core/src/main/java/com/pikolive/core/room/model/RoomBaseModel.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.model; +package com.pikolive.core.room.model; import android.annotation.SuppressLint; import android.text.TextUtils; @@ -21,39 +21,47 @@ import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; import com.netease.nimlib.sdk.chatroom.model.MemberOption; import com.netease.nimlib.sdk.util.Entry; import com.orhanobut.logger.Logger; -import com.yizhuan.xchat_android_core.R; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.RoomMicInfo; -import com.yizhuan.xchat_android_core.bean.RoomQueueInfo; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.decoration.headwear.bean.HeadWearInfo; -import com.yizhuan.xchat_android_core.exception.ErrorThrowable; -import com.yizhuan.xchat_android_core.gift.bean.GiftFreeInfo; -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo; -import com.yizhuan.xchat_android_core.home.bean.BannerInfo; -import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.room.activitytimer.TimerBean; -import com.yizhuan.xchat_android_core.room.bean.BroadcastInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomResult; -import com.yizhuan.xchat_android_core.room.bean.RoomSettingTabInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomWelcomeConfig; -import com.yizhuan.xchat_android_core.room.bean.SearchRoomInfo; -import com.yizhuan.xchat_android_core.room.bean.SimplePartyRoomInfo; -import com.yizhuan.xchat_android_core.room.giftvalue.helper.GiftValueMrg; -import com.yizhuan.xchat_android_core.room.model.inteface.IRoomBaseModel; -import com.yizhuan.xchat_android_core.room.pk.bean.RoomPKInvitedUpMicMember; -import com.yizhuan.xchat_android_core.room.pk.model.PkModel; -import com.yizhuan.xchat_android_core.room.queue.bean.MicMemberInfo; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.BaseInfo; -import com.yizhuan.xchat_android_core.user.bean.FirstChargeInfo; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_core.vip.UserVipInfo; +import com.pikolive.core.room.activitytimer.TimerBean; +import com.pikolive.core.room.giftvalue.helper.GiftValueMrg; +import com.pikolive.core.room.model.inteface.IRoomBaseModel; +import com.pikolive.core.room.queue.bean.MicMemberInfo; +import com.pikolive.core.user.bean.BaseInfo; +import com.pikolive.core.user.bean.FirstChargeInfo; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.room.activitytimer.TimerBean; +import com.pikolive.core.room.giftvalue.helper.GiftValueMrg; +import com.pikolive.core.room.model.inteface.IRoomBaseModel; +import com.pikolive.core.room.queue.bean.MicMemberInfo; +import com.pikolive.core.user.bean.BaseInfo; +import com.pikolive.core.user.bean.FirstChargeInfo; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.vip.UserVipInfo; + +import com.pikolive.core.R; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.bean.RoomMicInfo; +import com.pikolive.core.bean.RoomQueueInfo; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.decoration.headwear.bean.HeadWearInfo; +import com.pikolive.core.exception.ErrorThrowable; +import com.pikolive.core.gift.bean.GiftFreeInfo; +import com.pikolive.core.gift.bean.GiftInfo; +import com.pikolive.core2.home.bean.BannerInfo; +import com.pikolive.core2.home.bean.HomeRoomInfo; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core2.manager.IMNetEaseManager; +import com.pikolive.core.room.bean.BroadcastInfo; +import com.pikolive.core.room.bean.RoomInfo; +import com.pikolive.core.room.bean.RoomResult; +import com.pikolive.core.room.bean.RoomSettingTabInfo; +import com.pikolive.core.room.bean.RoomWelcomeConfig; +import com.pikolive.core.room.bean.SearchRoomInfo; +import com.pikolive.core.room.bean.SimplePartyRoomInfo; +import com.pikolive.core.room.pk.bean.RoomPKInvitedUpMicMember; +import com.pikolive.core.room.pk.model.PkModel; +import com.pikolive.core.user.UserModel; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.net.rxnet.RxNet; import com.pikolive.library.net.rxnet.callback.CallBack; import com.pikolive.library.utils.JavaUtil; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/RoomCharmModel.java b/core/src/main/java/com/pikolive/core/room/model/RoomCharmModel.java similarity index 83% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/model/RoomCharmModel.java rename to core/src/main/java/com/pikolive/core/room/model/RoomCharmModel.java index 0cfceb6d4..1ce15a340 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/RoomCharmModel.java +++ b/core/src/main/java/com/pikolive/core/room/model/RoomCharmModel.java @@ -1,10 +1,12 @@ -package com.yizhuan.xchat_android_core.room.model; +package com.pikolive.core.room.model; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.room.bean.RoomContributeDataInfo; -import com.yizhuan.xchat_android_core.room.model.inteface.IRoomCharmModel; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.room.model.inteface.IRoomCharmModel; +import com.pikolive.core.room.model.inteface.IRoomCharmModel; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.room.bean.RoomContributeDataInfo; +import com.pikolive.core.room.model.inteface.IRoomCharmModel; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.net.rxnet.RxNet; import io.reactivex.Single; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/RoomContributeListModel.java b/core/src/main/java/com/pikolive/core/room/model/RoomContributeListModel.java similarity index 83% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/model/RoomContributeListModel.java rename to core/src/main/java/com/pikolive/core/room/model/RoomContributeListModel.java index 8e9f321fd..12d4782d0 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/RoomContributeListModel.java +++ b/core/src/main/java/com/pikolive/core/room/model/RoomContributeListModel.java @@ -1,13 +1,15 @@ -package com.yizhuan.xchat_android_core.room.model; +package com.pikolive.core.room.model; -import com.yizhuan.xchat_android_core.R; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.room.bean.RoomContributeDataInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.room.model.inteface.IRoomContributeListModel; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.room.model.inteface.IRoomContributeListModel; +import com.pikolive.core.room.model.inteface.IRoomContributeListModel; +import com.pikolive.core.R; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core.room.bean.RoomContributeDataInfo; +import com.pikolive.core.room.bean.RoomInfo; +import com.pikolive.core.room.model.inteface.IRoomContributeListModel; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.net.rxnet.RxNet; import com.pikolive.library.utils.ResUtil; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/RoomInviteFansModel.kt b/core/src/main/java/com/pikolive/core/room/model/RoomInviteFansModel.kt similarity index 77% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/model/RoomInviteFansModel.kt rename to core/src/main/java/com/pikolive/core/room/model/RoomInviteFansModel.kt index 9fb634866..9ae794175 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/RoomInviteFansModel.kt +++ b/core/src/main/java/com/pikolive/core/room/model/RoomInviteFansModel.kt @@ -1,11 +1,11 @@ -package com.yizhuan.xchat_android_core.room.model +package com.pikolive.core.room.model -import com.yizhuan.xchat_android_core.bean.response.ServiceResult -import com.yizhuan.xchat_android_core.room.bean.RoomInviteFansInfo -import com.yizhuan.xchat_android_core.utils.net.handleBeanData -import com.yizhuan.xchat_android_core.utils.net.io2main +import com.pikolive.core.bean.response.ServiceResult +import com.pikolive.core.room.bean.RoomInviteFansInfo +import com.pikolive.core.utils.net.handleBeanData +import com.pikolive.core.utils.net.io2main import com.pikolive.library.net.rxnet.RxNet import io.reactivex.Single import retrofit2.http.GET diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/RoomInviteModel.java b/core/src/main/java/com/pikolive/core/room/model/RoomInviteModel.java similarity index 88% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/model/RoomInviteModel.java rename to core/src/main/java/com/pikolive/core/room/model/RoomInviteModel.java index fc860eb0c..2e2e17458 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/RoomInviteModel.java +++ b/core/src/main/java/com/pikolive/core/room/model/RoomInviteModel.java @@ -1,8 +1,10 @@ -package com.yizhuan.xchat_android_core.room.model; +package com.pikolive.core.room.model; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.room.model.inteface.IRoomInviteModel; +import com.pikolive.core.room.model.inteface.IRoomInviteModel; +import com.pikolive.core.room.model.inteface.IRoomInviteModel; +import com.pikolive.core.Constants; +import com.pikolive.core.room.model.inteface.IRoomInviteModel; import com.pikolive.library.utils.ListUtils; import java.util.ArrayList; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/RoomRankModel.java b/core/src/main/java/com/pikolive/core/room/model/RoomRankModel.java similarity index 79% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/model/RoomRankModel.java rename to core/src/main/java/com/pikolive/core/room/model/RoomRankModel.java index 69224027e..a08e24243 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/RoomRankModel.java +++ b/core/src/main/java/com/pikolive/core/room/model/RoomRankModel.java @@ -1,10 +1,12 @@ -package com.yizhuan.xchat_android_core.room.model; +package com.pikolive.core.room.model; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.room.bean.RoomRankHalfHourDataInfo; -import com.yizhuan.xchat_android_core.room.model.inteface.IRoomRankModel; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.room.model.inteface.IRoomRankModel; +import com.pikolive.core.room.model.inteface.IRoomRankModel; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.room.bean.RoomRankHalfHourDataInfo; +import com.pikolive.core.room.model.inteface.IRoomRankModel; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.net.rxnet.RxNet; import io.reactivex.Single; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/RoomSettingModel.java b/core/src/main/java/com/pikolive/core/room/model/RoomSettingModel.java similarity index 94% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/model/RoomSettingModel.java rename to core/src/main/java/com/pikolive/core/room/model/RoomSettingModel.java index a256367fe..fd5fc1667 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/RoomSettingModel.java +++ b/core/src/main/java/com/pikolive/core/room/model/RoomSettingModel.java @@ -1,16 +1,28 @@ -package com.yizhuan.xchat_android_core.room.model; +package com.pikolive.core.room.model; import android.text.TextUtils; -import com.yizhuan.xchat_android_core.R; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.BaseMvpModel; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomSettingTabInfo; -import com.yizhuan.xchat_android_core.room.bean.SingleRoomSortInfo; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core.manager.BaseMvpModel; +import com.pikolive.core.room.bean.RoomInfo; +import com.pikolive.core.room.bean.RoomSettingTabInfo; +import com.pikolive.core.room.bean.SingleRoomSortInfo; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core.manager.BaseMvpModel; +import com.pikolive.core.room.bean.RoomInfo; +import com.pikolive.core.room.bean.RoomSettingTabInfo; +import com.pikolive.core.room.bean.SingleRoomSortInfo; +import com.pikolive.core.R; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core.manager.BaseMvpModel; +import com.pikolive.core.room.bean.RoomInfo; +import com.pikolive.core.room.bean.RoomSettingTabInfo; +import com.pikolive.core.room.bean.SingleRoomSortInfo; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.net.rxnet.RxNet; import com.pikolive.library.net.rxnet.callback.CallBack; import com.pikolive.library.utils.ResUtil; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IAvRoomModel.java b/core/src/main/java/com/pikolive/core/room/model/inteface/IAvRoomModel.java similarity index 84% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IAvRoomModel.java rename to core/src/main/java/com/pikolive/core/room/model/inteface/IAvRoomModel.java index 1ab2fdd0a..29d0368cf 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IAvRoomModel.java +++ b/core/src/main/java/com/pikolive/core/room/model/inteface/IAvRoomModel.java @@ -1,19 +1,21 @@ -package com.yizhuan.xchat_android_core.room.model.inteface; +package com.pikolive.core.room.model.inteface; import com.google.gson.JsonElement; import com.netease.nimlib.sdk.chatroom.model.EnterChatRoomResultData; -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo; -import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo; -import com.yizhuan.xchat_android_core.room.activitytimer.TimerBean; -import com.yizhuan.xchat_android_core.room.bean.BroadcastInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomResult; -import com.yizhuan.xchat_android_core.room.bean.RoomWelcomeConfig; -import com.yizhuan.xchat_android_core.room.bean.SearchRoomInfo; -import com.yizhuan.xchat_android_core.room.bean.SimplePartyRoomInfo; -import com.yizhuan.xchat_android_core.user.bean.FirstChargeInfo; +import com.pikolive.core.room.activitytimer.TimerBean; +import com.pikolive.core.user.bean.FirstChargeInfo; +import com.pikolive.core.room.activitytimer.TimerBean; +import com.pikolive.core.user.bean.FirstChargeInfo; +import com.pikolive.core.base.IModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.gift.bean.GiftInfo; +import com.pikolive.core2.home.bean.HomeRoomInfo; +import com.pikolive.core.room.bean.BroadcastInfo; +import com.pikolive.core.room.bean.RoomInfo; +import com.pikolive.core.room.bean.RoomResult; +import com.pikolive.core.room.bean.RoomWelcomeConfig; +import com.pikolive.core.room.bean.SearchRoomInfo; +import com.pikolive.core.room.bean.SimplePartyRoomInfo; import com.pikolive.library.net.rxnet.callback.CallBack; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IHomePartyModel.java b/core/src/main/java/com/pikolive/core/room/model/inteface/IHomePartyModel.java similarity index 93% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IHomePartyModel.java rename to core/src/main/java/com/pikolive/core/room/model/inteface/IHomePartyModel.java index 624a465de..f1b3f3876 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IHomePartyModel.java +++ b/core/src/main/java/com/pikolive/core/room/model/inteface/IHomePartyModel.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.room.model.inteface; +package com.pikolive.core.room.model.inteface; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember; -import com.yizhuan.xchat_android_core.base.IModel; +import com.pikolive.core.base.IModel; import com.pikolive.library.net.rxnet.callback.CallBack; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IHomePartyUserListModel.java b/core/src/main/java/com/pikolive/core/room/model/inteface/IHomePartyUserListModel.java similarity index 87% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IHomePartyUserListModel.java rename to core/src/main/java/com/pikolive/core/room/model/inteface/IHomePartyUserListModel.java index d3872de0d..3f6043645 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IHomePartyUserListModel.java +++ b/core/src/main/java/com/pikolive/core/room/model/inteface/IHomePartyUserListModel.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.room.model.inteface; +package com.pikolive.core.room.model.inteface; -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.room.bean.OnlineChatMember; +import com.pikolive.core.base.IModel; +import com.pikolive.core.room.bean.OnlineChatMember; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IMicQueueModel.java b/core/src/main/java/com/pikolive/core/room/model/inteface/IMicQueueModel.java similarity index 81% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IMicQueueModel.java rename to core/src/main/java/com/pikolive/core/room/model/inteface/IMicQueueModel.java index e954aaeca..c6cbf03f2 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IMicQueueModel.java +++ b/core/src/main/java/com/pikolive/core/room/model/inteface/IMicQueueModel.java @@ -1,6 +1,8 @@ -package com.yizhuan.xchat_android_core.room.model.inteface; +package com.pikolive.core.room.model.inteface; -import com.yizhuan.xchat_android_core.room.queuing_mic.bean.RespQueuingMicListInfo; +import com.pikolive.core.room.queuing_mic.bean.RespQueuingMicListInfo; +import com.pikolive.core.room.queuing_mic.bean.RespQueuingMicListInfo; +import com.pikolive.core.room.queuing_mic.bean.RespQueuingMicListInfo; import io.reactivex.Single; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IRoomBaseModel.java b/core/src/main/java/com/pikolive/core/room/model/inteface/IRoomBaseModel.java similarity index 90% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IRoomBaseModel.java rename to core/src/main/java/com/pikolive/core/room/model/inteface/IRoomBaseModel.java index f11b46dfa..6ce1df7b4 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IRoomBaseModel.java +++ b/core/src/main/java/com/pikolive/core/room/model/inteface/IRoomBaseModel.java @@ -1,15 +1,19 @@ -package com.yizhuan.xchat_android_core.room.model.inteface; +package com.pikolive.core.room.model.inteface; import com.netease.nimlib.sdk.chatroom.model.ChatRoomInfo; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; import com.netease.nimlib.sdk.util.Entry; -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomResult; -import com.yizhuan.xchat_android_core.room.pk.bean.RoomPKInvitedUpMicMember; -import com.yizhuan.xchat_android_core.user.bean.BaseInfo; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.pikolive.core.user.bean.BaseInfo; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.user.bean.BaseInfo; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.base.IModel; +import com.pikolive.core.room.bean.RoomInfo; +import com.pikolive.core.room.bean.RoomResult; +import com.pikolive.core.room.pk.bean.RoomPKInvitedUpMicMember; +import com.pikolive.core.user.bean.BaseInfo; +import com.pikolive.core.user.bean.UserInfo; import com.pikolive.library.net.rxnet.callback.CallBack; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IRoomCharmModel.java b/core/src/main/java/com/pikolive/core/room/model/inteface/IRoomCharmModel.java similarity index 69% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IRoomCharmModel.java rename to core/src/main/java/com/pikolive/core/room/model/inteface/IRoomCharmModel.java index 75a5c9ebc..f45d4e565 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IRoomCharmModel.java +++ b/core/src/main/java/com/pikolive/core/room/model/inteface/IRoomCharmModel.java @@ -1,8 +1,8 @@ -package com.yizhuan.xchat_android_core.room.model.inteface; +package com.pikolive.core.room.model.inteface; -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.room.bean.RoomContributeDataInfo; +import com.pikolive.core.base.IModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.room.bean.RoomContributeDataInfo; import io.reactivex.Single; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IRoomContributeListModel.java b/core/src/main/java/com/pikolive/core/room/model/inteface/IRoomContributeListModel.java similarity index 72% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IRoomContributeListModel.java rename to core/src/main/java/com/pikolive/core/room/model/inteface/IRoomContributeListModel.java index ee60a5f32..bf4c2f17c 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IRoomContributeListModel.java +++ b/core/src/main/java/com/pikolive/core/room/model/inteface/IRoomContributeListModel.java @@ -1,8 +1,8 @@ -package com.yizhuan.xchat_android_core.room.model.inteface; +package com.pikolive.core.room.model.inteface; -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.room.bean.RoomContributeDataInfo; +import com.pikolive.core.base.IModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.room.bean.RoomContributeDataInfo; import io.reactivex.Single; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IRoomInviteModel.java b/core/src/main/java/com/pikolive/core/room/model/inteface/IRoomInviteModel.java similarity index 85% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IRoomInviteModel.java rename to core/src/main/java/com/pikolive/core/room/model/inteface/IRoomInviteModel.java index a2f7b5438..ac058231b 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IRoomInviteModel.java +++ b/core/src/main/java/com/pikolive/core/room/model/inteface/IRoomInviteModel.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.room.model.inteface; +package com.pikolive.core.room.model.inteface; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember; -import com.yizhuan.xchat_android_core.base.IModel; +import com.pikolive.core.base.IModel; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IRoomRankModel.java b/core/src/main/java/com/pikolive/core/room/model/inteface/IRoomRankModel.java similarity index 69% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IRoomRankModel.java rename to core/src/main/java/com/pikolive/core/room/model/inteface/IRoomRankModel.java index 3fbc12ddd..615fae368 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IRoomRankModel.java +++ b/core/src/main/java/com/pikolive/core/room/model/inteface/IRoomRankModel.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.room.model.inteface; +package com.pikolive.core.room.model.inteface; -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.room.bean.RoomRankHalfHourDataInfo; +import com.pikolive.core.base.IModel; +import com.pikolive.core.room.bean.RoomRankHalfHourDataInfo; import io.reactivex.Single; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IRoomSettingModel.java b/core/src/main/java/com/pikolive/core/room/model/inteface/IRoomSettingModel.java similarity index 81% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IRoomSettingModel.java rename to core/src/main/java/com/pikolive/core/room/model/inteface/IRoomSettingModel.java index 8221f337a..5e98c78b8 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/model/inteface/IRoomSettingModel.java +++ b/core/src/main/java/com/pikolive/core/room/model/inteface/IRoomSettingModel.java @@ -1,8 +1,8 @@ -package com.yizhuan.xchat_android_core.room.model.inteface; +package com.pikolive.core.room.model.inteface; -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomSettingTabInfo; +import com.pikolive.core.base.IModel; +import com.pikolive.core.room.bean.RoomInfo; +import com.pikolive.core.room.bean.RoomSettingTabInfo; import com.pikolive.library.net.rxnet.callback.CallBack; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/attachment/RoomPkAttachment.java b/core/src/main/java/com/pikolive/core/room/pk/attachment/RoomPkAttachment.java similarity index 85% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/pk/attachment/RoomPkAttachment.java rename to core/src/main/java/com/pikolive/core/room/pk/attachment/RoomPkAttachment.java index 0022f0d7d..dd45f263e 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/attachment/RoomPkAttachment.java +++ b/core/src/main/java/com/pikolive/core/room/pk/attachment/RoomPkAttachment.java @@ -1,12 +1,12 @@ -package com.yizhuan.xchat_android_core.room.pk.attachment; +package com.pikolive.core.room.pk.attachment; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.room.pk.bean.RoomPKInvitedUpMicMember; -import com.yizhuan.xchat_android_core.room.pk.bean.RoomPkData; +import com.pikolive.core.im.custom.bean.CustomAttachment; +import com.pikolive.core.room.pk.bean.RoomPKInvitedUpMicMember; +import com.pikolive.core.room.pk.bean.RoomPkData; import java.util.Map; diff --git a/core/src/main/java/com/pikolive/core/room/pk/bean/PKMemberInfo.java b/core/src/main/java/com/pikolive/core/room/pk/bean/PKMemberInfo.java new file mode 100644 index 000000000..f9b9d7d4d --- /dev/null +++ b/core/src/main/java/com/pikolive/core/room/pk/bean/PKMemberInfo.java @@ -0,0 +1,18 @@ +package com.pikolive.core.room.pk.bean; + +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.user.bean.UserInfo; + +import lombok.Data; + +/** + * @author jack + * @Description + * @Date 2019/1/8 + */ +@Data +public class PKMemberInfo { + private int teamId; + private UserInfo userInfo; +} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/PKQueuingMicMemberInfo.java b/core/src/main/java/com/pikolive/core/room/pk/bean/PKQueuingMicMemberInfo.java similarity index 89% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/PKQueuingMicMemberInfo.java rename to core/src/main/java/com/pikolive/core/room/pk/bean/PKQueuingMicMemberInfo.java index de5d1cc4c..a20a3fff6 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/PKQueuingMicMemberInfo.java +++ b/core/src/main/java/com/pikolive/core/room/pk/bean/PKQueuingMicMemberInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.pk.bean; +package com.pikolive.core.room.pk.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/PKRecordInfo.java b/core/src/main/java/com/pikolive/core/room/pk/bean/PKRecordInfo.java similarity index 92% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/PKRecordInfo.java rename to core/src/main/java/com/pikolive/core/room/pk/bean/PKRecordInfo.java index 0c701ffed..5126cf454 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/PKRecordInfo.java +++ b/core/src/main/java/com/pikolive/core/room/pk/bean/PKRecordInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.pk.bean; +package com.pikolive.core.room.pk.bean; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/PKRecordListInfo.java b/core/src/main/java/com/pikolive/core/room/pk/bean/PKRecordListInfo.java similarity index 79% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/PKRecordListInfo.java rename to core/src/main/java/com/pikolive/core/room/pk/bean/PKRecordListInfo.java index 8b493d066..c8197f95f 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/PKRecordListInfo.java +++ b/core/src/main/java/com/pikolive/core/room/pk/bean/PKRecordListInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.pk.bean; +package com.pikolive.core.room.pk.bean; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/PKRespQueuingMicListInfo.java b/core/src/main/java/com/pikolive/core/room/pk/bean/PKRespQueuingMicListInfo.java similarity index 83% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/PKRespQueuingMicListInfo.java rename to core/src/main/java/com/pikolive/core/room/pk/bean/PKRespQueuingMicListInfo.java index 6317f178a..67aba50a0 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/PKRespQueuingMicListInfo.java +++ b/core/src/main/java/com/pikolive/core/room/pk/bean/PKRespQueuingMicListInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.pk.bean; +package com.pikolive.core.room.pk.bean; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/PKTeamInfo.java b/core/src/main/java/com/pikolive/core/room/pk/bean/PKTeamInfo.java similarity index 77% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/PKTeamInfo.java rename to core/src/main/java/com/pikolive/core/room/pk/bean/PKTeamInfo.java index a640f0ac4..ece807adc 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/PKTeamInfo.java +++ b/core/src/main/java/com/pikolive/core/room/pk/bean/PKTeamInfo.java @@ -1,6 +1,8 @@ -package com.yizhuan.xchat_android_core.room.pk.bean; +package com.pikolive.core.room.pk.bean; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.user.bean.UserInfo; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/PKTeamMember.java b/core/src/main/java/com/pikolive/core/room/pk/bean/PKTeamMember.java similarity index 86% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/PKTeamMember.java rename to core/src/main/java/com/pikolive/core/room/pk/bean/PKTeamMember.java index be76a517c..f56e26d43 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/PKTeamMember.java +++ b/core/src/main/java/com/pikolive/core/room/pk/bean/PKTeamMember.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.pk.bean; +package com.pikolive.core.room.pk.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/RoomPKInvitedUpMicMember.java b/core/src/main/java/com/pikolive/core/room/pk/bean/RoomPKInvitedUpMicMember.java similarity index 76% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/RoomPKInvitedUpMicMember.java rename to core/src/main/java/com/pikolive/core/room/pk/bean/RoomPKInvitedUpMicMember.java index 3e5c0b9ba..3da81b35c 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/RoomPKInvitedUpMicMember.java +++ b/core/src/main/java/com/pikolive/core/room/pk/bean/RoomPKInvitedUpMicMember.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.pk.bean; +package com.pikolive.core.room.pk.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/RoomPkData.java b/core/src/main/java/com/pikolive/core/room/pk/bean/RoomPkData.java similarity index 97% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/RoomPkData.java rename to core/src/main/java/com/pikolive/core/room/pk/bean/RoomPkData.java index e4b268214..2efe57f27 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/RoomPkData.java +++ b/core/src/main/java/com/pikolive/core/room/pk/bean/RoomPkData.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.pk.bean; +package com.pikolive.core.room.pk.bean; import java.util.List; import java.util.Map; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/request/CreatePKMember.java b/core/src/main/java/com/pikolive/core/room/pk/bean/request/CreatePKMember.java similarity index 83% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/request/CreatePKMember.java rename to core/src/main/java/com/pikolive/core/room/pk/bean/request/CreatePKMember.java index 896c53902..aaf7ad2aa 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/request/CreatePKMember.java +++ b/core/src/main/java/com/pikolive/core/room/pk/bean/request/CreatePKMember.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.pk.bean.request; +package com.pikolive.core.room.pk.bean.request; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/response/RespPKData.java b/core/src/main/java/com/pikolive/core/room/pk/bean/response/RespPKData.java similarity index 57% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/response/RespPKData.java rename to core/src/main/java/com/pikolive/core/room/pk/bean/response/RespPKData.java index b8af5bef7..9015497d2 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/response/RespPKData.java +++ b/core/src/main/java/com/pikolive/core/room/pk/bean/response/RespPKData.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.room.pk.bean.response; +package com.pikolive.core.room.pk.bean.response; -import com.yizhuan.xchat_android_core.room.pk.bean.RoomPkData; +import com.pikolive.core.room.pk.bean.RoomPkData; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/event/PKDataUpdateEvent.java b/core/src/main/java/com/pikolive/core/room/pk/event/PKDataUpdateEvent.java similarity index 70% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/pk/event/PKDataUpdateEvent.java rename to core/src/main/java/com/pikolive/core/room/pk/event/PKDataUpdateEvent.java index f68be068b..ebdbedcec 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/event/PKDataUpdateEvent.java +++ b/core/src/main/java/com/pikolive/core/room/pk/event/PKDataUpdateEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.pk.event; +package com.pikolive.core.room.pk.event; /** * @author jack diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/event/PKStateEvent.java b/core/src/main/java/com/pikolive/core/room/pk/event/PKStateEvent.java similarity index 69% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/pk/event/PKStateEvent.java rename to core/src/main/java/com/pikolive/core/room/pk/event/PKStateEvent.java index bb3eeb0b5..c00d724ff 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/event/PKStateEvent.java +++ b/core/src/main/java/com/pikolive/core/room/pk/event/PKStateEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.pk.event; +package com.pikolive.core.room.pk.event; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/event/PKTimeFinishEvent.java b/core/src/main/java/com/pikolive/core/room/pk/event/PKTimeFinishEvent.java similarity index 63% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/pk/event/PKTimeFinishEvent.java rename to core/src/main/java/com/pikolive/core/room/pk/event/PKTimeFinishEvent.java index 2fe149a35..e7d21c7d9 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/event/PKTimeFinishEvent.java +++ b/core/src/main/java/com/pikolive/core/room/pk/event/PKTimeFinishEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.pk.event; +package com.pikolive.core.room.pk.event; /** * @author jack diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/event/PKTimeTickEvent.java b/core/src/main/java/com/pikolive/core/room/pk/event/PKTimeTickEvent.java similarity index 81% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/pk/event/PKTimeTickEvent.java rename to core/src/main/java/com/pikolive/core/room/pk/event/PKTimeTickEvent.java index 075b20c01..690967ca8 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/event/PKTimeTickEvent.java +++ b/core/src/main/java/com/pikolive/core/room/pk/event/PKTimeTickEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.pk.event; +package com.pikolive.core.room.pk.event; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/model/IPkModel.java b/core/src/main/java/com/pikolive/core/room/pk/model/IPkModel.java similarity index 86% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/pk/model/IPkModel.java rename to core/src/main/java/com/pikolive/core/room/pk/model/IPkModel.java index ec388f777..f1dc268ef 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/model/IPkModel.java +++ b/core/src/main/java/com/pikolive/core/room/pk/model/IPkModel.java @@ -1,15 +1,17 @@ -package com.yizhuan.xchat_android_core.room.pk.model; +package com.pikolive.core.room.pk.model; import androidx.annotation.Nullable; -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.room.pk.bean.PKMemberInfo; -import com.yizhuan.xchat_android_core.room.pk.bean.PKRecordListInfo; -import com.yizhuan.xchat_android_core.room.pk.bean.PKRespQueuingMicListInfo; -import com.yizhuan.xchat_android_core.room.pk.bean.PKTeamInfo; -import com.yizhuan.xchat_android_core.room.pk.bean.RoomPKInvitedUpMicMember; -import com.yizhuan.xchat_android_core.room.pk.bean.RoomPkData; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.base.IModel; +import com.pikolive.core.room.pk.bean.PKMemberInfo; +import com.pikolive.core.room.pk.bean.PKRecordListInfo; +import com.pikolive.core.room.pk.bean.PKRespQueuingMicListInfo; +import com.pikolive.core.room.pk.bean.PKTeamInfo; +import com.pikolive.core.room.pk.bean.RoomPKInvitedUpMicMember; +import com.pikolive.core.room.pk.bean.RoomPkData; +import com.pikolive.core.user.bean.UserInfo; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/model/PkModel.java b/core/src/main/java/com/pikolive/core/room/pk/model/PkModel.java similarity index 95% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/pk/model/PkModel.java rename to core/src/main/java/com/pikolive/core/room/pk/model/PkModel.java index 51241c0c1..dad28e1ff 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/model/PkModel.java +++ b/core/src/main/java/com/pikolive/core/room/pk/model/PkModel.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.pk.model; +package com.pikolive.core.room.pk.model; import android.annotation.SuppressLint; import android.os.CountDownTimer; @@ -10,45 +10,51 @@ import com.google.gson.Gson; import com.netease.nimlib.sdk.chatroom.ChatRoomMessageBuilder; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; import com.orhanobut.logger.Logger; -import com.yizhuan.xchat_android_core.R; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.RoomQueueInfo; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.gift.GiftModel; -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo; -import com.yizhuan.xchat_android_core.gift.bean.GiftList; -import com.yizhuan.xchat_android_core.gift.bean.GiftMultiReceiverInfo; -import com.yizhuan.xchat_android_core.gift.bean.GiftReceiveInfo; -import com.yizhuan.xchat_android_core.gift.bean.GiftReceiver; -import com.yizhuan.xchat_android_core.gift.bean.LuckyBagGifts; -import com.yizhuan.xchat_android_core.gift.bean.MultiGiftReceiveInfo; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.magic.MagicModel; -import com.yizhuan.xchat_android_core.magic.bean.MagicInfo; -import com.yizhuan.xchat_android_core.magic.bean.MagicReceivedInfo; -import com.yizhuan.xchat_android_core.magic.bean.MultiMagicReceivedInfo; -import com.yizhuan.xchat_android_core.manager.AudioEngineManager; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.manager.RoomEvent; -import com.yizhuan.xchat_android_core.room.model.AvRoomModel; -import com.yizhuan.xchat_android_core.room.pk.attachment.RoomPkAttachment; -import com.yizhuan.xchat_android_core.room.pk.bean.PKMemberInfo; -import com.yizhuan.xchat_android_core.room.pk.bean.PKRecordListInfo; -import com.yizhuan.xchat_android_core.room.pk.bean.PKRespQueuingMicListInfo; -import com.yizhuan.xchat_android_core.room.pk.bean.PKTeamInfo; -import com.yizhuan.xchat_android_core.room.pk.bean.PKTeamMember; -import com.yizhuan.xchat_android_core.room.pk.bean.RoomPKInvitedUpMicMember; -import com.yizhuan.xchat_android_core.room.pk.bean.RoomPkData; -import com.yizhuan.xchat_android_core.room.pk.bean.request.CreatePKMember; -import com.yizhuan.xchat_android_core.room.pk.bean.response.RespPKData; -import com.yizhuan.xchat_android_core.room.pk.event.PKDataUpdateEvent; -import com.yizhuan.xchat_android_core.room.pk.event.PKTimeFinishEvent; -import com.yizhuan.xchat_android_core.room.pk.event.PKTimeTickEvent; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.magic.MagicModel; +import com.pikolive.core.magic.bean.MagicInfo; +import com.pikolive.core.magic.bean.MagicReceivedInfo; +import com.pikolive.core.magic.bean.MultiMagicReceivedInfo; +import com.pikolive.core.room.pk.attachment.RoomPkAttachment; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.magic.MagicModel; +import com.pikolive.core.magic.bean.MagicInfo; +import com.pikolive.core.magic.bean.MagicReceivedInfo; +import com.pikolive.core.magic.bean.MultiMagicReceivedInfo; +import com.pikolive.core.room.pk.attachment.RoomPkAttachment; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.R; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.bean.RoomQueueInfo; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.gift.GiftModel; +import com.pikolive.core.gift.bean.GiftInfo; +import com.pikolive.core.gift.bean.GiftList; +import com.pikolive.core.gift.bean.GiftMultiReceiverInfo; +import com.pikolive.core.gift.bean.GiftReceiveInfo; +import com.pikolive.core.gift.bean.GiftReceiver; +import com.pikolive.core.gift.bean.LuckyBagGifts; +import com.pikolive.core.gift.bean.MultiGiftReceiveInfo; +import com.pikolive.core.im.custom.bean.CustomAttachment; +import com.pikolive.core2.manager.AudioEngineManager; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core2.manager.IMNetEaseManager; +import com.pikolive.core.manager.RoomEvent; +import com.pikolive.core.room.model.AvRoomModel; +import com.pikolive.core.room.pk.bean.PKMemberInfo; +import com.pikolive.core.room.pk.bean.PKRecordListInfo; +import com.pikolive.core.room.pk.bean.PKRespQueuingMicListInfo; +import com.pikolive.core.room.pk.bean.PKTeamInfo; +import com.pikolive.core.room.pk.bean.PKTeamMember; +import com.pikolive.core.room.pk.bean.RoomPKInvitedUpMicMember; +import com.pikolive.core.room.pk.bean.RoomPkData; +import com.pikolive.core.room.pk.bean.request.CreatePKMember; +import com.pikolive.core.room.pk.bean.response.RespPKData; +import com.pikolive.core.room.pk.event.PKDataUpdateEvent; +import com.pikolive.core.room.pk.event.PKTimeFinishEvent; +import com.pikolive.core.room.pk.event.PKTimeTickEvent; +import com.pikolive.core.user.UserModel; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.net.rxnet.RxNet; import com.pikolive.library.utils.ResUtil; import com.pikolive.library.utils.SingleToastUtil; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/queue/bean/ConsumeInfo.java b/core/src/main/java/com/pikolive/core/room/queue/bean/ConsumeInfo.java similarity index 99% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/queue/bean/ConsumeInfo.java rename to core/src/main/java/com/pikolive/core/room/queue/bean/ConsumeInfo.java index 73133ecfd..7015c3f92 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/queue/bean/ConsumeInfo.java +++ b/core/src/main/java/com/pikolive/core/room/queue/bean/ConsumeInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.queue.bean; +package com.pikolive.core.room.queue.bean; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/queue/bean/MicMemberInfo.java b/core/src/main/java/com/pikolive/core/room/queue/bean/MicMemberInfo.java similarity index 97% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/queue/bean/MicMemberInfo.java rename to core/src/main/java/com/pikolive/core/room/queue/bean/MicMemberInfo.java index 7582443ad..91a4df475 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/queue/bean/MicMemberInfo.java +++ b/core/src/main/java/com/pikolive/core/room/queue/bean/MicMemberInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.queue.bean; +package com.pikolive.core.room.queue.bean; import com.google.gson.annotations.SerializedName; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/queue/bean/RoomConsumeInfo.java b/core/src/main/java/com/pikolive/core/room/queue/bean/RoomConsumeInfo.java similarity index 81% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/queue/bean/RoomConsumeInfo.java rename to core/src/main/java/com/pikolive/core/room/queue/bean/RoomConsumeInfo.java index eeb1f5991..726a66066 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/queue/bean/RoomConsumeInfo.java +++ b/core/src/main/java/com/pikolive/core/room/queue/bean/RoomConsumeInfo.java @@ -1,7 +1,11 @@ -package com.yizhuan.xchat_android_core.room.queue.bean; +package com.pikolive.core.room.queue.bean; -import com.yizhuan.xchat_android_core.level.UserLevelVo; -import com.yizhuan.xchat_android_core.noble.NobleInfo; +import com.pikolive.core.level.UserLevelVo; +import com.pikolive.core.noble.NobleInfo; +import com.pikolive.core.level.UserLevelVo; +import com.pikolive.core.noble.NobleInfo; +import com.pikolive.core.level.UserLevelVo; +import com.pikolive.core.noble.NobleInfo; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/queuing_mic/attachment/QueuingMicAttachment.java b/core/src/main/java/com/pikolive/core/room/queuing_mic/attachment/QueuingMicAttachment.java similarity index 76% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/queuing_mic/attachment/QueuingMicAttachment.java rename to core/src/main/java/com/pikolive/core/room/queuing_mic/attachment/QueuingMicAttachment.java index e47a7c7e2..dbd7d3485 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/queuing_mic/attachment/QueuingMicAttachment.java +++ b/core/src/main/java/com/pikolive/core/room/queuing_mic/attachment/QueuingMicAttachment.java @@ -1,10 +1,10 @@ -package com.yizhuan.xchat_android_core.room.queuing_mic.attachment; +package com.pikolive.core.room.queuing_mic.attachment; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.room.queuing_mic.bean.QueuingMicInfo; +import com.pikolive.core.im.custom.bean.CustomAttachment; +import com.pikolive.core.room.queuing_mic.bean.QueuingMicInfo; public class QueuingMicAttachment extends CustomAttachment { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/queuing_mic/bean/GroupType.java b/core/src/main/java/com/pikolive/core/room/queuing_mic/bean/GroupType.java similarity index 59% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/queuing_mic/bean/GroupType.java rename to core/src/main/java/com/pikolive/core/room/queuing_mic/bean/GroupType.java index bd24aba37..591f273d7 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/queuing_mic/bean/GroupType.java +++ b/core/src/main/java/com/pikolive/core/room/queuing_mic/bean/GroupType.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.queuing_mic.bean; +package com.pikolive.core.room.queuing_mic.bean; public interface GroupType { int NORMAL = 1; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/queuing_mic/bean/QueuingMicInfo.java b/core/src/main/java/com/pikolive/core/room/queuing_mic/bean/QueuingMicInfo.java similarity index 89% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/queuing_mic/bean/QueuingMicInfo.java rename to core/src/main/java/com/pikolive/core/room/queuing_mic/bean/QueuingMicInfo.java index 7ba80cb8c..e5c5c1cf6 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/queuing_mic/bean/QueuingMicInfo.java +++ b/core/src/main/java/com/pikolive/core/room/queuing_mic/bean/QueuingMicInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.queuing_mic.bean; +package com.pikolive.core.room.queuing_mic.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/queuing_mic/bean/QueuingMicMemeberInfo.java b/core/src/main/java/com/pikolive/core/room/queuing_mic/bean/QueuingMicMemeberInfo.java similarity index 88% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/queuing_mic/bean/QueuingMicMemeberInfo.java rename to core/src/main/java/com/pikolive/core/room/queuing_mic/bean/QueuingMicMemeberInfo.java index 871b18305..064f1ab8e 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/queuing_mic/bean/QueuingMicMemeberInfo.java +++ b/core/src/main/java/com/pikolive/core/room/queuing_mic/bean/QueuingMicMemeberInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.queuing_mic.bean; +package com.pikolive.core.room.queuing_mic.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/queuing_mic/bean/RespQueuingMicListInfo.java b/core/src/main/java/com/pikolive/core/room/queuing_mic/bean/RespQueuingMicListInfo.java similarity index 80% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/queuing_mic/bean/RespQueuingMicListInfo.java rename to core/src/main/java/com/pikolive/core/room/queuing_mic/bean/RespQueuingMicListInfo.java index 195cc68a1..aee725c7a 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/queuing_mic/bean/RespQueuingMicListInfo.java +++ b/core/src/main/java/com/pikolive/core/room/queuing_mic/bean/RespQueuingMicListInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.queuing_mic.bean; +package com.pikolive.core.room.queuing_mic.bean; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/queuing_mic/event/HasAnimationEffect.java b/core/src/main/java/com/pikolive/core/room/queuing_mic/event/HasAnimationEffect.java similarity index 59% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/queuing_mic/event/HasAnimationEffect.java rename to core/src/main/java/com/pikolive/core/room/queuing_mic/event/HasAnimationEffect.java index 4adfa6a9d..cf27ad4ed 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/queuing_mic/event/HasAnimationEffect.java +++ b/core/src/main/java/com/pikolive/core/room/queuing_mic/event/HasAnimationEffect.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.queuing_mic.event; +package com.pikolive.core.room.queuing_mic.event; /** * 房间内更新头部开关特效图标事件 diff --git a/core/src/main/java/com/pikolive/core/room/queuing_mic/event/QueuingMicEmptyEvent.java b/core/src/main/java/com/pikolive/core/room/queuing_mic/event/QueuingMicEmptyEvent.java new file mode 100644 index 000000000..9e986aa8e --- /dev/null +++ b/core/src/main/java/com/pikolive/core/room/queuing_mic/event/QueuingMicEmptyEvent.java @@ -0,0 +1,4 @@ +package com.pikolive.core.room.queuing_mic.event; + +public class QueuingMicEmptyEvent { +} diff --git a/core/src/main/java/com/pikolive/core/room/queuing_mic/event/QueuingMicNotEmptyEvent.java b/core/src/main/java/com/pikolive/core/room/queuing_mic/event/QueuingMicNotEmptyEvent.java new file mode 100644 index 000000000..1d5fb07a7 --- /dev/null +++ b/core/src/main/java/com/pikolive/core/room/queuing_mic/event/QueuingMicNotEmptyEvent.java @@ -0,0 +1,4 @@ +package com.pikolive.core.room.queuing_mic.event; + +public class QueuingMicNotEmptyEvent { +} diff --git a/core/src/main/java/com/pikolive/core/room/recommendpos/IRecommendCardModel.java b/core/src/main/java/com/pikolive/core/room/recommendpos/IRecommendCardModel.java new file mode 100644 index 000000000..5428254d7 --- /dev/null +++ b/core/src/main/java/com/pikolive/core/room/recommendpos/IRecommendCardModel.java @@ -0,0 +1,27 @@ +package com.pikolive.core.room.recommendpos; + +import com.pikolive.core.room.recommendpos.bean.RcmdCardType; +import com.pikolive.core.room.recommendpos.bean.RecommendCard; +import com.pikolive.core.room.recommendpos.bean.RcmdCardType; +import com.pikolive.core.room.recommendpos.bean.RecommendCard; +import com.pikolive.core.room.recommendpos.bean.RecommendCard; + +import java.util.List; + +import io.reactivex.Single; + +/** + * Created by lvzebiao on 2019/1/30. + */ + +public interface IRecommendCardModel { + + /** + * 我的推荐卡接口 + * + * @param status {@link RcmdCardType} + * @return list + */ + Single> getBagList(int status, int page, int pageSize); + +} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/recommendpos/RecommendCardModel.java b/core/src/main/java/com/pikolive/core/room/recommendpos/RecommendCardModel.java similarity index 69% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/recommendpos/RecommendCardModel.java rename to core/src/main/java/com/pikolive/core/room/recommendpos/RecommendCardModel.java index 8c1048b31..986dea242 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/recommendpos/RecommendCardModel.java +++ b/core/src/main/java/com/pikolive/core/room/recommendpos/RecommendCardModel.java @@ -1,10 +1,14 @@ -package com.yizhuan.xchat_android_core.room.recommendpos; +package com.pikolive.core.room.recommendpos; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.room.recommendpos.bean.RecommendCard; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.room.recommendpos.bean.RcmdCardType; +import com.pikolive.core.room.recommendpos.bean.RecommendCard; +import com.pikolive.core.room.recommendpos.bean.RcmdCardType; +import com.pikolive.core.room.recommendpos.bean.RecommendCard; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.room.recommendpos.bean.RecommendCard; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.net.rxnet.RxNet; import java.util.ArrayList; @@ -33,7 +37,7 @@ public class RecommendCardModel extends BaseModel implements IRecommendCardModel /** * 我的推荐卡接口 * - * @param status {@link com.yizhuan.xchat_android_core.room.recommendpos.bean.RcmdCardType} + * @param status {@link RcmdCardType} * @return list */ @Override @@ -46,7 +50,7 @@ public class RecommendCardModel extends BaseModel implements IRecommendCardModel /** * 我的推荐卡接口 * - * @param status {@link com.yizhuan.xchat_android_core.room.recommendpos.bean.RcmdCardType} + * @param status {@link RcmdCardType} */ @POST("recommend/backpack") Single>> getBagList(@Query("uid") long uid, diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/recommendpos/bean/RcmdCardType.java b/core/src/main/java/com/pikolive/core/room/recommendpos/bean/RcmdCardType.java similarity index 84% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/recommendpos/bean/RcmdCardType.java rename to core/src/main/java/com/pikolive/core/room/recommendpos/bean/RcmdCardType.java index 3f7927c3f..e7c19e935 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/recommendpos/bean/RcmdCardType.java +++ b/core/src/main/java/com/pikolive/core/room/recommendpos/bean/RcmdCardType.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.recommendpos.bean; +package com.pikolive.core.room.recommendpos.bean; /** * Created by lvzebiao on 2019/1/31. diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/recommendpos/bean/RecommendCard.java b/core/src/main/java/com/pikolive/core/room/recommendpos/bean/RecommendCard.java similarity index 89% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/recommendpos/bean/RecommendCard.java rename to core/src/main/java/com/pikolive/core/room/recommendpos/bean/RecommendCard.java index f8b695832..185c7692b 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/recommendpos/bean/RecommendCard.java +++ b/core/src/main/java/com/pikolive/core/room/recommendpos/bean/RecommendCard.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.recommendpos.bean; +package com.pikolive.core.room.recommendpos.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/treasure_box/bean/BoxRankingInfo.java b/core/src/main/java/com/pikolive/core/room/treasure_box/bean/BoxRankingInfo.java similarity index 94% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/treasure_box/bean/BoxRankingInfo.java rename to core/src/main/java/com/pikolive/core/room/treasure_box/bean/BoxRankingInfo.java index 61eb0917b..a2c3675d4 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/treasure_box/bean/BoxRankingInfo.java +++ b/core/src/main/java/com/pikolive/core/room/treasure_box/bean/BoxRankingInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.treasure_box.bean; +package com.pikolive.core.room.treasure_box.bean; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/treasure_box/bean/TreasureRankingInfo.kt b/core/src/main/java/com/pikolive/core/room/treasure_box/bean/TreasureRankingInfo.kt similarity index 78% rename from core/src/main/java/com/yizhuan/xchat_android_core/room/treasure_box/bean/TreasureRankingInfo.kt rename to core/src/main/java/com/pikolive/core/room/treasure_box/bean/TreasureRankingInfo.kt index a3772fc8c..3256290d5 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/treasure_box/bean/TreasureRankingInfo.kt +++ b/core/src/main/java/com/pikolive/core/room/treasure_box/bean/TreasureRankingInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.room.treasure_box.bean +package com.pikolive.core.room.treasure_box.bean import java.io.Serializable diff --git a/core/src/main/java/com/pikolive/core/room/treasure_box/event/RefreshBoxRankingEvent.java b/core/src/main/java/com/pikolive/core/room/treasure_box/event/RefreshBoxRankingEvent.java new file mode 100644 index 000000000..ba514483c --- /dev/null +++ b/core/src/main/java/com/pikolive/core/room/treasure_box/event/RefreshBoxRankingEvent.java @@ -0,0 +1,4 @@ +package com.pikolive.core.room.treasure_box.event; + +public class RefreshBoxRankingEvent { +} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/settings/ISettingsModel.java b/core/src/main/java/com/pikolive/core/settings/ISettingsModel.java similarity index 54% rename from core/src/main/java/com/yizhuan/xchat_android_core/settings/ISettingsModel.java rename to core/src/main/java/com/pikolive/core/settings/ISettingsModel.java index e7e7cf785..001eab96b 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/settings/ISettingsModel.java +++ b/core/src/main/java/com/pikolive/core/settings/ISettingsModel.java @@ -1,9 +1,17 @@ -package com.yizhuan.xchat_android_core.settings; +package com.pikolive.core.settings; -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.settings.bean.SysAccount; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.pikolive.core.base.IModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.settings.bean.SysAccount; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.base.IModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.settings.bean.SysAccount; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.base.IModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.settings.bean.SysAccount; +import com.pikolive.core.user.bean.UserInfo; import io.reactivex.Single; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/settings/SettingsModel.java b/core/src/main/java/com/pikolive/core/settings/SettingsModel.java similarity index 90% rename from core/src/main/java/com/yizhuan/xchat_android_core/settings/SettingsModel.java rename to core/src/main/java/com/pikolive/core/settings/SettingsModel.java index e3f7e3258..c22f6d031 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/settings/SettingsModel.java +++ b/core/src/main/java/com/pikolive/core/settings/SettingsModel.java @@ -1,15 +1,21 @@ -package com.yizhuan.xchat_android_core.settings; +package com.pikolive.core.settings; import com.google.gson.JsonElement; import com.netease.nimlib.sdk.NIMClient; import com.netease.nimlib.sdk.RequestCallback; import com.netease.nimlib.sdk.friend.FriendService; -import com.yizhuan.xchat_android_core.R; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.settings.bean.SysAccount; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.settings.bean.SysAccount; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.settings.bean.SysAccount; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.R; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.settings.bean.SysAccount; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.net.rxnet.RxNet; import com.pikolive.library.utils.ResUtil; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/settings/bean/SysAccount.java b/core/src/main/java/com/pikolive/core/settings/bean/SysAccount.java similarity index 82% rename from core/src/main/java/com/yizhuan/xchat_android_core/settings/bean/SysAccount.java rename to core/src/main/java/com/pikolive/core/settings/bean/SysAccount.java index 9533a623c..f1611bb27 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/settings/bean/SysAccount.java +++ b/core/src/main/java/com/pikolive/core/settings/bean/SysAccount.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.settings.bean; +package com.pikolive.core.settings.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/share/IShareCoreClient.java b/core/src/main/java/com/pikolive/core/share/IShareCoreClient.java similarity index 96% rename from core/src/main/java/com/yizhuan/xchat_android_core/share/IShareCoreClient.java rename to core/src/main/java/com/pikolive/core/share/IShareCoreClient.java index 6d22c8a60..61e1eedfa 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/share/IShareCoreClient.java +++ b/core/src/main/java/com/pikolive/core/share/IShareCoreClient.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.share; +package com.pikolive.core.share; import com.pikolive.library.coremanager.ICoreClient; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/share/IShareModel.java b/core/src/main/java/com/pikolive/core/share/IShareModel.java similarity index 78% rename from core/src/main/java/com/yizhuan/xchat_android_core/share/IShareModel.java rename to core/src/main/java/com/pikolive/core/share/IShareModel.java index ea7cb42bf..e7ff58b52 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/share/IShareModel.java +++ b/core/src/main/java/com/pikolive/core/share/IShareModel.java @@ -1,7 +1,11 @@ -package com.yizhuan.xchat_android_core.share; +package com.pikolive.core.share; -import com.yizhuan.xchat_android_core.share.bean.ShareCommonInfo; -import com.yizhuan.xchat_android_core.web.bean.WebJsBeanInfo; +import com.pikolive.core.share.bean.ShareCommonInfo; +import com.pikolive.core.web.bean.WebJsBeanInfo; +import com.pikolive.core.share.bean.ShareCommonInfo; +import com.pikolive.core.web.bean.WebJsBeanInfo; +import com.pikolive.core.share.bean.ShareCommonInfo; +import com.pikolive.core.web.bean.WebJsBeanInfo; import com.pikolive.library.coremanager.IBaseCore; import cn.sharesdk.framework.Platform; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/share/ShareModel.java b/core/src/main/java/com/pikolive/core/share/ShareModel.java similarity index 94% rename from core/src/main/java/com/yizhuan/xchat_android_core/share/ShareModel.java rename to core/src/main/java/com/pikolive/core/share/ShareModel.java index 6a30264bc..53ec66969 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/share/ShareModel.java +++ b/core/src/main/java/com/pikolive/core/share/ShareModel.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.share; +package com.pikolive.core.share; import android.annotation.SuppressLint; import android.content.ClipData; @@ -7,22 +7,34 @@ import android.content.Context; import com.netease.nimlib.sdk.chatroom.ChatRoomMessageBuilder; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; -import com.yizhuan.xchat_android_core.R; -import com.yizhuan.xchat_android_constants.XChatConstants; -import com.yizhuan.xchat_android_core.UriProvider; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.result.ShareRedPacketResult; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomTipAttachment; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.share.bean.ShareCommonInfo; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.utils.Logger; -import com.yizhuan.xchat_android_core.web.bean.WebJsBeanInfo; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.bean.response.result.ShareRedPacketResult; +import com.pikolive.core.im.custom.bean.CustomAttachment; +import com.pikolive.core.im.custom.bean.RoomTipAttachment; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core.room.bean.RoomInfo; +import com.pikolive.core.share.bean.ShareCommonInfo; +import com.pikolive.core.user.UserModel; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.utils.Logger; +import com.pikolive.core.web.bean.WebJsBeanInfo; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.bean.response.result.ShareRedPacketResult; +import com.pikolive.core.im.custom.bean.CustomAttachment; +import com.pikolive.core.im.custom.bean.RoomTipAttachment; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core.room.bean.RoomInfo; +import com.pikolive.core.share.bean.ShareCommonInfo; +import com.pikolive.core.user.UserModel; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.utils.Logger; +import com.pikolive.core.web.bean.WebJsBeanInfo; +import com.pikolive.core.R; +import com.pikolive.core2.XChatConstants; +import com.pikolive.core2.UriProvider; +import com.pikolive.core2.manager.IMNetEaseManager; import com.pikolive.library.net.rxnet.RxNet; import com.pikolive.library.utils.ResUtil; import com.pikolive.library.utils.SingleToastUtil; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/share/bean/InAppSharingFamilyInfo.java b/core/src/main/java/com/pikolive/core/share/bean/InAppSharingFamilyInfo.java similarity index 54% rename from core/src/main/java/com/yizhuan/xchat_android_core/share/bean/InAppSharingFamilyInfo.java rename to core/src/main/java/com/pikolive/core/share/bean/InAppSharingFamilyInfo.java index d0f30c649..839b91d26 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/share/bean/InAppSharingFamilyInfo.java +++ b/core/src/main/java/com/pikolive/core/share/bean/InAppSharingFamilyInfo.java @@ -1,6 +1,8 @@ -package com.yizhuan.xchat_android_core.share.bean; +package com.pikolive.core.share.bean; -import com.yizhuan.xchat_android_core.family.bean.FamilyInfo; +import com.pikolive.core.family.bean.FamilyInfo; +import com.pikolive.core.family.bean.FamilyInfo; +import com.pikolive.core.family.bean.FamilyInfo; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/share/bean/InAppSharingInfo.java b/core/src/main/java/com/pikolive/core/share/bean/InAppSharingInfo.java similarity index 86% rename from core/src/main/java/com/yizhuan/xchat_android_core/share/bean/InAppSharingInfo.java rename to core/src/main/java/com/pikolive/core/share/bean/InAppSharingInfo.java index c3c73928a..f5bea2ecc 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/share/bean/InAppSharingInfo.java +++ b/core/src/main/java/com/pikolive/core/share/bean/InAppSharingInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.share.bean; +package com.pikolive.core.share.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/share/bean/InAppSharingMiniWorldInfo.java b/core/src/main/java/com/pikolive/core/share/bean/InAppSharingMiniWorldInfo.java similarity index 60% rename from core/src/main/java/com/yizhuan/xchat_android_core/share/bean/InAppSharingMiniWorldInfo.java rename to core/src/main/java/com/pikolive/core/share/bean/InAppSharingMiniWorldInfo.java index 27560b1be..c56b15daa 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/share/bean/InAppSharingMiniWorldInfo.java +++ b/core/src/main/java/com/pikolive/core/share/bean/InAppSharingMiniWorldInfo.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.share.bean; +package com.pikolive.core.share.bean; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldDetailInfo; +import com.pikolive.core.miniworld.bean.MiniWorldDetailInfo; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/share/bean/InAppSharingRoomInfo.java b/core/src/main/java/com/pikolive/core/share/bean/InAppSharingRoomInfo.java similarity index 61% rename from core/src/main/java/com/yizhuan/xchat_android_core/share/bean/InAppSharingRoomInfo.java rename to core/src/main/java/com/pikolive/core/share/bean/InAppSharingRoomInfo.java index ae2e26350..7a03d91f5 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/share/bean/InAppSharingRoomInfo.java +++ b/core/src/main/java/com/pikolive/core/share/bean/InAppSharingRoomInfo.java @@ -1,6 +1,8 @@ -package com.yizhuan.xchat_android_core.share.bean; +package com.pikolive.core.share.bean; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; +import com.pikolive.core.room.bean.RoomInfo; +import com.pikolive.core.room.bean.RoomInfo; +import com.pikolive.core.room.bean.RoomInfo; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/share/bean/InAppSharingTeamInfo.java b/core/src/main/java/com/pikolive/core/share/bean/InAppSharingTeamInfo.java similarity index 56% rename from core/src/main/java/com/yizhuan/xchat_android_core/share/bean/InAppSharingTeamInfo.java rename to core/src/main/java/com/pikolive/core/share/bean/InAppSharingTeamInfo.java index 5dc66ee9f..6014f4dda 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/share/bean/InAppSharingTeamInfo.java +++ b/core/src/main/java/com/pikolive/core/share/bean/InAppSharingTeamInfo.java @@ -1,6 +1,8 @@ -package com.yizhuan.xchat_android_core.share.bean; +package com.pikolive.core.share.bean; -import com.yizhuan.xchat_android_core.team.bean.TeamInfo; +import com.pikolive.core.team.bean.TeamInfo; +import com.pikolive.core.team.bean.TeamInfo; +import com.pikolive.core.team.bean.TeamInfo; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/share/bean/SessionType.java b/core/src/main/java/com/pikolive/core/share/bean/SessionType.java similarity index 94% rename from core/src/main/java/com/yizhuan/xchat_android_core/share/bean/SessionType.java rename to core/src/main/java/com/pikolive/core/share/bean/SessionType.java index 3db629caf..1e0ec4808 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/share/bean/SessionType.java +++ b/core/src/main/java/com/pikolive/core/share/bean/SessionType.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.share.bean; +package com.pikolive.core.share.bean; import android.util.SparseArray; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/share/bean/ShareCommonInfo.java b/core/src/main/java/com/pikolive/core/share/bean/ShareCommonInfo.java similarity index 94% rename from core/src/main/java/com/yizhuan/xchat_android_core/share/bean/ShareCommonInfo.java rename to core/src/main/java/com/pikolive/core/share/bean/ShareCommonInfo.java index 16dd1de6f..4e57d5018 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/share/bean/ShareCommonInfo.java +++ b/core/src/main/java/com/pikolive/core/share/bean/ShareCommonInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.share.bean; +package com.pikolive.core.share.bean; import lombok.Getter; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/skill/entity/SkillNotifyEntity.kt b/core/src/main/java/com/pikolive/core/skill/entity/SkillNotifyEntity.kt similarity index 85% rename from core/src/main/java/com/yizhuan/xchat_android_core/skill/entity/SkillNotifyEntity.kt rename to core/src/main/java/com/pikolive/core/skill/entity/SkillNotifyEntity.kt index d6b344484..05e7189b5 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/skill/entity/SkillNotifyEntity.kt +++ b/core/src/main/java/com/pikolive/core/skill/entity/SkillNotifyEntity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.skill.entity +package com.pikolive.core.skill.entity data class SkillNotifyEntity(val layout: LayoutBean) diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/skill/entity/SkillPostServerEntity.kt b/core/src/main/java/com/pikolive/core/skill/entity/SkillPostServerEntity.kt similarity index 82% rename from core/src/main/java/com/yizhuan/xchat_android_core/skill/entity/SkillPostServerEntity.kt rename to core/src/main/java/com/pikolive/core/skill/entity/SkillPostServerEntity.kt index 44a296a66..7ecaf53cb 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/skill/entity/SkillPostServerEntity.kt +++ b/core/src/main/java/com/pikolive/core/skill/entity/SkillPostServerEntity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.skill.entity +package com.pikolive.core.skill.entity /** * ...... diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/skill/entity/SkillPropertyEntity.kt b/core/src/main/java/com/pikolive/core/skill/entity/SkillPropertyEntity.kt similarity index 95% rename from core/src/main/java/com/yizhuan/xchat_android_core/skill/entity/SkillPropertyEntity.kt rename to core/src/main/java/com/pikolive/core/skill/entity/SkillPropertyEntity.kt index 13316d1a1..7d25aacbc 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/skill/entity/SkillPropertyEntity.kt +++ b/core/src/main/java/com/pikolive/core/skill/entity/SkillPropertyEntity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.skill.entity +package com.pikolive.core.skill.entity import com.google.gson.annotations.SerializedName diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/skill/entity/SkillRecordEntity.kt b/core/src/main/java/com/pikolive/core/skill/entity/SkillRecordEntity.kt similarity index 95% rename from core/src/main/java/com/yizhuan/xchat_android_core/skill/entity/SkillRecordEntity.kt rename to core/src/main/java/com/pikolive/core/skill/entity/SkillRecordEntity.kt index a65b2756e..6f51de8bb 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/skill/entity/SkillRecordEntity.kt +++ b/core/src/main/java/com/pikolive/core/skill/entity/SkillRecordEntity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.skill.entity +package com.pikolive.core.skill.entity import com.google.gson.annotations.SerializedName diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/skill/entity/SkillTypeEntity.kt b/core/src/main/java/com/pikolive/core/skill/entity/SkillTypeEntity.kt similarity index 60% rename from core/src/main/java/com/yizhuan/xchat_android_core/skill/entity/SkillTypeEntity.kt rename to core/src/main/java/com/pikolive/core/skill/entity/SkillTypeEntity.kt index 0100c773a..8401cfbbf 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/skill/entity/SkillTypeEntity.kt +++ b/core/src/main/java/com/pikolive/core/skill/entity/SkillTypeEntity.kt @@ -1,3 +1,3 @@ -package com.yizhuan.xchat_android_core.skill.entity +package com.pikolive.core.skill.entity data class SkillTypeEntity(val cardId: Int, val name: String, val icon: String) \ No newline at end of file diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/skill/event/SkillEvent.java b/core/src/main/java/com/pikolive/core/skill/event/SkillEvent.java similarity index 83% rename from core/src/main/java/com/yizhuan/xchat_android_core/skill/event/SkillEvent.java rename to core/src/main/java/com/pikolive/core/skill/event/SkillEvent.java index 750a91734..2803a518f 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/skill/event/SkillEvent.java +++ b/core/src/main/java/com/pikolive/core/skill/event/SkillEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.skill.event; +package com.pikolive.core.skill.event; public class SkillEvent { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/statistic/StatLogKey.java b/core/src/main/java/com/pikolive/core/statistic/StatLogKey.java similarity index 91% rename from core/src/main/java/com/yizhuan/xchat_android_core/statistic/StatLogKey.java rename to core/src/main/java/com/pikolive/core/statistic/StatLogKey.java index fbb075088..ac78e48de 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/statistic/StatLogKey.java +++ b/core/src/main/java/com/pikolive/core/statistic/StatLogKey.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.statistic; +package com.pikolive.core.statistic; /** *

diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/statistic/protocol/StatisticsProtocol.java b/core/src/main/java/com/pikolive/core/statistic/protocol/StatisticsProtocol.java similarity index 99% rename from core/src/main/java/com/yizhuan/xchat_android_core/statistic/protocol/StatisticsProtocol.java rename to core/src/main/java/com/pikolive/core/statistic/protocol/StatisticsProtocol.java index 2f3c3ab80..fad171d5c 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/statistic/protocol/StatisticsProtocol.java +++ b/core/src/main/java/com/pikolive/core/statistic/protocol/StatisticsProtocol.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.statistic.protocol; +package com.pikolive.core.statistic.protocol; /** * @author jiajie diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/support/config/Constants.kt b/core/src/main/java/com/pikolive/core/support/config/Constants.kt similarity index 68% rename from core/src/main/java/com/yizhuan/xchat_android_core/support/config/Constants.kt rename to core/src/main/java/com/pikolive/core/support/config/Constants.kt index 9dc4339b2..5226d89aa 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/support/config/Constants.kt +++ b/core/src/main/java/com/pikolive/core/support/config/Constants.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.support.config +package com.pikolive.core.support.config /** * Created by Max on 2023/10/26 22:50 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/support/room/FrameLayoutRoomWidget.kt b/core/src/main/java/com/pikolive/core/support/room/FrameLayoutRoomWidget.kt similarity index 97% rename from core/src/main/java/com/yizhuan/xchat_android_core/support/room/FrameLayoutRoomWidget.kt rename to core/src/main/java/com/pikolive/core/support/room/FrameLayoutRoomWidget.kt index 633acdd36..84843f5c0 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/support/room/FrameLayoutRoomWidget.kt +++ b/core/src/main/java/com/pikolive/core/support/room/FrameLayoutRoomWidget.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.support.room +package com.pikolive.core.support.room import android.content.Context import android.util.AttributeSet diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/support/room/RoomAbility.kt b/core/src/main/java/com/pikolive/core/support/room/RoomAbility.kt similarity index 93% rename from core/src/main/java/com/yizhuan/xchat_android_core/support/room/RoomAbility.kt rename to core/src/main/java/com/pikolive/core/support/room/RoomAbility.kt index 0ca3eb241..0e05ad3b9 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/support/room/RoomAbility.kt +++ b/core/src/main/java/com/pikolive/core/support/room/RoomAbility.kt @@ -1,16 +1,16 @@ -package com.yizhuan.xchat_android_core.support.room +package com.pikolive.core.support.room import androidx.annotation.CallSuper import androidx.lifecycle.Lifecycle import androidx.lifecycle.LifecycleEventObserver import androidx.lifecycle.LifecycleOwner +import com.pikolive.core.support.room.lifecycle.RoomFullLifecycleObserver +import com.pikolive.core.support.room.lifecycle.RoomLifecycle import com.pikolive.utils.log.ILog import com.trello.rxlifecycle3.LifecycleProvider import com.trello.rxlifecycle3.LifecycleTransformer import com.trello.rxlifecycle3.OutsideLifecycleException import com.trello.rxlifecycle3.RxLifecycle -import com.yizhuan.xchat_android_core.support.room.lifecycle.RoomFullLifecycleObserver -import com.yizhuan.xchat_android_core.support.room.lifecycle.RoomLifecycle import io.reactivex.Observable import io.reactivex.functions.Function import io.reactivex.subjects.BehaviorSubject diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/support/room/RoomContext.kt b/core/src/main/java/com/pikolive/core/support/room/RoomContext.kt similarity index 92% rename from core/src/main/java/com/yizhuan/xchat_android_core/support/room/RoomContext.kt rename to core/src/main/java/com/pikolive/core/support/room/RoomContext.kt index e6724902e..7d1762ab9 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/support/room/RoomContext.kt +++ b/core/src/main/java/com/pikolive/core/support/room/RoomContext.kt @@ -1,10 +1,10 @@ -package com.yizhuan.xchat_android_core.support.room +package com.pikolive.core.support.room import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import com.pikolive.utils.log.ILog -import com.yizhuan.xchat_android_core.support.room.lifecycle.RoomLifecycle -import com.yizhuan.xchat_android_core.support.room.lifecycle.RoomLifecycleRegistry +import com.pikolive.core.support.room.lifecycle.RoomLifecycle +import com.pikolive.core.support.room.lifecycle.RoomLifecycleRegistry /** * Created by Max on 2023/10/26 11:50 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/support/room/RoomHandler.kt b/core/src/main/java/com/pikolive/core/support/room/RoomHandler.kt similarity index 70% rename from core/src/main/java/com/yizhuan/xchat_android_core/support/room/RoomHandler.kt rename to core/src/main/java/com/pikolive/core/support/room/RoomHandler.kt index c8cfbc7d5..fa92091a3 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/support/room/RoomHandler.kt +++ b/core/src/main/java/com/pikolive/core/support/room/RoomHandler.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.support.room +package com.pikolive.core.support.room /** * Created by Max on 2023/10/26 11:02 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/support/room/RoomService.kt b/core/src/main/java/com/pikolive/core/support/room/RoomService.kt similarity index 84% rename from core/src/main/java/com/yizhuan/xchat_android_core/support/room/RoomService.kt rename to core/src/main/java/com/pikolive/core/support/room/RoomService.kt index ef9ef505c..4c51c319b 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/support/room/RoomService.kt +++ b/core/src/main/java/com/pikolive/core/support/room/RoomService.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.support.room +package com.pikolive.core.support.room /** * Created by Max on 2023/10/26 12:31 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/support/room/RoomView.kt b/core/src/main/java/com/pikolive/core/support/room/RoomView.kt similarity index 91% rename from core/src/main/java/com/yizhuan/xchat_android_core/support/room/RoomView.kt rename to core/src/main/java/com/pikolive/core/support/room/RoomView.kt index da5ee0dc2..caaf1c9a7 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/support/room/RoomView.kt +++ b/core/src/main/java/com/pikolive/core/support/room/RoomView.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.support.room +package com.pikolive.core.support.room import android.app.Activity import androidx.lifecycle.LifecycleOwner diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/support/room/RoomWidget.kt b/core/src/main/java/com/pikolive/core/support/room/RoomWidget.kt similarity index 84% rename from core/src/main/java/com/yizhuan/xchat_android_core/support/room/RoomWidget.kt rename to core/src/main/java/com/pikolive/core/support/room/RoomWidget.kt index d94d1f930..c6dd5ee01 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/support/room/RoomWidget.kt +++ b/core/src/main/java/com/pikolive/core/support/room/RoomWidget.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.support.room +package com.pikolive.core.support.room import com.pikolive.utils.log.ILog diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/support/room/lifecycle/RoomFullLifecycleObserver.kt b/core/src/main/java/com/pikolive/core/support/room/lifecycle/RoomFullLifecycleObserver.kt similarity index 85% rename from core/src/main/java/com/yizhuan/xchat_android_core/support/room/lifecycle/RoomFullLifecycleObserver.kt rename to core/src/main/java/com/pikolive/core/support/room/lifecycle/RoomFullLifecycleObserver.kt index 7f21d1a93..ac76784a5 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/support/room/lifecycle/RoomFullLifecycleObserver.kt +++ b/core/src/main/java/com/pikolive/core/support/room/lifecycle/RoomFullLifecycleObserver.kt @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.support.room.lifecycle +package com.pikolive.core.support.room.lifecycle -import com.yizhuan.xchat_android_core.support.room.RoomContext +import com.pikolive.core.support.room.RoomContext /** diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/support/room/lifecycle/RoomLifecycle.kt b/core/src/main/java/com/pikolive/core/support/room/lifecycle/RoomLifecycle.kt similarity index 92% rename from core/src/main/java/com/yizhuan/xchat_android_core/support/room/lifecycle/RoomLifecycle.kt rename to core/src/main/java/com/pikolive/core/support/room/lifecycle/RoomLifecycle.kt index 9b845810c..fa20d8c47 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/support/room/lifecycle/RoomLifecycle.kt +++ b/core/src/main/java/com/pikolive/core/support/room/lifecycle/RoomLifecycle.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.support.room.lifecycle +package com.pikolive.core.support.room.lifecycle import com.pikolive.utils.ICleared diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/support/room/lifecycle/RoomLifecycleObserver.kt b/core/src/main/java/com/pikolive/core/support/room/lifecycle/RoomLifecycleObserver.kt similarity index 68% rename from core/src/main/java/com/yizhuan/xchat_android_core/support/room/lifecycle/RoomLifecycleObserver.kt rename to core/src/main/java/com/pikolive/core/support/room/lifecycle/RoomLifecycleObserver.kt index 27ac33f92..ba3efea5b 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/support/room/lifecycle/RoomLifecycleObserver.kt +++ b/core/src/main/java/com/pikolive/core/support/room/lifecycle/RoomLifecycleObserver.kt @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.support.room.lifecycle +package com.pikolive.core.support.room.lifecycle -import com.yizhuan.xchat_android_core.support.room.RoomContext +import com.pikolive.core.support.room.RoomContext /** diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/support/room/lifecycle/RoomLifecycleOwner.kt b/core/src/main/java/com/pikolive/core/support/room/lifecycle/RoomLifecycleOwner.kt similarity index 71% rename from core/src/main/java/com/yizhuan/xchat_android_core/support/room/lifecycle/RoomLifecycleOwner.kt rename to core/src/main/java/com/pikolive/core/support/room/lifecycle/RoomLifecycleOwner.kt index a8a5c007b..ae41f2f78 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/support/room/lifecycle/RoomLifecycleOwner.kt +++ b/core/src/main/java/com/pikolive/core/support/room/lifecycle/RoomLifecycleOwner.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.support.room.lifecycle +package com.pikolive.core.support.room.lifecycle /** * Created by Max on 2023/10/26 11:50 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/support/room/lifecycle/RoomLifecycleRegistry.kt b/core/src/main/java/com/pikolive/core/support/room/lifecycle/RoomLifecycleRegistry.kt similarity index 92% rename from core/src/main/java/com/yizhuan/xchat_android_core/support/room/lifecycle/RoomLifecycleRegistry.kt rename to core/src/main/java/com/pikolive/core/support/room/lifecycle/RoomLifecycleRegistry.kt index a9c6df811..6eeaf74b2 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/support/room/lifecycle/RoomLifecycleRegistry.kt +++ b/core/src/main/java/com/pikolive/core/support/room/lifecycle/RoomLifecycleRegistry.kt @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.support.room.lifecycle +package com.pikolive.core.support.room.lifecycle import com.pikolive.utils.log.ILog -import com.yizhuan.xchat_android_core.support.room.RoomContext +import com.pikolive.core.support.room.RoomContext import java.util.concurrent.CopyOnWriteArrayList /** diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/support/room/lifecycle/rx/RoomRxLifecycleEvent.java b/core/src/main/java/com/pikolive/core/support/room/lifecycle/rx/RoomRxLifecycleEvent.java similarity index 68% rename from core/src/main/java/com/yizhuan/xchat_android_core/support/room/lifecycle/rx/RoomRxLifecycleEvent.java rename to core/src/main/java/com/pikolive/core/support/room/lifecycle/rx/RoomRxLifecycleEvent.java index 10fb6b7f3..0258ffafb 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/support/room/lifecycle/rx/RoomRxLifecycleEvent.java +++ b/core/src/main/java/com/pikolive/core/support/room/lifecycle/rx/RoomRxLifecycleEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.support.room.lifecycle.rx; +package com.pikolive.core.support.room.lifecycle.rx; /** diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/team/bean/RespTeamMemberInfo.java b/core/src/main/java/com/pikolive/core/team/bean/RespTeamMemberInfo.java similarity index 80% rename from core/src/main/java/com/yizhuan/xchat_android_core/team/bean/RespTeamMemberInfo.java rename to core/src/main/java/com/pikolive/core/team/bean/RespTeamMemberInfo.java index 8f05c00a1..051941264 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/team/bean/RespTeamMemberInfo.java +++ b/core/src/main/java/com/pikolive/core/team/bean/RespTeamMemberInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.team.bean; +package com.pikolive.core.team.bean; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/team/bean/TeamEvent.java b/core/src/main/java/com/pikolive/core/team/bean/TeamEvent.java similarity index 92% rename from core/src/main/java/com/yizhuan/xchat_android_core/team/bean/TeamEvent.java rename to core/src/main/java/com/pikolive/core/team/bean/TeamEvent.java index 8c9bf782d..2ebf57d97 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/team/bean/TeamEvent.java +++ b/core/src/main/java/com/pikolive/core/team/bean/TeamEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.team.bean; +package com.pikolive.core.team.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/team/bean/TeamInfo.java b/core/src/main/java/com/pikolive/core/team/bean/TeamInfo.java similarity index 95% rename from core/src/main/java/com/yizhuan/xchat_android_core/team/bean/TeamInfo.java rename to core/src/main/java/com/pikolive/core/team/bean/TeamInfo.java index f7c10be7d..fee867c08 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/team/bean/TeamInfo.java +++ b/core/src/main/java/com/pikolive/core/team/bean/TeamInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.team.bean; +package com.pikolive.core.team.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/team/bean/TeamMemberInfo.java b/core/src/main/java/com/pikolive/core/team/bean/TeamMemberInfo.java similarity index 88% rename from core/src/main/java/com/yizhuan/xchat_android_core/team/bean/TeamMemberInfo.java rename to core/src/main/java/com/pikolive/core/team/bean/TeamMemberInfo.java index 304cb2ad0..fe314d8f5 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/team/bean/TeamMemberInfo.java +++ b/core/src/main/java/com/pikolive/core/team/bean/TeamMemberInfo.java @@ -1,7 +1,9 @@ -package com.yizhuan.xchat_android_core.team.bean; +package com.pikolive.core.team.bean; -import com.yizhuan.xchat_android_core.R; -import com.yizhuan.xchat_android_core.level.UserLevelVo; +import com.pikolive.core.level.UserLevelVo; +import com.pikolive.core.level.UserLevelVo; +import com.pikolive.core.R; +import com.pikolive.core.level.UserLevelVo; import com.pikolive.library.utils.ResUtil; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/team/bean/TeamTransactionInfo.java b/core/src/main/java/com/pikolive/core/team/bean/TeamTransactionInfo.java similarity index 84% rename from core/src/main/java/com/yizhuan/xchat_android_core/team/bean/TeamTransactionInfo.java rename to core/src/main/java/com/pikolive/core/team/bean/TeamTransactionInfo.java index d62b65f40..ae69b3e75 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/team/bean/TeamTransactionInfo.java +++ b/core/src/main/java/com/pikolive/core/team/bean/TeamTransactionInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.team.bean; +package com.pikolive.core.team.bean; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/team/bean/TeamTransactionRecordInfo.java b/core/src/main/java/com/pikolive/core/team/bean/TeamTransactionRecordInfo.java similarity index 84% rename from core/src/main/java/com/yizhuan/xchat_android_core/team/bean/TeamTransactionRecordInfo.java rename to core/src/main/java/com/pikolive/core/team/bean/TeamTransactionRecordInfo.java index 86fbb6b99..5f0853603 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/team/bean/TeamTransactionRecordInfo.java +++ b/core/src/main/java/com/pikolive/core/team/bean/TeamTransactionRecordInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.team.bean; +package com.pikolive.core.team.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/team/model/ITeamModel.java b/core/src/main/java/com/pikolive/core/team/model/ITeamModel.java similarity index 90% rename from core/src/main/java/com/yizhuan/xchat_android_core/team/model/ITeamModel.java rename to core/src/main/java/com/pikolive/core/team/model/ITeamModel.java index 6dc300c45..a3ebdae4b 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/team/model/ITeamModel.java +++ b/core/src/main/java/com/pikolive/core/team/model/ITeamModel.java @@ -1,13 +1,13 @@ -package com.yizhuan.xchat_android_core.team.model; +package com.pikolive.core.team.model; -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.luckymoney.LuckyMoneyInfo; -import com.yizhuan.xchat_android_core.luckymoney.LuckyMoneyRecordsInfo; -import com.yizhuan.xchat_android_core.team.bean.RespTeamMemberInfo; -import com.yizhuan.xchat_android_core.team.bean.TeamInfo; -import com.yizhuan.xchat_android_core.team.bean.TeamMemberInfo; -import com.yizhuan.xchat_android_core.team.bean.TeamTransactionInfo; +import com.pikolive.core.base.IModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.luckymoney.LuckyMoneyInfo; +import com.pikolive.core.luckymoney.LuckyMoneyRecordsInfo; +import com.pikolive.core.team.bean.RespTeamMemberInfo; +import com.pikolive.core.team.bean.TeamInfo; +import com.pikolive.core.team.bean.TeamMemberInfo; +import com.pikolive.core.team.bean.TeamTransactionInfo; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/team/model/TeamModel.java b/core/src/main/java/com/pikolive/core/team/model/TeamModel.java similarity index 97% rename from core/src/main/java/com/yizhuan/xchat_android_core/team/model/TeamModel.java rename to core/src/main/java/com/pikolive/core/team/model/TeamModel.java index 4d8a6a175..06205ae48 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/team/model/TeamModel.java +++ b/core/src/main/java/com/pikolive/core/team/model/TeamModel.java @@ -1,20 +1,20 @@ -package com.yizhuan.xchat_android_core.team.model; +package com.pikolive.core.team.model; import com.netease.nimlib.sdk.NIMClient; import com.netease.nimlib.sdk.msg.MsgService; import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum; -import com.yizhuan.xchat_android_core.R; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.family.model.FamilyModel; -import com.yizhuan.xchat_android_core.luckymoney.LuckyMoneyInfo; -import com.yizhuan.xchat_android_core.luckymoney.LuckyMoneyRecordsInfo; -import com.yizhuan.xchat_android_core.team.bean.RespTeamMemberInfo; -import com.yizhuan.xchat_android_core.team.bean.TeamInfo; -import com.yizhuan.xchat_android_core.team.bean.TeamMemberInfo; -import com.yizhuan.xchat_android_core.team.bean.TeamTransactionInfo; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.R; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.family.model.FamilyModel; +import com.pikolive.core.luckymoney.LuckyMoneyInfo; +import com.pikolive.core.luckymoney.LuckyMoneyRecordsInfo; +import com.pikolive.core.team.bean.RespTeamMemberInfo; +import com.pikolive.core.team.bean.TeamInfo; +import com.pikolive.core.team.bean.TeamMemberInfo; +import com.pikolive.core.team.bean.TeamTransactionInfo; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.net.rxnet.RxNet; import com.pikolive.library.utils.ResUtil; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/AttentionModel.java b/core/src/main/java/com/pikolive/core/user/AttentionModel.java similarity index 83% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/AttentionModel.java rename to core/src/main/java/com/pikolive/core/user/AttentionModel.java index a10ded435..0b25d35f5 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/AttentionModel.java +++ b/core/src/main/java/com/pikolive/core/user/AttentionModel.java @@ -1,11 +1,15 @@ -package com.yizhuan.xchat_android_core.user; +package com.pikolive.core.user; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.result.AttentionListResult; -import com.yizhuan.xchat_android_core.bean.response.result.FansListResult; -import com.yizhuan.xchat_android_core.user.bean.AttentionInfo; -import com.yizhuan.xchat_android_core.user.bean.FansListInfo; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.user.bean.AttentionInfo; +import com.pikolive.core.user.bean.FansListInfo; +import com.pikolive.core.user.bean.AttentionInfo; +import com.pikolive.core.user.bean.FansListInfo; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.bean.response.result.AttentionListResult; +import com.pikolive.core.bean.response.result.FansListResult; +import com.pikolive.core.user.bean.AttentionInfo; +import com.pikolive.core.user.bean.FansListInfo; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.net.rxnet.RxNet; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/IAttentionModel.java b/core/src/main/java/com/pikolive/core/user/IAttentionModel.java similarity index 59% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/IAttentionModel.java rename to core/src/main/java/com/pikolive/core/user/IAttentionModel.java index 0667d41f3..1adfabcdc 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/IAttentionModel.java +++ b/core/src/main/java/com/pikolive/core/user/IAttentionModel.java @@ -1,8 +1,12 @@ -package com.yizhuan.xchat_android_core.user; +package com.pikolive.core.user; -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.user.bean.AttentionInfo; -import com.yizhuan.xchat_android_core.user.bean.FansListInfo; +import com.pikolive.core.user.bean.AttentionInfo; +import com.pikolive.core.user.bean.FansListInfo; +import com.pikolive.core.user.bean.AttentionInfo; +import com.pikolive.core.user.bean.FansListInfo; +import com.pikolive.core.base.IModel; +import com.pikolive.core.user.bean.AttentionInfo; +import com.pikolive.core.user.bean.FansListInfo; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/IUserDynamicModel.java b/core/src/main/java/com/pikolive/core/user/IUserDynamicModel.java similarity index 65% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/IUserDynamicModel.java rename to core/src/main/java/com/pikolive/core/user/IUserDynamicModel.java index 2dac5cb21..85d0cd1e3 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/IUserDynamicModel.java +++ b/core/src/main/java/com/pikolive/core/user/IUserDynamicModel.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.user; +package com.pikolive.core.user; -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.community.bean.WorldDynamicBean; +import com.pikolive.core.base.IModel; +import com.pikolive.core.community.bean.WorldDynamicBean; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/IUserModel.java b/core/src/main/java/com/pikolive/core/user/IUserModel.java similarity index 73% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/IUserModel.java rename to core/src/main/java/com/pikolive/core/user/IUserModel.java index 469f687a2..f5bd1bb4e 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/IUserModel.java +++ b/core/src/main/java/com/pikolive/core/user/IUserModel.java @@ -1,21 +1,41 @@ -package com.yizhuan.xchat_android_core.user; +package com.pikolive.core.user; import androidx.annotation.Nullable; -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.bean.RoomHistoryInfo; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.home.bean.VisitorInfo; -import com.yizhuan.xchat_android_core.user.bean.DiamondGiveHistoryInfo; -import com.yizhuan.xchat_android_core.user.bean.GiftAchievementInfo; -import com.yizhuan.xchat_android_core.user.bean.GiftWallInfo; -import com.yizhuan.xchat_android_core.user.bean.NewUserInfo; -import com.yizhuan.xchat_android_core.user.bean.ProtocolInfo; -import com.yizhuan.xchat_android_core.user.bean.UserDetailInfo; -import com.yizhuan.xchat_android_core.user.bean.UserGameInfo; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.user.bean.UserLabelInfo; -import com.yizhuan.xchat_android_core.user.bean.UserRandomConfig; +import com.pikolive.core.user.bean.DiamondGiveHistoryInfo; +import com.pikolive.core.user.bean.GiftAchievementInfo; +import com.pikolive.core.user.bean.GiftWallInfo; +import com.pikolive.core.user.bean.NewUserInfo; +import com.pikolive.core.user.bean.ProtocolInfo; +import com.pikolive.core.user.bean.UserDetailInfo; +import com.pikolive.core.user.bean.UserGameInfo; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.user.bean.UserLabelInfo; +import com.pikolive.core.user.bean.UserRandomConfig; +import com.pikolive.core.user.bean.DiamondGiveHistoryInfo; +import com.pikolive.core.user.bean.GiftAchievementInfo; +import com.pikolive.core.user.bean.GiftWallInfo; +import com.pikolive.core.user.bean.NewUserInfo; +import com.pikolive.core.user.bean.ProtocolInfo; +import com.pikolive.core.user.bean.UserDetailInfo; +import com.pikolive.core.user.bean.UserGameInfo; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.user.bean.UserLabelInfo; +import com.pikolive.core.user.bean.UserRandomConfig; +import com.pikolive.core.base.IModel; +import com.pikolive.core.bean.RoomHistoryInfo; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core2.home.bean.VisitorInfo; +import com.pikolive.core.user.bean.DiamondGiveHistoryInfo; +import com.pikolive.core.user.bean.GiftAchievementInfo; +import com.pikolive.core.user.bean.GiftWallInfo; +import com.pikolive.core.user.bean.NewUserInfo; +import com.pikolive.core.user.bean.ProtocolInfo; +import com.pikolive.core.user.bean.UserDetailInfo; +import com.pikolive.core.user.bean.UserGameInfo; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.user.bean.UserLabelInfo; +import com.pikolive.core.user.bean.UserRandomConfig; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/UserDynamicModel.java b/core/src/main/java/com/pikolive/core/user/UserDynamicModel.java similarity index 87% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/UserDynamicModel.java rename to core/src/main/java/com/pikolive/core/user/UserDynamicModel.java index 60c7e52da..2d5c78f78 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/UserDynamicModel.java +++ b/core/src/main/java/com/pikolive/core/user/UserDynamicModel.java @@ -1,8 +1,8 @@ -package com.yizhuan.xchat_android_core.user; +package com.pikolive.core.user; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.community.bean.WorldDynamicBean; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.community.bean.WorldDynamicBean; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.net.rxnet.RxNet; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/UserInfoUiMgr.java b/core/src/main/java/com/pikolive/core/user/UserInfoUiMgr.java similarity index 90% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/UserInfoUiMgr.java rename to core/src/main/java/com/pikolive/core/user/UserInfoUiMgr.java index dc25f4b93..7a4d11887 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/UserInfoUiMgr.java +++ b/core/src/main/java/com/pikolive/core/user/UserInfoUiMgr.java @@ -1,10 +1,12 @@ -package com.yizhuan.xchat_android_core.user; +package com.pikolive.core.user; import androidx.lifecycle.LifecycleOwner; import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.Observer; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.user.bean.UserInfo; /** * 个人主页/客态页用户信息监听 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/UserModel.java b/core/src/main/java/com/pikolive/core/user/UserModel.java similarity index 89% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/UserModel.java rename to core/src/main/java/com/pikolive/core/user/UserModel.java index 9bd3f66ec..71b207a7e 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/UserModel.java +++ b/core/src/main/java/com/pikolive/core/user/UserModel.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.user; +package com.pikolive.core.user; import android.annotation.SuppressLint; import android.text.TextUtils; @@ -7,38 +7,94 @@ import android.util.LruCache; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import com.yizhuan.xchat_android_core.DemoCache; -import com.yizhuan.xchat_android_core.R; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.auth.event.LoginEvent; -import com.yizhuan.xchat_android_core.auth.event.LogoutEvent; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.RoomHistoryInfo; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.bean.response.result.GiftWallListResult; -import com.yizhuan.xchat_android_core.bean.response.result.UserListResult; -import com.yizhuan.xchat_android_core.bean.response.result.UserResult; -import com.yizhuan.xchat_android_core.home.bean.VisitorInfo; -import com.yizhuan.xchat_android_core.level.event.CharmLevelUpEvent; -import com.yizhuan.xchat_android_core.level.event.LevelUpEvent; -import com.yizhuan.xchat_android_core.noble.NobleUtil; -import com.yizhuan.xchat_android_core.user.bean.DiamondGiveHistoryInfo; -import com.yizhuan.xchat_android_core.user.bean.GiftAchievementInfo; -import com.yizhuan.xchat_android_core.user.bean.GiftWallInfo; -import com.yizhuan.xchat_android_core.user.bean.NewUserInfo; -import com.yizhuan.xchat_android_core.user.bean.ProtocolInfo; -import com.yizhuan.xchat_android_core.user.bean.UserDetailInfo; -import com.yizhuan.xchat_android_core.user.bean.UserGameInfo; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.user.bean.UserLabelInfo; -import com.yizhuan.xchat_android_core.user.bean.UserRandomConfig; -import com.yizhuan.xchat_android_core.user.event.CurrentUserInfoCompleteEvent; -import com.yizhuan.xchat_android_core.user.event.CurrentUserInfoCompleteFailEvent; -import com.yizhuan.xchat_android_core.user.event.LoadLoginUserInfoEvent; -import com.yizhuan.xchat_android_core.user.event.LoginUserInfoUpdateEvent; -import com.yizhuan.xchat_android_core.user.event.NeedCompleteInfoEvent; -import com.yizhuan.xchat_android_core.user.event.NeedVerifyBoundAuthCodeEvent; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.auth.event.LoginEvent; +import com.pikolive.core.auth.event.LogoutEvent; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.bean.RoomHistoryInfo; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.bean.response.result.GiftWallListResult; +import com.pikolive.core.bean.response.result.UserListResult; +import com.pikolive.core.bean.response.result.UserResult; +import com.pikolive.core.level.event.CharmLevelUpEvent; +import com.pikolive.core.level.event.LevelUpEvent; +import com.pikolive.core.noble.NobleUtil; +import com.pikolive.core.user.bean.DiamondGiveHistoryInfo; +import com.pikolive.core.user.bean.GiftAchievementInfo; +import com.pikolive.core.user.bean.GiftWallInfo; +import com.pikolive.core.user.bean.NewUserInfo; +import com.pikolive.core.user.bean.ProtocolInfo; +import com.pikolive.core.user.bean.UserDetailInfo; +import com.pikolive.core.user.bean.UserGameInfo; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.user.bean.UserLabelInfo; +import com.pikolive.core.user.bean.UserRandomConfig; +import com.pikolive.core.user.event.CurrentUserInfoCompleteEvent; +import com.pikolive.core.user.event.CurrentUserInfoCompleteFailEvent; +import com.pikolive.core.user.event.LoadLoginUserInfoEvent; +import com.pikolive.core.user.event.LoginUserInfoUpdateEvent; +import com.pikolive.core.user.event.NeedCompleteInfoEvent; +import com.pikolive.core.user.event.NeedVerifyBoundAuthCodeEvent; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.auth.event.LoginEvent; +import com.pikolive.core.auth.event.LogoutEvent; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.bean.RoomHistoryInfo; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.bean.response.result.GiftWallListResult; +import com.pikolive.core.bean.response.result.UserListResult; +import com.pikolive.core.bean.response.result.UserResult; +import com.pikolive.core.level.event.CharmLevelUpEvent; +import com.pikolive.core.level.event.LevelUpEvent; +import com.pikolive.core.noble.NobleUtil; +import com.pikolive.core.user.bean.DiamondGiveHistoryInfo; +import com.pikolive.core.user.bean.GiftAchievementInfo; +import com.pikolive.core.user.bean.GiftWallInfo; +import com.pikolive.core.user.bean.NewUserInfo; +import com.pikolive.core.user.bean.ProtocolInfo; +import com.pikolive.core.user.bean.UserDetailInfo; +import com.pikolive.core.user.bean.UserGameInfo; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.user.bean.UserLabelInfo; +import com.pikolive.core.user.bean.UserRandomConfig; +import com.pikolive.core.user.event.CurrentUserInfoCompleteEvent; +import com.pikolive.core.user.event.CurrentUserInfoCompleteFailEvent; +import com.pikolive.core.user.event.LoadLoginUserInfoEvent; +import com.pikolive.core.user.event.LoginUserInfoUpdateEvent; +import com.pikolive.core.user.event.NeedCompleteInfoEvent; +import com.pikolive.core.user.event.NeedVerifyBoundAuthCodeEvent; +import com.pikolive.core.DemoCache; +import com.pikolive.core.R; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.auth.event.LoginEvent; +import com.pikolive.core.auth.event.LogoutEvent; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.bean.RoomHistoryInfo; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.bean.response.result.GiftWallListResult; +import com.pikolive.core.bean.response.result.UserListResult; +import com.pikolive.core.bean.response.result.UserResult; +import com.pikolive.core2.home.bean.VisitorInfo; +import com.pikolive.core.level.event.CharmLevelUpEvent; +import com.pikolive.core.level.event.LevelUpEvent; +import com.pikolive.core.noble.NobleUtil; +import com.pikolive.core.user.bean.DiamondGiveHistoryInfo; +import com.pikolive.core.user.bean.GiftAchievementInfo; +import com.pikolive.core.user.bean.GiftWallInfo; +import com.pikolive.core.user.bean.NewUserInfo; +import com.pikolive.core.user.bean.ProtocolInfo; +import com.pikolive.core.user.bean.UserDetailInfo; +import com.pikolive.core.user.bean.UserGameInfo; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.user.bean.UserLabelInfo; +import com.pikolive.core.user.bean.UserRandomConfig; +import com.pikolive.core.user.event.CurrentUserInfoCompleteEvent; +import com.pikolive.core.user.event.CurrentUserInfoCompleteFailEvent; +import com.pikolive.core.user.event.LoadLoginUserInfoEvent; +import com.pikolive.core.user.event.LoginUserInfoUpdateEvent; +import com.pikolive.core.user.event.NeedCompleteInfoEvent; +import com.pikolive.core.user.event.NeedVerifyBoundAuthCodeEvent; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.net.rxnet.RxNet; import com.pikolive.library.utils.ListUtils; import com.pikolive.library.utils.ResUtil; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/AttentionInfo.java b/core/src/main/java/com/pikolive/core/user/bean/AttentionInfo.java similarity index 75% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/bean/AttentionInfo.java rename to core/src/main/java/com/pikolive/core/user/bean/AttentionInfo.java index c8ff3942a..a29fec20c 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/AttentionInfo.java +++ b/core/src/main/java/com/pikolive/core/user/bean/AttentionInfo.java @@ -1,9 +1,13 @@ -package com.yizhuan.xchat_android_core.user.bean; +package com.pikolive.core.user.bean; -import com.yizhuan.xchat_android_core.level.UserLevelVo; -import com.yizhuan.xchat_android_core.noble.NobleInfo; -import com.yizhuan.xchat_android_core.room.bean.RoomInfo; -import com.yizhuan.xchat_android_core.vip.UserVipInfo; +import com.pikolive.core.level.UserLevelVo; +import com.pikolive.core.noble.NobleInfo; +import com.pikolive.core.level.UserLevelVo; +import com.pikolive.core.noble.NobleInfo; +import com.pikolive.core.level.UserLevelVo; +import com.pikolive.core.noble.NobleInfo; +import com.pikolive.core.room.bean.RoomInfo; +import com.pikolive.core.vip.UserVipInfo; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/AttentionItem.java b/core/src/main/java/com/pikolive/core/user/bean/AttentionItem.java similarity index 97% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/bean/AttentionItem.java rename to core/src/main/java/com/pikolive/core/user/bean/AttentionItem.java index 178b7b1c5..4dea15f10 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/AttentionItem.java +++ b/core/src/main/java/com/pikolive/core/user/bean/AttentionItem.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.user.bean; +package com.pikolive.core.user.bean; import android.os.Parcel; import android.os.Parcelable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/BaseInfo.java b/core/src/main/java/com/pikolive/core/user/bean/BaseInfo.java similarity index 95% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/bean/BaseInfo.java rename to core/src/main/java/com/pikolive/core/user/bean/BaseInfo.java index 81d820808..04d96e8cb 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/BaseInfo.java +++ b/core/src/main/java/com/pikolive/core/user/bean/BaseInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.user.bean; +package com.pikolive.core.user.bean; import android.text.TextUtils; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/BaseUserInfo.java b/core/src/main/java/com/pikolive/core/user/bean/BaseUserInfo.java similarity index 91% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/bean/BaseUserInfo.java rename to core/src/main/java/com/pikolive/core/user/bean/BaseUserInfo.java index af4bd7b73..609a87354 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/BaseUserInfo.java +++ b/core/src/main/java/com/pikolive/core/user/bean/BaseUserInfo.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.user.bean; +package com.pikolive.core.user.bean; -import com.yizhuan.xchat_android_core.vip.UserVipInfo; +import com.pikolive.core.vip.UserVipInfo; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/DiamondGiveHistoryInfo.java b/core/src/main/java/com/pikolive/core/user/bean/DiamondGiveHistoryInfo.java similarity index 95% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/bean/DiamondGiveHistoryInfo.java rename to core/src/main/java/com/pikolive/core/user/bean/DiamondGiveHistoryInfo.java index e55d3bb67..076f31f7f 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/DiamondGiveHistoryInfo.java +++ b/core/src/main/java/com/pikolive/core/user/bean/DiamondGiveHistoryInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.user.bean; +package com.pikolive.core.user.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/FansInfo.java b/core/src/main/java/com/pikolive/core/user/bean/FansInfo.java similarity index 79% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/bean/FansInfo.java rename to core/src/main/java/com/pikolive/core/user/bean/FansInfo.java index 5f1127745..93a04fc2a 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/FansInfo.java +++ b/core/src/main/java/com/pikolive/core/user/bean/FansInfo.java @@ -1,8 +1,8 @@ -package com.yizhuan.xchat_android_core.user.bean; +package com.pikolive.core.user.bean; -import com.yizhuan.xchat_android_core.level.UserLevelVo; -import com.yizhuan.xchat_android_core.noble.NobleInfo; -import com.yizhuan.xchat_android_core.vip.UserVipInfo; +import com.pikolive.core.level.UserLevelVo; +import com.pikolive.core.noble.NobleInfo; +import com.pikolive.core.vip.UserVipInfo; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/FansListInfo.java b/core/src/main/java/com/pikolive/core/user/bean/FansListInfo.java similarity index 91% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/bean/FansListInfo.java rename to core/src/main/java/com/pikolive/core/user/bean/FansListInfo.java index 30902d5de..5c5538a68 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/FansListInfo.java +++ b/core/src/main/java/com/pikolive/core/user/bean/FansListInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.user.bean; +package com.pikolive.core.user.bean; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/FirstChargeInfo.kt b/core/src/main/java/com/pikolive/core/user/bean/FirstChargeInfo.kt similarity index 75% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/bean/FirstChargeInfo.kt rename to core/src/main/java/com/pikolive/core/user/bean/FirstChargeInfo.kt index e28367fdd..fd83dce40 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/FirstChargeInfo.kt +++ b/core/src/main/java/com/pikolive/core/user/bean/FirstChargeInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.user.bean +package com.pikolive.core.user.bean import lombok.Data diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/GiftAchievementInfo.java b/core/src/main/java/com/pikolive/core/user/bean/GiftAchievementInfo.java similarity index 89% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/bean/GiftAchievementInfo.java rename to core/src/main/java/com/pikolive/core/user/bean/GiftAchievementInfo.java index 155881e73..6f39e1021 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/GiftAchievementInfo.java +++ b/core/src/main/java/com/pikolive/core/user/bean/GiftAchievementInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.user.bean; +package com.pikolive.core.user.bean; import java.io.Serializable; import java.util.ArrayList; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/GiftAchievementInfoSub.java b/core/src/main/java/com/pikolive/core/user/bean/GiftAchievementInfoSub.java similarity index 87% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/bean/GiftAchievementInfoSub.java rename to core/src/main/java/com/pikolive/core/user/bean/GiftAchievementInfoSub.java index c789c5a2c..b8613bb93 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/GiftAchievementInfoSub.java +++ b/core/src/main/java/com/pikolive/core/user/bean/GiftAchievementInfoSub.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.user.bean; +package com.pikolive.core.user.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/GiftAchievementItem.java b/core/src/main/java/com/pikolive/core/user/bean/GiftAchievementItem.java similarity index 96% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/bean/GiftAchievementItem.java rename to core/src/main/java/com/pikolive/core/user/bean/GiftAchievementItem.java index 00b7d90ea..61f308e51 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/GiftAchievementItem.java +++ b/core/src/main/java/com/pikolive/core/user/bean/GiftAchievementItem.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.user.bean; +package com.pikolive.core.user.bean; import com.chad.library.adapter.base.entity.MultiItemEntity; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/GiftWallInfo.java b/core/src/main/java/com/pikolive/core/user/bean/GiftWallInfo.java similarity index 95% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/bean/GiftWallInfo.java rename to core/src/main/java/com/pikolive/core/user/bean/GiftWallInfo.java index 2f85910fe..8327545ae 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/GiftWallInfo.java +++ b/core/src/main/java/com/pikolive/core/user/bean/GiftWallInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.user.bean; +package com.pikolive.core.user.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/InviteUserInfo.java b/core/src/main/java/com/pikolive/core/user/bean/InviteUserInfo.java similarity index 80% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/bean/InviteUserInfo.java rename to core/src/main/java/com/pikolive/core/user/bean/InviteUserInfo.java index 200aba630..ffccfa6de 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/InviteUserInfo.java +++ b/core/src/main/java/com/pikolive/core/user/bean/InviteUserInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.user.bean; +package com.pikolive.core.user.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/JoinWorldInfo.java b/core/src/main/java/com/pikolive/core/user/bean/JoinWorldInfo.java similarity index 86% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/bean/JoinWorldInfo.java rename to core/src/main/java/com/pikolive/core/user/bean/JoinWorldInfo.java index b31c4073f..5d4f60a0a 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/JoinWorldInfo.java +++ b/core/src/main/java/com/pikolive/core/user/bean/JoinWorldInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.user.bean; +package com.pikolive.core.user.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/LiveTagInfo.java b/core/src/main/java/com/pikolive/core/user/bean/LiveTagInfo.java similarity index 98% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/bean/LiveTagInfo.java rename to core/src/main/java/com/pikolive/core/user/bean/LiveTagInfo.java index 9a4ae4fcd..9103bb2a2 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/LiveTagInfo.java +++ b/core/src/main/java/com/pikolive/core/user/bean/LiveTagInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.user.bean; +package com.pikolive.core.user.bean; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/NewUserInfo.java b/core/src/main/java/com/pikolive/core/user/bean/NewUserInfo.java similarity index 97% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/bean/NewUserInfo.java rename to core/src/main/java/com/pikolive/core/user/bean/NewUserInfo.java index 689b0c71c..3d0a7a29b 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/NewUserInfo.java +++ b/core/src/main/java/com/pikolive/core/user/bean/NewUserInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.user.bean; +package com.pikolive.core.user.bean; public class NewUserInfo { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/ProtocolInfo.kt b/core/src/main/java/com/pikolive/core/user/bean/ProtocolInfo.kt similarity index 77% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/bean/ProtocolInfo.kt rename to core/src/main/java/com/pikolive/core/user/bean/ProtocolInfo.kt index bcb929e64..e332074cf 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/ProtocolInfo.kt +++ b/core/src/main/java/com/pikolive/core/user/bean/ProtocolInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.user.bean +package com.pikolive.core.user.bean data class ProtocolInfo( val content: String = "", diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/RadishWallInfo.java b/core/src/main/java/com/pikolive/core/user/bean/RadishWallInfo.java similarity index 79% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/bean/RadishWallInfo.java rename to core/src/main/java/com/pikolive/core/user/bean/RadishWallInfo.java index 36c000a57..7865fd413 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/RadishWallInfo.java +++ b/core/src/main/java/com/pikolive/core/user/bean/RadishWallInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.user.bean; +package com.pikolive.core.user.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/SearchUserInfo.java b/core/src/main/java/com/pikolive/core/user/bean/SearchUserInfo.java similarity index 90% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/bean/SearchUserInfo.java rename to core/src/main/java/com/pikolive/core/user/bean/SearchUserInfo.java index b858eb4ba..46be40c37 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/SearchUserInfo.java +++ b/core/src/main/java/com/pikolive/core/user/bean/SearchUserInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.user.bean; +package com.pikolive.core.user.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/SimpleUserInfo.java b/core/src/main/java/com/pikolive/core/user/bean/SimpleUserInfo.java similarity index 64% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/bean/SimpleUserInfo.java rename to core/src/main/java/com/pikolive/core/user/bean/SimpleUserInfo.java index cbfcca1af..ca7785a0a 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/SimpleUserInfo.java +++ b/core/src/main/java/com/pikolive/core/user/bean/SimpleUserInfo.java @@ -1,6 +1,8 @@ -package com.yizhuan.xchat_android_core.user.bean; +package com.pikolive.core.user.bean; -import com.yizhuan.xchat_android_core.level.UserLevelVo; +import com.pikolive.core.level.UserLevelVo; +import com.pikolive.core.level.UserLevelVo; +import com.pikolive.core.level.UserLevelVo; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserDetailInfo.java b/core/src/main/java/com/pikolive/core/user/bean/UserDetailInfo.java similarity index 99% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserDetailInfo.java rename to core/src/main/java/com/pikolive/core/user/bean/UserDetailInfo.java index dab61529a..1220f0d51 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserDetailInfo.java +++ b/core/src/main/java/com/pikolive/core/user/bean/UserDetailInfo.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.user.bean; +package com.pikolive.core.user.bean; import com.chad.library.adapter.base.entity.MultiItemEntity; -import com.yizhuan.xchat_android_core.community.bean.WorldDynamicBean; +import com.pikolive.core.community.bean.WorldDynamicBean; import java.io.Serializable; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserGameInfo.java b/core/src/main/java/com/pikolive/core/user/bean/UserGameInfo.java similarity index 96% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserGameInfo.java rename to core/src/main/java/com/pikolive/core/user/bean/UserGameInfo.java index cc64dde34..c9e0b02af 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserGameInfo.java +++ b/core/src/main/java/com/pikolive/core/user/bean/UserGameInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.user.bean; +package com.pikolive.core.user.bean; public class UserGameInfo { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserInfo.java b/core/src/main/java/com/pikolive/core/user/bean/UserInfo.java similarity index 96% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserInfo.java rename to core/src/main/java/com/pikolive/core/user/bean/UserInfo.java index 2f1462224..9d4721263 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserInfo.java +++ b/core/src/main/java/com/pikolive/core/user/bean/UserInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.user.bean; +package com.pikolive.core.user.bean; import android.graphics.Color; @@ -10,13 +10,19 @@ import android.text.style.ForegroundColorSpan; import androidx.annotation.Nullable; import com.google.gson.annotations.SerializedName; -import com.yizhuan.xchat_android_core.decoration.car.bean.CarInfo; -import com.yizhuan.xchat_android_core.decoration.headwear.bean.HeadWearInfo; -import com.yizhuan.xchat_android_core.level.UserLevelVo; -import com.yizhuan.xchat_android_core.noble.NobleInfo; -import com.yizhuan.xchat_android_core.noble.NobleResourceType; -import com.yizhuan.xchat_android_core.utils.StarUtils; -import com.yizhuan.xchat_android_core.vip.UserVipInfo; +import com.pikolive.core.level.UserLevelVo; +import com.pikolive.core.noble.NobleInfo; +import com.pikolive.core.noble.NobleResourceType; +import com.pikolive.core.level.UserLevelVo; +import com.pikolive.core.noble.NobleInfo; +import com.pikolive.core.noble.NobleResourceType; +import com.pikolive.core.decoration.car.bean.CarInfo; +import com.pikolive.core.decoration.headwear.bean.HeadWearInfo; +import com.pikolive.core.level.UserLevelVo; +import com.pikolive.core.noble.NobleInfo; +import com.pikolive.core.noble.NobleResourceType; +import com.pikolive.core.utils.StarUtils; +import com.pikolive.core.vip.UserVipInfo; import java.io.Serializable; import java.util.ArrayList; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserInfoSkillEntity.kt b/core/src/main/java/com/pikolive/core/user/bean/UserInfoSkillEntity.kt similarity index 85% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserInfoSkillEntity.kt rename to core/src/main/java/com/pikolive/core/user/bean/UserInfoSkillEntity.kt index ba082aedd..f32f87937 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserInfoSkillEntity.kt +++ b/core/src/main/java/com/pikolive/core/user/bean/UserInfoSkillEntity.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.user.bean +package com.pikolive.core.user.bean /** * { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserLabelInfo.kt b/core/src/main/java/com/pikolive/core/user/bean/UserLabelInfo.kt similarity index 82% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserLabelInfo.kt rename to core/src/main/java/com/pikolive/core/user/bean/UserLabelInfo.kt index e6c46ad8a..693e3bc26 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserLabelInfo.kt +++ b/core/src/main/java/com/pikolive/core/user/bean/UserLabelInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.user.bean +package com.pikolive.core.user.bean import lombok.Data import java.io.Serializable diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserLabelItemInfo.kt b/core/src/main/java/com/pikolive/core/user/bean/UserLabelItemInfo.kt similarity index 79% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserLabelItemInfo.kt rename to core/src/main/java/com/pikolive/core/user/bean/UserLabelItemInfo.kt index cfae8ee70..648554616 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserLabelItemInfo.kt +++ b/core/src/main/java/com/pikolive/core/user/bean/UserLabelItemInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.user.bean +package com.pikolive.core.user.bean import lombok.Data import java.io.Serializable diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserPhoto.java b/core/src/main/java/com/pikolive/core/user/bean/UserPhoto.java similarity index 91% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserPhoto.java rename to core/src/main/java/com/pikolive/core/user/bean/UserPhoto.java index 8fed597dd..06c7041c8 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserPhoto.java +++ b/core/src/main/java/com/pikolive/core/user/bean/UserPhoto.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.user.bean; +package com.pikolive.core.user.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserRandomConfig.java b/core/src/main/java/com/pikolive/core/user/bean/UserRandomConfig.java similarity index 76% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserRandomConfig.java rename to core/src/main/java/com/pikolive/core/user/bean/UserRandomConfig.java index 4d6f34b8d..c6f266b15 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserRandomConfig.java +++ b/core/src/main/java/com/pikolive/core/user/bean/UserRandomConfig.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.user.bean; +package com.pikolive.core.user.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserRankInfo.java b/core/src/main/java/com/pikolive/core/user/bean/UserRankInfo.java similarity index 97% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserRankInfo.java rename to core/src/main/java/com/pikolive/core/user/bean/UserRankInfo.java index 6f48fe334..9fedefd0d 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserRankInfo.java +++ b/core/src/main/java/com/pikolive/core/user/bean/UserRankInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.user.bean; +package com.pikolive.core.user.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserRecommendRoomInfo.java b/core/src/main/java/com/pikolive/core/user/bean/UserRecommendRoomInfo.java similarity index 82% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserRecommendRoomInfo.java rename to core/src/main/java/com/pikolive/core/user/bean/UserRecommendRoomInfo.java index 3c2ed8734..ab2934c85 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/bean/UserRecommendRoomInfo.java +++ b/core/src/main/java/com/pikolive/core/user/bean/UserRecommendRoomInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.user.bean; +package com.pikolive.core.user.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/event/CurrentUserInfoCompleteEvent.java b/core/src/main/java/com/pikolive/core/user/event/CurrentUserInfoCompleteEvent.java similarity index 82% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/event/CurrentUserInfoCompleteEvent.java rename to core/src/main/java/com/pikolive/core/user/event/CurrentUserInfoCompleteEvent.java index f4bb7e1ed..a4e1f096e 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/event/CurrentUserInfoCompleteEvent.java +++ b/core/src/main/java/com/pikolive/core/user/event/CurrentUserInfoCompleteEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.user.event; +package com.pikolive.core.user.event; /** * 补全资料成功的事件，一般来说，这个事件，整个用户周期只会触发一次 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/event/CurrentUserInfoCompleteFailEvent.java b/core/src/main/java/com/pikolive/core/user/event/CurrentUserInfoCompleteFailEvent.java similarity index 78% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/event/CurrentUserInfoCompleteFailEvent.java rename to core/src/main/java/com/pikolive/core/user/event/CurrentUserInfoCompleteFailEvent.java index e41535a04..fc92331c8 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/event/CurrentUserInfoCompleteFailEvent.java +++ b/core/src/main/java/com/pikolive/core/user/event/CurrentUserInfoCompleteFailEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.user.event; +package com.pikolive.core.user.event; public class CurrentUserInfoCompleteFailEvent { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/event/LoadLoginUserInfoEvent.java b/core/src/main/java/com/pikolive/core/user/event/LoadLoginUserInfoEvent.java similarity index 66% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/event/LoadLoginUserInfoEvent.java rename to core/src/main/java/com/pikolive/core/user/event/LoadLoginUserInfoEvent.java index dcd1d7639..3ea094d95 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/event/LoadLoginUserInfoEvent.java +++ b/core/src/main/java/com/pikolive/core/user/event/LoadLoginUserInfoEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.user.event; +package com.pikolive.core.user.event; /** * @author jack diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/event/LoginUserInfoUpdateEvent.java b/core/src/main/java/com/pikolive/core/user/event/LoginUserInfoUpdateEvent.java similarity index 73% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/event/LoginUserInfoUpdateEvent.java rename to core/src/main/java/com/pikolive/core/user/event/LoginUserInfoUpdateEvent.java index 24938a389..d038b8907 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/event/LoginUserInfoUpdateEvent.java +++ b/core/src/main/java/com/pikolive/core/user/event/LoginUserInfoUpdateEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.user.event; +package com.pikolive.core.user.event; /** * @author jack diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/event/NeedBindPhoneEvent.java b/core/src/main/java/com/pikolive/core/user/event/NeedBindPhoneEvent.java similarity index 67% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/event/NeedBindPhoneEvent.java rename to core/src/main/java/com/pikolive/core/user/event/NeedBindPhoneEvent.java index 0750d28ad..51b3f9617 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/event/NeedBindPhoneEvent.java +++ b/core/src/main/java/com/pikolive/core/user/event/NeedBindPhoneEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.user.event; +package com.pikolive.core.user.event; /** * 需要绑定手机号 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/event/NeedCompleteInfoEvent.java b/core/src/main/java/com/pikolive/core/user/event/NeedCompleteInfoEvent.java similarity index 62% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/event/NeedCompleteInfoEvent.java rename to core/src/main/java/com/pikolive/core/user/event/NeedCompleteInfoEvent.java index efaa5610d..bee226e0e 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/event/NeedCompleteInfoEvent.java +++ b/core/src/main/java/com/pikolive/core/user/event/NeedCompleteInfoEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.user.event; +package com.pikolive.core.user.event; /** * create by lvzebiao on 2018/8/31 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/event/NeedVerifyBoundAuthCodeEvent.java b/core/src/main/java/com/pikolive/core/user/event/NeedVerifyBoundAuthCodeEvent.java similarity index 64% rename from core/src/main/java/com/yizhuan/xchat_android_core/user/event/NeedVerifyBoundAuthCodeEvent.java rename to core/src/main/java/com/pikolive/core/user/event/NeedVerifyBoundAuthCodeEvent.java index 6e3d8a24c..ee1a22251 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/event/NeedVerifyBoundAuthCodeEvent.java +++ b/core/src/main/java/com/pikolive/core/user/event/NeedVerifyBoundAuthCodeEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.user.event; +package com.pikolive.core.user.event; /** * create by lvzebiao on 2018/8/31 diff --git a/core/src/main/java/com/pikolive/core/user/event/ShowMeEvent.kt b/core/src/main/java/com/pikolive/core/user/event/ShowMeEvent.kt new file mode 100644 index 000000000..276a75934 --- /dev/null +++ b/core/src/main/java/com/pikolive/core/user/event/ShowMeEvent.kt @@ -0,0 +1,3 @@ +package com.pikolive.core.user.event + +class ShowMeEvent diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/APIEncryptUtil.java b/core/src/main/java/com/pikolive/core/utils/APIEncryptUtil.java similarity index 97% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/APIEncryptUtil.java rename to core/src/main/java/com/pikolive/core/utils/APIEncryptUtil.java index a256aef57..d50332906 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/APIEncryptUtil.java +++ b/core/src/main/java/com/pikolive/core/utils/APIEncryptUtil.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.utils; +package com.pikolive.core.utils; import com.pikolive.library.utils.StringUtils; -import com.yizhuan.xchat_android_constants.XChatConstants; +import com.pikolive.core2.XChatConstants; import com.pikolive.library.utils.codec.MD5Utils; import java.net.URLEncoder; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/ActivityUtil.java b/core/src/main/java/com/pikolive/core/utils/ActivityUtil.java similarity index 97% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/ActivityUtil.java rename to core/src/main/java/com/pikolive/core/utils/ActivityUtil.java index 3eba2545c..93964cd89 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/ActivityUtil.java +++ b/core/src/main/java/com/pikolive/core/utils/ActivityUtil.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.utils; +package com.pikolive.core.utils; import android.app.Activity; import android.content.Context; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/ArrayUtils.java b/core/src/main/java/com/pikolive/core/utils/ArrayUtils.java similarity index 96% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/ArrayUtils.java rename to core/src/main/java/com/pikolive/core/utils/ArrayUtils.java index 5a58977d6..fc526f9cb 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/ArrayUtils.java +++ b/core/src/main/java/com/pikolive/core/utils/ArrayUtils.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.utils; +package com.pikolive.core.utils; import com.pikolive.library.utils.log.MLog; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/AsyncTaskScanMusicFile.java b/core/src/main/java/com/pikolive/core/utils/AsyncTaskScanMusicFile.java similarity index 98% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/AsyncTaskScanMusicFile.java rename to core/src/main/java/com/pikolive/core/utils/AsyncTaskScanMusicFile.java index f1926f743..43f1dc136 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/AsyncTaskScanMusicFile.java +++ b/core/src/main/java/com/pikolive/core/utils/AsyncTaskScanMusicFile.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.utils; +package com.pikolive.core.utils; import android.content.ContentResolver; import android.content.ContentUris; @@ -10,9 +10,9 @@ import android.os.AsyncTask; import android.os.Environment; import android.provider.MediaStore; -import com.yizhuan.xchat_android_core.R; -import com.yizhuan.xchat_android_core.music.db.bean.LocalMusicBean; -import com.yizhuan.xchat_android_core.music.db.model.LocalMusicDbModel; +import com.pikolive.core.R; +import com.pikolive.core.music.db.bean.LocalMusicBean; +import com.pikolive.core.music.db.model.LocalMusicDbModel; import com.pikolive.library.common.file.FileHelper; import com.pikolive.library.utils.BlankUtil; import com.pikolive.library.utils.ResUtil; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/BitmapLruCacheHelper.java b/core/src/main/java/com/pikolive/core/utils/BitmapLruCacheHelper.java similarity index 97% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/BitmapLruCacheHelper.java rename to core/src/main/java/com/pikolive/core/utils/BitmapLruCacheHelper.java index 682dc6830..dac67ea23 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/BitmapLruCacheHelper.java +++ b/core/src/main/java/com/pikolive/core/utils/BitmapLruCacheHelper.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.utils; +package com.pikolive.core.utils; import android.graphics.Bitmap; import android.util.Log; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/BitmapUtils.java b/core/src/main/java/com/pikolive/core/utils/BitmapUtils.java similarity index 98% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/BitmapUtils.java rename to core/src/main/java/com/pikolive/core/utils/BitmapUtils.java index 0d088db6d..ba3223b72 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/BitmapUtils.java +++ b/core/src/main/java/com/pikolive/core/utils/BitmapUtils.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.utils; +package com.pikolive.core.utils; import android.content.res.Resources; import android.graphics.Bitmap; diff --git a/core/src/main/java/com/pikolive/core/utils/CheckUtils.java b/core/src/main/java/com/pikolive/core/utils/CheckUtils.java new file mode 100644 index 000000000..355c0e9b5 --- /dev/null +++ b/core/src/main/java/com/pikolive/core/utils/CheckUtils.java @@ -0,0 +1,21 @@ +package com.pikolive.core.utils; + +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.initial.InitialModel; +import com.pikolive.core.initial.bean.InitInfo; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.initial.InitialModel; +import com.pikolive.core.initial.bean.InitInfo; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.initial.InitialModel; +import com.pikolive.core.initial.bean.InitInfo; +import com.pikolive.library.utils.ListUtils; + +public class CheckUtils { + + public static boolean isCheckUser() { + InitInfo initInfo = InitialModel.get().getCacheInitInfo(); + if (initInfo == null || ListUtils.isListEmpty(initInfo.getCheckUids())) return false; + return initInfo.getCheckUids().contains(AuthModel.get().getCurrentUid()); + } +} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/CurrentTimeUtils.java b/core/src/main/java/com/pikolive/core/utils/CurrentTimeUtils.java similarity index 87% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/CurrentTimeUtils.java rename to core/src/main/java/com/pikolive/core/utils/CurrentTimeUtils.java index d13a2414e..2f2bdd611 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/CurrentTimeUtils.java +++ b/core/src/main/java/com/pikolive/core/utils/CurrentTimeUtils.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.utils; +package com.pikolive.core.utils; public class CurrentTimeUtils { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/DirectoryHelper.java b/core/src/main/java/com/pikolive/core/utils/DirectoryHelper.java similarity index 95% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/DirectoryHelper.java rename to core/src/main/java/com/pikolive/core/utils/DirectoryHelper.java index 4ee6c6c5a..b1f2a96ac 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/DirectoryHelper.java +++ b/core/src/main/java/com/pikolive/core/utils/DirectoryHelper.java @@ -1,11 +1,11 @@ -package com.yizhuan.xchat_android_core.utils; +package com.pikolive.core.utils; import static android.os.Environment.MEDIA_MOUNTED; import android.content.Context; import android.os.Environment; -import com.yizhuan.xchat_android_core.Constants; +import com.pikolive.core.Constants; import com.pikolive.library.utils.config.BasicConfig; import com.pikolive.library.utils.file.StorageUtils; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/ExtensionUtil.java b/core/src/main/java/com/pikolive/core/utils/ExtensionUtil.java similarity index 92% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/ExtensionUtil.java rename to core/src/main/java/com/pikolive/core/utils/ExtensionUtil.java index a15b45fb8..d3fcabc18 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/ExtensionUtil.java +++ b/core/src/main/java/com/pikolive/core/utils/ExtensionUtil.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.utils; +package com.pikolive.core.utils; import android.text.TextUtils; @@ -7,9 +7,15 @@ import com.netease.nim.uikit.common.util.log.LogUtil; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; import com.netease.nimlib.sdk.msg.constant.MsgTypeEnum; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.FaceAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.RoomTipAttachment; +import com.pikolive.core.im.custom.bean.CustomAttachment; +import com.pikolive.core.im.custom.bean.FaceAttachment; +import com.pikolive.core.im.custom.bean.RoomTipAttachment; +import com.pikolive.core.im.custom.bean.CustomAttachment; +import com.pikolive.core.im.custom.bean.FaceAttachment; +import com.pikolive.core.im.custom.bean.RoomTipAttachment; +import com.pikolive.core.im.custom.bean.CustomAttachment; +import com.pikolive.core.im.custom.bean.FaceAttachment; +import com.pikolive.core.im.custom.bean.RoomTipAttachment; import java.util.HashMap; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/ExtensionUtils.java b/core/src/main/java/com/pikolive/core/utils/ExtensionUtils.java similarity index 66% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/ExtensionUtils.java rename to core/src/main/java/com/pikolive/core/utils/ExtensionUtils.java index 1c76c5cff..1dc1e4dda 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/ExtensionUtils.java +++ b/core/src/main/java/com/pikolive/core/utils/ExtensionUtils.java @@ -1,13 +1,21 @@ -package com.yizhuan.xchat_android_core.utils; +package com.pikolive.core.utils; import androidx.annotation.NonNull; -import com.yizhuan.xchat_android_core.decoration.car.bean.CarInfo; -import com.yizhuan.xchat_android_core.decoration.headwear.bean.HeadWearInfo; -import com.yizhuan.xchat_android_core.level.UserLevelVo; -import com.yizhuan.xchat_android_core.super_admin.util.SuperAdminUtil; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.pikolive.core.decoration.car.bean.CarInfo; +import com.pikolive.core.decoration.headwear.bean.HeadWearInfo; +import com.pikolive.core.level.UserLevelVo; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.decoration.car.bean.CarInfo; +import com.pikolive.core.decoration.headwear.bean.HeadWearInfo; +import com.pikolive.core.level.UserLevelVo; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.decoration.car.bean.CarInfo; +import com.pikolive.core.decoration.headwear.bean.HeadWearInfo; +import com.pikolive.core.level.UserLevelVo; +import com.pikolive.core.admin.util.SuperAdminUtil; +import com.pikolive.core.user.bean.UserInfo; import java.util.HashMap; import java.util.Map; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/IConnectivityClient.java b/core/src/main/java/com/pikolive/core/utils/IConnectivityClient.java similarity index 86% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/IConnectivityClient.java rename to core/src/main/java/com/pikolive/core/utils/IConnectivityClient.java index d81be7d21..2a61886a5 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/IConnectivityClient.java +++ b/core/src/main/java/com/pikolive/core/utils/IConnectivityClient.java @@ -1,7 +1,7 @@ /** * */ -package com.yizhuan.xchat_android_core.utils; +package com.pikolive.core.utils; import com.pikolive.library.coremanager.ICoreClient; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/IConnectivityCore.java b/core/src/main/java/com/pikolive/core/utils/IConnectivityCore.java similarity index 87% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/IConnectivityCore.java rename to core/src/main/java/com/pikolive/core/utils/IConnectivityCore.java index bfbd79ed9..16ff91f5b 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/IConnectivityCore.java +++ b/core/src/main/java/com/pikolive/core/utils/IConnectivityCore.java @@ -1,7 +1,7 @@ /** * */ -package com.yizhuan.xchat_android_core.utils; +package com.pikolive.core.utils; import com.pikolive.library.coremanager.IBaseCore; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/IHandlerCore.java b/core/src/main/java/com/pikolive/core/utils/IHandlerCore.java similarity index 95% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/IHandlerCore.java rename to core/src/main/java/com/pikolive/core/utils/IHandlerCore.java index e31a3dd0e..6a92bb415 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/IHandlerCore.java +++ b/core/src/main/java/com/pikolive/core/utils/IHandlerCore.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.utils; +package com.pikolive.core.utils; import com.pikolive.library.coremanager.IBaseCore; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/ImageSplitter.java b/core/src/main/java/com/pikolive/core/utils/ImageSplitter.java similarity index 94% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/ImageSplitter.java rename to core/src/main/java/com/pikolive/core/utils/ImageSplitter.java index 8c14435f2..02891dbda 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/ImageSplitter.java +++ b/core/src/main/java/com/pikolive/core/utils/ImageSplitter.java @@ -1,11 +1,13 @@ -package com.yizhuan.xchat_android_core.utils; +package com.pikolive.core.utils; import android.graphics.Bitmap; import android.graphics.Matrix; import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core.manager.AvRoomDataManager; import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/ImgServiceUrlUtil.java b/core/src/main/java/com/pikolive/core/utils/ImgServiceUrlUtil.java similarity index 99% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/ImgServiceUrlUtil.java rename to core/src/main/java/com/pikolive/core/utils/ImgServiceUrlUtil.java index ebd2a9efc..2139dfeea 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/ImgServiceUrlUtil.java +++ b/core/src/main/java/com/pikolive/core/utils/ImgServiceUrlUtil.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.utils; +package com.pikolive.core.utils; import com.pikolive.library.utils.StringUtils; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/IntentUtils.java b/core/src/main/java/com/pikolive/core/utils/IntentUtils.java similarity index 97% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/IntentUtils.java rename to core/src/main/java/com/pikolive/core/utils/IntentUtils.java index 79b254410..2e3b67ab8 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/IntentUtils.java +++ b/core/src/main/java/com/pikolive/core/utils/IntentUtils.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.utils; +package com.pikolive.core.utils; import android.app.Activity; import android.app.PendingIntent; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/LogUtils.java b/core/src/main/java/com/pikolive/core/utils/LogUtils.java similarity index 95% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/LogUtils.java rename to core/src/main/java/com/pikolive/core/utils/LogUtils.java index dc63186db..e7cea561c 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/LogUtils.java +++ b/core/src/main/java/com/pikolive/core/utils/LogUtils.java @@ -3,12 +3,12 @@ // (powered by Fernflower decompiler) // -package com.yizhuan.xchat_android_core.utils; +package com.pikolive.core.utils; import android.util.Log; -import com.yizhuan.xchat_android_core.R; -import com.yizhuan.xchat_android_core.BuildConfig; +import com.pikolive.core.R; +import com.pikolive.core.BuildConfig; import com.pikolive.library.utils.ResUtil; import java.util.Locale; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/Logger.java b/core/src/main/java/com/pikolive/core/utils/Logger.java similarity index 99% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/Logger.java rename to core/src/main/java/com/pikolive/core/utils/Logger.java index c6923fb88..25f1490d3 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/Logger.java +++ b/core/src/main/java/com/pikolive/core/utils/Logger.java @@ -4,7 +4,7 @@ * 使用前需要先调用init初始化 * 内部使用android的Log类实现，并支持写入文件 */ -package com.yizhuan.xchat_android_core.utils; +package com.pikolive.core.utils; import android.annotation.SuppressLint; import android.os.Bundle; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/OaidUtil.java b/core/src/main/java/com/pikolive/core/utils/OaidUtil.java similarity index 84% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/OaidUtil.java rename to core/src/main/java/com/pikolive/core/utils/OaidUtil.java index c5aea8456..9a1cd1274 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/OaidUtil.java +++ b/core/src/main/java/com/pikolive/core/utils/OaidUtil.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.utils; +package com.pikolive.core.utils; public class OaidUtil { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/OldHttpErrorHandleUtil.java b/core/src/main/java/com/pikolive/core/utils/OldHttpErrorHandleUtil.java similarity index 90% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/OldHttpErrorHandleUtil.java rename to core/src/main/java/com/pikolive/core/utils/OldHttpErrorHandleUtil.java index 09497f66a..fb603be21 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/OldHttpErrorHandleUtil.java +++ b/core/src/main/java/com/pikolive/core/utils/OldHttpErrorHandleUtil.java @@ -1,8 +1,10 @@ -package com.yizhuan.xchat_android_core.utils; +package com.pikolive.core.utils; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.R; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.R; +import com.pikolive.core.bean.response.ServiceResult; import com.pikolive.library.utils.ResUtil; import java.nio.charset.Charset; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/SharedPreferenceUtils.java b/core/src/main/java/com/pikolive/core/utils/SharedPreferenceUtils.java similarity index 96% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/SharedPreferenceUtils.java rename to core/src/main/java/com/pikolive/core/utils/SharedPreferenceUtils.java index 19d230dbc..7b971416d 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/SharedPreferenceUtils.java +++ b/core/src/main/java/com/pikolive/core/utils/SharedPreferenceUtils.java @@ -1,9 +1,9 @@ -package com.yizhuan.xchat_android_core.utils; +package com.pikolive.core.utils; import android.content.Context; import android.content.SharedPreferences; -import com.yizhuan.xchat_android_constants.XChatConstants; +import com.pikolive.core2.XChatConstants; public class SharedPreferenceUtils { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/SongUtils.java b/core/src/main/java/com/pikolive/core/utils/SongUtils.java similarity index 90% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/SongUtils.java rename to core/src/main/java/com/pikolive/core/utils/SongUtils.java index 799277ed3..f347364a4 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/SongUtils.java +++ b/core/src/main/java/com/pikolive/core/utils/SongUtils.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.utils; +package com.pikolive.core.utils; import com.pikolive.library.utils.UUIDUtil; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/StarUtils.java b/core/src/main/java/com/pikolive/core/utils/StarUtils.java similarity index 98% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/StarUtils.java rename to core/src/main/java/com/pikolive/core/utils/StarUtils.java index e7cee8086..9776fd171 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/StarUtils.java +++ b/core/src/main/java/com/pikolive/core/utils/StarUtils.java @@ -1,5 +1,5 @@ -package com.yizhuan.xchat_android_core.utils; -import com.yizhuan.xchat_android_core.R; +package com.pikolive.core.utils; +import com.pikolive.core.R; import com.pikolive.library.utils.ResUtil; import java.util.Calendar; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/StringExtension.kt b/core/src/main/java/com/pikolive/core/utils/StringExtension.kt similarity index 96% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/StringExtension.kt rename to core/src/main/java/com/pikolive/core/utils/StringExtension.kt index e5d75ae5f..77a38c24d 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/StringExtension.kt +++ b/core/src/main/java/com/pikolive/core/utils/StringExtension.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.utils +package com.pikolive.core.utils import android.graphics.Color import com.pikolive.library.utils.SingleToastUtil diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/StringUtils.java b/core/src/main/java/com/pikolive/core/utils/StringUtils.java similarity index 99% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/StringUtils.java rename to core/src/main/java/com/pikolive/core/utils/StringUtils.java index e5beb95e4..ace2feb5f 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/StringUtils.java +++ b/core/src/main/java/com/pikolive/core/utils/StringUtils.java @@ -1,5 +1,5 @@ -package com.yizhuan.xchat_android_core.utils; -import com.yizhuan.xchat_android_core.R; +package com.pikolive.core.utils; +import com.pikolive.core.R; import com.pikolive.library.utils.ResUtil; import java.net.URLEncoder; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/SystemUidUtil.java b/core/src/main/java/com/pikolive/core/utils/SystemUidUtil.java similarity index 72% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/SystemUidUtil.java rename to core/src/main/java/com/pikolive/core/utils/SystemUidUtil.java index e2da89ad9..b8fa36a2f 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/SystemUidUtil.java +++ b/core/src/main/java/com/pikolive/core/utils/SystemUidUtil.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.utils; +package com.pikolive.core.utils; -import com.yizhuan.xchat_android_constants.XChatConstants; +import com.pikolive.core2.XChatConstants; public class SystemUidUtil { diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/SystemUtils.java b/core/src/main/java/com/pikolive/core/utils/SystemUtils.java similarity index 97% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/SystemUtils.java rename to core/src/main/java/com/pikolive/core/utils/SystemUtils.java index 38b151928..b5099b12d 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/SystemUtils.java +++ b/core/src/main/java/com/pikolive/core/utils/SystemUtils.java @@ -1,7 +1,7 @@ /** * */ -package com.yizhuan.xchat_android_core.utils; +package com.pikolive.core.utils; import android.content.Context; import android.os.Build; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/TestLog.java b/core/src/main/java/com/pikolive/core/utils/TestLog.java similarity index 94% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/TestLog.java rename to core/src/main/java/com/pikolive/core/utils/TestLog.java index 516687765..a3c239c76 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/TestLog.java +++ b/core/src/main/java/com/pikolive/core/utils/TestLog.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.utils; +package com.pikolive.core.utils; import com.netease.nim.uikit.common.util.log.sdk.LogBase; import com.netease.nim.uikit.common.util.log.sdk.wrapper.NimLog; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/TextUtils.java b/core/src/main/java/com/pikolive/core/utils/TextUtils.java similarity index 98% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/TextUtils.java rename to core/src/main/java/com/pikolive/core/utils/TextUtils.java index a2f6fbc58..7bd363c1b 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/TextUtils.java +++ b/core/src/main/java/com/pikolive/core/utils/TextUtils.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.utils; +package com.pikolive.core.utils; import android.content.ClipData; import android.content.ClipboardManager; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/Transformer.java b/core/src/main/java/com/pikolive/core/utils/Transformer.java similarity index 94% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/Transformer.java rename to core/src/main/java/com/pikolive/core/utils/Transformer.java index eb74aea93..488e667a4 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/Transformer.java +++ b/core/src/main/java/com/pikolive/core/utils/Transformer.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.utils; +package com.pikolive.core.utils; import io.reactivex.Single; import io.reactivex.SingleSource; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/UploadUtils.java b/core/src/main/java/com/pikolive/core/utils/UploadUtils.java similarity index 61% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/UploadUtils.java rename to core/src/main/java/com/pikolive/core/utils/UploadUtils.java index ba4c30af3..5c100aa55 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/UploadUtils.java +++ b/core/src/main/java/com/pikolive/core/utils/UploadUtils.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.utils; +package com.pikolive.core.utils; /** * create by lvzebiao @2019/11/20 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/net/BalanceNotEnoughExeption.java b/core/src/main/java/com/pikolive/core/utils/net/BalanceNotEnoughExeption.java similarity index 83% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/net/BalanceNotEnoughExeption.java rename to core/src/main/java/com/pikolive/core/utils/net/BalanceNotEnoughExeption.java index 08dbfa3cb..b7dbc5401 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/net/BalanceNotEnoughExeption.java +++ b/core/src/main/java/com/pikolive/core/utils/net/BalanceNotEnoughExeption.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.utils.net; +package com.pikolive.core.utils.net; /** * Created by huangmeng1 on 2018/5/14. diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/net/BeanObserver.java b/core/src/main/java/com/pikolive/core/utils/net/BeanObserver.java similarity index 94% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/net/BeanObserver.java rename to core/src/main/java/com/pikolive/core/utils/net/BeanObserver.java index 6b1ffe98d..e5bed8538 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/net/BeanObserver.java +++ b/core/src/main/java/com/pikolive/core/utils/net/BeanObserver.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.utils.net; +package com.pikolive.core.utils.net; import com.google.gson.JsonParseException; -import com.yizhuan.xchat_android_core.R; +import com.pikolive.core.R; import com.pikolive.library.utils.ResUtil; import org.json.JSONException; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/net/DontWarnObserver.java b/core/src/main/java/com/pikolive/core/utils/net/DontWarnObserver.java similarity index 90% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/net/DontWarnObserver.java rename to core/src/main/java/com/pikolive/core/utils/net/DontWarnObserver.java index b25f8f52b..269561f3c 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/net/DontWarnObserver.java +++ b/core/src/main/java/com/pikolive/core/utils/net/DontWarnObserver.java @@ -1,8 +1,8 @@ -package com.yizhuan.xchat_android_core.utils.net; +package com.pikolive.core.utils.net; import android.text.TextUtils; -import com.yizhuan.xchat_android_constants.XChatConstants; +import com.pikolive.core2.XChatConstants; import java.net.UnknownHostException; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/net/ErrorConsumer.java b/core/src/main/java/com/pikolive/core/utils/net/ErrorConsumer.java similarity index 86% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/net/ErrorConsumer.java rename to core/src/main/java/com/pikolive/core/utils/net/ErrorConsumer.java index e570066c5..48575e72d 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/net/ErrorConsumer.java +++ b/core/src/main/java/com/pikolive/core/utils/net/ErrorConsumer.java @@ -1,10 +1,11 @@ -package com.yizhuan.xchat_android_core.utils.net; +package com.pikolive.core.utils.net; import android.text.TextUtils; -import com.yizhuan.xchat_android_core.R; -import com.yizhuan.xchat_android_constants.XChatConstants; -import com.yizhuan.xchat_android_core.patriarch.exception.PmRoomLimitException; +import com.pikolive.core.patriarch.exception.PmRoomLimitException; +import com.pikolive.core.patriarch.exception.PmRoomLimitException; +import com.pikolive.core.R; +import com.pikolive.core2.XChatConstants; import com.pikolive.library.rxbus.RxBus; import com.pikolive.library.utils.ResUtil; import com.pikolive.library.utils.SingleToastUtil; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/net/FreezeException.java b/core/src/main/java/com/pikolive/core/utils/net/FreezeException.java similarity index 77% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/net/FreezeException.java rename to core/src/main/java/com/pikolive/core/utils/net/FreezeException.java index 481fa61a2..510b0f316 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/net/FreezeException.java +++ b/core/src/main/java/com/pikolive/core/utils/net/FreezeException.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.utils.net; +package com.pikolive.core.utils.net; public class FreezeException extends Exception { public static final int code = 402; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/net/IgnoreException.java b/core/src/main/java/com/pikolive/core/utils/net/IgnoreException.java similarity index 78% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/net/IgnoreException.java rename to core/src/main/java/com/pikolive/core/utils/net/IgnoreException.java index b7fcfcbca..227c58ed8 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/net/IgnoreException.java +++ b/core/src/main/java/com/pikolive/core/utils/net/IgnoreException.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.utils.net; +package com.pikolive.core.utils.net; /** * 可以忽略的异常,比如不弹toast diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/net/RadishNotEnoughException.java b/core/src/main/java/com/pikolive/core/utils/net/RadishNotEnoughException.java similarity index 83% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/net/RadishNotEnoughException.java rename to core/src/main/java/com/pikolive/core/utils/net/RadishNotEnoughException.java index 5b4bde1c4..a62b3afd7 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/net/RadishNotEnoughException.java +++ b/core/src/main/java/com/pikolive/core/utils/net/RadishNotEnoughException.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.utils.net; +package com.pikolive.core.utils.net; /** * create by lvzebiao @2019/3/21 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/net/RxExtension.kt b/core/src/main/java/com/pikolive/core/utils/net/RxExtension.kt similarity index 92% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/net/RxExtension.kt rename to core/src/main/java/com/pikolive/core/utils/net/RxExtension.kt index 65cd65470..3e6080a37 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/net/RxExtension.kt +++ b/core/src/main/java/com/pikolive/core/utils/net/RxExtension.kt @@ -1,9 +1,9 @@ -package com.yizhuan.xchat_android_core.utils.net +package com.pikolive.core.utils.net -import com.yizhuan.xchat_android_core.R -import com.yizhuan.xchat_android_core.bean.response.ServiceResult -import com.yizhuan.xchat_android_core.utils.ifNullOrEmpty +import com.pikolive.core.R +import com.pikolive.core.bean.response.ServiceResult +import com.pikolive.core.utils.ifNullOrEmpty import com.pikolive.library.utils.ResUtil import io.reactivex.Single import io.reactivex.android.schedulers.AndroidSchedulers diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/net/RxHelper.java b/core/src/main/java/com/pikolive/core/utils/net/RxHelper.java similarity index 95% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/net/RxHelper.java rename to core/src/main/java/com/pikolive/core/utils/net/RxHelper.java index a42fc82a4..1342e87bb 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/net/RxHelper.java +++ b/core/src/main/java/com/pikolive/core/utils/net/RxHelper.java @@ -1,21 +1,24 @@ -package com.yizhuan.xchat_android_core.utils.net; +package com.pikolive.core.utils.net; import android.content.Context; import android.text.TextUtils; import com.google.gson.JsonElement; import com.orhanobut.logger.Logger; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.exception.FailReasonException; +import com.pikolive.core.patriarch.exception.PmRoomLimitException; import com.trello.rxlifecycle3.LifecycleProvider; import com.trello.rxlifecycle3.android.ActivityEvent; import com.trello.rxlifecycle3.android.FragmentEvent; import com.trello.rxlifecycle3.components.RxActivity; import com.trello.rxlifecycle3.components.support.RxAppCompatActivity; -import com.yizhuan.xchat_android_core.R; -import com.yizhuan.xchat_android_constants.XChatConstants; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.exception.FailReasonException; -import com.yizhuan.xchat_android_core.patriarch.exception.PmRoomLimitException; -import com.yizhuan.xchat_android_core.super_admin.model.exception.SAdminCannotGameException; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.exception.FailReasonException; +import com.pikolive.core.patriarch.exception.PmRoomLimitException; +import com.pikolive.core.R; +import com.pikolive.core2.XChatConstants; +import com.pikolive.core.admin.model.exception.SAdminCannotGameException; import com.pikolive.library.rxbus.RxBus; import com.pikolive.library.utils.ResUtil; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/net/ServerException.java b/core/src/main/java/com/pikolive/core/utils/net/ServerException.java similarity index 82% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/net/ServerException.java rename to core/src/main/java/com/pikolive/core/utils/net/ServerException.java index 2244ebb6d..36d550413 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/net/ServerException.java +++ b/core/src/main/java/com/pikolive/core/utils/net/ServerException.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.utils.net; +package com.pikolive.core.utils.net; /** * Created by fwhm on 2017/7/27. diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/net/VipLevelNotEnoughException.java b/core/src/main/java/com/pikolive/core/utils/net/VipLevelNotEnoughException.java similarity index 83% rename from core/src/main/java/com/yizhuan/xchat_android_core/utils/net/VipLevelNotEnoughException.java rename to core/src/main/java/com/pikolive/core/utils/net/VipLevelNotEnoughException.java index f9e39537e..4547410f0 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/net/VipLevelNotEnoughException.java +++ b/core/src/main/java/com/pikolive/core/utils/net/VipLevelNotEnoughException.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.utils.net; +package com.pikolive.core.utils.net; /** * Created by huangmeng1 on 2018/5/14. diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/vip/UserVipInfo.kt b/core/src/main/java/com/pikolive/core/vip/UserVipInfo.kt similarity index 87% rename from core/src/main/java/com/yizhuan/xchat_android_core/vip/UserVipInfo.kt rename to core/src/main/java/com/pikolive/core/vip/UserVipInfo.kt index 1a3f7dac7..6f595fbbb 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/vip/UserVipInfo.kt +++ b/core/src/main/java/com/pikolive/core/vip/UserVipInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.vip +package com.pikolive.core.vip import java.io.Serializable diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/vip/VipAuthInfo.kt b/core/src/main/java/com/pikolive/core/vip/VipAuthInfo.kt similarity index 90% rename from core/src/main/java/com/yizhuan/xchat_android_core/vip/VipAuthInfo.kt rename to core/src/main/java/com/pikolive/core/vip/VipAuthInfo.kt index 081b009a5..33c27a86c 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/vip/VipAuthInfo.kt +++ b/core/src/main/java/com/pikolive/core/vip/VipAuthInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.vip +package com.pikolive.core.vip data class VipAuthInfo( val authDesc: String = "", diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/vip/VipBroadcastInfo.kt b/core/src/main/java/com/pikolive/core/vip/VipBroadcastInfo.kt similarity index 79% rename from core/src/main/java/com/yizhuan/xchat_android_core/vip/VipBroadcastInfo.kt rename to core/src/main/java/com/pikolive/core/vip/VipBroadcastInfo.kt index 226dd811e..db7846f6a 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/vip/VipBroadcastInfo.kt +++ b/core/src/main/java/com/pikolive/core/vip/VipBroadcastInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.vip +package com.pikolive.core.vip import java.io.Serializable diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/vip/VipBroadcastMsgEvent.kt b/core/src/main/java/com/pikolive/core/vip/VipBroadcastMsgEvent.kt similarity index 76% rename from core/src/main/java/com/yizhuan/xchat_android_core/vip/VipBroadcastMsgEvent.kt rename to core/src/main/java/com/pikolive/core/vip/VipBroadcastMsgEvent.kt index e682263cf..e75c932c5 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/vip/VipBroadcastMsgEvent.kt +++ b/core/src/main/java/com/pikolive/core/vip/VipBroadcastMsgEvent.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.vip +package com.pikolive.core.vip import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/vip/VipInfo.kt b/core/src/main/java/com/pikolive/core/vip/VipInfo.kt similarity index 94% rename from core/src/main/java/com/yizhuan/xchat_android_core/vip/VipInfo.kt rename to core/src/main/java/com/pikolive/core/vip/VipInfo.kt index 448572a39..2bb6f7db3 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/vip/VipInfo.kt +++ b/core/src/main/java/com/pikolive/core/vip/VipInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.vip +package com.pikolive.core.vip import java.io.Serializable diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/vip/VipMessageInfo.java b/core/src/main/java/com/pikolive/core/vip/VipMessageInfo.java similarity index 88% rename from core/src/main/java/com/yizhuan/xchat_android_core/vip/VipMessageInfo.java rename to core/src/main/java/com/pikolive/core/vip/VipMessageInfo.java index 92a3d4217..96d86a64c 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/vip/VipMessageInfo.java +++ b/core/src/main/java/com/pikolive/core/vip/VipMessageInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.vip; +package com.pikolive.core.vip; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/vip/VipModel.kt b/core/src/main/java/com/pikolive/core/vip/VipModel.kt similarity index 89% rename from core/src/main/java/com/yizhuan/xchat_android_core/vip/VipModel.kt rename to core/src/main/java/com/pikolive/core/vip/VipModel.kt index 787a0b325..bdc59cb2d 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/vip/VipModel.kt +++ b/core/src/main/java/com/pikolive/core/vip/VipModel.kt @@ -1,9 +1,9 @@ -package com.yizhuan.xchat_android_core.vip +package com.pikolive.core.vip -import com.yizhuan.xchat_android_core.base.BaseModel -import com.yizhuan.xchat_android_core.bean.response.ServiceResult -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager -import com.yizhuan.xchat_android_core.utils.net.launchRequest +import com.pikolive.core.base.BaseModel +import com.pikolive.core.bean.response.ServiceResult +import com.pikolive.core.manager.AvRoomDataManager +import com.pikolive.core.utils.net.launchRequest import com.pikolive.library.net.rxnet.RxNet import retrofit2.http.* diff --git a/core/src/main/java/com/pikolive/core/vip/VipOpenEvent.kt b/core/src/main/java/com/pikolive/core/vip/VipOpenEvent.kt new file mode 100644 index 000000000..ee0d1c2ad --- /dev/null +++ b/core/src/main/java/com/pikolive/core/vip/VipOpenEvent.kt @@ -0,0 +1,3 @@ +package com.pikolive.core.vip + + class VipOpenEvent diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/vip/VipPageInfo.kt b/core/src/main/java/com/pikolive/core/vip/VipPageInfo.kt similarity index 84% rename from core/src/main/java/com/yizhuan/xchat_android_core/vip/VipPageInfo.kt rename to core/src/main/java/com/pikolive/core/vip/VipPageInfo.kt index 929e00882..c3001504b 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/vip/VipPageInfo.kt +++ b/core/src/main/java/com/pikolive/core/vip/VipPageInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.vip +package com.pikolive.core.vip data class VipPageInfo( val vipAuthInfos: List? = null, diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/vip/VipUpgradeEvent.kt b/core/src/main/java/com/pikolive/core/vip/VipUpgradeEvent.kt similarity index 53% rename from core/src/main/java/com/yizhuan/xchat_android_core/vip/VipUpgradeEvent.kt rename to core/src/main/java/com/pikolive/core/vip/VipUpgradeEvent.kt index 2d4db2c34..3ac3a347f 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/vip/VipUpgradeEvent.kt +++ b/core/src/main/java/com/pikolive/core/vip/VipUpgradeEvent.kt @@ -1,3 +1,3 @@ -package com.yizhuan.xchat_android_core.vip +package com.pikolive.core.vip data class VipUpgradeEvent(val vipInfo: VipInfo) diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/web/bean/H5NotifyData.java b/core/src/main/java/com/pikolive/core/web/bean/H5NotifyData.java similarity index 93% rename from core/src/main/java/com/yizhuan/xchat_android_core/web/bean/H5NotifyData.java rename to core/src/main/java/com/pikolive/core/web/bean/H5NotifyData.java index 3dc21b2fd..c8e2f553c 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/web/bean/H5NotifyData.java +++ b/core/src/main/java/com/pikolive/core/web/bean/H5NotifyData.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.web.bean; +package com.pikolive.core.web.bean; import android.text.TextUtils; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/web/bean/WebJsBeanInfo.java b/core/src/main/java/com/pikolive/core/web/bean/WebJsBeanInfo.java similarity index 98% rename from core/src/main/java/com/yizhuan/xchat_android_core/web/bean/WebJsBeanInfo.java rename to core/src/main/java/com/pikolive/core/web/bean/WebJsBeanInfo.java index be5b23626..8ce1ea3eb 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/web/bean/WebJsBeanInfo.java +++ b/core/src/main/java/com/pikolive/core/web/bean/WebJsBeanInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.web.bean; +package com.pikolive.core.web.bean; /** *

js回调字段信息

diff --git a/core/src/main/java/com/pikolive/core/web/event/WebViewRefreshEvent.java b/core/src/main/java/com/pikolive/core/web/event/WebViewRefreshEvent.java new file mode 100644 index 000000000..ee649925c --- /dev/null +++ b/core/src/main/java/com/pikolive/core/web/event/WebViewRefreshEvent.java @@ -0,0 +1,4 @@ +package com.pikolive.core.web.event; + +public class WebViewRefreshEvent { +} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/withdraw/IWithdrawModel.java b/core/src/main/java/com/pikolive/core/withdraw/IWithdrawModel.java similarity index 56% rename from core/src/main/java/com/yizhuan/xchat_android_core/withdraw/IWithdrawModel.java rename to core/src/main/java/com/pikolive/core/withdraw/IWithdrawModel.java index da0d44f15..44f944ef6 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/withdraw/IWithdrawModel.java +++ b/core/src/main/java/com/pikolive/core/withdraw/IWithdrawModel.java @@ -1,10 +1,18 @@ -package com.yizhuan.xchat_android_core.withdraw; +package com.pikolive.core.withdraw; -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.initial.bean.TaxInfo; -import com.yizhuan.xchat_android_core.withdraw.bean.ExchangerInfo; -import com.yizhuan.xchat_android_core.withdraw.bean.WithdrawInfo; -import com.yizhuan.xchat_android_core.withdraw.bean.WithdrwaListInfo; +import com.pikolive.core.base.IModel; +import com.pikolive.core.withdraw.bean.ExchangerInfo; +import com.pikolive.core.withdraw.bean.WithdrawInfo; +import com.pikolive.core.withdraw.bean.WithdrwaListInfo; +import com.pikolive.core.base.IModel; +import com.pikolive.core.withdraw.bean.ExchangerInfo; +import com.pikolive.core.withdraw.bean.WithdrawInfo; +import com.pikolive.core.withdraw.bean.WithdrwaListInfo; +import com.pikolive.core.base.IModel; +import com.pikolive.core.initial.bean.TaxInfo; +import com.pikolive.core.withdraw.bean.ExchangerInfo; +import com.pikolive.core.withdraw.bean.WithdrawInfo; +import com.pikolive.core.withdraw.bean.WithdrwaListInfo; import java.util.List; @@ -14,7 +22,7 @@ import io.reactivex.Single; * Created by Administrator on 2017/7/24. */ -public interface IWithdrawModel extends IModel{ +public interface IWithdrawModel extends IModel { // 获取提现列表 Single> getWithdrawList(); diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/withdraw/WithdrawModel.java b/core/src/main/java/com/pikolive/core/withdraw/WithdrawModel.java similarity index 80% rename from core/src/main/java/com/yizhuan/xchat_android_core/withdraw/WithdrawModel.java rename to core/src/main/java/com/pikolive/core/withdraw/WithdrawModel.java index e5e6f4598..4a0a05173 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/withdraw/WithdrawModel.java +++ b/core/src/main/java/com/pikolive/core/withdraw/WithdrawModel.java @@ -1,23 +1,44 @@ -package com.yizhuan.xchat_android_core.withdraw; +package com.pikolive.core.withdraw; import com.google.gson.JsonElement; -import com.yizhuan.xchat_android_core.R; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.bean.response.result.ExchangeInfoResult; -import com.yizhuan.xchat_android_core.bean.response.result.WithdrawListResult; -import com.yizhuan.xchat_android_core.bean.response.result.WithdrawUserInfoResult; -import com.yizhuan.xchat_android_core.initial.bean.TaxInfo; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.utils.APIEncryptUtil; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; -import com.yizhuan.xchat_android_core.withdraw.bean.BindAliInfo; -import com.yizhuan.xchat_android_core.withdraw.bean.ExchangerInfo; -import com.yizhuan.xchat_android_core.withdraw.bean.RefreshInfo; -import com.yizhuan.xchat_android_core.withdraw.bean.WithdrawInfo; -import com.yizhuan.xchat_android_core.withdraw.bean.WithdrwaListInfo; -import com.yizhuan.xchat_android_core.withdraw.event.ExchangeInfoEvent; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.bean.response.result.ExchangeInfoResult; +import com.pikolive.core.bean.response.result.WithdrawListResult; +import com.pikolive.core.bean.response.result.WithdrawUserInfoResult; +import com.pikolive.core.withdraw.bean.BindAliInfo; +import com.pikolive.core.withdraw.bean.ExchangerInfo; +import com.pikolive.core.withdraw.bean.RefreshInfo; +import com.pikolive.core.withdraw.bean.WithdrawInfo; +import com.pikolive.core.withdraw.bean.WithdrwaListInfo; +import com.pikolive.core.withdraw.event.ExchangeInfoEvent; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.bean.response.result.ExchangeInfoResult; +import com.pikolive.core.bean.response.result.WithdrawListResult; +import com.pikolive.core.bean.response.result.WithdrawUserInfoResult; +import com.pikolive.core.withdraw.bean.BindAliInfo; +import com.pikolive.core.withdraw.bean.ExchangerInfo; +import com.pikolive.core.withdraw.bean.RefreshInfo; +import com.pikolive.core.withdraw.bean.WithdrawInfo; +import com.pikolive.core.withdraw.bean.WithdrwaListInfo; +import com.pikolive.core.withdraw.event.ExchangeInfoEvent; +import com.pikolive.core.R; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.bean.response.result.ExchangeInfoResult; +import com.pikolive.core.bean.response.result.WithdrawListResult; +import com.pikolive.core.bean.response.result.WithdrawUserInfoResult; +import com.pikolive.core.initial.bean.TaxInfo; +import com.pikolive.core.user.UserModel; +import com.pikolive.core.utils.APIEncryptUtil; +import com.pikolive.core.utils.net.RxHelper; +import com.pikolive.core.withdraw.bean.BindAliInfo; +import com.pikolive.core.withdraw.bean.ExchangerInfo; +import com.pikolive.core.withdraw.bean.RefreshInfo; +import com.pikolive.core.withdraw.bean.WithdrawInfo; +import com.pikolive.core.withdraw.bean.WithdrwaListInfo; +import com.pikolive.core.withdraw.event.ExchangeInfoEvent; import com.pikolive.library.net.rxnet.RxNet; import com.pikolive.library.utils.ResUtil; import com.pikolive.library.utils.codec.DESUtils; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/withdraw/bean/BindAliInfo.java b/core/src/main/java/com/pikolive/core/withdraw/bean/BindAliInfo.java similarity index 87% rename from core/src/main/java/com/yizhuan/xchat_android_core/withdraw/bean/BindAliInfo.java rename to core/src/main/java/com/pikolive/core/withdraw/bean/BindAliInfo.java index 473f714a8..aa716c1db 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/withdraw/bean/BindAliInfo.java +++ b/core/src/main/java/com/pikolive/core/withdraw/bean/BindAliInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.withdraw.bean; +package com.pikolive.core.withdraw.bean; import lombok.Data; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/withdraw/bean/ExchangerInfo.java b/core/src/main/java/com/pikolive/core/withdraw/bean/ExchangerInfo.java similarity index 77% rename from core/src/main/java/com/yizhuan/xchat_android_core/withdraw/bean/ExchangerInfo.java rename to core/src/main/java/com/pikolive/core/withdraw/bean/ExchangerInfo.java index 98b2cd430..f24fbe506 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/withdraw/bean/ExchangerInfo.java +++ b/core/src/main/java/com/pikolive/core/withdraw/bean/ExchangerInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.withdraw.bean; +package com.pikolive.core.withdraw.bean; /** * Created by Administrator on 2017/7/27. diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/withdraw/bean/RefreshInfo.java b/core/src/main/java/com/pikolive/core/withdraw/bean/RefreshInfo.java similarity index 60% rename from core/src/main/java/com/yizhuan/xchat_android_core/withdraw/bean/RefreshInfo.java rename to core/src/main/java/com/pikolive/core/withdraw/bean/RefreshInfo.java index 68c26ca79..c166144bb 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/withdraw/bean/RefreshInfo.java +++ b/core/src/main/java/com/pikolive/core/withdraw/bean/RefreshInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.withdraw.bean; +package com.pikolive.core.withdraw.bean; /** * Created by Administrator on 2017/7/26. diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/withdraw/bean/WithdrawInfo.java b/core/src/main/java/com/pikolive/core/withdraw/bean/WithdrawInfo.java similarity index 95% rename from core/src/main/java/com/yizhuan/xchat_android_core/withdraw/bean/WithdrawInfo.java rename to core/src/main/java/com/pikolive/core/withdraw/bean/WithdrawInfo.java index 1528067ef..f119cc4ea 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/withdraw/bean/WithdrawInfo.java +++ b/core/src/main/java/com/pikolive/core/withdraw/bean/WithdrawInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.withdraw.bean; +package com.pikolive.core.withdraw.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/withdraw/bean/WithdrwaListInfo.java b/core/src/main/java/com/pikolive/core/withdraw/bean/WithdrwaListInfo.java similarity index 92% rename from core/src/main/java/com/yizhuan/xchat_android_core/withdraw/bean/WithdrwaListInfo.java rename to core/src/main/java/com/pikolive/core/withdraw/bean/WithdrwaListInfo.java index 19ba871aa..5fc0828ad 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/withdraw/bean/WithdrwaListInfo.java +++ b/core/src/main/java/com/pikolive/core/withdraw/bean/WithdrwaListInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.withdraw.bean; +package com.pikolive.core.withdraw.bean; import java.io.Serializable; diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/withdraw/event/ExchangeInfoEvent.java b/core/src/main/java/com/pikolive/core/withdraw/event/ExchangeInfoEvent.java similarity index 54% rename from core/src/main/java/com/yizhuan/xchat_android_core/withdraw/event/ExchangeInfoEvent.java rename to core/src/main/java/com/pikolive/core/withdraw/event/ExchangeInfoEvent.java index c8cdc5bbc..5a07800cd 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/withdraw/event/ExchangeInfoEvent.java +++ b/core/src/main/java/com/pikolive/core/withdraw/event/ExchangeInfoEvent.java @@ -1,7 +1,9 @@ -package com.yizhuan.xchat_android_core.withdraw.event; +package com.pikolive.core.withdraw.event; -import com.yizhuan.xchat_android_core.base.BaseDataEvent; -import com.yizhuan.xchat_android_core.withdraw.bean.ExchangerInfo; +import com.pikolive.core.base.BaseDataEvent; +import com.pikolive.core.base.BaseDataEvent; +import com.pikolive.core.base.BaseDataEvent; +import com.pikolive.core.withdraw.bean.ExchangerInfo; /** * Created by Administrator on 2018/9/17. diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/withdraw/event/WithdrawInfoEvent.java b/core/src/main/java/com/pikolive/core/withdraw/event/WithdrawInfoEvent.java similarity index 53% rename from core/src/main/java/com/yizhuan/xchat_android_core/withdraw/event/WithdrawInfoEvent.java rename to core/src/main/java/com/pikolive/core/withdraw/event/WithdrawInfoEvent.java index ebbf344d2..cb5dcfa1a 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/withdraw/event/WithdrawInfoEvent.java +++ b/core/src/main/java/com/pikolive/core/withdraw/event/WithdrawInfoEvent.java @@ -1,7 +1,9 @@ -package com.yizhuan.xchat_android_core.withdraw.event; +package com.pikolive.core.withdraw.event; -import com.yizhuan.xchat_android_core.base.BaseDataEvent; -import com.yizhuan.xchat_android_core.withdraw.bean.WithdrawInfo; +import com.pikolive.core.base.BaseDataEvent; +import com.pikolive.core.base.BaseDataEvent; +import com.pikolive.core.base.BaseDataEvent; +import com.pikolive.core.withdraw.bean.WithdrawInfo; /** * create by lvzebiao on 2018/9/8 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/activity/model/ActivityModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/activity/model/ActivityModel.java deleted file mode 100644 index db3748c28..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/activity/model/ActivityModel.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.yizhuan.xchat_android_core.activity.model; - -import com.yizhuan.xchat_android_core.base.BaseModel; - -public class ActivityModel extends BaseModel implements IActivityModel { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/activity/model/IActivityModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/activity/model/IActivityModel.java deleted file mode 100644 index 11eb61758..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/activity/model/IActivityModel.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.yizhuan.xchat_android_core.activity.model; - -import com.yizhuan.xchat_android_core.base.IModel; - -public interface IActivityModel extends IModel { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/base/IModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/base/IModel.java deleted file mode 100644 index 04cf243d2..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/base/IModel.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.yizhuan.xchat_android_core.base; - -public interface IModel { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/ActionDialogResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/ActionDialogResult.java deleted file mode 100644 index ce3c71bd2..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/ActionDialogResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.yizhuan.xchat_android_core.bean.response.result; - - -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.redPacket.bean.ActionDialogInfo; - -import java.util.List; - -/** - * Created by zhouxiangfeng on 2017/5/28. - */ - -public class ActionDialogResult extends ServiceResult> { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/AttentionListResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/AttentionListResult.java deleted file mode 100644 index 14547fe5c..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/AttentionListResult.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.yizhuan.xchat_android_core.bean.response.result; - -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.user.bean.AttentionInfo; - -import java.util.List; - -/** - * Created by Administrator on 2017/7/5 0005. - */ - -public class AttentionListResult extends ServiceResult> { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/AuctionInfoResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/AuctionInfoResult.java deleted file mode 100644 index 042616116..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/AuctionInfoResult.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.yizhuan.xchat_android_core.bean.response.result; - -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.room.auction.bean.AuctionInfo; - -/** - * Created by zhouxiangfeng on 2017/5/28. - */ - -public class AuctionInfoResult extends ServiceResult { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/AuctionListUserInfoResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/AuctionListUserInfoResult.java deleted file mode 100644 index f29181434..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/AuctionListUserInfoResult.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.yizhuan.xchat_android_core.bean.response.result; - -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.room.auction.bean.AuctionListUserInfo; - -import java.util.List; - -/** - * Created by chenran on 2017/8/9. - */ - -public class AuctionListUserInfoResult extends ServiceResult> { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/AuctionUserListResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/AuctionUserListResult.java deleted file mode 100644 index de26b217a..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/AuctionUserListResult.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.yizhuan.xchat_android_core.bean.response.result; - -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.room.auction.bean.AuctionUser; - -import java.util.List; - -/** - * Created by zhouxiangfeng on 2017/5/28. - */ - -public class AuctionUserListResult extends ServiceResult> { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/AuctionUserResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/AuctionUserResult.java deleted file mode 100644 index 5033228e9..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/AuctionUserResult.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.yizhuan.xchat_android_core.bean.response.result; - -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.room.auction.bean.AuctionUser; - -/** - * Created by zhouxiangfeng on 2017/5/28. - */ - -public class AuctionUserResult extends ServiceResult { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/BoolApiResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/BoolApiResult.java deleted file mode 100644 index e717f7b92..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/BoolApiResult.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.yizhuan.xchat_android_core.bean.response.result; - -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; - -/** - * Created by chenran on 2017/2/16. - */ - -public class BoolApiResult extends ServiceResult{ - -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/BooleanResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/BooleanResult.java deleted file mode 100644 index 96a767260..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/BooleanResult.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.yizhuan.xchat_android_core.bean.response.result; - -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; - -/** - * Created by zhouxiangfeng on 2017/5/27. - */ - -public class BooleanResult extends ServiceResult { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/CheckLostUserResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/CheckLostUserResult.java deleted file mode 100644 index adbf08fc4..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/CheckLostUserResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.yizhuan.xchat_android_core.bean.response.result; - -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.recall.bean.CheckLostUserInfo; - -public class CheckLostUserResult extends ServiceResult { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/ExchangeInfoResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/ExchangeInfoResult.java deleted file mode 100644 index a2ee4bde2..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/ExchangeInfoResult.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.yizhuan.xchat_android_core.bean.response.result; - -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.withdraw.bean.ExchangerInfo; - -/** - * Created by Administrator on 2017/7/5 0005. - */ - -public class ExchangeInfoResult extends ServiceResult { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/FaceResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/FaceResult.java deleted file mode 100644 index a0ce5823c..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/FaceResult.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.yizhuan.xchat_android_core.bean.response.result; - -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.room.face.FaceListInfo; - -/** - * Created by chenran on 2017/7/27. - */ - -public class FaceResult extends ServiceResult{ -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/FansListResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/FansListResult.java deleted file mode 100644 index 4ba9d2e02..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/FansListResult.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.yizhuan.xchat_android_core.bean.response.result; - -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.user.bean.FansListInfo; - -/** - * Created by Administrator on 2017/7/5 0005. - */ - -public class FansListResult extends ServiceResult { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/GiftInfosResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/GiftInfosResult.java deleted file mode 100644 index 28888fe7f..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/GiftInfosResult.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.yizhuan.xchat_android_core.bean.response.result; - -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.bills.bean.TextInfos; - -/** - * Created by Seven on 2017/9/9. - */ - -public class GiftInfosResult extends ServiceResult { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/GiftRecieveInfoResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/GiftRecieveInfoResult.java deleted file mode 100644 index 7a0ab12ef..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/GiftRecieveInfoResult.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.yizhuan.xchat_android_core.bean.response.result; - -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.gift.bean.GiftReceiveInfo; - -/** - * Created by chenran on 2017/11/25. - */ - -public class GiftRecieveInfoResult extends ServiceResult { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/GiftResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/GiftResult.java deleted file mode 100644 index 7205f2dc4..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/GiftResult.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.yizhuan.xchat_android_core.bean.response.result; - -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.gift.bean.GiftListInfo; - -/** - * Created by chenran on 2017/7/27. - */ - -public class GiftResult extends ServiceResult{ -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/GiftWallListResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/GiftWallListResult.java deleted file mode 100644 index 601ea7809..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/GiftWallListResult.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.yizhuan.xchat_android_core.bean.response.result; - -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.user.bean.GiftWallInfo; - -import java.util.List; - -/** - * Created by chenran on 2017/10/17. - */ - -public class GiftWallListResult extends ServiceResult> { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/GoBackResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/GoBackResult.java deleted file mode 100644 index f6a3fb1de..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/GoBackResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.yizhuan.xchat_android_core.bean.response.result; - -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.recall.bean.GoBackInfo; - -public class GoBackResult extends ServiceResult { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/IdQueryUserInfoResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/IdQueryUserInfoResult.java deleted file mode 100644 index e8631b176..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/IdQueryUserInfoResult.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.yizhuan.xchat_android_core.bean.response.result; - -import com.yizhuan.xchat_android_core.auth.entity.AccountInfo; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; - -/** - * Created by chenran on 2017/2/16. - */ - -public class IdQueryUserInfoResult extends ServiceResult{ - -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/InitResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/InitResult.java deleted file mode 100644 index 545c45fd7..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/InitResult.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.yizhuan.xchat_android_core.bean.response.result; - -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.initial.bean.InitInfo; - -/** - * @author xiaoyu - * @date 2017/12/8 - */ - -public class InitResult extends ServiceResult { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/IntegerResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/IntegerResult.java deleted file mode 100644 index 5a015cfcb..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/IntegerResult.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.yizhuan.xchat_android_core.bean.response.result; - -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; - -/** - * Created by chenran on 2017/11/15. - */ - -public class IntegerResult extends ServiceResult { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/MultiGiftRecieveInfoResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/MultiGiftRecieveInfoResult.java deleted file mode 100644 index 5857899b3..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/MultiGiftRecieveInfoResult.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.yizhuan.xchat_android_core.bean.response.result; - -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.gift.bean.MultiGiftReceiveInfo; - -/** - * Created by chenran on 2017/11/25. - */ - -public class MultiGiftRecieveInfoResult extends ServiceResult{ -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/RedDrawListInfoResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/RedDrawListInfoResult.java deleted file mode 100644 index 13b7d9a91..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/RedDrawListInfoResult.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.yizhuan.xchat_android_core.bean.response.result; - -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.redPacket.bean.RedDrawListInfo; - -import java.util.List; - -/** - * Created by chenran on 2017/12/4. - */ - -public class RedDrawListInfoResult extends ServiceResult> { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/RedPacketResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/RedPacketResult.java deleted file mode 100644 index 07911a56a..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/RedPacketResult.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.yizhuan.xchat_android_core.bean.response.result; - - -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.redPacket.bean.RedPacketInfo; - -/** - * Created by zhouxiangfeng on 2017/5/28. - */ - -public class RedPacketResult extends ServiceResult { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/RegisterResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/RegisterResult.java deleted file mode 100644 index ef094f279..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/RegisterResult.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.yizhuan.xchat_android_core.bean.response.result; - -import com.yizhuan.xchat_android_core.auth.entity.TicketInfo; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; - -/** - * Created by chenran on 2017/2/16. - */ - -public class RegisterResult extends ServiceResult{ - -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/RoomConsumeInfoListResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/RoomConsumeInfoListResult.java deleted file mode 100644 index 6e25cdd2f..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/RoomConsumeInfoListResult.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.yizhuan.xchat_android_core.bean.response.result; - -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.room.queue.bean.RoomConsumeInfo; - -import java.util.List; - -/** - * Created by chenran on 2017/10/2. - */ - -public class RoomConsumeInfoListResult extends ServiceResult> { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/RoomRewardResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/RoomRewardResult.java deleted file mode 100644 index 2ef541686..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/RoomRewardResult.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.yizhuan.xchat_android_core.bean.response.result; - -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.im.custom.bean.RewardBean; - -/** - * Created by zhouxiangfeng on 2017/5/4. - */ - -public class RoomRewardResult extends ServiceResult { - -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/ShareRedPacketResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/ShareRedPacketResult.java deleted file mode 100644 index 04338b2f5..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/ShareRedPacketResult.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.yizhuan.xchat_android_core.bean.response.result; - - -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.redPacket.bean.ShareRedBagInfo; - -/** - * Created by zhouxiangfeng on 2017/5/28. - */ - -public class ShareRedPacketResult extends ServiceResult { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/TabResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/TabResult.java deleted file mode 100644 index a7a64544b..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/TabResult.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.yizhuan.xchat_android_core.bean.response.result; - -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.room.bean.RoomSettingTabInfo; - -import java.util.List; - -/** - *

- * - * @author Administrator - * @date 2017/11/21 - */ -public class TabResult extends ServiceResult> { - -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/TicketResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/TicketResult.java deleted file mode 100644 index ef8710945..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/TicketResult.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.yizhuan.xchat_android_core.bean.response.result; - -import com.yizhuan.xchat_android_core.auth.entity.TicketInfo; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; - -/** - * Created by zhouxiangfeng on 2017/5/4. - */ - -public class TicketResult extends ServiceResult { - -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/UserListResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/UserListResult.java deleted file mode 100644 index ff3ace107..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/UserListResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.yizhuan.xchat_android_core.bean.response.result; - -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; - -import java.util.List; - -/** - * Created by zhouxiangfeng on 2017/5/4. - */ - -public class UserListResult extends ServiceResult> { - -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/UserResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/UserResult.java deleted file mode 100644 index 12aeecc16..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/UserResult.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.yizhuan.xchat_android_core.bean.response.result; - -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; - -/** - * Created by zhouxiangfeng on 2017/5/4. - */ - -public class UserResult extends ServiceResult { - -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/VersionsResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/VersionsResult.java deleted file mode 100644 index 2ad2ef215..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/VersionsResult.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.yizhuan.xchat_android_core.bean.response.result; - -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; - -/** - * Created by Administrator on 2017/7/12 0012. - */ - -public class VersionsResult extends ServiceResult { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/WalletInfoResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/WalletInfoResult.java deleted file mode 100644 index 3e50b0218..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/WalletInfoResult.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.yizhuan.xchat_android_core.bean.response.result; - -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.pay.bean.WalletInfo; - -/** - * Created by zhouxiangfeng on 2017/5/4. - */ - -public class WalletInfoResult extends ServiceResult { - -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/WithdrawListResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/WithdrawListResult.java deleted file mode 100644 index 9121ce92a..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/WithdrawListResult.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.yizhuan.xchat_android_core.bean.response.result; - -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.withdraw.bean.WithdrwaListInfo; - -import java.util.List; - -/** - * Created by Administrator on 2017/7/5 0005. - */ - -public class WithdrawListResult extends ServiceResult> { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/WithdrawRedListResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/WithdrawRedListResult.java deleted file mode 100644 index eb6e4fa4d..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/WithdrawRedListResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.yizhuan.xchat_android_core.bean.response.result; - - -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.redPacket.bean.WithdrawRedListInfo; - -import java.util.List; - -/** - * Created by zhouxiangfeng on 2017/5/28. - */ - -public class WithdrawRedListResult extends ServiceResult> { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/WithdrawRedSucceedResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/WithdrawRedSucceedResult.java deleted file mode 100644 index 58031c54e..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/WithdrawRedSucceedResult.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.yizhuan.xchat_android_core.bean.response.result; - - -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.redPacket.bean.WithdrawRedSucceedInfo; - -/** - * Created by zhouxiangfeng on 2017/5/28. - */ - -public class WithdrawRedSucceedResult extends ServiceResult { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/WithdrawUserInfoResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/WithdrawUserInfoResult.java deleted file mode 100644 index 8b6cd1e9f..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bean/response/result/WithdrawUserInfoResult.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.yizhuan.xchat_android_core.bean.response.result; - -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.withdraw.bean.WithdrawInfo; - -/** - * Created by zhouxiangfeng on 2017/5/4. - */ - -public class WithdrawUserInfoResult extends ServiceResult { - -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bills/IRadishGiftModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/bills/IRadishGiftModel.java deleted file mode 100644 index d66dc2cee..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bills/IRadishGiftModel.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.yizhuan.xchat_android_core.bills; - -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.bills.result.RadishGiftResult; -import com.yizhuan.xchat_android_core.user.bean.RadishWallInfo; - -import java.util.List; - -import io.reactivex.Single; - -public interface IRadishGiftModel extends IModel { - Single getRadishRecord(int page, int pageSize, long date, byte type); - Single> getRadishWall(long uid); -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bills/result/ChargeResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bills/result/ChargeResult.java deleted file mode 100644 index 14d4e9304..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bills/result/ChargeResult.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.yizhuan.xchat_android_core.bills.result; - -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.bills.bean.ExpendListInfo; - -/** - * Created by Seven on 2017/9/9. - */ - -public class ChargeResult extends ServiceResult { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bills/result/ExpendResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bills/result/ExpendResult.java deleted file mode 100644 index a5815545b..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bills/result/ExpendResult.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.yizhuan.xchat_android_core.bills.result; - -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.bills.bean.ExpendListInfo; - -/** - * Created by Seven on 2017/9/9. - */ - -public class ExpendResult extends ServiceResult { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bills/result/IncomedResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bills/result/IncomedResult.java deleted file mode 100644 index 9c8d5dd66..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bills/result/IncomedResult.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.yizhuan.xchat_android_core.bills.result; - -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.bills.bean.IncomeListInfo; - -/** - * Created by Seven on 2017/9/9. - */ - -public class IncomedResult extends ServiceResult { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bills/result/RadishGiftResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bills/result/RadishGiftResult.java deleted file mode 100644 index 949c18b6e..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bills/result/RadishGiftResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.yizhuan.xchat_android_core.bills.result; - -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.bills.bean.RadishGiftListInfo; - -public class RadishGiftResult extends ServiceResult { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/bills/result/RedBagResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/bills/result/RedBagResult.java deleted file mode 100644 index 26190396a..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/bills/result/RedBagResult.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.yizhuan.xchat_android_core.bills.result; - -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.bills.bean.RedBagListInfo; - -/** - * Created by Seven on 2017/9/9. - */ - -public class RedBagResult extends ServiceResult { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/contacts/IContactModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/contacts/IContactModel.java deleted file mode 100644 index 6deae58dc..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/contacts/IContactModel.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.yizhuan.xchat_android_core.contacts; - -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.room.bean.SearchRoomInfo; - -import java.util.List; - -import io.reactivex.Single; - -public interface IContactModel extends IModel { - - Single>> searchContacts(String keyword); -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/nameplate/INamePlateModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/decoration/nameplate/INamePlateModel.java deleted file mode 100644 index 87b11fce7..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/decoration/nameplate/INamePlateModel.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.yizhuan.xchat_android_core.decoration.nameplate; - -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.decoration.nameplate.bean.NamePlateInfo; - -import io.reactivex.Single; - -public interface INamePlateModel extends IModel { - - /** - * 获取我的铭牌列表 - * - * @return - */ - Single> getNamePlateList(long uid); - -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/FamilyPlazaInfo.java b/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/FamilyPlazaInfo.java deleted file mode 100644 index 813dd06e0..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/family/bean/FamilyPlazaInfo.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.yizhuan.xchat_android_core.family.bean; - -import com.yizhuan.xchat_android_core.family.bean.response.familyPlaza.RespFamily; - -import java.util.List; - -import lombok.Data; - -/** - * @author jack - * @Description - * @Date 2018/5/31 - */ -@Data -public class FamilyPlazaInfo { - private List banners; - private RespFamily familys; -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftLuckyBag.java b/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftLuckyBag.java deleted file mode 100644 index f26280bca..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/gift/bean/GiftLuckyBag.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.yizhuan.xchat_android_core.gift.bean; - -public class GiftLuckyBag { - -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/im/chatterbox/HideInputEvent.java b/core/src/main/java/com/yizhuan/xchat_android_core/im/chatterbox/HideInputEvent.java deleted file mode 100644 index 55e610e44..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/im/chatterbox/HideInputEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.yizhuan.xchat_android_core.im.chatterbox; - -public class HideInputEvent { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/linked/ILinkedModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/linked/ILinkedModel.java deleted file mode 100644 index 218a3015c..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/linked/ILinkedModel.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.yizhuan.xchat_android_core.linked; - -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.linked.bean.LinkedInfo; - - -public interface ILinkedModel extends IModel { - - void setLinkedInfo(LinkedInfo linkedInfo); - - LinkedInfo getLinkedInfo(); - -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/radish/RadishRecordResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/radish/RadishRecordResult.java deleted file mode 100644 index 65f29d5cc..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/radish/RadishRecordResult.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.yizhuan.xchat_android_core.radish; - -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.bills.bean.RadishRecordListInfo; - -public class RadishRecordResult extends ServiceResult { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/ISignInModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/ISignInModel.java deleted file mode 100644 index f6f7af134..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/radish/signin/ISignInModel.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.yizhuan.xchat_android_core.radish.signin; - -import com.yizhuan.xchat_android_core.radish.signin.bean.DrawNoticeInfo; -import com.yizhuan.xchat_android_core.radish.signin.bean.ReceiveTotalRewardInfo; -import com.yizhuan.xchat_android_core.radish.signin.bean.ReplenishSignInfo; -import com.yizhuan.xchat_android_core.radish.signin.bean.RewardNoticeInfo; -import com.yizhuan.xchat_android_core.radish.signin.bean.SignDetailInfo; -import com.yizhuan.xchat_android_core.radish.signin.bean.SignDrawInfo; -import com.yizhuan.xchat_android_core.radish.signin.bean.SignInfo; - -import java.util.List; - -import io.reactivex.Single; - -/** - * create by lvzebiao @2019/3/14 - */ -public interface ISignInModel { - - Single sign(); - - Single signDetail(); - - Single signDraw(); - - Single signRemind(); - - Single> drawNotice(); - - Single> getRewardTotalNotice(); - - Single> getRewardTodayNotice(); - - Single getShareImage(int shareType, String day, String reward); - - Single receiveTotalReward(long configId); - - void signShare(); - - Single insertSignDay(int signDay); - - /** - * 获取补签信息 - */ - Single getReplenishSignInfo(int signDay); - - /** - * 补签 - */ - Single replenishSign(int signDay); - -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/recall/IRecallModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/recall/IRecallModel.java deleted file mode 100644 index cdc20ed55..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/recall/IRecallModel.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.yizhuan.xchat_android_core.recall; - -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.recall.bean.CheckLostUserInfo; - -import io.reactivex.Single; - -public interface IRecallModel extends IModel { - - // 查询是否是回归状态 - Single checkLostUser(long uid); - // 接收回归礼物 - void goBack(String uid, String inviteCode); -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/recall/event/GoBackEvent.java b/core/src/main/java/com/yizhuan/xchat_android_core/recall/event/GoBackEvent.java deleted file mode 100644 index c1658fc36..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/recall/event/GoBackEvent.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.yizhuan.xchat_android_core.recall.event; - -import com.yizhuan.xchat_android_core.base.BaseDataEvent; -import com.yizhuan.xchat_android_core.recall.bean.GoBackInfo; - -public class GoBackEvent extends BaseDataEvent { - - public GoBackEvent(GoBackInfo goBackInfo) { - super(goBackInfo); - } - - public GoBackEvent(String error) { - super(error); - } -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/redPacket/IRedPacketModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/redPacket/IRedPacketModel.java deleted file mode 100644 index 91ec563a1..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/redPacket/IRedPacketModel.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.yizhuan.xchat_android_core.redPacket; - -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.redPacket.bean.ActionDialogInfo; -import com.yizhuan.xchat_android_core.redPacket.bean.RedDrawListInfo; -import com.yizhuan.xchat_android_core.redPacket.bean.RedPacketInfo; -import com.yizhuan.xchat_android_core.redPacket.bean.WithdrawRedListInfo; -import com.yizhuan.xchat_android_core.redPacket.bean.WithdrawRedSucceedInfo; - -import java.util.List; - -import io.reactivex.Single; - -/** - * Created by ${Seven} on 2017/9/20. - */ - -public interface IRedPacketModel extends IModel { - //获取红包页面信息 - Single getRedPacketInfo(); - //进入主界面有红包后设置弹窗类型 1，首页 2直播间 - Single> getActionDialog(int type); - //获取红包提现列表 - Single> getRedList(); - //发起红包提现 - Single getRedWithdraw(long uid, int packetId, String pwd); - //获取红包提现列表 - Single> getRedDrawList(); -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/redpackage/RedEnvelopeGiftItemVO.kt b/core/src/main/java/com/yizhuan/xchat_android_core/redpackage/RedEnvelopeGiftItemVO.kt deleted file mode 100644 index 0fc100dab..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/redpackage/RedEnvelopeGiftItemVO.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.yizhuan.xchat_android_core.redpackage - -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo - - -data class RedEnvelopeGiftItemVO( - var giftNum: Int = 0, - var giftVo: GiftInfo? = null -) \ No newline at end of file diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/relation/cp/CpBindUnbindEvent.java b/core/src/main/java/com/yizhuan/xchat_android_core/relation/cp/CpBindUnbindEvent.java deleted file mode 100644 index f03544110..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/relation/cp/CpBindUnbindEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.yizhuan.xchat_android_core.relation.cp; - -public class CpBindUnbindEvent { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomResult.java b/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomResult.java deleted file mode 100644 index 9920944fe..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/bean/RoomResult.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.yizhuan.xchat_android_core.room.bean; - -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; - -/** - * Created by zhouxiangfeng on 2017/5/4. - */ - -public class RoomResult extends ServiceResult { - -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/event/EixtCountDownEvent.java b/core/src/main/java/com/yizhuan/xchat_android_core/room/event/EixtCountDownEvent.java deleted file mode 100644 index c11649b4c..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/event/EixtCountDownEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.yizhuan.xchat_android_core.room.event; - -public class EixtCountDownEvent { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/event/FaceIsReadyEvent.java b/core/src/main/java/com/yizhuan/xchat_android_core/room/event/FaceIsReadyEvent.java deleted file mode 100644 index 46c947c13..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/event/FaceIsReadyEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.yizhuan.xchat_android_core.room.event; - -public class FaceIsReadyEvent { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/event/FinishAvRoomEvent.java b/core/src/main/java/com/yizhuan/xchat_android_core/room/event/FinishAvRoomEvent.java deleted file mode 100644 index bd6c9fa2c..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/event/FinishAvRoomEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.yizhuan.xchat_android_core.room.event; - -public class FinishAvRoomEvent { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/event/RoomClearScreenEvent.java b/core/src/main/java/com/yizhuan/xchat_android_core/room/event/RoomClearScreenEvent.java deleted file mode 100644 index daafca048..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/event/RoomClearScreenEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.yizhuan.xchat_android_core.room.event; - -public class RoomClearScreenEvent { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/PKMemberInfo.java b/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/PKMemberInfo.java deleted file mode 100644 index 279f7ec00..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/pk/bean/PKMemberInfo.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.yizhuan.xchat_android_core.room.pk.bean; - -import com.yizhuan.xchat_android_core.user.bean.UserInfo; - -import lombok.Data; - -/** - * @author jack - * @Description - * @Date 2019/1/8 - */ -@Data -public class PKMemberInfo { - private int teamId; - private UserInfo userInfo; -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/queuing_mic/event/QueuingMicEmptyEvent.java b/core/src/main/java/com/yizhuan/xchat_android_core/room/queuing_mic/event/QueuingMicEmptyEvent.java deleted file mode 100644 index 652334e25..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/queuing_mic/event/QueuingMicEmptyEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.yizhuan.xchat_android_core.room.queuing_mic.event; - -public class QueuingMicEmptyEvent { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/queuing_mic/event/QueuingMicNotEmptyEvent.java b/core/src/main/java/com/yizhuan/xchat_android_core/room/queuing_mic/event/QueuingMicNotEmptyEvent.java deleted file mode 100644 index 30eb36d5f..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/queuing_mic/event/QueuingMicNotEmptyEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.yizhuan.xchat_android_core.room.queuing_mic.event; - -public class QueuingMicNotEmptyEvent { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/recommendpos/IRecommendCardModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/room/recommendpos/IRecommendCardModel.java deleted file mode 100644 index a69ee8d2d..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/recommendpos/IRecommendCardModel.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.yizhuan.xchat_android_core.room.recommendpos; - -import com.yizhuan.xchat_android_core.room.recommendpos.bean.RecommendCard; - -import java.util.List; - -import io.reactivex.Single; - -/** - * Created by lvzebiao on 2019/1/30. - */ - -public interface IRecommendCardModel { - - /** - * 我的推荐卡接口 - * - * @param status {@link com.yizhuan.xchat_android_core.room.recommendpos.bean.RcmdCardType} - * @return list - */ - Single> getBagList(int status, int page, int pageSize); - -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/room/treasure_box/event/RefreshBoxRankingEvent.java b/core/src/main/java/com/yizhuan/xchat_android_core/room/treasure_box/event/RefreshBoxRankingEvent.java deleted file mode 100644 index a6e97400d..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/room/treasure_box/event/RefreshBoxRankingEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.yizhuan.xchat_android_core.room.treasure_box.event; - -public class RefreshBoxRankingEvent { -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/user/event/ShowMeEvent.kt b/core/src/main/java/com/yizhuan/xchat_android_core/user/event/ShowMeEvent.kt deleted file mode 100644 index 3a0e66998..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/user/event/ShowMeEvent.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.yizhuan.xchat_android_core.user.event - -class ShowMeEvent diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/utils/CheckUtils.java b/core/src/main/java/com/yizhuan/xchat_android_core/utils/CheckUtils.java deleted file mode 100644 index f18006e9a..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/utils/CheckUtils.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.yizhuan.xchat_android_core.utils; - -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.initial.InitialModel; -import com.yizhuan.xchat_android_core.initial.bean.InitInfo; -import com.pikolive.library.utils.ListUtils; - -public class CheckUtils { - - public static boolean isCheckUser() { - InitInfo initInfo = InitialModel.get().getCacheInitInfo(); - if (initInfo == null || ListUtils.isListEmpty(initInfo.getCheckUids())) return false; - return initInfo.getCheckUids().contains(AuthModel.get().getCurrentUid()); - } -} diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/vip/VipOpenEvent.kt b/core/src/main/java/com/yizhuan/xchat_android_core/vip/VipOpenEvent.kt deleted file mode 100644 index a58306696..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/vip/VipOpenEvent.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.yizhuan.xchat_android_core.vip - - class VipOpenEvent diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/web/event/WebViewRefreshEvent.java b/core/src/main/java/com/yizhuan/xchat_android_core/web/event/WebViewRefreshEvent.java deleted file mode 100644 index 904ae9f12..000000000 --- a/core/src/main/java/com/yizhuan/xchat_android_core/web/event/WebViewRefreshEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.yizhuan.xchat_android_core.web.event; - -public class WebViewRefreshEvent { -} diff --git a/core/src/model_bank_card/java/com/yizhuan/xchat_android_core/bank_card/bean/BankCardBean.java b/core/src/model_bank_card/java/com/pikolive/core/bank_card/bean/BankCardBean.java similarity index 93% rename from core/src/model_bank_card/java/com/yizhuan/xchat_android_core/bank_card/bean/BankCardBean.java rename to core/src/model_bank_card/java/com/pikolive/core/bank_card/bean/BankCardBean.java index 362b9a69f..6cc6fb690 100644 --- a/core/src/model_bank_card/java/com/yizhuan/xchat_android_core/bank_card/bean/BankCardBean.java +++ b/core/src/model_bank_card/java/com/pikolive/core/bank_card/bean/BankCardBean.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.bank_card.bean; +package com.pikolive.core.bank_card.bean; import lombok.Data; diff --git a/core/src/model_bank_card/java/com/yizhuan/xchat_android_core/bank_card/bean/BankCardListResp.java b/core/src/model_bank_card/java/com/pikolive/core/bank_card/bean/BankCardListResp.java similarity index 90% rename from core/src/model_bank_card/java/com/yizhuan/xchat_android_core/bank_card/bean/BankCardListResp.java rename to core/src/model_bank_card/java/com/pikolive/core/bank_card/bean/BankCardListResp.java index 1b9d92b86..f81e90c96 100644 --- a/core/src/model_bank_card/java/com/yizhuan/xchat_android_core/bank_card/bean/BankCardListResp.java +++ b/core/src/model_bank_card/java/com/pikolive/core/bank_card/bean/BankCardListResp.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.bank_card.bean; +package com.pikolive.core.bank_card.bean; import java.util.List; diff --git a/core/src/model_bank_card/java/com/yizhuan/xchat_android_core/bank_card/exception/NeedBindBankCardException.java b/core/src/model_bank_card/java/com/pikolive/core/bank_card/exception/NeedBindBankCardException.java similarity index 63% rename from core/src/model_bank_card/java/com/yizhuan/xchat_android_core/bank_card/exception/NeedBindBankCardException.java rename to core/src/model_bank_card/java/com/pikolive/core/bank_card/exception/NeedBindBankCardException.java index 2678f0915..81b585789 100644 --- a/core/src/model_bank_card/java/com/yizhuan/xchat_android_core/bank_card/exception/NeedBindBankCardException.java +++ b/core/src/model_bank_card/java/com/pikolive/core/bank_card/exception/NeedBindBankCardException.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.bank_card.exception; +package com.pikolive.core.bank_card.exception; -import com.yizhuan.xchat_android_core.exception.FailReasonException; +import com.pikolive.core.exception.FailReasonException; /** * Created by MadisonRong on 2019-08-16 diff --git a/core/src/model_bank_card/java/com/yizhuan/xchat_android_core/bank_card/model/BankCardModel.java b/core/src/model_bank_card/java/com/pikolive/core/bank_card/model/BankCardModel.java similarity index 92% rename from core/src/model_bank_card/java/com/yizhuan/xchat_android_core/bank_card/model/BankCardModel.java rename to core/src/model_bank_card/java/com/pikolive/core/bank_card/model/BankCardModel.java index 0e693a01a..751e1217b 100644 --- a/core/src/model_bank_card/java/com/yizhuan/xchat_android_core/bank_card/model/BankCardModel.java +++ b/core/src/model_bank_card/java/com/pikolive/core/bank_card/model/BankCardModel.java @@ -1,11 +1,11 @@ -package com.yizhuan.xchat_android_core.bank_card.model; +package com.pikolive.core.bank_card.model; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.bank_card.bean.BankCardListResp; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.bank_card.bean.BankCardListResp; +import com.pikolive.core.Constants; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.net.rxnet.RxNet; import io.reactivex.Single; diff --git a/core/src/model_bank_card/java/com/yizhuan/xchat_android_core/bank_card/model/IBankCardModel.java b/core/src/model_bank_card/java/com/pikolive/core/bank_card/model/IBankCardModel.java similarity index 87% rename from core/src/model_bank_card/java/com/yizhuan/xchat_android_core/bank_card/model/IBankCardModel.java rename to core/src/model_bank_card/java/com/pikolive/core/bank_card/model/IBankCardModel.java index 0571b4d0a..b10abf870 100644 --- a/core/src/model_bank_card/java/com/yizhuan/xchat_android_core/bank_card/model/IBankCardModel.java +++ b/core/src/model_bank_card/java/com/pikolive/core/bank_card/model/IBankCardModel.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.bank_card.model; +package com.pikolive.core.bank_card.model; -import com.yizhuan.xchat_android_core.bank_card.bean.BankCardListResp; -import com.yizhuan.xchat_android_core.base.IModel; +import com.pikolive.core.bank_card.bean.BankCardListResp; +import com.pikolive.core.base.IModel; import io.reactivex.Single; diff --git a/core/src/model_bank_card/java/com/yizhuan/xchat_android_core/bank_card/view/IAddBankCardAgreementView.java b/core/src/model_bank_card/java/com/pikolive/core/bank_card/view/IAddBankCardAgreementView.java similarity index 93% rename from core/src/model_bank_card/java/com/yizhuan/xchat_android_core/bank_card/view/IAddBankCardAgreementView.java rename to core/src/model_bank_card/java/com/pikolive/core/bank_card/view/IAddBankCardAgreementView.java index 253ae3b7a..fb4dce96a 100644 --- a/core/src/model_bank_card/java/com/yizhuan/xchat_android_core/bank_card/view/IAddBankCardAgreementView.java +++ b/core/src/model_bank_card/java/com/pikolive/core/bank_card/view/IAddBankCardAgreementView.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.bank_card.view; +package com.pikolive.core.bank_card.view; import com.pikolive.library.base.IMvpBaseView; diff --git a/core/src/model_bank_card/java/com/yizhuan/xchat_android_core/bank_card/view/IBankCardView.java b/core/src/model_bank_card/java/com/pikolive/core/bank_card/view/IBankCardView.java similarity index 86% rename from core/src/model_bank_card/java/com/yizhuan/xchat_android_core/bank_card/view/IBankCardView.java rename to core/src/model_bank_card/java/com/pikolive/core/bank_card/view/IBankCardView.java index 2ca981f5b..4511dff8a 100644 --- a/core/src/model_bank_card/java/com/yizhuan/xchat_android_core/bank_card/view/IBankCardView.java +++ b/core/src/model_bank_card/java/com/pikolive/core/bank_card/view/IBankCardView.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.bank_card.view; +package com.pikolive.core.bank_card.view; -import com.yizhuan.xchat_android_core.bank_card.bean.BankCardListResp; +import com.pikolive.core.bank_card.bean.BankCardListResp; import com.pikolive.library.base.IMvpBaseView; /** diff --git a/core/src/model_channel_page/java/com/yizhuan/xchat_android_core/channel_page/bean/ChannelPageInfo.java b/core/src/model_channel_page/java/com/pikolive/core/channel_page/bean/ChannelPageInfo.java similarity index 74% rename from core/src/model_channel_page/java/com/yizhuan/xchat_android_core/channel_page/bean/ChannelPageInfo.java rename to core/src/model_channel_page/java/com/pikolive/core/channel_page/bean/ChannelPageInfo.java index 195325678..7ec124ef3 100644 --- a/core/src/model_channel_page/java/com/yizhuan/xchat_android_core/channel_page/bean/ChannelPageInfo.java +++ b/core/src/model_channel_page/java/com/pikolive/core/channel_page/bean/ChannelPageInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.channel_page.bean; +package com.pikolive.core.channel_page.bean; import lombok.Data; diff --git a/core/src/model_channel_page/java/com/yizhuan/xchat_android_core/channel_page/bean/HelloMessageInfo.kt b/core/src/model_channel_page/java/com/pikolive/core/channel_page/bean/HelloMessageInfo.kt similarity index 77% rename from core/src/model_channel_page/java/com/yizhuan/xchat_android_core/channel_page/bean/HelloMessageInfo.kt rename to core/src/model_channel_page/java/com/pikolive/core/channel_page/bean/HelloMessageInfo.kt index cb32ace91..6ab133651 100644 --- a/core/src/model_channel_page/java/com/yizhuan/xchat_android_core/channel_page/bean/HelloMessageInfo.kt +++ b/core/src/model_channel_page/java/com/pikolive/core/channel_page/bean/HelloMessageInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.channel_page.bean +package com.pikolive.core.channel_page.bean import java.io.Serializable diff --git a/core/src/model_channel_page/java/com/yizhuan/xchat_android_core/channel_page/bean/NewUserHelloInfo.kt b/core/src/model_channel_page/java/com/pikolive/core/channel_page/bean/NewUserHelloInfo.kt similarity index 85% rename from core/src/model_channel_page/java/com/yizhuan/xchat_android_core/channel_page/bean/NewUserHelloInfo.kt rename to core/src/model_channel_page/java/com/pikolive/core/channel_page/bean/NewUserHelloInfo.kt index 0a404fb24..542022081 100644 --- a/core/src/model_channel_page/java/com/yizhuan/xchat_android_core/channel_page/bean/NewUserHelloInfo.kt +++ b/core/src/model_channel_page/java/com/pikolive/core/channel_page/bean/NewUserHelloInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.channel_page.bean +package com.pikolive.core.channel_page.bean import java.io.Serializable diff --git a/core/src/model_channel_page/java/com/yizhuan/xchat_android_core/channel_page/model/ChannelPageModel.java b/core/src/model_channel_page/java/com/pikolive/core/channel_page/model/ChannelPageModel.java similarity index 89% rename from core/src/model_channel_page/java/com/yizhuan/xchat_android_core/channel_page/model/ChannelPageModel.java rename to core/src/model_channel_page/java/com/pikolive/core/channel_page/model/ChannelPageModel.java index 7caa866ec..df86de804 100644 --- a/core/src/model_channel_page/java/com/yizhuan/xchat_android_core/channel_page/model/ChannelPageModel.java +++ b/core/src/model_channel_page/java/com/pikolive/core/channel_page/model/ChannelPageModel.java @@ -1,13 +1,13 @@ -package com.yizhuan.xchat_android_core.channel_page.model; +package com.pikolive.core.channel_page.model; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.channel_page.bean.ChannelPageInfo; -import com.yizhuan.xchat_android_core.channel_page.bean.HelloMessageInfo; -import com.yizhuan.xchat_android_core.channel_page.bean.NewUserHelloInfo; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.user.bean.InviteUserInfo; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.channel_page.bean.ChannelPageInfo; +import com.pikolive.core.channel_page.bean.HelloMessageInfo; +import com.pikolive.core.channel_page.bean.NewUserHelloInfo; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core.user.bean.InviteUserInfo; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.net.rxnet.RxNet; import com.pikolive.library.utils.NetworkUtils; import com.pikolive.library.utils.config.BasicConfig; diff --git a/core/src/model_channel_page/java/com/yizhuan/xchat_android_core/channel_page/model/IChannelPageModel.java b/core/src/model_channel_page/java/com/pikolive/core/channel_page/model/IChannelPageModel.java similarity index 56% rename from core/src/model_channel_page/java/com/yizhuan/xchat_android_core/channel_page/model/IChannelPageModel.java rename to core/src/model_channel_page/java/com/pikolive/core/channel_page/model/IChannelPageModel.java index 8b70c984b..fcfa14920 100644 --- a/core/src/model_channel_page/java/com/yizhuan/xchat_android_core/channel_page/model/IChannelPageModel.java +++ b/core/src/model_channel_page/java/com/pikolive/core/channel_page/model/IChannelPageModel.java @@ -1,9 +1,9 @@ -package com.yizhuan.xchat_android_core.channel_page.model; +package com.pikolive.core.channel_page.model; -import com.yizhuan.xchat_android_core.channel_page.bean.ChannelPageInfo; -import com.yizhuan.xchat_android_core.channel_page.bean.HelloMessageInfo; -import com.yizhuan.xchat_android_core.channel_page.bean.NewUserHelloInfo; -import com.yizhuan.xchat_android_core.user.bean.InviteUserInfo; +import com.pikolive.core.channel_page.bean.ChannelPageInfo; +import com.pikolive.core.channel_page.bean.HelloMessageInfo; +import com.pikolive.core.channel_page.bean.NewUserHelloInfo; +import com.pikolive.core.user.bean.InviteUserInfo; import io.reactivex.Single; diff --git a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/CommunityConstant.java b/core/src/model_community/java/com/pikolive/core/community/CommunityConstant.java similarity index 86% rename from core/src/model_community/java/com/yizhuan/xchat_android_core/community/CommunityConstant.java rename to core/src/model_community/java/com/pikolive/core/community/CommunityConstant.java index 1014608c6..22a92a6d6 100644 --- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/CommunityConstant.java +++ b/core/src/model_community/java/com/pikolive/core/community/CommunityConstant.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.community; +package com.pikolive.core.community; /** * 社区模块的一些常量定义 diff --git a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/IPublishModel.java b/core/src/model_community/java/com/pikolive/core/community/IPublishModel.java similarity index 58% rename from core/src/model_community/java/com/yizhuan/xchat_android_core/community/IPublishModel.java rename to core/src/model_community/java/com/pikolive/core/community/IPublishModel.java index cbf37d647..a8a9e06b3 100644 --- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/IPublishModel.java +++ b/core/src/model_community/java/com/pikolive/core/community/IPublishModel.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.community; +package com.pikolive.core.community; -import com.yizhuan.xchat_android_core.community.bean.MiniWorldChooseInfo; -import com.yizhuan.xchat_android_core.community.bean.PublishBody; +import com.pikolive.core.community.bean.MiniWorldChooseInfo; +import com.pikolive.core.community.bean.PublishBody; import java.util.List; diff --git a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/ImageUploadConfig.java b/core/src/model_community/java/com/pikolive/core/community/ImageUploadConfig.java similarity index 90% rename from core/src/model_community/java/com/yizhuan/xchat_android_core/community/ImageUploadConfig.java rename to core/src/model_community/java/com/pikolive/core/community/ImageUploadConfig.java index 247125648..bc936f6d3 100644 --- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/ImageUploadConfig.java +++ b/core/src/model_community/java/com/pikolive/core/community/ImageUploadConfig.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.community; +package com.pikolive.core.community; /** * 动态上传的一些配置 diff --git a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/PublishModel.java b/core/src/model_community/java/com/pikolive/core/community/PublishModel.java similarity index 83% rename from core/src/model_community/java/com/yizhuan/xchat_android_core/community/PublishModel.java rename to core/src/model_community/java/com/pikolive/core/community/PublishModel.java index 2cbb6d77e..2b2616d16 100644 --- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/PublishModel.java +++ b/core/src/model_community/java/com/pikolive/core/community/PublishModel.java @@ -1,13 +1,13 @@ -package com.yizhuan.xchat_android_core.community; +package com.pikolive.core.community; import com.google.gson.JsonElement; import com.netease.nim.uikit.common.util.log.LogUtil; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.community.bean.MiniWorldChooseInfo; -import com.yizhuan.xchat_android_core.community.bean.PublishBody; -import com.yizhuan.xchat_android_core.community.event.DynamicPublishEvent; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.community.bean.MiniWorldChooseInfo; +import com.pikolive.core.community.bean.PublishBody; +import com.pikolive.core.community.event.DynamicPublishEvent; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.net.rxnet.RxNet; import org.greenrobot.eventbus.EventBus; diff --git a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/attachment/DynamicSysAttachment.java b/core/src/model_community/java/com/pikolive/core/community/attachment/DynamicSysAttachment.java similarity index 83% rename from core/src/model_community/java/com/yizhuan/xchat_android_core/community/attachment/DynamicSysAttachment.java rename to core/src/model_community/java/com/pikolive/core/community/attachment/DynamicSysAttachment.java index 1c530d296..4173e0434 100644 --- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/attachment/DynamicSysAttachment.java +++ b/core/src/model_community/java/com/pikolive/core/community/attachment/DynamicSysAttachment.java @@ -1,9 +1,9 @@ -package com.yizhuan.xchat_android_core.community.attachment; +package com.pikolive.core.community.attachment; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.msg.sys.ErbanSysMsgInfo; +import com.pikolive.core.im.custom.bean.CustomAttachment; +import com.pikolive.core.msg.sys.ErbanSysMsgInfo; public class DynamicSysAttachment extends CustomAttachment { private ErbanSysMsgInfo erbanSysMsgInfo; diff --git a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/attachment/UnReadCountAttachment.java b/core/src/model_community/java/com/pikolive/core/community/attachment/UnReadCountAttachment.java similarity index 90% rename from core/src/model_community/java/com/yizhuan/xchat_android_core/community/attachment/UnReadCountAttachment.java rename to core/src/model_community/java/com/pikolive/core/community/attachment/UnReadCountAttachment.java index ba86e9d2a..509d0c173 100644 --- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/attachment/UnReadCountAttachment.java +++ b/core/src/model_community/java/com/pikolive/core/community/attachment/UnReadCountAttachment.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.community.attachment; +package com.pikolive.core.community.attachment; import com.alibaba.fastjson.JSONObject; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; +import com.pikolive.core.im.custom.bean.CustomAttachment; public class UnReadCountAttachment extends CustomAttachment { diff --git a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/Comment.java b/core/src/model_community/java/com/pikolive/core/community/bean/Comment.java similarity index 89% rename from core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/Comment.java rename to core/src/model_community/java/com/pikolive/core/community/bean/Comment.java index 9bdea270b..be24dda76 100644 --- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/Comment.java +++ b/core/src/model_community/java/com/pikolive/core/community/bean/Comment.java @@ -1,8 +1,8 @@ -package com.yizhuan.xchat_android_core.community.bean; +package com.pikolive.core.community.bean; -import com.yizhuan.xchat_android_core.community.bean.comment.Reply; -import com.yizhuan.xchat_android_core.community.bean.comment.ReplyResult; -import com.yizhuan.xchat_android_core.vip.UserVipInfo; +import com.pikolive.core.community.bean.comment.Reply; +import com.pikolive.core.community.bean.comment.ReplyResult; +import com.pikolive.core.vip.UserVipInfo; import com.pikolive.library.utils.ListUtils; import java.util.ArrayList; diff --git a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/CommentResult.java b/core/src/model_community/java/com/pikolive/core/community/bean/CommentResult.java similarity index 78% rename from core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/CommentResult.java rename to core/src/model_community/java/com/pikolive/core/community/bean/CommentResult.java index cf967eeb9..fb93be9de 100644 --- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/CommentResult.java +++ b/core/src/model_community/java/com/pikolive/core/community/bean/CommentResult.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.community.bean; +package com.pikolive.core.community.bean; import java.util.List; diff --git a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/CommunityNoticeInfo.java b/core/src/model_community/java/com/pikolive/core/community/bean/CommunityNoticeInfo.java similarity index 95% rename from core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/CommunityNoticeInfo.java rename to core/src/model_community/java/com/pikolive/core/community/bean/CommunityNoticeInfo.java index 72dd5f09f..e0acf96cb 100644 --- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/CommunityNoticeInfo.java +++ b/core/src/model_community/java/com/pikolive/core/community/bean/CommunityNoticeInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.community.bean; +package com.pikolive.core.community.bean; import lombok.Data; diff --git a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/DyChangeData.java b/core/src/model_community/java/com/pikolive/core/community/bean/DyChangeData.java similarity index 73% rename from core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/DyChangeData.java rename to core/src/model_community/java/com/pikolive/core/community/bean/DyChangeData.java index 25ec551f8..fc6923d16 100644 --- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/DyChangeData.java +++ b/core/src/model_community/java/com/pikolive/core/community/bean/DyChangeData.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.community.bean; +package com.pikolive.core.community.bean; import lombok.Data; diff --git a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/DynamicMedia.java b/core/src/model_community/java/com/pikolive/core/community/bean/DynamicMedia.java similarity index 95% rename from core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/DynamicMedia.java rename to core/src/model_community/java/com/pikolive/core/community/bean/DynamicMedia.java index 8e5a55155..2f35e8c97 100644 --- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/DynamicMedia.java +++ b/core/src/model_community/java/com/pikolive/core/community/bean/DynamicMedia.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.community.bean; +package com.pikolive.core.community.bean; import android.text.TextUtils; diff --git a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/MiniWorldChooseInfo.java b/core/src/model_community/java/com/pikolive/core/community/bean/MiniWorldChooseInfo.java similarity index 82% rename from core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/MiniWorldChooseInfo.java rename to core/src/model_community/java/com/pikolive/core/community/bean/MiniWorldChooseInfo.java index c0aa21d98..755a06e68 100644 --- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/MiniWorldChooseInfo.java +++ b/core/src/model_community/java/com/pikolive/core/community/bean/MiniWorldChooseInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.community.bean; +package com.pikolive.core.community.bean; import java.io.Serializable; diff --git a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/PublishBody.java b/core/src/model_community/java/com/pikolive/core/community/bean/PublishBody.java similarity index 92% rename from core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/PublishBody.java rename to core/src/model_community/java/com/pikolive/core/community/bean/PublishBody.java index d72f27fcb..094fc8834 100644 --- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/PublishBody.java +++ b/core/src/model_community/java/com/pikolive/core/community/bean/PublishBody.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.community.bean; +package com.pikolive.core.community.bean; import java.util.ArrayList; diff --git a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/PublishItem.java b/core/src/model_community/java/com/pikolive/core/community/bean/PublishItem.java similarity index 97% rename from core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/PublishItem.java rename to core/src/model_community/java/com/pikolive/core/community/bean/PublishItem.java index c3763cb76..3e8bed7cd 100644 --- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/PublishItem.java +++ b/core/src/model_community/java/com/pikolive/core/community/bean/PublishItem.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.community.bean; +package com.pikolive.core.community.bean; import android.os.Parcel; import android.os.Parcelable; diff --git a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/UnReadCountInfo.java b/core/src/model_community/java/com/pikolive/core/community/bean/UnReadCountInfo.java similarity index 94% rename from core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/UnReadCountInfo.java rename to core/src/model_community/java/com/pikolive/core/community/bean/UnReadCountInfo.java index 665af358c..2bb43a693 100644 --- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/UnReadCountInfo.java +++ b/core/src/model_community/java/com/pikolive/core/community/bean/UnReadCountInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.community.bean; +package com.pikolive.core.community.bean; import java.io.Serializable; diff --git a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/UserDynamicItem.java b/core/src/model_community/java/com/pikolive/core/community/bean/UserDynamicItem.java similarity index 96% rename from core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/UserDynamicItem.java rename to core/src/model_community/java/com/pikolive/core/community/bean/UserDynamicItem.java index 88982e69b..3544b3e08 100644 --- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/UserDynamicItem.java +++ b/core/src/model_community/java/com/pikolive/core/community/bean/UserDynamicItem.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.community.bean; +package com.pikolive.core.community.bean; import android.os.Parcel; import android.os.Parcelable; diff --git a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/WorldDynamicBean.java b/core/src/model_community/java/com/pikolive/core/community/bean/WorldDynamicBean.java similarity index 95% rename from core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/WorldDynamicBean.java rename to core/src/model_community/java/com/pikolive/core/community/bean/WorldDynamicBean.java index 743c145f5..f27476375 100644 --- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/WorldDynamicBean.java +++ b/core/src/model_community/java/com/pikolive/core/community/bean/WorldDynamicBean.java @@ -1,9 +1,9 @@ -package com.yizhuan.xchat_android_core.community.bean; +package com.pikolive.core.community.bean; import android.text.TextUtils; -import com.yizhuan.xchat_android_core.user.bean.BaseUserInfo; +import com.pikolive.core.user.bean.BaseUserInfo; import java.io.Serializable; import java.util.ArrayList; diff --git a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/WorldDynamicListResult.java b/core/src/model_community/java/com/pikolive/core/community/bean/WorldDynamicListResult.java similarity index 82% rename from core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/WorldDynamicListResult.java rename to core/src/model_community/java/com/pikolive/core/community/bean/WorldDynamicListResult.java index a73d967cf..9bec909ae 100644 --- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/WorldDynamicListResult.java +++ b/core/src/model_community/java/com/pikolive/core/community/bean/WorldDynamicListResult.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.community.bean; +package com.pikolive.core.community.bean; import java.util.List; diff --git a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/comment/PopupParams.java b/core/src/model_community/java/com/pikolive/core/community/bean/comment/PopupParams.java similarity index 87% rename from core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/comment/PopupParams.java rename to core/src/model_community/java/com/pikolive/core/community/bean/comment/PopupParams.java index 70e48f59f..6cb58697e 100644 --- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/comment/PopupParams.java +++ b/core/src/model_community/java/com/pikolive/core/community/bean/comment/PopupParams.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.community.bean.comment; +package com.pikolive.core.community.bean.comment; import lombok.Data; diff --git a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/comment/Reply.java b/core/src/model_community/java/com/pikolive/core/community/bean/comment/Reply.java similarity index 81% rename from core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/comment/Reply.java rename to core/src/model_community/java/com/pikolive/core/community/bean/comment/Reply.java index 18d90cb98..4dec81f0b 100644 --- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/comment/Reply.java +++ b/core/src/model_community/java/com/pikolive/core/community/bean/comment/Reply.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.community.bean.comment; +package com.pikolive.core.community.bean.comment; -import com.yizhuan.xchat_android_core.vip.UserVipInfo; +import com.pikolive.core.vip.UserVipInfo; import lombok.Data; diff --git a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/comment/ReplyResult.java b/core/src/model_community/java/com/pikolive/core/community/bean/comment/ReplyResult.java similarity index 87% rename from core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/comment/ReplyResult.java rename to core/src/model_community/java/com/pikolive/core/community/bean/comment/ReplyResult.java index f81d89569..c056bd27c 100644 --- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/bean/comment/ReplyResult.java +++ b/core/src/model_community/java/com/pikolive/core/community/bean/comment/ReplyResult.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.community.bean.comment; +package com.pikolive.core.community.bean.comment; import java.util.ArrayList; import java.util.List; diff --git a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/dynamic/DynamicDetailModel.java b/core/src/model_community/java/com/pikolive/core/community/dynamic/DynamicDetailModel.java similarity index 88% rename from core/src/model_community/java/com/yizhuan/xchat_android_core/community/dynamic/DynamicDetailModel.java rename to core/src/model_community/java/com/pikolive/core/community/dynamic/DynamicDetailModel.java index cc7a5fc69..abf9df52b 100644 --- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/dynamic/DynamicDetailModel.java +++ b/core/src/model_community/java/com/pikolive/core/community/dynamic/DynamicDetailModel.java @@ -1,14 +1,14 @@ -package com.yizhuan.xchat_android_core.community.dynamic; +package com.pikolive.core.community.dynamic; import com.google.gson.JsonElement; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.community.bean.CommentResult; -import com.yizhuan.xchat_android_core.community.bean.WorldDynamicBean; -import com.yizhuan.xchat_android_core.community.bean.comment.Reply; -import com.yizhuan.xchat_android_core.community.bean.comment.ReplyResult; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.community.bean.CommentResult; +import com.pikolive.core.community.bean.WorldDynamicBean; +import com.pikolive.core.community.bean.comment.Reply; +import com.pikolive.core.community.bean.comment.ReplyResult; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.net.rxnet.RxNet; import io.reactivex.Single; diff --git a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/dynamic/DynamicModel.java b/core/src/model_community/java/com/pikolive/core/community/dynamic/DynamicModel.java similarity index 91% rename from core/src/model_community/java/com/yizhuan/xchat_android_core/community/dynamic/DynamicModel.java rename to core/src/model_community/java/com/pikolive/core/community/dynamic/DynamicModel.java index f6748b16a..633245cf6 100644 --- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/dynamic/DynamicModel.java +++ b/core/src/model_community/java/com/pikolive/core/community/dynamic/DynamicModel.java @@ -1,12 +1,12 @@ -package com.yizhuan.xchat_android_core.community.dynamic; +package com.pikolive.core.community.dynamic; import com.google.gson.JsonElement; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.community.CommunityConstant; -import com.yizhuan.xchat_android_core.community.bean.WorldDynamicListResult; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.community.CommunityConstant; +import com.pikolive.core.community.bean.WorldDynamicListResult; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.net.rxnet.RxNet; import io.reactivex.Single; diff --git a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/dynamic/IDynamicDetailModel.java b/core/src/model_community/java/com/pikolive/core/community/dynamic/IDynamicDetailModel.java similarity index 62% rename from core/src/model_community/java/com/yizhuan/xchat_android_core/community/dynamic/IDynamicDetailModel.java rename to core/src/model_community/java/com/pikolive/core/community/dynamic/IDynamicDetailModel.java index 2263779e3..c7241bc6f 100644 --- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/dynamic/IDynamicDetailModel.java +++ b/core/src/model_community/java/com/pikolive/core/community/dynamic/IDynamicDetailModel.java @@ -1,9 +1,9 @@ -package com.yizhuan.xchat_android_core.community.dynamic; +package com.pikolive.core.community.dynamic; -import com.yizhuan.xchat_android_core.community.bean.CommentResult; -import com.yizhuan.xchat_android_core.community.bean.WorldDynamicBean; -import com.yizhuan.xchat_android_core.community.bean.comment.Reply; -import com.yizhuan.xchat_android_core.community.bean.comment.ReplyResult; +import com.pikolive.core.community.bean.comment.ReplyResult; +import com.pikolive.core.community.bean.CommentResult; +import com.pikolive.core.community.bean.WorldDynamicBean; +import com.pikolive.core.community.bean.comment.Reply; import io.reactivex.Single; diff --git a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/dynamic/IDynamicModel.java b/core/src/model_community/java/com/pikolive/core/community/dynamic/IDynamicModel.java similarity index 79% rename from core/src/model_community/java/com/yizhuan/xchat_android_core/community/dynamic/IDynamicModel.java rename to core/src/model_community/java/com/pikolive/core/community/dynamic/IDynamicModel.java index 7ca2f51fe..e36b08411 100644 --- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/dynamic/IDynamicModel.java +++ b/core/src/model_community/java/com/pikolive/core/community/dynamic/IDynamicModel.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.community.dynamic; +package com.pikolive.core.community.dynamic; -import com.yizhuan.xchat_android_core.community.bean.WorldDynamicListResult; +import com.pikolive.core.community.bean.WorldDynamicListResult; import io.reactivex.Single; diff --git a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/event/DynamicDetailFinishEvent.java b/core/src/model_community/java/com/pikolive/core/community/event/DynamicDetailFinishEvent.java similarity index 71% rename from core/src/model_community/java/com/yizhuan/xchat_android_core/community/event/DynamicDetailFinishEvent.java rename to core/src/model_community/java/com/pikolive/core/community/event/DynamicDetailFinishEvent.java index 87460847e..fb2b0666d 100644 --- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/event/DynamicDetailFinishEvent.java +++ b/core/src/model_community/java/com/pikolive/core/community/event/DynamicDetailFinishEvent.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.community.event; +package com.pikolive.core.community.event; -import com.yizhuan.xchat_android_core.community.bean.WorldDynamicBean; +import com.pikolive.core.community.bean.WorldDynamicBean; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/event/DynamicPublishEvent.java b/core/src/model_community/java/com/pikolive/core/community/event/DynamicPublishEvent.java similarity index 58% rename from core/src/model_community/java/com/yizhuan/xchat_android_core/community/event/DynamicPublishEvent.java rename to core/src/model_community/java/com/pikolive/core/community/event/DynamicPublishEvent.java index 225037a17..1f1836500 100644 --- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/event/DynamicPublishEvent.java +++ b/core/src/model_community/java/com/pikolive/core/community/event/DynamicPublishEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.community.event; +package com.pikolive.core.community.event; /** * create by lvzebiao @2019/12/1 diff --git a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/event/DynamicRefreshEvent.java b/core/src/model_community/java/com/pikolive/core/community/event/DynamicRefreshEvent.java similarity index 58% rename from core/src/model_community/java/com/yizhuan/xchat_android_core/community/event/DynamicRefreshEvent.java rename to core/src/model_community/java/com/pikolive/core/community/event/DynamicRefreshEvent.java index 2bd6e8a69..652223846 100644 --- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/event/DynamicRefreshEvent.java +++ b/core/src/model_community/java/com/pikolive/core/community/event/DynamicRefreshEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.community.event; +package com.pikolive.core.community.event; /** * create by lvzebiao @2019/12/1 diff --git a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/event/SquareTaskEvent.java b/core/src/model_community/java/com/pikolive/core/community/event/SquareTaskEvent.java similarity index 52% rename from core/src/model_community/java/com/yizhuan/xchat_android_core/community/event/SquareTaskEvent.java rename to core/src/model_community/java/com/pikolive/core/community/event/SquareTaskEvent.java index 17bc9262b..3b33d419b 100644 --- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/event/SquareTaskEvent.java +++ b/core/src/model_community/java/com/pikolive/core/community/event/SquareTaskEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.community.event; +package com.pikolive.core.community.event; import lombok.Data; diff --git a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/event/UnReadCountEvent.java b/core/src/model_community/java/com/pikolive/core/community/event/UnReadCountEvent.java similarity index 71% rename from core/src/model_community/java/com/yizhuan/xchat_android_core/community/event/UnReadCountEvent.java rename to core/src/model_community/java/com/pikolive/core/community/event/UnReadCountEvent.java index 117b38e03..8204453d4 100644 --- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/event/UnReadCountEvent.java +++ b/core/src/model_community/java/com/pikolive/core/community/event/UnReadCountEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.community.event; +package com.pikolive.core.community.event; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/im/DynamicImMsg.java b/core/src/model_community/java/com/pikolive/core/community/im/DynamicImMsg.java similarity index 91% rename from core/src/model_community/java/com/yizhuan/xchat_android_core/community/im/DynamicImMsg.java rename to core/src/model_community/java/com/pikolive/core/community/im/DynamicImMsg.java index 28953ed4e..2f0d66f0f 100644 --- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/im/DynamicImMsg.java +++ b/core/src/model_community/java/com/pikolive/core/community/im/DynamicImMsg.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.community.im; +package com.pikolive.core.community.im; -import com.yizhuan.xchat_android_core.community.bean.WorldDynamicBean; +import com.pikolive.core.community.bean.WorldDynamicBean; import java.io.Serializable; diff --git a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/im/WorldDynamicAttachment.java b/core/src/model_community/java/com/pikolive/core/community/im/WorldDynamicAttachment.java similarity index 94% rename from core/src/model_community/java/com/yizhuan/xchat_android_core/community/im/WorldDynamicAttachment.java rename to core/src/model_community/java/com/pikolive/core/community/im/WorldDynamicAttachment.java index 718da67f9..382c50d54 100644 --- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/im/WorldDynamicAttachment.java +++ b/core/src/model_community/java/com/pikolive/core/community/im/WorldDynamicAttachment.java @@ -1,11 +1,11 @@ -package com.yizhuan.xchat_android_core.community.im; +package com.pikolive.core.community.im; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.netease.nimlib.sdk.msg.MessageBuilder; import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum; import com.netease.nimlib.sdk.msg.model.IMMessage; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; +import com.pikolive.core.im.custom.bean.CustomAttachment; import lombok.Getter; import lombok.Setter; diff --git a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/square/ISquareModel.java b/core/src/model_community/java/com/pikolive/core/community/square/ISquareModel.java similarity index 65% rename from core/src/model_community/java/com/yizhuan/xchat_android_core/community/square/ISquareModel.java rename to core/src/model_community/java/com/pikolive/core/community/square/ISquareModel.java index 8dfc10d76..0fb2efd84 100644 --- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/square/ISquareModel.java +++ b/core/src/model_community/java/com/pikolive/core/community/square/ISquareModel.java @@ -1,8 +1,7 @@ -package com.yizhuan.xchat_android_core.community.square; +package com.pikolive.core.community.square; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.community.bean.WorldDynamicBean; -import com.yizhuan.xchat_android_core.community.bean.WorldDynamicListResult; +import com.pikolive.core.community.bean.WorldDynamicBean; +import com.pikolive.core.community.bean.WorldDynamicListResult; import java.util.List; diff --git a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/square/SquareModel.java b/core/src/model_community/java/com/pikolive/core/community/square/SquareModel.java similarity index 86% rename from core/src/model_community/java/com/yizhuan/xchat_android_core/community/square/SquareModel.java rename to core/src/model_community/java/com/pikolive/core/community/square/SquareModel.java index 869914eaa..5a74531db 100644 --- a/core/src/model_community/java/com/yizhuan/xchat_android_core/community/square/SquareModel.java +++ b/core/src/model_community/java/com/pikolive/core/community/square/SquareModel.java @@ -1,11 +1,11 @@ -package com.yizhuan.xchat_android_core.community.square; +package com.pikolive.core.community.square; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.community.CommunityConstant; -import com.yizhuan.xchat_android_core.community.bean.WorldDynamicBean; -import com.yizhuan.xchat_android_core.community.bean.WorldDynamicListResult; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.community.CommunityConstant; +import com.pikolive.core.community.bean.WorldDynamicBean; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.community.bean.WorldDynamicListResult; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.net.rxnet.RxNet; import java.util.ArrayList; diff --git a/core/src/model_database_room/java/com/yizhuan/tutu/database/AppDataBase.java b/core/src/model_database_room/java/com/pikolive/core/database/AppDataBase.java similarity index 80% rename from core/src/model_database_room/java/com/yizhuan/tutu/database/AppDataBase.java rename to core/src/model_database_room/java/com/pikolive/core/database/AppDataBase.java index f811d3916..b5fe21e13 100644 --- a/core/src/model_database_room/java/com/yizhuan/tutu/database/AppDataBase.java +++ b/core/src/model_database_room/java/com/pikolive/core/database/AppDataBase.java @@ -1,4 +1,4 @@ -package com.yizhuan.tutu.database; +package com.pikolive.core.database; import androidx.annotation.NonNull; import androidx.room.Database; @@ -7,11 +7,11 @@ import androidx.room.RoomDatabase; import androidx.room.migration.Migration; import androidx.sqlite.db.SupportSQLiteDatabase; -import com.yizhuan.xchat_android_constants.XChatConstants; -import com.yizhuan.xchat_android_core.music.db.bean.LocalMusicBean; -import com.yizhuan.xchat_android_core.music.db.bean.SongBean; -import com.yizhuan.xchat_android_core.music.db.dao.LocalMusicDao; -import com.yizhuan.xchat_android_core.music.db.dao.SongDao; +import com.pikolive.core2.XChatConstants; +import com.pikolive.core.music.db.bean.LocalMusicBean; +import com.pikolive.core.music.db.bean.SongBean; +import com.pikolive.core.music.db.dao.LocalMusicDao; +import com.pikolive.core.music.db.dao.SongDao; import com.pikolive.library.utils.config.BasicConfig; @Database(entities = {LocalMusicBean.class, SongBean.class}, version = 2, exportSchema = false) diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/HallModel.java b/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/HallModel.java similarity index 92% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/HallModel.java rename to core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/HallModel.java index 84e90c6ce..24af4722e 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/HallModel.java +++ b/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/HallModel.java @@ -1,28 +1,28 @@ -package com.yizhuan.xchat_android_core.module_hall.hall; +package com.pikolive.core.module_hall.hall; -import com.yizhuan.xchat_android_core.R; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.auth.event.LogoutEvent; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.ApplyResult; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.AuthInfo; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.AuthListResult; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.ClanAndHallInfo; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.ClanInfo; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.HallInfo; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.HallMenuByUidResult; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.JoinRoomInfo; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.ListMemberInfo; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.OptionInfo; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.OwnerHallInfo; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.SuperAdminHall; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.SuperAdminInfo; -import com.yizhuan.xchat_android_core.module_hall.hall.event.UserHallUpdateEvent; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.user.event.LoginUserInfoUpdateEvent; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.module_hall.hall.bean.AuthListResult; +import com.pikolive.core.module_hall.hall.bean.ClanAndHallInfo; +import com.pikolive.core.module_hall.hall.bean.HallInfo; +import com.pikolive.core.module_hall.hall.bean.SuperAdminInfo; +import com.pikolive.core.R; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.auth.event.LogoutEvent; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.module_hall.hall.bean.ApplyResult; +import com.pikolive.core.module_hall.hall.bean.AuthInfo; +import com.pikolive.core.module_hall.hall.bean.ClanInfo; +import com.pikolive.core.module_hall.hall.bean.HallMenuByUidResult; +import com.pikolive.core.module_hall.hall.bean.JoinRoomInfo; +import com.pikolive.core.module_hall.hall.bean.ListMemberInfo; +import com.pikolive.core.module_hall.hall.bean.OptionInfo; +import com.pikolive.core.module_hall.hall.bean.OwnerHallInfo; +import com.pikolive.core.module_hall.hall.bean.SuperAdminHall; +import com.pikolive.core.module_hall.hall.event.UserHallUpdateEvent; +import com.pikolive.core.user.UserModel; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.user.event.LoginUserInfoUpdateEvent; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.net.rxnet.RxNet; import com.pikolive.library.utils.ResUtil; diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/HallNameModel.java b/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/HallNameModel.java similarity index 83% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/HallNameModel.java rename to core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/HallNameModel.java index f7cc3e0ba..523283cbd 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/HallNameModel.java +++ b/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/HallNameModel.java @@ -1,9 +1,9 @@ -package com.yizhuan.xchat_android_core.module_hall.hall; +package com.pikolive.core.module_hall.hall; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.net.rxnet.RxNet; import io.reactivex.Single; diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/IHallModel.java b/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/IHallModel.java similarity index 74% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/IHallModel.java rename to core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/IHallModel.java index 846f00802..d3be50440 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/IHallModel.java +++ b/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/IHallModel.java @@ -1,16 +1,16 @@ -package com.yizhuan.xchat_android_core.module_hall.hall; +package com.pikolive.core.module_hall.hall; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.ApplyResult; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.AuthInfo; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.ClanAndHallInfo; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.HallInfo; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.JoinRoomInfo; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.ListMemberInfo; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.OptionInfo; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.OwnerHallInfo; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.SuperAdminHall; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.SuperAdminInfo; +import com.pikolive.core.module_hall.hall.bean.ClanAndHallInfo; +import com.pikolive.core.module_hall.hall.bean.HallInfo; +import com.pikolive.core.module_hall.hall.bean.SuperAdminInfo; +import com.pikolive.core.module_hall.hall.bean.ApplyResult; +import com.pikolive.core.module_hall.hall.bean.AuthInfo; +import com.pikolive.core.module_hall.hall.bean.JoinRoomInfo; +import com.pikolive.core.module_hall.hall.bean.ListMemberInfo; +import com.pikolive.core.module_hall.hall.bean.OptionInfo; +import com.pikolive.core.module_hall.hall.bean.OwnerHallInfo; +import com.pikolive.core.module_hall.hall.bean.SuperAdminHall; import java.util.List; diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/IHallNameModel.java b/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/IHallNameModel.java similarity index 57% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/IHallNameModel.java rename to core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/IHallNameModel.java index 5356717f0..032d3c5ee 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/IHallNameModel.java +++ b/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/IHallNameModel.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.module_hall.hall; +package com.pikolive.core.module_hall.hall; -import com.yizhuan.xchat_android_core.base.IModel; +import com.pikolive.core.base.IModel; import io.reactivex.Single; diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/ApplyResult.java b/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/ApplyResult.java similarity index 84% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/ApplyResult.java rename to core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/ApplyResult.java index 7ffb9429c..5a5ab1f84 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/ApplyResult.java +++ b/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/ApplyResult.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.module_hall.hall.bean; +package com.pikolive.core.module_hall.hall.bean; import lombok.Data; diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/AuthInfo.java b/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/AuthInfo.java similarity index 96% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/AuthInfo.java rename to core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/AuthInfo.java index 0d662971e..2311e2f9c 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/AuthInfo.java +++ b/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/AuthInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.module_hall.hall.bean; +package com.pikolive.core.module_hall.hall.bean; import java.io.Serializable; import java.util.ArrayList; diff --git a/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/AuthListResult.java b/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/AuthListResult.java new file mode 100644 index 000000000..c0f130c90 --- /dev/null +++ b/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/AuthListResult.java @@ -0,0 +1,8 @@ +package com.pikolive.core.module_hall.hall.bean; + +import com.pikolive.core.bean.response.ServiceResult; + +import java.util.List; + +public class AuthListResult extends ServiceResult> { +} diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/ClanAndHallInfo.java b/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/ClanAndHallInfo.java similarity index 70% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/ClanAndHallInfo.java rename to core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/ClanAndHallInfo.java index c39c10edb..c8ddab4cf 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/ClanAndHallInfo.java +++ b/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/ClanAndHallInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.module_hall.hall.bean; +package com.pikolive.core.module_hall.hall.bean; import lombok.Data; diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/ClanInfo.java b/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/ClanInfo.java similarity index 86% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/ClanInfo.java rename to core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/ClanInfo.java index 1b27b1065..845c4aa24 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/ClanInfo.java +++ b/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/ClanInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.module_hall.hall.bean; +package com.pikolive.core.module_hall.hall.bean; import lombok.Data; diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/GroupListInfo.java b/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/GroupListInfo.java similarity index 79% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/GroupListInfo.java rename to core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/GroupListInfo.java index 274ad6ef5..560a8861e 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/GroupListInfo.java +++ b/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/GroupListInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.module_hall.hall.bean; +package com.pikolive.core.module_hall.hall.bean; import java.io.Serializable; diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/HTeamInfo.java b/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/HTeamInfo.java similarity index 86% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/HTeamInfo.java rename to core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/HTeamInfo.java index ce828c0cd..528d05a70 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/HTeamInfo.java +++ b/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/HTeamInfo.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.module_hall.hall.bean; +package com.pikolive.core.module_hall.hall.bean; -import com.yizhuan.xchat_android_core.module_hall.team.bean.HTeamType; +import com.pikolive.core.module_hall.team.bean.HTeamType; import java.io.Serializable; import java.util.List; diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/HTeamMember.java b/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/HTeamMember.java similarity index 86% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/HTeamMember.java rename to core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/HTeamMember.java index 64309d99a..c4e37655c 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/HTeamMember.java +++ b/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/HTeamMember.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.module_hall.hall.bean; +package com.pikolive.core.module_hall.hall.bean; -import com.yizhuan.xchat_android_core.user.bean.SimpleUserInfo; +import com.pikolive.core.user.bean.SimpleUserInfo; import java.io.Serializable; diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/HallInfo.java b/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/HallInfo.java similarity index 90% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/HallInfo.java rename to core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/HallInfo.java index a5418b1e6..aa28040dc 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/HallInfo.java +++ b/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/HallInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.module_hall.hall.bean; +package com.pikolive.core.module_hall.hall.bean; import lombok.Data; diff --git a/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/HallMenuByUidResult.java b/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/HallMenuByUidResult.java new file mode 100644 index 000000000..4eec8258e --- /dev/null +++ b/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/HallMenuByUidResult.java @@ -0,0 +1,8 @@ +package com.pikolive.core.module_hall.hall.bean; + +import com.pikolive.core.bean.response.ServiceResult; + +import java.util.List; + +public class HallMenuByUidResult extends ServiceResult> { +} diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/JoinRoomInfo.kt b/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/JoinRoomInfo.kt similarity index 73% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/JoinRoomInfo.kt rename to core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/JoinRoomInfo.kt index 1bf80e19f..f69deacb4 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/JoinRoomInfo.kt +++ b/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/JoinRoomInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.module_hall.hall.bean +package com.pikolive.core.module_hall.hall.bean data class JoinRoomInfo( val recordId: Long = 0, diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/ListHTeamMember.java b/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/ListHTeamMember.java similarity index 83% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/ListHTeamMember.java rename to core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/ListHTeamMember.java index c5aadbd3e..f3190bc39 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/ListHTeamMember.java +++ b/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/ListHTeamMember.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.module_hall.hall.bean; +package com.pikolive.core.module_hall.hall.bean; import java.util.List; diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/ListMemberInfo.java b/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/ListMemberInfo.java similarity index 75% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/ListMemberInfo.java rename to core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/ListMemberInfo.java index fa42ca693..6993f5871 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/ListMemberInfo.java +++ b/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/ListMemberInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.module_hall.hall.bean; +package com.pikolive.core.module_hall.hall.bean; import java.util.List; diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/MemberInfo.java b/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/MemberInfo.java similarity index 86% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/MemberInfo.java rename to core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/MemberInfo.java index 145d88e17..31bf0a73f 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/MemberInfo.java +++ b/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/MemberInfo.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.module_hall.hall.bean; +package com.pikolive.core.module_hall.hall.bean; -import com.yizhuan.xchat_android_core.user.bean.SimpleUserInfo; +import com.pikolive.core.user.bean.SimpleUserInfo; import java.io.Serializable; import java.util.Objects; diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/OptionInfo.java b/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/OptionInfo.java similarity index 96% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/OptionInfo.java rename to core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/OptionInfo.java index b136149ca..190a37598 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/OptionInfo.java +++ b/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/OptionInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.module_hall.hall.bean; +package com.pikolive.core.module_hall.hall.bean; import java.io.Serializable; diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/OwnerHallInfo.java b/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/OwnerHallInfo.java similarity index 89% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/OwnerHallInfo.java rename to core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/OwnerHallInfo.java index 7efed4f8e..c15e7dc17 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/OwnerHallInfo.java +++ b/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/OwnerHallInfo.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.module_hall.hall.bean; +package com.pikolive.core.module_hall.hall.bean; -import com.yizhuan.xchat_android_core.module_hall.team.bean.HTeamType; +import com.pikolive.core.module_hall.team.bean.HTeamType; import java.io.Serializable; import java.util.List; diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/RoleType.java b/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/RoleType.java similarity index 87% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/RoleType.java rename to core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/RoleType.java index f4e82066c..ea11dc48d 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/RoleType.java +++ b/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/RoleType.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.module_hall.hall.bean; +package com.pikolive.core.module_hall.hall.bean; /** * 模厅角色 diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/SuperAdminHall.kt b/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/SuperAdminHall.kt similarity index 76% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/SuperAdminHall.kt rename to core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/SuperAdminHall.kt index dd4dabd19..10c918a6e 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/SuperAdminHall.kt +++ b/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/SuperAdminHall.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.module_hall.hall.bean +package com.pikolive.core.module_hall.hall.bean data class SuperAdminHall( val hallAvatar: String? = null, diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/SuperAdminInfo.kt b/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/SuperAdminInfo.kt similarity index 80% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/SuperAdminInfo.kt rename to core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/SuperAdminInfo.kt index 7b9688466..c3625b61a 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/SuperAdminInfo.kt +++ b/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/bean/SuperAdminInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.module_hall.hall.bean +package com.pikolive.core.module_hall.hall.bean data class SuperAdminInfo( val avatar: String? = "", diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/event/UserHallUpdateEvent.java b/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/event/UserHallUpdateEvent.java similarity index 64% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/event/UserHallUpdateEvent.java rename to core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/event/UserHallUpdateEvent.java index 0e65db512..e487ec604 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/event/UserHallUpdateEvent.java +++ b/core/src/model_labour_union/java/com/pikolive/core/module_hall/hall/event/UserHallUpdateEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.module_hall.hall.event; +package com.pikolive.core.module_hall.hall.event; /** * 用户模厅更新事件 diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/im/ClanAttachment.java b/core/src/model_labour_union/java/com/pikolive/core/module_hall/im/ClanAttachment.java similarity index 86% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/im/ClanAttachment.java rename to core/src/model_labour_union/java/com/pikolive/core/module_hall/im/ClanAttachment.java index 5ea50b438..1a2a6f8d7 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/im/ClanAttachment.java +++ b/core/src/model_labour_union/java/com/pikolive/core/module_hall/im/ClanAttachment.java @@ -1,8 +1,8 @@ -package com.yizhuan.xchat_android_core.module_hall.im; +package com.pikolive.core.module_hall.im; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; +import com.pikolive.core.im.custom.bean.CustomAttachment; /** * 公会消息 diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/im/ClanImMsgInfo.java b/core/src/model_labour_union/java/com/pikolive/core/module_hall/im/ClanImMsgInfo.java similarity index 93% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/im/ClanImMsgInfo.java rename to core/src/model_labour_union/java/com/pikolive/core/module_hall/im/ClanImMsgInfo.java index 5f6c60dfe..bc9f0d356 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/im/ClanImMsgInfo.java +++ b/core/src/model_labour_union/java/com/pikolive/core/module_hall/im/ClanImMsgInfo.java @@ -1,4 +1,6 @@ -package com.yizhuan.xchat_android_core.module_hall.im; +package com.pikolive.core.module_hall.im; + +import com.pikolive.core.im.custom.bean.RouterType; import java.io.Serializable; import java.util.HashMap; @@ -33,7 +35,7 @@ public class ClanImMsgInfo implements Serializable{ private int type; /**后台给的显示内容*/ private String layout; - /**{@link com.yizhuan.xchat_android_core.im.custom.bean.RouterType}*/ + /**{@link RouterType}*/ private int routerType; private String routerValue; diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/im/HallAttachment.java b/core/src/model_labour_union/java/com/pikolive/core/module_hall/im/HallAttachment.java similarity index 86% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/im/HallAttachment.java rename to core/src/model_labour_union/java/com/pikolive/core/module_hall/im/HallAttachment.java index b36ecb10a..5a156c585 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/im/HallAttachment.java +++ b/core/src/model_labour_union/java/com/pikolive/core/module_hall/im/HallAttachment.java @@ -1,8 +1,8 @@ -package com.yizhuan.xchat_android_core.module_hall.im; +package com.pikolive.core.module_hall.im; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; +import com.pikolive.core.im.custom.bean.CustomAttachment; /** * 模厅消息 diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/im/HallImMsgInfo.java b/core/src/model_labour_union/java/com/pikolive/core/module_hall/im/HallImMsgInfo.java similarity index 93% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/im/HallImMsgInfo.java rename to core/src/model_labour_union/java/com/pikolive/core/module_hall/im/HallImMsgInfo.java index cb23486b6..3ec3ecbfe 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/im/HallImMsgInfo.java +++ b/core/src/model_labour_union/java/com/pikolive/core/module_hall/im/HallImMsgInfo.java @@ -1,4 +1,6 @@ -package com.yizhuan.xchat_android_core.module_hall.im; +package com.pikolive.core.module_hall.im; + +import com.pikolive.core.im.custom.bean.RouterType; import java.io.Serializable; import java.util.HashMap; @@ -33,7 +35,7 @@ public class HallImMsgInfo implements Serializable{ private int type; /**后台给的显示内容*/ private String layout; - /**{@link com.yizhuan.xchat_android_core.im.custom.bean.RouterType}*/ + /**{@link RouterType}*/ private int routerType; private String routerValue; diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/im/bean/HallMsgComponent.java b/core/src/model_labour_union/java/com/pikolive/core/module_hall/im/bean/HallMsgComponent.java similarity index 84% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/im/bean/HallMsgComponent.java rename to core/src/model_labour_union/java/com/pikolive/core/module_hall/im/bean/HallMsgComponent.java index fd673e753..5e43e157b 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/im/bean/HallMsgComponent.java +++ b/core/src/model_labour_union/java/com/pikolive/core/module_hall/im/bean/HallMsgComponent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.module_hall.im.bean; +package com.pikolive.core.module_hall.im.bean; import java.io.Serializable; diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/im/bean/HallMsgLayout.java b/core/src/model_labour_union/java/com/pikolive/core/module_hall/im/bean/HallMsgLayout.java similarity index 81% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/im/bean/HallMsgLayout.java rename to core/src/model_labour_union/java/com/pikolive/core/module_hall/im/bean/HallMsgLayout.java index 6b5914771..c78cf80ea 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/im/bean/HallMsgLayout.java +++ b/core/src/model_labour_union/java/com/pikolive/core/module_hall/im/bean/HallMsgLayout.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.module_hall.im.bean; +package com.pikolive.core.module_hall.im.bean; import java.io.Serializable; import java.util.List; diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/IIncomeModel.java b/core/src/model_labour_union/java/com/pikolive/core/module_hall/income/IIncomeModel.java similarity index 51% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/IIncomeModel.java rename to core/src/model_labour_union/java/com/pikolive/core/module_hall/income/IIncomeModel.java index 0337f17d6..3d0490c2d 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/IIncomeModel.java +++ b/core/src/model_labour_union/java/com/pikolive/core/module_hall/income/IIncomeModel.java @@ -1,12 +1,12 @@ -package com.yizhuan.xchat_android_core.module_hall.income; +package com.pikolive.core.module_hall.income; -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.module_hall.income.bean.ClanTotalIncomeInfo; -import com.yizhuan.xchat_android_core.module_hall.income.bean.HallTotalIncomeInfo; -import com.yizhuan.xchat_android_core.module_hall.income.bean.IncomeGiftInfo; -import com.yizhuan.xchat_android_core.module_hall.income.bean.IncomeTotalInfo; -import com.yizhuan.xchat_android_core.module_hall.income.bean.LiveTotalIncomeInfo; -import com.yizhuan.xchat_android_core.module_hall.income.bean.SingleRoomTotalIncomeInfo; +import com.pikolive.core.module_hall.income.bean.IncomeGiftInfo; +import com.pikolive.core.module_hall.income.bean.IncomeTotalInfo; +import com.pikolive.core.module_hall.income.bean.SingleRoomTotalIncomeInfo; +import com.pikolive.core.base.IModel; +import com.pikolive.core.module_hall.income.bean.ClanTotalIncomeInfo; +import com.pikolive.core.module_hall.income.bean.HallTotalIncomeInfo; +import com.pikolive.core.module_hall.income.bean.LiveTotalIncomeInfo; import java.util.List; @@ -22,7 +22,7 @@ public interface IIncomeModel extends IModel { Single getLiveIncomeList(long clanId, String startTimeStr, String endTimeStr); - Single getSingleRoomIncomeList(String hallId, String clanId,String startTime, String endTime); + Single getSingleRoomIncomeList(String hallId, String clanId, String startTime, String endTime); Single> incomeDetail(long memberId, long hallId, String startTimeStr, String endTimeStr); } diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/IncomeModel.java b/core/src/model_labour_union/java/com/pikolive/core/module_hall/income/IncomeModel.java similarity index 90% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/IncomeModel.java rename to core/src/model_labour_union/java/com/pikolive/core/module_hall/income/IncomeModel.java index b6b621273..c117c0464 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/IncomeModel.java +++ b/core/src/model_labour_union/java/com/pikolive/core/module_hall/income/IncomeModel.java @@ -1,15 +1,15 @@ -package com.yizhuan.xchat_android_core.module_hall.income; +package com.pikolive.core.module_hall.income; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.module_hall.income.bean.ClanTotalIncomeInfo; -import com.yizhuan.xchat_android_core.module_hall.income.bean.HallTotalIncomeInfo; -import com.yizhuan.xchat_android_core.module_hall.income.bean.IncomeGiftInfo; -import com.yizhuan.xchat_android_core.module_hall.income.bean.IncomeTotalInfo; -import com.yizhuan.xchat_android_core.module_hall.income.bean.LiveTotalIncomeInfo; -import com.yizhuan.xchat_android_core.module_hall.income.bean.SingleRoomTotalIncomeInfo; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.module_hall.income.bean.IncomeGiftInfo; +import com.pikolive.core.module_hall.income.bean.IncomeTotalInfo; +import com.pikolive.core.module_hall.income.bean.SingleRoomTotalIncomeInfo; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.module_hall.income.bean.ClanTotalIncomeInfo; +import com.pikolive.core.module_hall.income.bean.HallTotalIncomeInfo; +import com.pikolive.core.module_hall.income.bean.LiveTotalIncomeInfo; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.net.rxnet.RxNet; import java.util.List; diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/bean/ClanIncomeInfo.java b/core/src/model_labour_union/java/com/pikolive/core/module_hall/income/bean/ClanIncomeInfo.java similarity index 84% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/bean/ClanIncomeInfo.java rename to core/src/model_labour_union/java/com/pikolive/core/module_hall/income/bean/ClanIncomeInfo.java index 6f880497d..8cf9a3d56 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/bean/ClanIncomeInfo.java +++ b/core/src/model_labour_union/java/com/pikolive/core/module_hall/income/bean/ClanIncomeInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.module_hall.income.bean; +package com.pikolive.core.module_hall.income.bean; import java.io.Serializable; diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/bean/ClanTotalIncomeInfo.java b/core/src/model_labour_union/java/com/pikolive/core/module_hall/income/bean/ClanTotalIncomeInfo.java similarity index 71% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/bean/ClanTotalIncomeInfo.java rename to core/src/model_labour_union/java/com/pikolive/core/module_hall/income/bean/ClanTotalIncomeInfo.java index 732fa4900..fdba22983 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/bean/ClanTotalIncomeInfo.java +++ b/core/src/model_labour_union/java/com/pikolive/core/module_hall/income/bean/ClanTotalIncomeInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.module_hall.income.bean; +package com.pikolive.core.module_hall.income.bean; import java.util.List; diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/bean/HallIncomeInfo.java b/core/src/model_labour_union/java/com/pikolive/core/module_hall/income/bean/HallIncomeInfo.java similarity index 98% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/bean/HallIncomeInfo.java rename to core/src/model_labour_union/java/com/pikolive/core/module_hall/income/bean/HallIncomeInfo.java index 93f3350c9..2fcd32bf4 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/bean/HallIncomeInfo.java +++ b/core/src/model_labour_union/java/com/pikolive/core/module_hall/income/bean/HallIncomeInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.module_hall.income.bean; +package com.pikolive.core.module_hall.income.bean; import java.io.Serializable; diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/bean/HallTotalIncomeInfo.java b/core/src/model_labour_union/java/com/pikolive/core/module_hall/income/bean/HallTotalIncomeInfo.java similarity index 97% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/bean/HallTotalIncomeInfo.java rename to core/src/model_labour_union/java/com/pikolive/core/module_hall/income/bean/HallTotalIncomeInfo.java index 9921afa13..4ddd59670 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/bean/HallTotalIncomeInfo.java +++ b/core/src/model_labour_union/java/com/pikolive/core/module_hall/income/bean/HallTotalIncomeInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.module_hall.income.bean; +package com.pikolive.core.module_hall.income.bean; import java.util.List; diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/bean/IncomeGiftInfo.java b/core/src/model_labour_union/java/com/pikolive/core/module_hall/income/bean/IncomeGiftInfo.java similarity index 81% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/bean/IncomeGiftInfo.java rename to core/src/model_labour_union/java/com/pikolive/core/module_hall/income/bean/IncomeGiftInfo.java index 10d6f0306..b2fc0bc9d 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/bean/IncomeGiftInfo.java +++ b/core/src/model_labour_union/java/com/pikolive/core/module_hall/income/bean/IncomeGiftInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.module_hall.income.bean; +package com.pikolive.core.module_hall.income.bean; import java.io.Serializable; diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/bean/IncomeInfo.java b/core/src/model_labour_union/java/com/pikolive/core/module_hall/income/bean/IncomeInfo.java similarity index 85% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/bean/IncomeInfo.java rename to core/src/model_labour_union/java/com/pikolive/core/module_hall/income/bean/IncomeInfo.java index ef296cc0e..783a19ff4 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/bean/IncomeInfo.java +++ b/core/src/model_labour_union/java/com/pikolive/core/module_hall/income/bean/IncomeInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.module_hall.income.bean; +package com.pikolive.core.module_hall.income.bean; import java.io.Serializable; diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/bean/IncomeTotalInfo.java b/core/src/model_labour_union/java/com/pikolive/core/module_hall/income/bean/IncomeTotalInfo.java similarity index 69% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/bean/IncomeTotalInfo.java rename to core/src/model_labour_union/java/com/pikolive/core/module_hall/income/bean/IncomeTotalInfo.java index c772cdc82..ad177affe 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/bean/IncomeTotalInfo.java +++ b/core/src/model_labour_union/java/com/pikolive/core/module_hall/income/bean/IncomeTotalInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.module_hall.income.bean; +package com.pikolive.core.module_hall.income.bean; import java.util.List; diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/bean/LiveIncomeInfo.java b/core/src/model_labour_union/java/com/pikolive/core/module_hall/income/bean/LiveIncomeInfo.java similarity index 83% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/bean/LiveIncomeInfo.java rename to core/src/model_labour_union/java/com/pikolive/core/module_hall/income/bean/LiveIncomeInfo.java index 53f6082f6..017299e0c 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/bean/LiveIncomeInfo.java +++ b/core/src/model_labour_union/java/com/pikolive/core/module_hall/income/bean/LiveIncomeInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.module_hall.income.bean; +package com.pikolive.core.module_hall.income.bean; import java.io.Serializable; diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/bean/LiveTotalIncomeInfo.java b/core/src/model_labour_union/java/com/pikolive/core/module_hall/income/bean/LiveTotalIncomeInfo.java similarity index 71% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/bean/LiveTotalIncomeInfo.java rename to core/src/model_labour_union/java/com/pikolive/core/module_hall/income/bean/LiveTotalIncomeInfo.java index cc284d066..1e7da64aa 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/bean/LiveTotalIncomeInfo.java +++ b/core/src/model_labour_union/java/com/pikolive/core/module_hall/income/bean/LiveTotalIncomeInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.module_hall.income.bean; +package com.pikolive.core.module_hall.income.bean; import java.util.List; diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/bean/SingleRoomIncomeInfo.java b/core/src/model_labour_union/java/com/pikolive/core/module_hall/income/bean/SingleRoomIncomeInfo.java similarity index 82% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/bean/SingleRoomIncomeInfo.java rename to core/src/model_labour_union/java/com/pikolive/core/module_hall/income/bean/SingleRoomIncomeInfo.java index 5e64ddb81..94a9c0b97 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/bean/SingleRoomIncomeInfo.java +++ b/core/src/model_labour_union/java/com/pikolive/core/module_hall/income/bean/SingleRoomIncomeInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.module_hall.income.bean; +package com.pikolive.core.module_hall.income.bean; import java.io.Serializable; diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/bean/SingleRoomTotalIncomeInfo.java b/core/src/model_labour_union/java/com/pikolive/core/module_hall/income/bean/SingleRoomTotalIncomeInfo.java similarity index 73% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/bean/SingleRoomTotalIncomeInfo.java rename to core/src/model_labour_union/java/com/pikolive/core/module_hall/income/bean/SingleRoomTotalIncomeInfo.java index 3edf88586..5714aca27 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/bean/SingleRoomTotalIncomeInfo.java +++ b/core/src/model_labour_union/java/com/pikolive/core/module_hall/income/bean/SingleRoomTotalIncomeInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.module_hall.income.bean; +package com.pikolive.core.module_hall.income.bean; import java.util.List; diff --git a/core/src/model_labour_union/java/com/pikolive/core/module_hall/income/event/UpdateMemberListEvent.java b/core/src/model_labour_union/java/com/pikolive/core/module_hall/income/event/UpdateMemberListEvent.java new file mode 100644 index 000000000..724e19ec5 --- /dev/null +++ b/core/src/model_labour_union/java/com/pikolive/core/module_hall/income/event/UpdateMemberListEvent.java @@ -0,0 +1,4 @@ +package com.pikolive.core.module_hall.income.event; + +public class UpdateMemberListEvent { +} diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/secretcode/ISecretCodeModel.java b/core/src/model_labour_union/java/com/pikolive/core/module_hall/secretcode/ISecretCodeModel.java similarity index 59% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/secretcode/ISecretCodeModel.java rename to core/src/model_labour_union/java/com/pikolive/core/module_hall/secretcode/ISecretCodeModel.java index f569a50ba..77b4d84d1 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/secretcode/ISecretCodeModel.java +++ b/core/src/model_labour_union/java/com/pikolive/core/module_hall/secretcode/ISecretCodeModel.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.module_hall.secretcode; +package com.pikolive.core.module_hall.secretcode; -import com.yizhuan.xchat_android_core.module_hall.secretcode.bean.CheckCodeResult; -import com.yizhuan.xchat_android_core.module_hall.secretcode.bean.SecretCodeInfo; +import com.pikolive.core.module_hall.secretcode.bean.CheckCodeResult; +import com.pikolive.core.module_hall.secretcode.bean.SecretCodeInfo; import io.reactivex.Single; diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/secretcode/SecretCodeModel.java b/core/src/model_labour_union/java/com/pikolive/core/module_hall/secretcode/SecretCodeModel.java similarity index 84% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/secretcode/SecretCodeModel.java rename to core/src/model_labour_union/java/com/pikolive/core/module_hall/secretcode/SecretCodeModel.java index c6958792e..e0091d500 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/secretcode/SecretCodeModel.java +++ b/core/src/model_labour_union/java/com/pikolive/core/module_hall/secretcode/SecretCodeModel.java @@ -1,13 +1,13 @@ -package com.yizhuan.xchat_android_core.module_hall.secretcode; +package com.pikolive.core.module_hall.secretcode; import com.google.gson.JsonElement; -import com.yizhuan.xchat_android_core.R; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.module_hall.secretcode.bean.CheckCodeResult; -import com.yizhuan.xchat_android_core.module_hall.secretcode.bean.SecretCodeInfo; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.module_hall.secretcode.bean.CheckCodeResult; +import com.pikolive.core.module_hall.secretcode.bean.SecretCodeInfo; +import com.pikolive.core.R; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.net.rxnet.RxNet; import com.pikolive.library.utils.ResUtil; diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/secretcode/bean/CheckCodeResult.java b/core/src/model_labour_union/java/com/pikolive/core/module_hall/secretcode/bean/CheckCodeResult.java similarity index 95% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/secretcode/bean/CheckCodeResult.java rename to core/src/model_labour_union/java/com/pikolive/core/module_hall/secretcode/bean/CheckCodeResult.java index 1780ebd63..7f72089a4 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/secretcode/bean/CheckCodeResult.java +++ b/core/src/model_labour_union/java/com/pikolive/core/module_hall/secretcode/bean/CheckCodeResult.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.module_hall.secretcode.bean; +package com.pikolive.core.module_hall.secretcode.bean; import java.io.Serializable; diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/secretcode/bean/SecretCodeInfo.java b/core/src/model_labour_union/java/com/pikolive/core/module_hall/secretcode/bean/SecretCodeInfo.java similarity index 90% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/secretcode/bean/SecretCodeInfo.java rename to core/src/model_labour_union/java/com/pikolive/core/module_hall/secretcode/bean/SecretCodeInfo.java index 9c5003d6f..662f7d31b 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/secretcode/bean/SecretCodeInfo.java +++ b/core/src/model_labour_union/java/com/pikolive/core/module_hall/secretcode/bean/SecretCodeInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.module_hall.secretcode.bean; +package com.pikolive.core.module_hall.secretcode.bean; import java.io.Serializable; diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/team/HTeamModel.java b/core/src/model_labour_union/java/com/pikolive/core/module_hall/team/HTeamModel.java similarity index 94% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/team/HTeamModel.java rename to core/src/model_labour_union/java/com/pikolive/core/module_hall/team/HTeamModel.java index 80a74d746..3c35ef22a 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/team/HTeamModel.java +++ b/core/src/model_labour_union/java/com/pikolive/core/module_hall/team/HTeamModel.java @@ -1,21 +1,21 @@ -package com.yizhuan.xchat_android_core.module_hall.team; +package com.pikolive.core.module_hall.team; import com.netease.nimlib.sdk.NIMClient; import com.netease.nimlib.sdk.msg.MsgService; import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum; -import com.yizhuan.xchat_android_core.R; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.module_hall.hall.HallModel; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.HTeamInfo; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.ListHTeamMember; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.ListMemberInfo; -import com.yizhuan.xchat_android_core.module_hall.team.bean.HTeamChatLimit; -import com.yizhuan.xchat_android_core.module_hall.team.event.HteamInfoUpdateInfoEvent; -import com.yizhuan.xchat_android_core.module_hall.team.event.HteamListChangeEvent; -import com.yizhuan.xchat_android_core.module_hall.team.event.HteamMemberNumChangeEvent; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.module_hall.hall.HallModel; +import com.pikolive.core.module_hall.hall.bean.HTeamInfo; +import com.pikolive.core.module_hall.team.bean.HTeamChatLimit; +import com.pikolive.core.module_hall.team.event.HteamInfoUpdateInfoEvent; +import com.pikolive.core.module_hall.team.event.HteamListChangeEvent; +import com.pikolive.core.module_hall.team.event.HteamMemberNumChangeEvent; +import com.pikolive.core.R; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.module_hall.hall.bean.ListHTeamMember; +import com.pikolive.core.module_hall.hall.bean.ListMemberInfo; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.net.rxnet.RxNet; import com.pikolive.library.utils.ResUtil; diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/team/IHTeamModel.java b/core/src/model_labour_union/java/com/pikolive/core/module_hall/team/IHTeamModel.java similarity index 88% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/team/IHTeamModel.java rename to core/src/model_labour_union/java/com/pikolive/core/module_hall/team/IHTeamModel.java index 54b1b3054..76fd00e9f 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/team/IHTeamModel.java +++ b/core/src/model_labour_union/java/com/pikolive/core/module_hall/team/IHTeamModel.java @@ -1,9 +1,9 @@ -package com.yizhuan.xchat_android_core.module_hall.team; +package com.pikolive.core.module_hall.team; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.HTeamInfo; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.ListHTeamMember; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.ListMemberInfo; -import com.yizhuan.xchat_android_core.module_hall.team.bean.HTeamChatLimit; +import com.pikolive.core.module_hall.hall.bean.HTeamInfo; +import com.pikolive.core.module_hall.team.bean.HTeamChatLimit; +import com.pikolive.core.module_hall.hall.bean.ListHTeamMember; +import com.pikolive.core.module_hall.hall.bean.ListMemberInfo; import java.util.List; diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/team/bean/HTeamChatLimit.java b/core/src/model_labour_union/java/com/pikolive/core/module_hall/team/bean/HTeamChatLimit.java similarity index 82% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/team/bean/HTeamChatLimit.java rename to core/src/model_labour_union/java/com/pikolive/core/module_hall/team/bean/HTeamChatLimit.java index bc43f60bc..94d82377c 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/team/bean/HTeamChatLimit.java +++ b/core/src/model_labour_union/java/com/pikolive/core/module_hall/team/bean/HTeamChatLimit.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.module_hall.team.bean; +package com.pikolive.core.module_hall.team.bean; import lombok.Data; diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/team/bean/HTeamType.java b/core/src/model_labour_union/java/com/pikolive/core/module_hall/team/bean/HTeamType.java similarity index 73% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/team/bean/HTeamType.java rename to core/src/model_labour_union/java/com/pikolive/core/module_hall/team/bean/HTeamType.java index 7671d9c9b..661570037 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/team/bean/HTeamType.java +++ b/core/src/model_labour_union/java/com/pikolive/core/module_hall/team/bean/HTeamType.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.module_hall.team.bean; +package com.pikolive.core.module_hall.team.bean; /** * 群类型 diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/team/event/HteamInfoUpdateInfoEvent.java b/core/src/model_labour_union/java/com/pikolive/core/module_hall/team/event/HteamInfoUpdateInfoEvent.java similarity index 51% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/team/event/HteamInfoUpdateInfoEvent.java rename to core/src/model_labour_union/java/com/pikolive/core/module_hall/team/event/HteamInfoUpdateInfoEvent.java index e07169e4a..5c717e17a 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/team/event/HteamInfoUpdateInfoEvent.java +++ b/core/src/model_labour_union/java/com/pikolive/core/module_hall/team/event/HteamInfoUpdateInfoEvent.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.module_hall.team.event; +package com.pikolive.core.module_hall.team.event; -import com.yizhuan.xchat_android_core.base.BaseBusEvent; -import com.yizhuan.xchat_android_core.module_hall.hall.bean.HTeamInfo; +import com.pikolive.core.module_hall.hall.bean.HTeamInfo; +import com.pikolive.core.base.BaseBusEvent; /** * Created by lvzebiao on 2019/1/15. diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/team/event/HteamListChangeEvent.java b/core/src/model_labour_union/java/com/pikolive/core/module_hall/team/event/HteamListChangeEvent.java similarity index 64% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/team/event/HteamListChangeEvent.java rename to core/src/model_labour_union/java/com/pikolive/core/module_hall/team/event/HteamListChangeEvent.java index e6a1bc850..21e3b4abe 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/team/event/HteamListChangeEvent.java +++ b/core/src/model_labour_union/java/com/pikolive/core/module_hall/team/event/HteamListChangeEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.module_hall.team.event; +package com.pikolive.core.module_hall.team.event; /** * 厅群列表改变的事件 diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/team/event/HteamMemberNumChangeEvent.java b/core/src/model_labour_union/java/com/pikolive/core/module_hall/team/event/HteamMemberNumChangeEvent.java similarity index 65% rename from core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/team/event/HteamMemberNumChangeEvent.java rename to core/src/model_labour_union/java/com/pikolive/core/module_hall/team/event/HteamMemberNumChangeEvent.java index 802275421..ce4026888 100644 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/team/event/HteamMemberNumChangeEvent.java +++ b/core/src/model_labour_union/java/com/pikolive/core/module_hall/team/event/HteamMemberNumChangeEvent.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.module_hall.team.event; +package com.pikolive.core.module_hall.team.event; -import com.yizhuan.xchat_android_core.base.BaseBusEvent; +import com.pikolive.core.base.BaseBusEvent; /** * 厅群的成员变动事件 diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/AuthListResult.java b/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/AuthListResult.java deleted file mode 100644 index b1fd0f14d..000000000 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/AuthListResult.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.yizhuan.xchat_android_core.module_hall.hall.bean; - -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; - -import java.util.List; - -public class AuthListResult extends ServiceResult> { -} diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/HallMenuByUidResult.java b/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/HallMenuByUidResult.java deleted file mode 100644 index 6b9616259..000000000 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/hall/bean/HallMenuByUidResult.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.yizhuan.xchat_android_core.module_hall.hall.bean; - -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; - -import java.util.List; - -public class HallMenuByUidResult extends ServiceResult> { -} diff --git a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/event/UpdateMemberListEvent.java b/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/event/UpdateMemberListEvent.java deleted file mode 100644 index f0a5b6fd6..000000000 --- a/core/src/model_labour_union/java/com/yizhuan/xchat_android_core/module_hall/income/event/UpdateMemberListEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.yizhuan.xchat_android_core.module_hall.income.event; - -public class UpdateMemberListEvent { -} diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/attachment/MentoringApprenticeMissionFourAttachment.java b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/attachment/MentoringApprenticeMissionFourAttachment.java similarity index 69% rename from core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/attachment/MentoringApprenticeMissionFourAttachment.java rename to core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/attachment/MentoringApprenticeMissionFourAttachment.java index a7f17b0b4..015851b48 100644 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/attachment/MentoringApprenticeMissionFourAttachment.java +++ b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/attachment/MentoringApprenticeMissionFourAttachment.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.mentoring_relationship.attachment; +package com.pikolive.core.mentoring_relationship.attachment; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; +import com.pikolive.core.im.custom.bean.CustomAttachment; public class MentoringApprenticeMissionFourAttachment extends MentoringMasterMissionFourAttachment { diff --git a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/attachment/MentoringApprenticeMissionOneAttachment.java b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/attachment/MentoringApprenticeMissionOneAttachment.java new file mode 100644 index 000000000..b5345db40 --- /dev/null +++ b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/attachment/MentoringApprenticeMissionOneAttachment.java @@ -0,0 +1,11 @@ +package com.pikolive.core.mentoring_relationship.attachment; + +public class MentoringApprenticeMissionOneAttachment extends MentoringMasterMissionOneAttachment { + + + public MentoringApprenticeMissionOneAttachment() { + super(CUSTOM_MSG_MENTORING_RELATIONSHIP, + CUSTOM_MSG_SUB_MENTORING_RELATIONSHIP_MISSION_ONE_APPRENTICE); + } + +} diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/attachment/MentoringApprenticeMissionThreeAttachment.java b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/attachment/MentoringApprenticeMissionThreeAttachment.java similarity index 63% rename from core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/attachment/MentoringApprenticeMissionThreeAttachment.java rename to core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/attachment/MentoringApprenticeMissionThreeAttachment.java index 05756e1f0..5040af1d6 100644 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/attachment/MentoringApprenticeMissionThreeAttachment.java +++ b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/attachment/MentoringApprenticeMissionThreeAttachment.java @@ -1,19 +1,18 @@ -package com.yizhuan.xchat_android_core.mentoring_relationship.attachment; +package com.pikolive.core.mentoring_relationship.attachment; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.mentoring_relationship.bean.MissionVo; -import com.yizhuan.xchat_android_core.mentoring_relationship.bean.SimpleGiftVo; +import com.pikolive.core.mentoring_relationship.bean.MissionVo; +import com.pikolive.core.mentoring_relationship.bean.SimpleGiftVo; public class MentoringApprenticeMissionThreeAttachment extends MentoringMasterMissionThreeAttachment { private MissionVo simpleGiftVoMissionVo; public MentoringApprenticeMissionThreeAttachment() { - super(CustomAttachment.CUSTOM_MSG_MENTORING_RELATIONSHIP, - CustomAttachment.CUSTOM_MSG_SUB_MENTORING_RELATIONSHIP_MISSION_THREE_APPRENTICE); + super(CUSTOM_MSG_MENTORING_RELATIONSHIP, + CUSTOM_MSG_SUB_MENTORING_RELATIONSHIP_MISSION_THREE_APPRENTICE); } @Override diff --git a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/attachment/MentoringApprenticeMissionTwoAttachment.java b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/attachment/MentoringApprenticeMissionTwoAttachment.java new file mode 100644 index 000000000..6e269e3e5 --- /dev/null +++ b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/attachment/MentoringApprenticeMissionTwoAttachment.java @@ -0,0 +1,9 @@ +package com.pikolive.core.mentoring_relationship.attachment; + +public class MentoringApprenticeMissionTwoAttachment extends MentoringMasterMissionTwoAttachment { + + public MentoringApprenticeMissionTwoAttachment() { + super(CUSTOM_MSG_MENTORING_RELATIONSHIP, + CUSTOM_MSG_SUB_MENTORING_RELATIONSHIP_MISSION_TWO_APPRENTICE); + } +} diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/attachment/MentoringGrabApprenticesAttachment.java b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/attachment/MentoringGrabApprenticesAttachment.java similarity index 71% rename from core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/attachment/MentoringGrabApprenticesAttachment.java rename to core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/attachment/MentoringGrabApprenticesAttachment.java index e47257880..9d0b4bb36 100644 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/attachment/MentoringGrabApprenticesAttachment.java +++ b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/attachment/MentoringGrabApprenticesAttachment.java @@ -1,9 +1,11 @@ -package com.yizhuan.xchat_android_core.mentoring_relationship.attachment; +package com.pikolive.core.mentoring_relationship.attachment; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.mentoring_relationship.bean.GrabApprenticesMissionInfo; +import com.pikolive.core.mentoring_relationship.bean.GrabApprenticesMissionInfo; +import com.pikolive.core.mentoring_relationship.bean.GrabApprenticesMissionInfo; +import com.pikolive.core.im.custom.bean.CustomAttachment; +import com.pikolive.core.mentoring_relationship.bean.GrabApprenticesMissionInfo; public class MentoringGrabApprenticesAttachment extends CustomAttachment { diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/attachment/MentoringMasterMissionFourAttachment.java b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/attachment/MentoringMasterMissionFourAttachment.java similarity index 79% rename from core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/attachment/MentoringMasterMissionFourAttachment.java rename to core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/attachment/MentoringMasterMissionFourAttachment.java index 8b9002eef..f57a13dab 100644 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/attachment/MentoringMasterMissionFourAttachment.java +++ b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/attachment/MentoringMasterMissionFourAttachment.java @@ -1,9 +1,9 @@ -package com.yizhuan.xchat_android_core.mentoring_relationship.attachment; +package com.pikolive.core.mentoring_relationship.attachment; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.mentoring_relationship.bean.MissionVo; +import com.pikolive.core.im.custom.bean.CustomAttachment; +import com.pikolive.core.mentoring_relationship.bean.MissionVo; public class MentoringMasterMissionFourAttachment extends CustomAttachment { diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/attachment/MentoringMasterMissionOneAttachment.java b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/attachment/MentoringMasterMissionOneAttachment.java similarity index 67% rename from core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/attachment/MentoringMasterMissionOneAttachment.java rename to core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/attachment/MentoringMasterMissionOneAttachment.java index ae94ead4a..5988b66cb 100644 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/attachment/MentoringMasterMissionOneAttachment.java +++ b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/attachment/MentoringMasterMissionOneAttachment.java @@ -1,11 +1,15 @@ -package com.yizhuan.xchat_android_core.mentoring_relationship.attachment; +package com.pikolive.core.mentoring_relationship.attachment; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.mentoring_relationship.bean.MissionVo; -import com.yizhuan.xchat_android_core.mentoring_relationship.bean.SimpleUserVo; +import com.pikolive.core.mentoring_relationship.bean.MissionVo; +import com.pikolive.core.mentoring_relationship.bean.SimpleUserVo; +import com.pikolive.core.mentoring_relationship.bean.MissionVo; +import com.pikolive.core.mentoring_relationship.bean.SimpleUserVo; +import com.pikolive.core.im.custom.bean.CustomAttachment; +import com.pikolive.core.mentoring_relationship.bean.MissionVo; +import com.pikolive.core.mentoring_relationship.bean.SimpleUserVo; public class MentoringMasterMissionOneAttachment extends CustomAttachment { diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/attachment/MentoringMasterMissionThreeAttachment.java b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/attachment/MentoringMasterMissionThreeAttachment.java similarity index 73% rename from core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/attachment/MentoringMasterMissionThreeAttachment.java rename to core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/attachment/MentoringMasterMissionThreeAttachment.java index eed37b113..49834fa42 100644 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/attachment/MentoringMasterMissionThreeAttachment.java +++ b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/attachment/MentoringMasterMissionThreeAttachment.java @@ -1,9 +1,11 @@ -package com.yizhuan.xchat_android_core.mentoring_relationship.attachment; +package com.pikolive.core.mentoring_relationship.attachment; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.mentoring_relationship.bean.MissionVo; +import com.pikolive.core.mentoring_relationship.bean.MissionVo; +import com.pikolive.core.mentoring_relationship.bean.MissionVo; +import com.pikolive.core.im.custom.bean.CustomAttachment; +import com.pikolive.core.mentoring_relationship.bean.MissionVo; public class MentoringMasterMissionThreeAttachment extends CustomAttachment { diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/attachment/MentoringMasterMissionTwoAttachment.java b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/attachment/MentoringMasterMissionTwoAttachment.java similarity index 77% rename from core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/attachment/MentoringMasterMissionTwoAttachment.java rename to core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/attachment/MentoringMasterMissionTwoAttachment.java index 7b01f02bc..b95261651 100644 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/attachment/MentoringMasterMissionTwoAttachment.java +++ b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/attachment/MentoringMasterMissionTwoAttachment.java @@ -1,11 +1,11 @@ -package com.yizhuan.xchat_android_core.mentoring_relationship.attachment; +package com.pikolive.core.mentoring_relationship.attachment; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.mentoring_relationship.bean.MissionVo; -import com.yizhuan.xchat_android_core.mentoring_relationship.bean.SimpleGiftVo; +import com.pikolive.core.mentoring_relationship.bean.MissionVo; +import com.pikolive.core.mentoring_relationship.bean.SimpleGiftVo; +import com.pikolive.core.im.custom.bean.CustomAttachment; public class MentoringMasterMissionTwoAttachment extends CustomAttachment { diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/attachment/MentoringMissionTipsAttachment.java b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/attachment/MentoringMissionTipsAttachment.java similarity index 72% rename from core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/attachment/MentoringMissionTipsAttachment.java rename to core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/attachment/MentoringMissionTipsAttachment.java index 06eec9800..0f9b70de3 100644 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/attachment/MentoringMissionTipsAttachment.java +++ b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/attachment/MentoringMissionTipsAttachment.java @@ -1,9 +1,11 @@ -package com.yizhuan.xchat_android_core.mentoring_relationship.attachment; +package com.pikolive.core.mentoring_relationship.attachment; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.mentoring_relationship.bean.MentoringTipsInfo; +import com.pikolive.core.mentoring_relationship.bean.MentoringTipsInfo; +import com.pikolive.core.mentoring_relationship.bean.MentoringTipsInfo; +import com.pikolive.core.im.custom.bean.CustomAttachment; +import com.pikolive.core.mentoring_relationship.bean.MentoringTipsInfo; public class MentoringMissionTipsAttachment extends CustomAttachment { diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/attachment/MentoringSharingRoomAttachment.java b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/attachment/MentoringSharingRoomAttachment.java similarity index 81% rename from core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/attachment/MentoringSharingRoomAttachment.java rename to core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/attachment/MentoringSharingRoomAttachment.java index 0ff59eadc..f6fa44d00 100644 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/attachment/MentoringSharingRoomAttachment.java +++ b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/attachment/MentoringSharingRoomAttachment.java @@ -1,9 +1,9 @@ -package com.yizhuan.xchat_android_core.mentoring_relationship.attachment; +package com.pikolive.core.mentoring_relationship.attachment; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.mentoring_relationship.bean.MentoringSharingRoomInfo; +import com.pikolive.core.mentoring_relationship.bean.MentoringSharingRoomInfo; +import com.pikolive.core.im.custom.bean.CustomAttachment; public class MentoringSharingRoomAttachment extends CustomAttachment { diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/GrabApprenticesInfo.kt b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/bean/GrabApprenticesInfo.kt similarity index 86% rename from core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/GrabApprenticesInfo.kt rename to core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/bean/GrabApprenticesInfo.kt index 600596dc1..cbd0c2437 100644 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/GrabApprenticesInfo.kt +++ b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/bean/GrabApprenticesInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.mentoring_relationship.bean +package com.pikolive.core.mentoring_relationship.bean data class GrabApprenticesInfo( /** diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/GrabApprenticesMissionInfo.kt b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/bean/GrabApprenticesMissionInfo.kt similarity index 69% rename from core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/GrabApprenticesMissionInfo.kt rename to core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/bean/GrabApprenticesMissionInfo.kt index e82a6f834..69e5ffefe 100644 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/GrabApprenticesMissionInfo.kt +++ b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/bean/GrabApprenticesMissionInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.mentoring_relationship.bean +package com.pikolive.core.mentoring_relationship.bean data class GrabApprenticesMissionInfo( /** diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/MentoringRankingDataInfo.kt b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/bean/MentoringRankingDataInfo.kt similarity index 99% rename from core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/MentoringRankingDataInfo.kt rename to core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/bean/MentoringRankingDataInfo.kt index c320bc71c..e8c987bcc 100644 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/MentoringRankingDataInfo.kt +++ b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/bean/MentoringRankingDataInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.mentoring_relationship.bean +package com.pikolive.core.mentoring_relationship.bean data class MentoringRankingDataInfo( /** diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/MentoringResultMarqueeInfo.java b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/bean/MentoringResultMarqueeInfo.java similarity index 82% rename from core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/MentoringResultMarqueeInfo.java rename to core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/bean/MentoringResultMarqueeInfo.java index ca577c8d5..87d094ab1 100644 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/MentoringResultMarqueeInfo.java +++ b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/bean/MentoringResultMarqueeInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.mentoring_relationship.bean; +package com.pikolive.core.mentoring_relationship.bean; import lombok.Data; diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/MentoringSharingRoomInfo.java b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/bean/MentoringSharingRoomInfo.java similarity index 89% rename from core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/MentoringSharingRoomInfo.java rename to core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/bean/MentoringSharingRoomInfo.java index 8166b1d68..720e6667e 100644 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/MentoringSharingRoomInfo.java +++ b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/bean/MentoringSharingRoomInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.mentoring_relationship.bean; +package com.pikolive.core.mentoring_relationship.bean; import java.io.Serializable; diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/MentoringTipsInfo.kt b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/bean/MentoringTipsInfo.kt similarity index 80% rename from core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/MentoringTipsInfo.kt rename to core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/bean/MentoringTipsInfo.kt index 8a135b9de..85c7b7342 100644 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/MentoringTipsInfo.kt +++ b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/bean/MentoringTipsInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.mentoring_relationship.bean +package com.pikolive.core.mentoring_relationship.bean import java.io.Serializable diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/MentoringUserInfo.kt b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/bean/MentoringUserInfo.kt similarity index 96% rename from core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/MentoringUserInfo.kt rename to core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/bean/MentoringUserInfo.kt index 63e7d8c2a..4e4f8c5e9 100644 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/MentoringUserInfo.kt +++ b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/bean/MentoringUserInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.mentoring_relationship.bean +package com.pikolive.core.mentoring_relationship.bean data class MentoringUserInfo( /** diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/MissionVo.kt b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/bean/MissionVo.kt similarity index 90% rename from core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/MissionVo.kt rename to core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/bean/MissionVo.kt index ff3e60d50..d2b331c02 100644 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/MissionVo.kt +++ b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/bean/MissionVo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.mentoring_relationship.bean +package com.pikolive.core.mentoring_relationship.bean import java.io.Serializable diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/PickUpApprenticeInfo.kt b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/bean/PickUpApprenticeInfo.kt similarity index 82% rename from core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/PickUpApprenticeInfo.kt rename to core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/bean/PickUpApprenticeInfo.kt index 44eaee60a..5541f5314 100644 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/PickUpApprenticeInfo.kt +++ b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/bean/PickUpApprenticeInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.mentoring_relationship.bean +package com.pikolive.core.mentoring_relationship.bean data class PickUpApprenticeInfo( /** diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/SimpleGiftVo.java b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/bean/SimpleGiftVo.java similarity index 82% rename from core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/SimpleGiftVo.java rename to core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/bean/SimpleGiftVo.java index 03e5b2085..bc90c3479 100644 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/SimpleGiftVo.java +++ b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/bean/SimpleGiftVo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.mentoring_relationship.bean; +package com.pikolive.core.mentoring_relationship.bean; import java.io.Serializable; diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/SimpleUserVo.kt b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/bean/SimpleUserVo.kt similarity index 86% rename from core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/SimpleUserVo.kt rename to core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/bean/SimpleUserVo.kt index 160937c77..864fe74a8 100644 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/bean/SimpleUserVo.kt +++ b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/bean/SimpleUserVo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.mentoring_relationship.bean +package com.pikolive.core.mentoring_relationship.bean import java.io.Serializable diff --git a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/event/GrabApprenticesDataEvent.java b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/event/GrabApprenticesDataEvent.java new file mode 100644 index 000000000..b839d70ee --- /dev/null +++ b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/event/GrabApprenticesDataEvent.java @@ -0,0 +1,18 @@ +package com.pikolive.core.mentoring_relationship.event; + +import com.pikolive.core.mentoring_relationship.bean.GrabApprenticesInfo; +import com.pikolive.core.mentoring_relationship.bean.GrabApprenticesInfo; +import com.pikolive.core.mentoring_relationship.bean.GrabApprenticesInfo; + +import java.util.List; + +import lombok.Data; + +/** + * 抢徒弟消息到达时，消息页数据更新 + */ +@Data +public class GrabApprenticesDataEvent { + + private List grabApprenticesInfoList; +} diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/event/GrabApprenticesEvent.java b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/event/GrabApprenticesEvent.java similarity index 63% rename from core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/event/GrabApprenticesEvent.java rename to core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/event/GrabApprenticesEvent.java index 82bb871d7..3f2e9e811 100644 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/event/GrabApprenticesEvent.java +++ b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/event/GrabApprenticesEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.mentoring_relationship.event; +package com.pikolive.core.mentoring_relationship.event; /** * 抢徒弟消息到达时，在顶部出现一个 dialog 作为提示 diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/event/MentoringCountingEvent.java b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/event/MentoringCountingEvent.java similarity index 83% rename from core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/event/MentoringCountingEvent.java rename to core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/event/MentoringCountingEvent.java index ad66e26a0..8a932022a 100644 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/event/MentoringCountingEvent.java +++ b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/event/MentoringCountingEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.mentoring_relationship.event; +package com.pikolive.core.mentoring_relationship.event; import lombok.Data; diff --git a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/event/MentoringCountingFinishEvent.java b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/event/MentoringCountingFinishEvent.java new file mode 100644 index 000000000..c72b3cf4d --- /dev/null +++ b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/event/MentoringCountingFinishEvent.java @@ -0,0 +1,4 @@ +package com.pikolive.core.mentoring_relationship.event; + +public class MentoringCountingFinishEvent { +} diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/event/MentoringRelationshipMissionEvent.java b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/event/MentoringRelationshipMissionEvent.java similarity index 74% rename from core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/event/MentoringRelationshipMissionEvent.java rename to core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/event/MentoringRelationshipMissionEvent.java index 10b4c076e..5e109921f 100644 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/event/MentoringRelationshipMissionEvent.java +++ b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/event/MentoringRelationshipMissionEvent.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.mentoring_relationship.event; +package com.pikolive.core.mentoring_relationship.event; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; +import com.pikolive.core.im.custom.bean.CustomAttachment; import lombok.Data; diff --git a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/event/MentoringStartCountingEvent.java b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/event/MentoringStartCountingEvent.java new file mode 100644 index 000000000..38357f09f --- /dev/null +++ b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/event/MentoringStartCountingEvent.java @@ -0,0 +1,4 @@ +package com.pikolive.core.mentoring_relationship.event; + +public class MentoringStartCountingEvent { +} diff --git a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/event/MentoringStopCountingEvent.java b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/event/MentoringStopCountingEvent.java new file mode 100644 index 000000000..8da62d2f3 --- /dev/null +++ b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/event/MentoringStopCountingEvent.java @@ -0,0 +1,4 @@ +package com.pikolive.core.mentoring_relationship.event; + +public class MentoringStopCountingEvent { +} diff --git a/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/event/MentoringSuccessEvent.java b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/event/MentoringSuccessEvent.java new file mode 100644 index 000000000..118e6c00c --- /dev/null +++ b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/event/MentoringSuccessEvent.java @@ -0,0 +1,4 @@ +package com.pikolive.core.mentoring_relationship.event; + +public class MentoringSuccessEvent { +} diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/exception/MentoringAlreadyHasMasterException.java b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/exception/MentoringAlreadyHasMasterException.java similarity index 82% rename from core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/exception/MentoringAlreadyHasMasterException.java rename to core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/exception/MentoringAlreadyHasMasterException.java index 7ae9081b6..10c0ffd50 100644 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/exception/MentoringAlreadyHasMasterException.java +++ b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/exception/MentoringAlreadyHasMasterException.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.mentoring_relationship.exception; +package com.pikolive.core.mentoring_relationship.exception; public class MentoringAlreadyHasMasterException extends Exception { diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/exception/MentoringCanNotPickUpApprenticeException.java b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/exception/MentoringCanNotPickUpApprenticeException.java similarity index 51% rename from core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/exception/MentoringCanNotPickUpApprenticeException.java rename to core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/exception/MentoringCanNotPickUpApprenticeException.java index a2c1e78bc..f5711dc50 100644 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/exception/MentoringCanNotPickUpApprenticeException.java +++ b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/exception/MentoringCanNotPickUpApprenticeException.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.mentoring_relationship.exception; +package com.pikolive.core.mentoring_relationship.exception; public class MentoringCanNotPickUpApprenticeException extends Exception { } diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/exception/MentoringLessThanFiveMinutesException.java b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/exception/MentoringLessThanFiveMinutesException.java similarity index 79% rename from core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/exception/MentoringLessThanFiveMinutesException.java rename to core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/exception/MentoringLessThanFiveMinutesException.java index 783ad9965..7239c2afd 100644 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/exception/MentoringLessThanFiveMinutesException.java +++ b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/exception/MentoringLessThanFiveMinutesException.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.mentoring_relationship.exception; +package com.pikolive.core.mentoring_relationship.exception; public class MentoringLessThanFiveMinutesException extends Exception { diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/exception/MentoringMissionExpiredException.java b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/exception/MentoringMissionExpiredException.java similarity index 79% rename from core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/exception/MentoringMissionExpiredException.java rename to core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/exception/MentoringMissionExpiredException.java index d8748c451..d176b0814 100644 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/exception/MentoringMissionExpiredException.java +++ b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/exception/MentoringMissionExpiredException.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.mentoring_relationship.exception; +package com.pikolive.core.mentoring_relationship.exception; public class MentoringMissionExpiredException extends Exception { diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/model/IMentoringRelationshipModel.java b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/model/IMentoringRelationshipModel.java similarity index 68% rename from core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/model/IMentoringRelationshipModel.java rename to core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/model/IMentoringRelationshipModel.java index 418de5faf..abc5a6020 100644 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/model/IMentoringRelationshipModel.java +++ b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/model/IMentoringRelationshipModel.java @@ -1,12 +1,12 @@ -package com.yizhuan.xchat_android_core.mentoring_relationship.model; +package com.pikolive.core.mentoring_relationship.model; -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.gift.bean.GiftReceiveInfo; -import com.yizhuan.xchat_android_core.mentoring_relationship.bean.MentoringRankingDataInfo; -import com.yizhuan.xchat_android_core.mentoring_relationship.bean.MentoringResultMarqueeInfo; -import com.yizhuan.xchat_android_core.mentoring_relationship.bean.MentoringUserInfo; -import com.yizhuan.xchat_android_core.mentoring_relationship.bean.PickUpApprenticeInfo; +import com.pikolive.core.mentoring_relationship.bean.MentoringRankingDataInfo; +import com.pikolive.core.mentoring_relationship.bean.MentoringResultMarqueeInfo; +import com.pikolive.core.mentoring_relationship.bean.MentoringUserInfo; +import com.pikolive.core.mentoring_relationship.bean.PickUpApprenticeInfo; +import com.pikolive.core.base.IModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.gift.bean.GiftReceiveInfo; import java.util.List; diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/model/MentoringRelationshipModel.java b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/model/MentoringRelationshipModel.java similarity index 91% rename from core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/model/MentoringRelationshipModel.java rename to core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/model/MentoringRelationshipModel.java index f602dceac..599b49f6a 100644 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/model/MentoringRelationshipModel.java +++ b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/model/MentoringRelationshipModel.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.mentoring_relationship.model; +package com.pikolive.core.mentoring_relationship.model; import android.os.CountDownTimer; import android.util.Log; @@ -8,50 +8,50 @@ import com.netease.nimlib.sdk.msg.constant.MsgDirectionEnum; import com.netease.nimlib.sdk.msg.constant.MsgStatusEnum; import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum; import com.netease.nimlib.sdk.msg.model.IMMessage; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.auth.event.LogoutEvent; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.exception.FailReasonException; -import com.yizhuan.xchat_android_core.exception.UnKnowException; -import com.yizhuan.xchat_android_core.gift.bean.GiftReceiveInfo; -import com.yizhuan.xchat_android_core.gift.exception.GiftOutOfDateException; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.mentoring_relationship.attachment.MentoringApprenticeMissionFourAttachment; -import com.yizhuan.xchat_android_core.mentoring_relationship.attachment.MentoringApprenticeMissionOneAttachment; -import com.yizhuan.xchat_android_core.mentoring_relationship.attachment.MentoringApprenticeMissionThreeAttachment; -import com.yizhuan.xchat_android_core.mentoring_relationship.attachment.MentoringApprenticeMissionTwoAttachment; -import com.yizhuan.xchat_android_core.mentoring_relationship.attachment.MentoringGrabApprenticesAttachment; -import com.yizhuan.xchat_android_core.mentoring_relationship.attachment.MentoringMasterMissionFourAttachment; -import com.yizhuan.xchat_android_core.mentoring_relationship.attachment.MentoringMasterMissionOneAttachment; -import com.yizhuan.xchat_android_core.mentoring_relationship.attachment.MentoringMasterMissionThreeAttachment; -import com.yizhuan.xchat_android_core.mentoring_relationship.attachment.MentoringMasterMissionTwoAttachment; -import com.yizhuan.xchat_android_core.mentoring_relationship.attachment.MentoringMissionTipsAttachment; -import com.yizhuan.xchat_android_core.mentoring_relationship.bean.GrabApprenticesInfo; -import com.yizhuan.xchat_android_core.mentoring_relationship.bean.GrabApprenticesMissionInfo; -import com.yizhuan.xchat_android_core.mentoring_relationship.bean.MentoringRankingDataInfo; -import com.yizhuan.xchat_android_core.mentoring_relationship.bean.MentoringResultMarqueeInfo; -import com.yizhuan.xchat_android_core.mentoring_relationship.bean.MentoringTipsInfo; -import com.yizhuan.xchat_android_core.mentoring_relationship.bean.MentoringUserInfo; -import com.yizhuan.xchat_android_core.mentoring_relationship.bean.MissionVo; -import com.yizhuan.xchat_android_core.mentoring_relationship.bean.PickUpApprenticeInfo; -import com.yizhuan.xchat_android_core.mentoring_relationship.bean.SimpleGiftVo; -import com.yizhuan.xchat_android_core.mentoring_relationship.bean.SimpleUserVo; -import com.yizhuan.xchat_android_core.mentoring_relationship.event.GrabApprenticesDataEvent; -import com.yizhuan.xchat_android_core.mentoring_relationship.event.GrabApprenticesEvent; -import com.yizhuan.xchat_android_core.mentoring_relationship.event.MentoringCountingEvent; -import com.yizhuan.xchat_android_core.mentoring_relationship.event.MentoringCountingFinishEvent; -import com.yizhuan.xchat_android_core.mentoring_relationship.event.MentoringRelationshipMissionEvent; -import com.yizhuan.xchat_android_core.mentoring_relationship.event.MentoringStartCountingEvent; -import com.yizhuan.xchat_android_core.mentoring_relationship.event.MentoringStopCountingEvent; -import com.yizhuan.xchat_android_core.mentoring_relationship.event.MentoringSuccessEvent; -import com.yizhuan.xchat_android_core.msg.sys.ErbanSysMsgInfo; -import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; -import com.yizhuan.xchat_android_core.utils.net.BalanceNotEnoughExeption; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.mentoring_relationship.attachment.MentoringApprenticeMissionFourAttachment; +import com.pikolive.core.mentoring_relationship.attachment.MentoringApprenticeMissionOneAttachment; +import com.pikolive.core.mentoring_relationship.attachment.MentoringApprenticeMissionThreeAttachment; +import com.pikolive.core.mentoring_relationship.attachment.MentoringApprenticeMissionTwoAttachment; +import com.pikolive.core.mentoring_relationship.attachment.MentoringGrabApprenticesAttachment; +import com.pikolive.core.mentoring_relationship.attachment.MentoringMasterMissionFourAttachment; +import com.pikolive.core.mentoring_relationship.attachment.MentoringMasterMissionOneAttachment; +import com.pikolive.core.mentoring_relationship.attachment.MentoringMasterMissionThreeAttachment; +import com.pikolive.core.mentoring_relationship.attachment.MentoringMasterMissionTwoAttachment; +import com.pikolive.core.mentoring_relationship.attachment.MentoringMissionTipsAttachment; +import com.pikolive.core.mentoring_relationship.bean.GrabApprenticesInfo; +import com.pikolive.core.mentoring_relationship.bean.GrabApprenticesMissionInfo; +import com.pikolive.core.mentoring_relationship.bean.MentoringRankingDataInfo; +import com.pikolive.core.mentoring_relationship.bean.MentoringResultMarqueeInfo; +import com.pikolive.core.mentoring_relationship.bean.MentoringTipsInfo; +import com.pikolive.core.mentoring_relationship.bean.MentoringUserInfo; +import com.pikolive.core.mentoring_relationship.bean.MissionVo; +import com.pikolive.core.mentoring_relationship.bean.PickUpApprenticeInfo; +import com.pikolive.core.mentoring_relationship.bean.SimpleGiftVo; +import com.pikolive.core.mentoring_relationship.bean.SimpleUserVo; +import com.pikolive.core.mentoring_relationship.event.MentoringCountingEvent; +import com.pikolive.core.mentoring_relationship.event.MentoringCountingFinishEvent; +import com.pikolive.core.mentoring_relationship.event.MentoringStartCountingEvent; +import com.pikolive.core.mentoring_relationship.event.MentoringSuccessEvent; +import com.pikolive.core.Constants; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.auth.event.LogoutEvent; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.exception.FailReasonException; +import com.pikolive.core.exception.UnKnowException; +import com.pikolive.core.gift.bean.GiftReceiveInfo; +import com.pikolive.core.gift.exception.GiftOutOfDateException; +import com.pikolive.core.im.custom.bean.CustomAttachment; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core2.manager.IMNetEaseManager; +import com.pikolive.core.mentoring_relationship.event.GrabApprenticesDataEvent; +import com.pikolive.core.mentoring_relationship.event.GrabApprenticesEvent; +import com.pikolive.core.mentoring_relationship.event.MentoringRelationshipMissionEvent; +import com.pikolive.core.mentoring_relationship.event.MentoringStopCountingEvent; +import com.pikolive.core.msg.sys.ErbanSysMsgInfo; +import com.pikolive.core.utils.SharedPreferenceUtils; +import com.pikolive.core.utils.net.BalanceNotEnoughExeption; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.net.rxnet.RxNet; import com.pikolive.library.rxbus.RxBus; diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/view/IMentoringRelationshipView.java b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/view/IMentoringRelationshipView.java similarity index 78% rename from core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/view/IMentoringRelationshipView.java rename to core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/view/IMentoringRelationshipView.java index 70780840c..db679ebf3 100644 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/view/IMentoringRelationshipView.java +++ b/core/src/model_mentoring_relationship/java/com/pikolive/core/mentoring_relationship/view/IMentoringRelationshipView.java @@ -1,9 +1,9 @@ -package com.yizhuan.xchat_android_core.mentoring_relationship.view; +package com.pikolive.core.mentoring_relationship.view; -import com.yizhuan.xchat_android_core.mentoring_relationship.bean.MentoringRankingDataInfo; -import com.yizhuan.xchat_android_core.mentoring_relationship.bean.MentoringResultMarqueeInfo; -import com.yizhuan.xchat_android_core.mentoring_relationship.bean.MentoringUserInfo; -import com.yizhuan.xchat_android_core.mentoring_relationship.bean.PickUpApprenticeInfo; +import com.pikolive.core.mentoring_relationship.bean.MentoringRankingDataInfo; +import com.pikolive.core.mentoring_relationship.bean.MentoringResultMarqueeInfo; +import com.pikolive.core.mentoring_relationship.bean.MentoringUserInfo; +import com.pikolive.core.mentoring_relationship.bean.PickUpApprenticeInfo; import com.pikolive.library.base.IMvpBaseView; import java.util.List; diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/attachment/MentoringApprenticeMissionOneAttachment.java b/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/attachment/MentoringApprenticeMissionOneAttachment.java deleted file mode 100644 index 97751c647..000000000 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/attachment/MentoringApprenticeMissionOneAttachment.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.yizhuan.xchat_android_core.mentoring_relationship.attachment; - -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; - -public class MentoringApprenticeMissionOneAttachment extends MentoringMasterMissionOneAttachment { - - - public MentoringApprenticeMissionOneAttachment() { - super(CustomAttachment.CUSTOM_MSG_MENTORING_RELATIONSHIP, - CustomAttachment.CUSTOM_MSG_SUB_MENTORING_RELATIONSHIP_MISSION_ONE_APPRENTICE); - } - -} diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/attachment/MentoringApprenticeMissionTwoAttachment.java b/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/attachment/MentoringApprenticeMissionTwoAttachment.java deleted file mode 100644 index ba2aa4851..000000000 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/attachment/MentoringApprenticeMissionTwoAttachment.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.yizhuan.xchat_android_core.mentoring_relationship.attachment; - -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; - -public class MentoringApprenticeMissionTwoAttachment extends MentoringMasterMissionTwoAttachment { - - public MentoringApprenticeMissionTwoAttachment() { - super(CustomAttachment.CUSTOM_MSG_MENTORING_RELATIONSHIP, - CustomAttachment.CUSTOM_MSG_SUB_MENTORING_RELATIONSHIP_MISSION_TWO_APPRENTICE); - } -} diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/event/GrabApprenticesDataEvent.java b/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/event/GrabApprenticesDataEvent.java deleted file mode 100644 index 776d39046..000000000 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/event/GrabApprenticesDataEvent.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.yizhuan.xchat_android_core.mentoring_relationship.event; - -import com.yizhuan.xchat_android_core.mentoring_relationship.bean.GrabApprenticesInfo; - -import java.util.List; - -import lombok.Data; - -/** - * 抢徒弟消息到达时，消息页数据更新 - */ -@Data -public class GrabApprenticesDataEvent { - - private List grabApprenticesInfoList; -} diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/event/MentoringCountingFinishEvent.java b/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/event/MentoringCountingFinishEvent.java deleted file mode 100644 index 5bd290da4..000000000 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/event/MentoringCountingFinishEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.yizhuan.xchat_android_core.mentoring_relationship.event; - -public class MentoringCountingFinishEvent { -} diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/event/MentoringStartCountingEvent.java b/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/event/MentoringStartCountingEvent.java deleted file mode 100644 index 27221874d..000000000 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/event/MentoringStartCountingEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.yizhuan.xchat_android_core.mentoring_relationship.event; - -public class MentoringStartCountingEvent { -} diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/event/MentoringStopCountingEvent.java b/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/event/MentoringStopCountingEvent.java deleted file mode 100644 index 2b23c02e1..000000000 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/event/MentoringStopCountingEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.yizhuan.xchat_android_core.mentoring_relationship.event; - -public class MentoringStopCountingEvent { -} diff --git a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/event/MentoringSuccessEvent.java b/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/event/MentoringSuccessEvent.java deleted file mode 100644 index 08787d3e0..000000000 --- a/core/src/model_mentoring_relationship/java/com/yizhuan/xchat_android_core/mentoring_relationship/event/MentoringSuccessEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.yizhuan.xchat_android_core.mentoring_relationship.event; - -public class MentoringSuccessEvent { -} diff --git a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/AudioPartyInfo.java b/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/AudioPartyInfo.java similarity index 90% rename from core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/AudioPartyInfo.java rename to core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/AudioPartyInfo.java index c7d1fc1b1..077a31c81 100644 --- a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/AudioPartyInfo.java +++ b/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/AudioPartyInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.miniworld.bean; +package com.pikolive.core.miniworld.bean; import java.io.Serializable; diff --git a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/AudioPartyItem.java b/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/AudioPartyItem.java similarity index 96% rename from core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/AudioPartyItem.java rename to core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/AudioPartyItem.java index 5e577ae04..8d5ae83c0 100644 --- a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/AudioPartyItem.java +++ b/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/AudioPartyItem.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.miniworld.bean; +package com.pikolive.core.miniworld.bean; import android.os.Parcel; import android.os.Parcelable; diff --git a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/AudioPartyListInfo.java b/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/AudioPartyListInfo.java similarity index 77% rename from core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/AudioPartyListInfo.java rename to core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/AudioPartyListInfo.java index 76dafc929..019ec865c 100644 --- a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/AudioPartyListInfo.java +++ b/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/AudioPartyListInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.miniworld.bean; +package com.pikolive.core.miniworld.bean; import java.util.ArrayList; diff --git a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MWChatInfo.java b/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MWChatInfo.java similarity index 88% rename from core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MWChatInfo.java rename to core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MWChatInfo.java index 80efb08fb..c397bba5a 100644 --- a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MWChatInfo.java +++ b/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MWChatInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.miniworld.bean; +package com.pikolive.core.miniworld.bean; import java.util.List; diff --git a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MWChatMemberCountAttachment.java b/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MWChatMemberCountAttachment.java similarity index 91% rename from core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MWChatMemberCountAttachment.java rename to core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MWChatMemberCountAttachment.java index 64eec818a..c9e47ef5e 100644 --- a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MWChatMemberCountAttachment.java +++ b/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MWChatMemberCountAttachment.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.miniworld.bean; +package com.pikolive.core.miniworld.bean; import com.alibaba.fastjson.JSONObject; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; +import com.pikolive.core.im.custom.bean.CustomAttachment; import java.util.List; diff --git a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MWChatTopicAttachment.java b/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MWChatTopicAttachment.java similarity index 88% rename from core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MWChatTopicAttachment.java rename to core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MWChatTopicAttachment.java index d40ef0792..d58278cee 100644 --- a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MWChatTopicAttachment.java +++ b/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MWChatTopicAttachment.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.miniworld.bean; +package com.pikolive.core.miniworld.bean; import com.alibaba.fastjson.JSONObject; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; +import com.pikolive.core.im.custom.bean.CustomAttachment; public class MWChatTopicAttachment extends CustomAttachment { public long getWorldId() { diff --git a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MiniWorldCategoryInfo.java b/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MiniWorldCategoryInfo.java similarity index 88% rename from core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MiniWorldCategoryInfo.java rename to core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MiniWorldCategoryInfo.java index c3914d5ab..016ea245e 100644 --- a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MiniWorldCategoryInfo.java +++ b/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MiniWorldCategoryInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.miniworld.bean; +package com.pikolive.core.miniworld.bean; import java.util.List; diff --git a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MiniWorldDetailInfo.java b/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MiniWorldDetailInfo.java similarity index 96% rename from core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MiniWorldDetailInfo.java rename to core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MiniWorldDetailInfo.java index 0d4925abb..627f8c5a8 100644 --- a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MiniWorldDetailInfo.java +++ b/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MiniWorldDetailInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.miniworld.bean; +package com.pikolive.core.miniworld.bean; import java.io.Serializable; import java.util.List; diff --git a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MiniWorldDetailInfoWithCurrentMember.java b/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MiniWorldDetailInfoWithCurrentMember.java similarity index 91% rename from core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MiniWorldDetailInfoWithCurrentMember.java rename to core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MiniWorldDetailInfoWithCurrentMember.java index 12b2926b6..97440fec6 100644 --- a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MiniWorldDetailInfoWithCurrentMember.java +++ b/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MiniWorldDetailInfoWithCurrentMember.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.miniworld.bean; +package com.pikolive.core.miniworld.bean; import java.io.Serializable; diff --git a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MiniWorldDetailInfoWithMemberInfo.java b/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MiniWorldDetailInfoWithMemberInfo.java similarity index 91% rename from core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MiniWorldDetailInfoWithMemberInfo.java rename to core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MiniWorldDetailInfoWithMemberInfo.java index b6474e84b..2bb920276 100644 --- a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MiniWorldDetailInfoWithMemberInfo.java +++ b/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MiniWorldDetailInfoWithMemberInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.miniworld.bean; +package com.pikolive.core.miniworld.bean; import java.io.Serializable; diff --git a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MiniWorldEditClassifyInfo.java b/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MiniWorldEditClassifyInfo.java similarity index 85% rename from core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MiniWorldEditClassifyInfo.java rename to core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MiniWorldEditClassifyInfo.java index 33287b54d..bda5ba5e6 100644 --- a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MiniWorldEditClassifyInfo.java +++ b/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MiniWorldEditClassifyInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.miniworld.bean; +package com.pikolive.core.miniworld.bean; import lombok.Data; diff --git a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MiniWorldInWorldInfo.java b/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MiniWorldInWorldInfo.java similarity index 80% rename from core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MiniWorldInWorldInfo.java rename to core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MiniWorldInWorldInfo.java index da0f95e73..9f391be43 100644 --- a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MiniWorldInWorldInfo.java +++ b/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MiniWorldInWorldInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.miniworld.bean; +package com.pikolive.core.miniworld.bean; import lombok.Data; diff --git a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MiniWorldInfo.java b/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MiniWorldInfo.java similarity index 93% rename from core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MiniWorldInfo.java rename to core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MiniWorldInfo.java index b2aa3a140..79768f40c 100644 --- a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MiniWorldInfo.java +++ b/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MiniWorldInfo.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.miniworld.bean; +package com.pikolive.core.miniworld.bean; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; +import com.pikolive.core.user.bean.UserInfo; import java.util.List; diff --git a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MiniWorldListInfo.java b/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MiniWorldListInfo.java similarity index 68% rename from core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MiniWorldListInfo.java rename to core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MiniWorldListInfo.java index 7edbd0cf4..e3671cae3 100644 --- a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MiniWorldListInfo.java +++ b/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MiniWorldListInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.miniworld.bean; +package com.pikolive.core.miniworld.bean; import java.util.List; diff --git a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MiniWorldMainInfo.java b/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MiniWorldMainInfo.java similarity index 68% rename from core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MiniWorldMainInfo.java rename to core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MiniWorldMainInfo.java index b1e9ad79e..eb4a78ca7 100644 --- a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MiniWorldMainInfo.java +++ b/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MiniWorldMainInfo.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.miniworld.bean; +package com.pikolive.core.miniworld.bean; -import com.yizhuan.xchat_android_core.home.bean.BannerInfo; +import com.pikolive.core2.home.bean.BannerInfo; import java.util.List; diff --git a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MiniWorldMainItemInfo.java b/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MiniWorldMainItemInfo.java similarity index 93% rename from core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MiniWorldMainItemInfo.java rename to core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MiniWorldMainItemInfo.java index e87322a8c..e925d170e 100644 --- a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MiniWorldMainItemInfo.java +++ b/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MiniWorldMainItemInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.miniworld.bean; +package com.pikolive.core.miniworld.bean; import com.chad.library.adapter.base.entity.MultiItemEntity; diff --git a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MiniWorldMemberListInfo.java b/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MiniWorldMemberListInfo.java similarity index 83% rename from core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MiniWorldMemberListInfo.java rename to core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MiniWorldMemberListInfo.java index ca800dd59..6c3ed6890 100644 --- a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MiniWorldMemberListInfo.java +++ b/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MiniWorldMemberListInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.miniworld.bean; +package com.pikolive.core.miniworld.bean; import java.io.Serializable; import java.util.List; diff --git a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MiniWorldMemberListMemberInfo.java b/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MiniWorldMemberListMemberInfo.java similarity index 87% rename from core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MiniWorldMemberListMemberInfo.java rename to core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MiniWorldMemberListMemberInfo.java index 95b77615b..920362fcd 100644 --- a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/MiniWorldMemberListMemberInfo.java +++ b/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/MiniWorldMemberListMemberInfo.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.miniworld.bean; +package com.pikolive.core.miniworld.bean; -import com.yizhuan.xchat_android_core.level.UserLevelVo; +import com.pikolive.core.level.UserLevelVo; import java.io.Serializable; diff --git a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/OpenAudioPartyAttachment.java b/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/OpenAudioPartyAttachment.java similarity index 90% rename from core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/OpenAudioPartyAttachment.java rename to core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/OpenAudioPartyAttachment.java index 15911b96e..2636352c9 100644 --- a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/OpenAudioPartyAttachment.java +++ b/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/OpenAudioPartyAttachment.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.miniworld.bean; +package com.pikolive.core.miniworld.bean; import com.alibaba.fastjson.JSONObject; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; +import com.pikolive.core.im.custom.bean.CustomAttachment; public class OpenAudioPartyAttachment extends CustomAttachment { diff --git a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/OpenSuccessInfo.java b/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/OpenSuccessInfo.java similarity index 60% rename from core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/OpenSuccessInfo.java rename to core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/OpenSuccessInfo.java index 7cf9a2d83..0f3ecccc0 100644 --- a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/OpenSuccessInfo.java +++ b/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/OpenSuccessInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.miniworld.bean; +package com.pikolive.core.miniworld.bean; import lombok.Data; diff --git a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/TopicInfo.java b/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/TopicInfo.java similarity index 59% rename from core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/TopicInfo.java rename to core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/TopicInfo.java index 5a0e880ba..dd5091fc2 100644 --- a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/bean/TopicInfo.java +++ b/core/src/model_mini_world/java/com/pikolive/core/miniworld/bean/TopicInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.miniworld.bean; +package com.pikolive.core.miniworld.bean; import lombok.Data; diff --git a/core/src/model_mini_world/java/com/pikolive/core/miniworld/event/AudioPartyOpenEvent.java b/core/src/model_mini_world/java/com/pikolive/core/miniworld/event/AudioPartyOpenEvent.java new file mode 100644 index 000000000..c96d84bd5 --- /dev/null +++ b/core/src/model_mini_world/java/com/pikolive/core/miniworld/event/AudioPartyOpenEvent.java @@ -0,0 +1,4 @@ +package com.pikolive.core.miniworld.event; + +public class AudioPartyOpenEvent { +} diff --git a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/event/MWChatTopicEvent.java b/core/src/model_mini_world/java/com/pikolive/core/miniworld/event/MWChatTopicEvent.java similarity index 67% rename from core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/event/MWChatTopicEvent.java rename to core/src/model_mini_world/java/com/pikolive/core/miniworld/event/MWChatTopicEvent.java index 164d75d01..16e558eb3 100644 --- a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/event/MWChatTopicEvent.java +++ b/core/src/model_mini_world/java/com/pikolive/core/miniworld/event/MWChatTopicEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.miniworld.event; +package com.pikolive.core.miniworld.event; import lombok.Data; diff --git a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/event/MWGroupChatMemberEvent.java b/core/src/model_mini_world/java/com/pikolive/core/miniworld/event/MWGroupChatMemberEvent.java similarity index 75% rename from core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/event/MWGroupChatMemberEvent.java rename to core/src/model_mini_world/java/com/pikolive/core/miniworld/event/MWGroupChatMemberEvent.java index e63804446..91f7c0bdc 100644 --- a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/event/MWGroupChatMemberEvent.java +++ b/core/src/model_mini_world/java/com/pikolive/core/miniworld/event/MWGroupChatMemberEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.miniworld.event; +package com.pikolive.core.miniworld.event; import java.util.List; diff --git a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/event/MWOpenAudioPartyEvent.java b/core/src/model_mini_world/java/com/pikolive/core/miniworld/event/MWOpenAudioPartyEvent.java similarity index 72% rename from core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/event/MWOpenAudioPartyEvent.java rename to core/src/model_mini_world/java/com/pikolive/core/miniworld/event/MWOpenAudioPartyEvent.java index c301cd5db..ebdf94a39 100644 --- a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/event/MWOpenAudioPartyEvent.java +++ b/core/src/model_mini_world/java/com/pikolive/core/miniworld/event/MWOpenAudioPartyEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.miniworld.event; +package com.pikolive.core.miniworld.event; import lombok.Data; diff --git a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/event/MiniWorldJoinVerifiedEvent.java b/core/src/model_mini_world/java/com/pikolive/core/miniworld/event/MiniWorldJoinVerifiedEvent.java similarity index 75% rename from core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/event/MiniWorldJoinVerifiedEvent.java rename to core/src/model_mini_world/java/com/pikolive/core/miniworld/event/MiniWorldJoinVerifiedEvent.java index 688ba2b55..81b762b14 100644 --- a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/event/MiniWorldJoinVerifiedEvent.java +++ b/core/src/model_mini_world/java/com/pikolive/core/miniworld/event/MiniWorldJoinVerifiedEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.miniworld.event; +package com.pikolive.core.miniworld.event; import lombok.Data; diff --git a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/event/MiniWorldStateChangedEvent.java b/core/src/model_mini_world/java/com/pikolive/core/miniworld/event/MiniWorldStateChangedEvent.java similarity index 93% rename from core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/event/MiniWorldStateChangedEvent.java rename to core/src/model_mini_world/java/com/pikolive/core/miniworld/event/MiniWorldStateChangedEvent.java index 3eaf6ee81..efe9aba25 100644 --- a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/event/MiniWorldStateChangedEvent.java +++ b/core/src/model_mini_world/java/com/pikolive/core/miniworld/event/MiniWorldStateChangedEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.miniworld.event; +package com.pikolive.core.miniworld.event; import lombok.Data; diff --git a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/event/MiniWorldTeamExitEvent.java b/core/src/model_mini_world/java/com/pikolive/core/miniworld/event/MiniWorldTeamExitEvent.java similarity index 72% rename from core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/event/MiniWorldTeamExitEvent.java rename to core/src/model_mini_world/java/com/pikolive/core/miniworld/event/MiniWorldTeamExitEvent.java index 5510dee6d..c479891a6 100644 --- a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/event/MiniWorldTeamExitEvent.java +++ b/core/src/model_mini_world/java/com/pikolive/core/miniworld/event/MiniWorldTeamExitEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.miniworld.event; +package com.pikolive.core.miniworld.event; import java.io.Serializable; diff --git a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/event/OpenedMyMiniWorldEvent.java b/core/src/model_mini_world/java/com/pikolive/core/miniworld/event/OpenedMyMiniWorldEvent.java similarity index 82% rename from core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/event/OpenedMyMiniWorldEvent.java rename to core/src/model_mini_world/java/com/pikolive/core/miniworld/event/OpenedMyMiniWorldEvent.java index a064506ca..74e1e9167 100644 --- a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/event/OpenedMyMiniWorldEvent.java +++ b/core/src/model_mini_world/java/com/pikolive/core/miniworld/event/OpenedMyMiniWorldEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.miniworld.event; +package com.pikolive.core.miniworld.event; /** * 打开我加入的事件 diff --git a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/model/IMiniWorldModel.java b/core/src/model_mini_world/java/com/pikolive/core/miniworld/model/IMiniWorldModel.java similarity index 78% rename from core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/model/IMiniWorldModel.java rename to core/src/model_mini_world/java/com/pikolive/core/miniworld/model/IMiniWorldModel.java index 85ee79caa..dd06e5a36 100644 --- a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/model/IMiniWorldModel.java +++ b/core/src/model_mini_world/java/com/pikolive/core/miniworld/model/IMiniWorldModel.java @@ -1,18 +1,18 @@ -package com.yizhuan.xchat_android_core.miniworld.model; +package com.pikolive.core.miniworld.model; -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.miniworld.bean.AudioPartyInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.AudioPartyListInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.MWChatInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldCategoryInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldDetailInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldEditClassifyInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldInWorldInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldMainInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldMemberListInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.TopicInfo; +import com.pikolive.core.miniworld.bean.AudioPartyInfo; +import com.pikolive.core.miniworld.bean.AudioPartyListInfo; +import com.pikolive.core.miniworld.bean.MWChatInfo; +import com.pikolive.core.miniworld.bean.MiniWorldCategoryInfo; +import com.pikolive.core.miniworld.bean.MiniWorldDetailInfo; +import com.pikolive.core.miniworld.bean.MiniWorldEditClassifyInfo; +import com.pikolive.core.miniworld.bean.MiniWorldInWorldInfo; +import com.pikolive.core.miniworld.bean.MiniWorldMainInfo; +import com.pikolive.core.miniworld.bean.MiniWorldMemberListInfo; +import com.pikolive.core.miniworld.bean.TopicInfo; +import com.pikolive.core.base.IModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.miniworld.bean.MiniWorldInfo; import java.util.List; diff --git a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/model/MiniWorldHelper.java b/core/src/model_mini_world/java/com/pikolive/core/miniworld/model/MiniWorldHelper.java similarity index 91% rename from core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/model/MiniWorldHelper.java rename to core/src/model_mini_world/java/com/pikolive/core/miniworld/model/MiniWorldHelper.java index 79532ff2a..d03d15f71 100644 --- a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/model/MiniWorldHelper.java +++ b/core/src/model_mini_world/java/com/pikolive/core/miniworld/model/MiniWorldHelper.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.miniworld.model; +package com.pikolive.core.miniworld.model; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.utils.SharedPreferenceUtils; import java.util.HashMap; import java.util.Map; diff --git a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/model/MiniWorldModel.java b/core/src/model_mini_world/java/com/pikolive/core/miniworld/model/MiniWorldModel.java similarity index 95% rename from core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/model/MiniWorldModel.java rename to core/src/model_mini_world/java/com/pikolive/core/miniworld/model/MiniWorldModel.java index 5ca644068..9966e89df 100644 --- a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/model/MiniWorldModel.java +++ b/core/src/model_mini_world/java/com/pikolive/core/miniworld/model/MiniWorldModel.java @@ -1,27 +1,27 @@ -package com.yizhuan.xchat_android_core.miniworld.model; +package com.pikolive.core.miniworld.model; import androidx.annotation.Nullable; import com.google.gson.JsonElement; -import com.yizhuan.xchat_android_core.R; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.exception.FailReasonException; -import com.yizhuan.xchat_android_core.miniworld.bean.AudioPartyInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.AudioPartyListInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.MWChatInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldCategoryInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldDetailInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldEditClassifyInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldInWorldInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldListInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldMainInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldMemberListInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.OpenSuccessInfo; -import com.yizhuan.xchat_android_core.miniworld.bean.TopicInfo; -import com.yizhuan.xchat_android_core.monsterhunting.model.MonsterHuntingModel; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.miniworld.bean.AudioPartyInfo; +import com.pikolive.core.miniworld.bean.AudioPartyListInfo; +import com.pikolive.core.miniworld.bean.MWChatInfo; +import com.pikolive.core.miniworld.bean.MiniWorldCategoryInfo; +import com.pikolive.core.miniworld.bean.MiniWorldDetailInfo; +import com.pikolive.core.miniworld.bean.MiniWorldEditClassifyInfo; +import com.pikolive.core.miniworld.bean.MiniWorldInWorldInfo; +import com.pikolive.core.miniworld.bean.MiniWorldInfo; +import com.pikolive.core.miniworld.bean.MiniWorldListInfo; +import com.pikolive.core.miniworld.bean.MiniWorldMainInfo; +import com.pikolive.core.miniworld.bean.MiniWorldMemberListInfo; +import com.pikolive.core.miniworld.bean.OpenSuccessInfo; +import com.pikolive.core.miniworld.bean.TopicInfo; +import com.pikolive.core.R; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.exception.FailReasonException; +import com.pikolive.core.monsterhunting.model.MonsterHuntingModel; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.net.rxnet.RxNet; import com.pikolive.library.utils.ResUtil; diff --git a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/event/AudioPartyOpenEvent.java b/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/event/AudioPartyOpenEvent.java deleted file mode 100644 index 867b97bd7..000000000 --- a/core/src/model_mini_world/java/com/yizhuan/xchat_android_core/miniworld/event/AudioPartyOpenEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.yizhuan.xchat_android_core.miniworld.event; - -public class AudioPartyOpenEvent { -} diff --git a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/bean/BaseMusicInfo.java b/core/src/model_music/java/com/pikolive/core/music/bean/BaseMusicInfo.java similarity index 98% rename from core/src/model_music/java/com/yizhuan/xchat_android_core/music/bean/BaseMusicInfo.java rename to core/src/model_music/java/com/pikolive/core/music/bean/BaseMusicInfo.java index eba16cc3e..241485f44 100644 --- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/bean/BaseMusicInfo.java +++ b/core/src/model_music/java/com/pikolive/core/music/bean/BaseMusicInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.music.bean; +package com.pikolive.core.music.bean; import com.pikolive.library.utils.BlankUtil; import com.pikolive.library.utils.json.JsonParser; diff --git a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/bean/LocalMusicInfo.java b/core/src/model_music/java/com/pikolive/core/music/bean/LocalMusicInfo.java similarity index 99% rename from core/src/model_music/java/com/yizhuan/xchat_android_core/music/bean/LocalMusicInfo.java rename to core/src/model_music/java/com/pikolive/core/music/bean/LocalMusicInfo.java index d3436c037..fab1da970 100644 --- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/bean/LocalMusicInfo.java +++ b/core/src/model_music/java/com/pikolive/core/music/bean/LocalMusicInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.music.bean; +package com.pikolive.core.music.bean; import com.pikolive.library.utils.BlankUtil; import com.pikolive.library.utils.json.JsonParser; diff --git a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/bean/ShareMusicInfo.java b/core/src/model_music/java/com/pikolive/core/music/bean/ShareMusicInfo.java similarity index 95% rename from core/src/model_music/java/com/yizhuan/xchat_android_core/music/bean/ShareMusicInfo.java rename to core/src/model_music/java/com/pikolive/core/music/bean/ShareMusicInfo.java index 91e1cb5bb..7f38b9ba4 100644 --- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/bean/ShareMusicInfo.java +++ b/core/src/model_music/java/com/pikolive/core/music/bean/ShareMusicInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.music.bean; +package com.pikolive.core.music.bean; import java.io.Serializable; diff --git a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/bean/LocalMusicBean.java b/core/src/model_music/java/com/pikolive/core/music/db/bean/LocalMusicBean.java similarity index 95% rename from core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/bean/LocalMusicBean.java rename to core/src/model_music/java/com/pikolive/core/music/db/bean/LocalMusicBean.java index 84b195c50..798c08e9a 100644 --- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/bean/LocalMusicBean.java +++ b/core/src/model_music/java/com/pikolive/core/music/db/bean/LocalMusicBean.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.music.db.bean; +package com.pikolive.core.music.db.bean; import androidx.room.ColumnInfo; import androidx.room.Entity; diff --git a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/bean/SongBean.java b/core/src/model_music/java/com/pikolive/core/music/db/bean/SongBean.java similarity index 95% rename from core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/bean/SongBean.java rename to core/src/model_music/java/com/pikolive/core/music/db/bean/SongBean.java index 62e6a76c9..cc984eda2 100644 --- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/bean/SongBean.java +++ b/core/src/model_music/java/com/pikolive/core/music/db/bean/SongBean.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.music.db.bean; +package com.pikolive.core.music.db.bean; import androidx.room.ColumnInfo; import androidx.room.Entity; diff --git a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/converter/LocalMusicBeanConverter.java b/core/src/model_music/java/com/pikolive/core/music/db/converter/LocalMusicBeanConverter.java similarity index 81% rename from core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/converter/LocalMusicBeanConverter.java rename to core/src/model_music/java/com/pikolive/core/music/db/converter/LocalMusicBeanConverter.java index 63139a48a..857ebd4eb 100644 --- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/converter/LocalMusicBeanConverter.java +++ b/core/src/model_music/java/com/pikolive/core/music/db/converter/LocalMusicBeanConverter.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.music.db.converter; +package com.pikolive.core.music.db.converter; -import com.yizhuan.xchat_android_core.music.bean.LocalMusicInfo; -import com.yizhuan.xchat_android_core.music.db.bean.LocalMusicBean; +import com.pikolive.core.music.bean.LocalMusicInfo; +import com.pikolive.core.music.db.bean.LocalMusicBean; /** * 方便将 UI 实体 跟 数据库实体 互相转换的工具类 diff --git a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/converter/ShareMusicConverter.java b/core/src/model_music/java/com/pikolive/core/music/db/converter/ShareMusicConverter.java similarity index 67% rename from core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/converter/ShareMusicConverter.java rename to core/src/model_music/java/com/pikolive/core/music/db/converter/ShareMusicConverter.java index a4839bf2b..e0fe6bd93 100644 --- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/converter/ShareMusicConverter.java +++ b/core/src/model_music/java/com/pikolive/core/music/db/converter/ShareMusicConverter.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.music.db.converter; +package com.pikolive.core.music.db.converter; -import com.yizhuan.xchat_android_core.music.bean.ShareMusicInfo; -import com.yizhuan.xchat_android_core.music.db.bean.SongBean; +import com.pikolive.core.music.bean.ShareMusicInfo; +import com.pikolive.core.music.db.bean.SongBean; /** * 方便将 UI 实体 跟 数据库实体 互相转换的工具类 diff --git a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/dao/LocalMusicDao.java b/core/src/model_music/java/com/pikolive/core/music/db/dao/LocalMusicDao.java similarity index 88% rename from core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/dao/LocalMusicDao.java rename to core/src/model_music/java/com/pikolive/core/music/db/dao/LocalMusicDao.java index 2c06bf7c5..25dac3092 100644 --- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/dao/LocalMusicDao.java +++ b/core/src/model_music/java/com/pikolive/core/music/db/dao/LocalMusicDao.java @@ -1,11 +1,11 @@ -package com.yizhuan.xchat_android_core.music.db.dao; +package com.pikolive.core.music.db.dao; import androidx.room.Dao; import androidx.room.Insert; import androidx.room.OnConflictStrategy; import androidx.room.Query; -import com.yizhuan.xchat_android_core.music.db.bean.LocalMusicBean; +import com.pikolive.core.music.db.bean.LocalMusicBean; import java.util.List; @@ -15,7 +15,7 @@ import io.reactivex.Single; public interface LocalMusicDao { @Query("SELECT * FROM local_songs ORDER BY ID DESC LIMIT :page, :size") - Single> getLocalMusicList(int page,int size); + Single> getLocalMusicList(int page, int size); @Query("SELECT * FROM local_songs ORDER BY ID DESC") Single> getLocalMusicList(); diff --git a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/dao/SongDao.java b/core/src/model_music/java/com/pikolive/core/music/db/dao/SongDao.java similarity index 71% rename from core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/dao/SongDao.java rename to core/src/model_music/java/com/pikolive/core/music/db/dao/SongDao.java index 405303cb9..46804610b 100644 --- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/dao/SongDao.java +++ b/core/src/model_music/java/com/pikolive/core/music/db/dao/SongDao.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.music.db.dao; +package com.pikolive.core.music.db.dao; import androidx.room.Dao; import androidx.room.Delete; @@ -6,8 +6,8 @@ import androidx.room.Insert; import androidx.room.OnConflictStrategy; import androidx.room.Query; -import com.yizhuan.xchat_android_core.music.db.bean.LocalMusicBean; -import com.yizhuan.xchat_android_core.music.db.bean.SongBean; +import com.pikolive.core.music.db.bean.LocalMusicBean; +import com.pikolive.core.music.db.bean.SongBean; import java.util.List; @@ -17,7 +17,7 @@ import io.reactivex.Single; public interface SongDao { @Query("SELECT * FROM songs ORDER BY ID LIMIT :page, :size") - Single> getPlayList(int page,int size); + Single> getPlayList(int page, int size); @Query("SELECT * FROM songs WHERE music_id = :musicId") Single findByMusicId(long musicId); diff --git a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/model/ILocalMusicDbModel.java b/core/src/model_music/java/com/pikolive/core/music/db/model/ILocalMusicDbModel.java similarity index 77% rename from core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/model/ILocalMusicDbModel.java rename to core/src/model_music/java/com/pikolive/core/music/db/model/ILocalMusicDbModel.java index ee3be5319..d5971316c 100644 --- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/model/ILocalMusicDbModel.java +++ b/core/src/model_music/java/com/pikolive/core/music/db/model/ILocalMusicDbModel.java @@ -1,8 +1,8 @@ -package com.yizhuan.xchat_android_core.music.db.model; +package com.pikolive.core.music.db.model; -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.music.bean.LocalMusicInfo; -import com.yizhuan.xchat_android_core.music.db.bean.LocalMusicBean; +import com.pikolive.core.music.bean.LocalMusicInfo; +import com.pikolive.core.base.IModel; +import com.pikolive.core.music.db.bean.LocalMusicBean; import java.util.List; diff --git a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/model/IPlayerDbModel.java b/core/src/model_music/java/com/pikolive/core/music/db/model/IPlayerDbModel.java similarity index 85% rename from core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/model/IPlayerDbModel.java rename to core/src/model_music/java/com/pikolive/core/music/db/model/IPlayerDbModel.java index 215f2d991..5aa7085fa 100644 --- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/model/IPlayerDbModel.java +++ b/core/src/model_music/java/com/pikolive/core/music/db/model/IPlayerDbModel.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.music.db.model; +package com.pikolive.core.music.db.model; -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.music.bean.LocalMusicInfo; +import com.pikolive.core.music.bean.LocalMusicInfo; +import com.pikolive.core.base.IModel; import java.util.List; diff --git a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/model/LocalMusicDbModel.java b/core/src/model_music/java/com/pikolive/core/music/db/model/LocalMusicDbModel.java similarity index 95% rename from core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/model/LocalMusicDbModel.java rename to core/src/model_music/java/com/pikolive/core/music/db/model/LocalMusicDbModel.java index b34bfb5fb..50258eed0 100644 --- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/model/LocalMusicDbModel.java +++ b/core/src/model_music/java/com/pikolive/core/music/db/model/LocalMusicDbModel.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.music.db.model; +package com.pikolive.core.music.db.model; import android.annotation.SuppressLint; import android.content.ContentUris; @@ -9,15 +9,15 @@ import android.provider.MediaStore; import androidx.annotation.Nullable; -import com.yizhuan.tutu.database.AppDataBase; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.music.bean.LocalMusicInfo; -import com.yizhuan.xchat_android_core.music.db.bean.LocalMusicBean; -import com.yizhuan.xchat_android_core.music.db.converter.LocalMusicBeanConverter; -import com.yizhuan.xchat_android_core.music.event.RefreshLocalMusicEvent; -import com.yizhuan.xchat_android_core.utils.AsyncTaskScanMusicFile; -import com.yizhuan.xchat_android_core.utils.SongUtils; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.music.bean.LocalMusicInfo; +import com.pikolive.core.music.db.converter.LocalMusicBeanConverter; +import com.pikolive.core.music.event.RefreshLocalMusicEvent; +import com.pikolive.core.database.AppDataBase; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.music.db.bean.LocalMusicBean; +import com.pikolive.core.utils.AsyncTaskScanMusicFile; +import com.pikolive.core.utils.SongUtils; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.utils.ListUtils; import com.pikolive.library.utils.config.BasicConfig; diff --git a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/model/PlayerDbModel.java b/core/src/model_music/java/com/pikolive/core/music/db/model/PlayerDbModel.java similarity index 95% rename from core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/model/PlayerDbModel.java rename to core/src/model_music/java/com/pikolive/core/music/db/model/PlayerDbModel.java index 3c9800441..85c084afd 100644 --- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/db/model/PlayerDbModel.java +++ b/core/src/model_music/java/com/pikolive/core/music/db/model/PlayerDbModel.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.music.db.model; +package com.pikolive.core.music.db.model; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.music.bean.LocalMusicInfo; +import com.pikolive.core.music.bean.LocalMusicInfo; +import com.pikolive.core.base.BaseModel; import java.util.List; diff --git a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/event/CurrentMusicUpdateEvent.java b/core/src/model_music/java/com/pikolive/core/music/event/CurrentMusicUpdateEvent.java similarity index 61% rename from core/src/model_music/java/com/yizhuan/xchat_android_core/music/event/CurrentMusicUpdateEvent.java rename to core/src/model_music/java/com/pikolive/core/music/event/CurrentMusicUpdateEvent.java index 6acf9c02b..02d584c99 100644 --- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/event/CurrentMusicUpdateEvent.java +++ b/core/src/model_music/java/com/pikolive/core/music/event/CurrentMusicUpdateEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.music.event; +package com.pikolive.core.music.event; /** * create by lvzebiao on 2018/9/5 diff --git a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/event/JumpToShareMusicListFragmentEvent.java b/core/src/model_music/java/com/pikolive/core/music/event/JumpToShareMusicListFragmentEvent.java similarity index 50% rename from core/src/model_music/java/com/yizhuan/xchat_android_core/music/event/JumpToShareMusicListFragmentEvent.java rename to core/src/model_music/java/com/pikolive/core/music/event/JumpToShareMusicListFragmentEvent.java index bd22fc0ff..e918d4d81 100644 --- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/event/JumpToShareMusicListFragmentEvent.java +++ b/core/src/model_music/java/com/pikolive/core/music/event/JumpToShareMusicListFragmentEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.music.event; +package com.pikolive.core.music.event; public class JumpToShareMusicListFragmentEvent { } diff --git a/core/src/model_music/java/com/pikolive/core/music/event/MusicAddEvent.java b/core/src/model_music/java/com/pikolive/core/music/event/MusicAddEvent.java new file mode 100644 index 000000000..5d05c81c8 --- /dev/null +++ b/core/src/model_music/java/com/pikolive/core/music/event/MusicAddEvent.java @@ -0,0 +1,11 @@ +package com.pikolive.core.music.event; + +import com.pikolive.core.music.bean.LocalMusicInfo; + +import lombok.Data; + +@Data +public class MusicAddEvent { + + private LocalMusicInfo localMusicInfo; +} diff --git a/core/src/model_music/java/com/pikolive/core/music/event/MusicDeleteEvent.java b/core/src/model_music/java/com/pikolive/core/music/event/MusicDeleteEvent.java new file mode 100644 index 000000000..c36e346b4 --- /dev/null +++ b/core/src/model_music/java/com/pikolive/core/music/event/MusicDeleteEvent.java @@ -0,0 +1,11 @@ +package com.pikolive.core.music.event; + +import com.pikolive.core.music.bean.LocalMusicInfo; + +import lombok.Data; + +@Data +public class MusicDeleteEvent { + + private LocalMusicInfo localMusicInfo; +} diff --git a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/event/MusicPauseEvent.java b/core/src/model_music/java/com/pikolive/core/music/event/MusicPauseEvent.java similarity index 59% rename from core/src/model_music/java/com/yizhuan/xchat_android_core/music/event/MusicPauseEvent.java rename to core/src/model_music/java/com/pikolive/core/music/event/MusicPauseEvent.java index 3498148be..385a403fe 100644 --- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/event/MusicPauseEvent.java +++ b/core/src/model_music/java/com/pikolive/core/music/event/MusicPauseEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.music.event; +package com.pikolive.core.music.event; /** * create by lvzebiao on 2018/9/6 diff --git a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/event/MusicPlayingEvent.java b/core/src/model_music/java/com/pikolive/core/music/event/MusicPlayingEvent.java similarity index 60% rename from core/src/model_music/java/com/yizhuan/xchat_android_core/music/event/MusicPlayingEvent.java rename to core/src/model_music/java/com/pikolive/core/music/event/MusicPlayingEvent.java index 6e7ea987e..3d34e68b0 100644 --- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/event/MusicPlayingEvent.java +++ b/core/src/model_music/java/com/pikolive/core/music/event/MusicPlayingEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.music.event; +package com.pikolive.core.music.event; /** * create by lvzebiao on 2018/9/6 diff --git a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/event/MusicStopEvent.java b/core/src/model_music/java/com/pikolive/core/music/event/MusicStopEvent.java similarity index 59% rename from core/src/model_music/java/com/yizhuan/xchat_android_core/music/event/MusicStopEvent.java rename to core/src/model_music/java/com/pikolive/core/music/event/MusicStopEvent.java index 95dd25b6a..ad0c86ef2 100644 --- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/event/MusicStopEvent.java +++ b/core/src/model_music/java/com/pikolive/core/music/event/MusicStopEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.music.event; +package com.pikolive.core.music.event; /** * create by lvzebiao on 2018/9/6 diff --git a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/event/RefreshLocalMusicEvent.java b/core/src/model_music/java/com/pikolive/core/music/event/RefreshLocalMusicEvent.java similarity index 61% rename from core/src/model_music/java/com/yizhuan/xchat_android_core/music/event/RefreshLocalMusicEvent.java rename to core/src/model_music/java/com/pikolive/core/music/event/RefreshLocalMusicEvent.java index 48d58386b..e59b7c027 100644 --- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/event/RefreshLocalMusicEvent.java +++ b/core/src/model_music/java/com/pikolive/core/music/event/RefreshLocalMusicEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.music.event; +package com.pikolive.core.music.event; /** * create by lvzebiao on 2018/9/5 diff --git a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/event/RefreshPlayerListEvent.java b/core/src/model_music/java/com/pikolive/core/music/event/RefreshPlayerListEvent.java similarity index 61% rename from core/src/model_music/java/com/yizhuan/xchat_android_core/music/event/RefreshPlayerListEvent.java rename to core/src/model_music/java/com/pikolive/core/music/event/RefreshPlayerListEvent.java index 4e168b6de..fe2619b60 100644 --- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/event/RefreshPlayerListEvent.java +++ b/core/src/model_music/java/com/pikolive/core/music/event/RefreshPlayerListEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.music.event; +package com.pikolive.core.music.event; /** * create by lvzebiao on 2018/9/5 diff --git a/core/src/model_music/java/com/pikolive/core/music/model/ILocalMusicListModel.java b/core/src/model_music/java/com/pikolive/core/music/model/ILocalMusicListModel.java new file mode 100644 index 000000000..7188186fb --- /dev/null +++ b/core/src/model_music/java/com/pikolive/core/music/model/ILocalMusicListModel.java @@ -0,0 +1,6 @@ +package com.pikolive.core.music.model; + +import com.pikolive.core.base.IModel; + +public interface ILocalMusicListModel extends IModel { +} diff --git a/core/src/model_music/java/com/pikolive/core/music/model/IMusicListModel.java b/core/src/model_music/java/com/pikolive/core/music/model/IMusicListModel.java new file mode 100644 index 000000000..5fc824fcf --- /dev/null +++ b/core/src/model_music/java/com/pikolive/core/music/model/IMusicListModel.java @@ -0,0 +1,6 @@ +package com.pikolive.core.music.model; + +import com.pikolive.core.base.IModel; + +public interface IMusicListModel extends IModel { +} diff --git a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/model/IPlayerModel.java b/core/src/model_music/java/com/pikolive/core/music/model/IPlayerModel.java similarity index 84% rename from core/src/model_music/java/com/yizhuan/xchat_android_core/music/model/IPlayerModel.java rename to core/src/model_music/java/com/pikolive/core/music/model/IPlayerModel.java index 5ce4a2c51..4d90974a4 100644 --- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/model/IPlayerModel.java +++ b/core/src/model_music/java/com/pikolive/core/music/model/IPlayerModel.java @@ -1,8 +1,8 @@ -package com.yizhuan.xchat_android_core.music.model; +package com.pikolive.core.music.model; -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.music.bean.LocalMusicInfo; -import com.yizhuan.xchat_android_core.music.db.bean.LocalMusicBean; +import com.pikolive.core.music.bean.LocalMusicInfo; +import com.pikolive.core.music.db.bean.LocalMusicBean; +import com.pikolive.core.base.IModel; import java.util.List; diff --git a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/model/IShareMusicListModel.java b/core/src/model_music/java/com/pikolive/core/music/model/IShareMusicListModel.java similarity index 64% rename from core/src/model_music/java/com/yizhuan/xchat_android_core/music/model/IShareMusicListModel.java rename to core/src/model_music/java/com/pikolive/core/music/model/IShareMusicListModel.java index 979f30201..5328fda67 100644 --- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/model/IShareMusicListModel.java +++ b/core/src/model_music/java/com/pikolive/core/music/model/IShareMusicListModel.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.music.model; +package com.pikolive.core.music.model; -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.music.bean.ShareMusicInfo; +import com.pikolive.core.base.IModel; +import com.pikolive.core.music.bean.ShareMusicInfo; import java.util.List; diff --git a/core/src/model_music/java/com/pikolive/core/music/model/LocalMusicListModel.java b/core/src/model_music/java/com/pikolive/core/music/model/LocalMusicListModel.java new file mode 100644 index 000000000..7211d705a --- /dev/null +++ b/core/src/model_music/java/com/pikolive/core/music/model/LocalMusicListModel.java @@ -0,0 +1,7 @@ +package com.pikolive.core.music.model; + +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.base.IModel; + +public class LocalMusicListModel extends BaseModel implements IModel { +} diff --git a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/model/MusicListModel.java b/core/src/model_music/java/com/pikolive/core/music/model/MusicListModel.java similarity index 76% rename from core/src/model_music/java/com/yizhuan/xchat_android_core/music/model/MusicListModel.java rename to core/src/model_music/java/com/pikolive/core/music/model/MusicListModel.java index e380c88cb..a67441a03 100644 --- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/model/MusicListModel.java +++ b/core/src/model_music/java/com/pikolive/core/music/model/MusicListModel.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.music.model; +package com.pikolive.core.music.model; -import com.yizhuan.xchat_android_core.base.BaseModel; +import com.pikolive.core.base.BaseModel; public class MusicListModel extends BaseModel implements IMusicListModel { diff --git a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/model/PlayerModel.java b/core/src/model_music/java/com/pikolive/core/music/model/PlayerModel.java similarity index 93% rename from core/src/model_music/java/com/yizhuan/xchat_android_core/music/model/PlayerModel.java rename to core/src/model_music/java/com/pikolive/core/music/model/PlayerModel.java index b9ed5ff70..737dbc771 100644 --- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/model/PlayerModel.java +++ b/core/src/model_music/java/com/pikolive/core/music/model/PlayerModel.java @@ -1,22 +1,22 @@ -package com.yizhuan.xchat_android_core.music.model; +package com.pikolive.core.music.model; import android.os.Handler; import android.os.Message; import android.text.TextUtils; -import com.yizhuan.xchat_android_core.DemoCache; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.manager.AudioEngineManager; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.manager.RoomEvent; -import com.yizhuan.xchat_android_core.music.bean.LocalMusicInfo; -import com.yizhuan.xchat_android_core.music.db.bean.LocalMusicBean; -import com.yizhuan.xchat_android_core.music.db.model.LocalMusicDbModel; -import com.yizhuan.xchat_android_core.music.db.model.PlayerDbModel; -import com.yizhuan.xchat_android_core.music.event.MusicPauseEvent; -import com.yizhuan.xchat_android_core.music.event.MusicPlayingEvent; -import com.yizhuan.xchat_android_core.music.event.MusicStopEvent; +import com.pikolive.core.DemoCache; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core2.manager.AudioEngineManager; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core2.manager.IMNetEaseManager; +import com.pikolive.core.manager.RoomEvent; +import com.pikolive.core.music.bean.LocalMusicInfo; +import com.pikolive.core.music.db.bean.LocalMusicBean; +import com.pikolive.core.music.db.model.LocalMusicDbModel; +import com.pikolive.core.music.db.model.PlayerDbModel; +import com.pikolive.core.music.event.MusicPauseEvent; +import com.pikolive.core.music.event.MusicPlayingEvent; +import com.pikolive.core.music.event.MusicStopEvent; import com.pikolive.library.utils.config.BasicConfig; import com.pikolive.library.utils.pref.CommonPref; diff --git a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/model/ShareMusicListModel.java b/core/src/model_music/java/com/pikolive/core/music/model/ShareMusicListModel.java similarity index 91% rename from core/src/model_music/java/com/yizhuan/xchat_android_core/music/model/ShareMusicListModel.java rename to core/src/model_music/java/com/pikolive/core/music/model/ShareMusicListModel.java index f132a01f5..1f98823ea 100644 --- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/model/ShareMusicListModel.java +++ b/core/src/model_music/java/com/pikolive/core/music/model/ShareMusicListModel.java @@ -1,14 +1,14 @@ -package com.yizhuan.xchat_android_core.music.model; +package com.pikolive.core.music.model; -import com.yizhuan.xchat_android_core.R; -import com.yizhuan.tutu.database.AppDataBase; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.music.bean.ShareMusicInfo; -import com.yizhuan.xchat_android_core.music.db.bean.LocalMusicBean; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.music.bean.ShareMusicInfo; +import com.pikolive.core.music.db.bean.LocalMusicBean; +import com.pikolive.core.R; +import com.pikolive.core.database.AppDataBase; +import com.pikolive.core.Constants; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.net.rxnet.RxNet; import com.pikolive.library.utils.ListUtils; import com.pikolive.library.utils.ResUtil; diff --git a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/view/IAddLocalMusicListView.java b/core/src/model_music/java/com/pikolive/core/music/view/IAddLocalMusicListView.java similarity index 89% rename from core/src/model_music/java/com/yizhuan/xchat_android_core/music/view/IAddLocalMusicListView.java rename to core/src/model_music/java/com/pikolive/core/music/view/IAddLocalMusicListView.java index 4f7b56b8b..6cd8cac3f 100644 --- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/view/IAddLocalMusicListView.java +++ b/core/src/model_music/java/com/pikolive/core/music/view/IAddLocalMusicListView.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.music.view; +package com.pikolive.core.music.view; -import com.yizhuan.xchat_android_core.music.db.bean.LocalMusicBean; +import com.pikolive.core.music.db.bean.LocalMusicBean; import com.pikolive.library.base.IMvpBaseView; import java.util.List; diff --git a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/view/ILocalMusicListView.java b/core/src/model_music/java/com/pikolive/core/music/view/ILocalMusicListView.java similarity index 87% rename from core/src/model_music/java/com/yizhuan/xchat_android_core/music/view/ILocalMusicListView.java rename to core/src/model_music/java/com/pikolive/core/music/view/ILocalMusicListView.java index 50c393e7e..5804f9b7d 100644 --- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/view/ILocalMusicListView.java +++ b/core/src/model_music/java/com/pikolive/core/music/view/ILocalMusicListView.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.music.view; +package com.pikolive.core.music.view; -import com.yizhuan.xchat_android_core.music.db.bean.LocalMusicBean; +import com.pikolive.core.music.db.bean.LocalMusicBean; import com.pikolive.library.base.IMvpBaseView; import java.util.List; diff --git a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/view/IMusicListView.java b/core/src/model_music/java/com/pikolive/core/music/view/IMusicListView.java similarity index 67% rename from core/src/model_music/java/com/yizhuan/xchat_android_core/music/view/IMusicListView.java rename to core/src/model_music/java/com/pikolive/core/music/view/IMusicListView.java index 2c7df3a15..a52faf16f 100644 --- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/view/IMusicListView.java +++ b/core/src/model_music/java/com/pikolive/core/music/view/IMusicListView.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.music.view; +package com.pikolive.core.music.view; import com.pikolive.library.base.IMvpBaseView; diff --git a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/view/IShareMusicListView.java b/core/src/model_music/java/com/pikolive/core/music/view/IShareMusicListView.java similarity index 83% rename from core/src/model_music/java/com/yizhuan/xchat_android_core/music/view/IShareMusicListView.java rename to core/src/model_music/java/com/pikolive/core/music/view/IShareMusicListView.java index 4e183a920..969c22621 100644 --- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/view/IShareMusicListView.java +++ b/core/src/model_music/java/com/pikolive/core/music/view/IShareMusicListView.java @@ -1,7 +1,7 @@ -package com.yizhuan.xchat_android_core.music.view; +package com.pikolive.core.music.view; -import com.yizhuan.xchat_android_core.music.bean.ShareMusicInfo; -import com.yizhuan.xchat_android_core.music.db.bean.LocalMusicBean; +import com.pikolive.core.music.bean.ShareMusicInfo; +import com.pikolive.core.music.db.bean.LocalMusicBean; import com.pikolive.library.base.IMvpBaseView; import java.util.List; diff --git a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/event/MusicAddEvent.java b/core/src/model_music/java/com/yizhuan/xchat_android_core/music/event/MusicAddEvent.java deleted file mode 100644 index e6bb2913b..000000000 --- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/event/MusicAddEvent.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.yizhuan.xchat_android_core.music.event; - -import com.yizhuan.xchat_android_core.music.bean.LocalMusicInfo; - -import lombok.Data; - -@Data -public class MusicAddEvent { - - private LocalMusicInfo localMusicInfo; -} diff --git a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/event/MusicDeleteEvent.java b/core/src/model_music/java/com/yizhuan/xchat_android_core/music/event/MusicDeleteEvent.java deleted file mode 100644 index 9f5e87ce8..000000000 --- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/event/MusicDeleteEvent.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.yizhuan.xchat_android_core.music.event; - -import com.yizhuan.xchat_android_core.music.bean.LocalMusicInfo; - -import lombok.Data; - -@Data -public class MusicDeleteEvent { - - private LocalMusicInfo localMusicInfo; -} diff --git a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/model/ILocalMusicListModel.java b/core/src/model_music/java/com/yizhuan/xchat_android_core/music/model/ILocalMusicListModel.java deleted file mode 100644 index 25ed78ff1..000000000 --- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/model/ILocalMusicListModel.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.yizhuan.xchat_android_core.music.model; - -import com.yizhuan.xchat_android_core.base.IModel; - -public interface ILocalMusicListModel extends IModel { -} diff --git a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/model/IMusicListModel.java b/core/src/model_music/java/com/yizhuan/xchat_android_core/music/model/IMusicListModel.java deleted file mode 100644 index 2571e1128..000000000 --- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/model/IMusicListModel.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.yizhuan.xchat_android_core.music.model; - -import com.yizhuan.xchat_android_core.base.IModel; - -public interface IMusicListModel extends IModel { -} diff --git a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/model/LocalMusicListModel.java b/core/src/model_music/java/com/yizhuan/xchat_android_core/music/model/LocalMusicListModel.java deleted file mode 100644 index 612a021d4..000000000 --- a/core/src/model_music/java/com/yizhuan/xchat_android_core/music/model/LocalMusicListModel.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.yizhuan.xchat_android_core.music.model; - -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.base.IModel; - -public class LocalMusicListModel extends BaseModel implements IModel { -} diff --git a/core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/attachment/AitFriendsAttachment.java b/core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/attachment/AitFriendsAttachment.java similarity index 80% rename from core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/attachment/AitFriendsAttachment.java rename to core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/attachment/AitFriendsAttachment.java index cbadd9816..6853f3612 100644 --- a/core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/attachment/AitFriendsAttachment.java +++ b/core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/attachment/AitFriendsAttachment.java @@ -1,10 +1,10 @@ -package com.yizhuan.xchat_android_core.public_chat_hall.attachment; +package com.pikolive.core.public_chat_hall.attachment; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.public_chat_hall.bean.AitFriendsInfo; +import com.pikolive.core.im.custom.bean.CustomAttachment; +import com.pikolive.core.public_chat_hall.bean.AitFriendsInfo; public class AitFriendsAttachment extends CustomAttachment { diff --git a/core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/attachment/AitMeAttachment.java b/core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/attachment/AitMeAttachment.java similarity index 79% rename from core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/attachment/AitMeAttachment.java rename to core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/attachment/AitMeAttachment.java index f0e5bb52c..35e82c5b5 100644 --- a/core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/attachment/AitMeAttachment.java +++ b/core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/attachment/AitMeAttachment.java @@ -1,10 +1,10 @@ -package com.yizhuan.xchat_android_core.public_chat_hall.attachment; +package com.pikolive.core.public_chat_hall.attachment; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.public_chat_hall.bean.AitMeInfo; +import com.pikolive.core.public_chat_hall.bean.AitMeInfo; +import com.pikolive.core.im.custom.bean.CustomAttachment; public class AitMeAttachment extends CustomAttachment { diff --git a/core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/bean/AitFriendsInfo.java b/core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/bean/AitFriendsInfo.java similarity index 92% rename from core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/bean/AitFriendsInfo.java rename to core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/bean/AitFriendsInfo.java index 9b04e7eab..9ee334c38 100644 --- a/core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/bean/AitFriendsInfo.java +++ b/core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/bean/AitFriendsInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.public_chat_hall.bean; +package com.pikolive.core.public_chat_hall.bean; import java.util.List; diff --git a/core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/bean/AitMeInfo.java b/core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/bean/AitMeInfo.java similarity index 89% rename from core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/bean/AitMeInfo.java rename to core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/bean/AitMeInfo.java index cbcfcc7c0..1f3edcae7 100644 --- a/core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/bean/AitMeInfo.java +++ b/core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/bean/AitMeInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.public_chat_hall.bean; +package com.pikolive.core.public_chat_hall.bean; import java.io.Serializable; diff --git a/core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/bean/PublicChatHallMessage.java b/core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/bean/PublicChatHallMessage.java similarity index 99% rename from core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/bean/PublicChatHallMessage.java rename to core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/bean/PublicChatHallMessage.java index a3887821e..15c677dd8 100644 --- a/core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/bean/PublicChatHallMessage.java +++ b/core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/bean/PublicChatHallMessage.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.public_chat_hall.bean; +package com.pikolive.core.public_chat_hall.bean; import java.util.List; diff --git a/core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/event/PublicChatHallAitMeEvent.java b/core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/event/PublicChatHallAitMeEvent.java similarity index 76% rename from core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/event/PublicChatHallAitMeEvent.java rename to core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/event/PublicChatHallAitMeEvent.java index 01f0aef1c..339d9ba69 100644 --- a/core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/event/PublicChatHallAitMeEvent.java +++ b/core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/event/PublicChatHallAitMeEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.public_chat_hall.event; +package com.pikolive.core.public_chat_hall.event; import lombok.Data; diff --git a/core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/event/PublicChatHallHistoryEvent.java b/core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/event/PublicChatHallHistoryEvent.java similarity index 84% rename from core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/event/PublicChatHallHistoryEvent.java rename to core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/event/PublicChatHallHistoryEvent.java index b8afdb9b6..5644ec7db 100644 --- a/core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/event/PublicChatHallHistoryEvent.java +++ b/core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/event/PublicChatHallHistoryEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.public_chat_hall.event; +package com.pikolive.core.public_chat_hall.event; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; diff --git a/core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/event/PublicChatHallMsgCountingDownEvent.java b/core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/event/PublicChatHallMsgCountingDownEvent.java similarity index 87% rename from core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/event/PublicChatHallMsgCountingDownEvent.java rename to core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/event/PublicChatHallMsgCountingDownEvent.java index c8bf24ebc..9817e6db4 100644 --- a/core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/event/PublicChatHallMsgCountingDownEvent.java +++ b/core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/event/PublicChatHallMsgCountingDownEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.public_chat_hall.event; +package com.pikolive.core.public_chat_hall.event; import lombok.Data; diff --git a/core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/event/PublicChatHallMsgIncomingEvent.java b/core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/event/PublicChatHallMsgIncomingEvent.java similarity index 84% rename from core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/event/PublicChatHallMsgIncomingEvent.java rename to core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/event/PublicChatHallMsgIncomingEvent.java index 4e86a30ce..fb0cb5ead 100644 --- a/core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/event/PublicChatHallMsgIncomingEvent.java +++ b/core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/event/PublicChatHallMsgIncomingEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.public_chat_hall.event; +package com.pikolive.core.public_chat_hall.event; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; diff --git a/core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/event/PublicChatHallPlayGiftAnimationEvent.java b/core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/event/PublicChatHallPlayGiftAnimationEvent.java similarity index 70% rename from core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/event/PublicChatHallPlayGiftAnimationEvent.java rename to core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/event/PublicChatHallPlayGiftAnimationEvent.java index 484ae3499..195c70b22 100644 --- a/core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/event/PublicChatHallPlayGiftAnimationEvent.java +++ b/core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/event/PublicChatHallPlayGiftAnimationEvent.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.public_chat_hall.event; +package com.pikolive.core.public_chat_hall.event; -import com.yizhuan.xchat_android_core.gift.bean.GiftReceiveInfo; +import com.pikolive.core.gift.bean.GiftReceiveInfo; import lombok.Data; diff --git a/core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/manager/PublicChatHallDataManager.java b/core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/manager/PublicChatHallDataManager.java similarity index 92% rename from core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/manager/PublicChatHallDataManager.java rename to core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/manager/PublicChatHallDataManager.java index 4d800d320..0b7ab7eaa 100644 --- a/core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/manager/PublicChatHallDataManager.java +++ b/core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/manager/PublicChatHallDataManager.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.public_chat_hall.manager; +package com.pikolive.core.public_chat_hall.manager; import static com.netease.nimlib.sdk.msg.constant.NotificationType.ChatRoomMemberTempMuteAdd; @@ -24,21 +24,21 @@ import com.netease.nimlib.sdk.msg.constant.MsgTypeEnum; import com.netease.nimlib.sdk.msg.model.IMMessage; import com.netease.nimlib.sdk.msg.model.QueryDirectionEnum; import com.orhanobut.logger.Logger; -import com.yizhuan.xchat_android_core.R; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.gift.GiftModel; -import com.yizhuan.xchat_android_core.gift.bean.GiftInfo; -import com.yizhuan.xchat_android_core.gift.bean.GiftReceiveInfo; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.GiftAttachment; -import com.yizhuan.xchat_android_core.public_chat_hall.attachment.AitFriendsAttachment; -import com.yizhuan.xchat_android_core.public_chat_hall.bean.AitFriendsInfo; -import com.yizhuan.xchat_android_core.public_chat_hall.event.PublicChatHallAitMeEvent; -import com.yizhuan.xchat_android_core.public_chat_hall.event.PublicChatHallHistoryEvent; -import com.yizhuan.xchat_android_core.public_chat_hall.event.PublicChatHallMsgCountingDownEvent; -import com.yizhuan.xchat_android_core.public_chat_hall.event.PublicChatHallMsgIncomingEvent; -import com.yizhuan.xchat_android_core.public_chat_hall.event.PublicChatHallPlayGiftAnimationEvent; -import com.yizhuan.xchat_android_core.public_chat_hall.model.PublicChatHallModel; +import com.pikolive.core.public_chat_hall.attachment.AitFriendsAttachment; +import com.pikolive.core.R; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.gift.GiftModel; +import com.pikolive.core.gift.bean.GiftInfo; +import com.pikolive.core.gift.bean.GiftReceiveInfo; +import com.pikolive.core.im.custom.bean.CustomAttachment; +import com.pikolive.core.im.custom.bean.GiftAttachment; +import com.pikolive.core.public_chat_hall.bean.AitFriendsInfo; +import com.pikolive.core.public_chat_hall.event.PublicChatHallAitMeEvent; +import com.pikolive.core.public_chat_hall.event.PublicChatHallHistoryEvent; +import com.pikolive.core.public_chat_hall.event.PublicChatHallMsgCountingDownEvent; +import com.pikolive.core.public_chat_hall.event.PublicChatHallMsgIncomingEvent; +import com.pikolive.core.public_chat_hall.event.PublicChatHallPlayGiftAnimationEvent; +import com.pikolive.core.public_chat_hall.model.PublicChatHallModel; import com.pikolive.library.utils.ListUtils; import com.pikolive.library.utils.ResUtil; diff --git a/core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/model/IPublicChatHallModel.java b/core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/model/IPublicChatHallModel.java similarity index 78% rename from core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/model/IPublicChatHallModel.java rename to core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/model/IPublicChatHallModel.java index cfc064409..9871bec1c 100644 --- a/core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/model/IPublicChatHallModel.java +++ b/core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/model/IPublicChatHallModel.java @@ -1,9 +1,9 @@ -package com.yizhuan.xchat_android_core.public_chat_hall.model; +package com.pikolive.core.public_chat_hall.model; import com.netease.nimlib.sdk.chatroom.model.EnterChatRoomResultData; -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.public_chat_hall.bean.PublicChatHallMessage; +import com.pikolive.core.base.IModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.public_chat_hall.bean.PublicChatHallMessage; import java.util.List; diff --git a/core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/model/PublicChatHallModel.java b/core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/model/PublicChatHallModel.java similarity index 92% rename from core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/model/PublicChatHallModel.java rename to core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/model/PublicChatHallModel.java index d2e271351..cc239a3a0 100644 --- a/core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/model/PublicChatHallModel.java +++ b/core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/model/PublicChatHallModel.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.public_chat_hall.model; +package com.pikolive.core.public_chat_hall.model; import android.annotation.SuppressLint; @@ -12,22 +12,22 @@ import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; import com.netease.nimlib.sdk.chatroom.model.EnterChatRoomData; import com.netease.nimlib.sdk.chatroom.model.EnterChatRoomResultData; -import com.yizhuan.xchat_android_core.R; -import com.yizhuan.xchat_android_core.Constants; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.decoration.car.bean.CarInfo; -import com.yizhuan.xchat_android_core.decoration.headwear.bean.HeadWearInfo; -import com.yizhuan.xchat_android_core.initial.InitialModel; -import com.yizhuan.xchat_android_core.level.UserLevelVo; -import com.yizhuan.xchat_android_core.noble.NobleInfo; -import com.yizhuan.xchat_android_core.public_chat_hall.bean.PublicChatHallMessage; -import com.yizhuan.xchat_android_core.public_chat_hall.manager.PublicChatHallDataManager; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.user.event.LoadLoginUserInfoEvent; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.public_chat_hall.manager.PublicChatHallDataManager; +import com.pikolive.core.R; +import com.pikolive.core.Constants; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.decoration.car.bean.CarInfo; +import com.pikolive.core.decoration.headwear.bean.HeadWearInfo; +import com.pikolive.core.initial.InitialModel; +import com.pikolive.core.level.UserLevelVo; +import com.pikolive.core.noble.NobleInfo; +import com.pikolive.core.public_chat_hall.bean.PublicChatHallMessage; +import com.pikolive.core.user.UserModel; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.user.event.LoadLoginUserInfoEvent; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.net.rxnet.RxNet; import com.pikolive.library.utils.ListUtils; import com.pikolive.library.utils.ResUtil; diff --git a/core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/util/PublicChatHallMessageConvertor.java b/core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/util/PublicChatHallMessageConvertor.java similarity index 79% rename from core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/util/PublicChatHallMessageConvertor.java rename to core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/util/PublicChatHallMessageConvertor.java index 3781cea4a..3fc44b2d5 100644 --- a/core/src/model_public_chat_hall/java/com/yizhuan/xchat_android_core/public_chat_hall/util/PublicChatHallMessageConvertor.java +++ b/core/src/model_public_chat_hall/java/com/pikolive/core/public_chat_hall/util/PublicChatHallMessageConvertor.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.public_chat_hall.util; +package com.pikolive.core.public_chat_hall.util; public class PublicChatHallMessageConvertor { diff --git a/core/src/model_smscode/java/com/yizhuan/xchat_android_core/code/CodeModel.java b/core/src/model_smscode/java/com/pikolive/core/code/CodeModel.java similarity index 90% rename from core/src/model_smscode/java/com/yizhuan/xchat_android_core/code/CodeModel.java rename to core/src/model_smscode/java/com/pikolive/core/code/CodeModel.java index 2aefb493f..0ffb40c5f 100644 --- a/core/src/model_smscode/java/com/yizhuan/xchat_android_core/code/CodeModel.java +++ b/core/src/model_smscode/java/com/pikolive/core/code/CodeModel.java @@ -1,11 +1,11 @@ -package com.yizhuan.xchat_android_core.code; +package com.pikolive.core.code; import android.text.TextUtils; -import com.yizhuan.xchat_android_core.R; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; +import com.pikolive.core.R; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.bean.response.ServiceResult; import com.pikolive.library.net.rxnet.RxNet; import com.pikolive.library.utils.ResUtil; import com.pikolive.library.utils.codec.DESUtils; diff --git a/core/src/model_smscode/java/com/yizhuan/xchat_android_core/code/CodeType.java b/core/src/model_smscode/java/com/pikolive/core/code/CodeType.java similarity index 93% rename from core/src/model_smscode/java/com/yizhuan/xchat_android_core/code/CodeType.java rename to core/src/model_smscode/java/com/pikolive/core/code/CodeType.java index d6e6bf93e..5969bcfdd 100644 --- a/core/src/model_smscode/java/com/yizhuan/xchat_android_core/code/CodeType.java +++ b/core/src/model_smscode/java/com/pikolive/core/code/CodeType.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.code; +package com.pikolive.core.code; /** * 验证码类型 diff --git a/core/src/model_smscode/java/com/yizhuan/xchat_android_core/code/ICodeModel.java b/core/src/model_smscode/java/com/pikolive/core/code/ICodeModel.java similarity index 73% rename from core/src/model_smscode/java/com/yizhuan/xchat_android_core/code/ICodeModel.java rename to core/src/model_smscode/java/com/pikolive/core/code/ICodeModel.java index 83023c7ae..271dd301b 100644 --- a/core/src/model_smscode/java/com/yizhuan/xchat_android_core/code/ICodeModel.java +++ b/core/src/model_smscode/java/com/pikolive/core/code/ICodeModel.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.code; +package com.pikolive.core.code; -import com.yizhuan.xchat_android_core.base.IModel; +import com.pikolive.core.base.IModel; import io.reactivex.Single; diff --git a/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/SaConstant.java b/core/src/model_super_admin/java/com/pikolive/core/admin/SaConstant.java similarity index 71% rename from core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/SaConstant.java rename to core/src/model_super_admin/java/com/pikolive/core/admin/SaConstant.java index e0313780e..56efb166c 100644 --- a/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/SaConstant.java +++ b/core/src/model_super_admin/java/com/pikolive/core/admin/SaConstant.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.super_admin; +package com.pikolive.core.admin; -import com.yizhuan.xchat_android_core.R; +import com.pikolive.core.R; import com.pikolive.library.utils.ResUtil; /** diff --git a/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/SuperAdminDataMrg.java b/core/src/model_super_admin/java/com/pikolive/core/admin/SuperAdminDataMrg.java similarity index 91% rename from core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/SuperAdminDataMrg.java rename to core/src/model_super_admin/java/com/pikolive/core/admin/SuperAdminDataMrg.java index d353f5913..824ab3f37 100644 --- a/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/SuperAdminDataMrg.java +++ b/core/src/model_super_admin/java/com/pikolive/core/admin/SuperAdminDataMrg.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.super_admin; +package com.pikolive.core.admin; import android.annotation.SuppressLint; import android.text.TextUtils; @@ -7,12 +7,12 @@ import com.netease.nim.uikit.common.util.log.LogUtil; import com.netease.nimlib.sdk.chatroom.model.ChatRoomInfo; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.room.model.AvRoomModel; -import com.yizhuan.xchat_android_core.room.model.RoomBaseModel; -import com.yizhuan.xchat_android_core.super_admin.util.SuperAdminUtil; -import com.yizhuan.xchat_android_core.utils.ExtensionUtil; -import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core.room.model.AvRoomModel; +import com.pikolive.core.room.model.RoomBaseModel; +import com.pikolive.core.admin.util.SuperAdminUtil; +import com.pikolive.core.utils.ExtensionUtil; +import com.pikolive.core.utils.net.DontWarnObserver; import com.pikolive.library.utils.ListUtils; import java.util.ArrayList; diff --git a/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/attachment/SuperAdminOpAttachment.java b/core/src/model_super_admin/java/com/pikolive/core/admin/attachment/SuperAdminOpAttachment.java similarity index 85% rename from core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/attachment/SuperAdminOpAttachment.java rename to core/src/model_super_admin/java/com/pikolive/core/admin/attachment/SuperAdminOpAttachment.java index bed2dd3ef..168583a26 100644 --- a/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/attachment/SuperAdminOpAttachment.java +++ b/core/src/model_super_admin/java/com/pikolive/core/admin/attachment/SuperAdminOpAttachment.java @@ -1,10 +1,10 @@ -package com.yizhuan.xchat_android_core.super_admin.attachment; +package com.pikolive.core.admin.attachment; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.google.gson.Gson; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.super_admin.bean.SaOpInfo; +import com.pikolive.core.im.custom.bean.CustomAttachment; +import com.pikolive.core.admin.bean.SaOpInfo; import lombok.Getter; import lombok.Setter; diff --git a/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/bean/KickOutExtBean.java b/core/src/model_super_admin/java/com/pikolive/core/admin/bean/KickOutExtBean.java similarity index 87% rename from core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/bean/KickOutExtBean.java rename to core/src/model_super_admin/java/com/pikolive/core/admin/bean/KickOutExtBean.java index 45266397f..df2a6daeb 100644 --- a/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/bean/KickOutExtBean.java +++ b/core/src/model_super_admin/java/com/pikolive/core/admin/bean/KickOutExtBean.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.super_admin.bean; +package com.pikolive.core.admin.bean; import lombok.Getter; import lombok.Setter; diff --git a/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/bean/SaOpInfo.java b/core/src/model_super_admin/java/com/pikolive/core/admin/bean/SaOpInfo.java similarity index 86% rename from core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/bean/SaOpInfo.java rename to core/src/model_super_admin/java/com/pikolive/core/admin/bean/SaOpInfo.java index 75708f63b..17a1f500f 100644 --- a/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/bean/SaOpInfo.java +++ b/core/src/model_super_admin/java/com/pikolive/core/admin/bean/SaOpInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.super_admin.bean; +package com.pikolive.core.admin.bean; import java.io.Serializable; diff --git a/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/model/ISuperAdminModel.java b/core/src/model_super_admin/java/com/pikolive/core/admin/model/ISuperAdminModel.java similarity index 74% rename from core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/model/ISuperAdminModel.java rename to core/src/model_super_admin/java/com/pikolive/core/admin/model/ISuperAdminModel.java index 9712fd289..901b23748 100644 --- a/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/model/ISuperAdminModel.java +++ b/core/src/model_super_admin/java/com/pikolive/core/admin/model/ISuperAdminModel.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.super_admin.model; +package com.pikolive.core.admin.model; -import com.yizhuan.xchat_android_core.base.IModel; +import com.pikolive.core.base.IModel; import io.reactivex.Single; diff --git a/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/model/SuperAdminModel.java b/core/src/model_super_admin/java/com/pikolive/core/admin/model/SuperAdminModel.java similarity index 90% rename from core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/model/SuperAdminModel.java rename to core/src/model_super_admin/java/com/pikolive/core/admin/model/SuperAdminModel.java index b37969394..32bbb15bb 100644 --- a/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/model/SuperAdminModel.java +++ b/core/src/model_super_admin/java/com/pikolive/core/admin/model/SuperAdminModel.java @@ -1,11 +1,11 @@ -package com.yizhuan.xchat_android_core.super_admin.model; +package com.pikolive.core.admin.model; import com.google.gson.JsonElement; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.net.rxnet.RxNet; import io.reactivex.Single; diff --git a/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/model/exception/SAdminCannotGameException.java b/core/src/model_super_admin/java/com/pikolive/core/admin/model/exception/SAdminCannotGameException.java similarity index 78% rename from core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/model/exception/SAdminCannotGameException.java rename to core/src/model_super_admin/java/com/pikolive/core/admin/model/exception/SAdminCannotGameException.java index 8232bcfdc..7bd845642 100644 --- a/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/model/exception/SAdminCannotGameException.java +++ b/core/src/model_super_admin/java/com/pikolive/core/admin/model/exception/SAdminCannotGameException.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.super_admin.model.exception; +package com.pikolive.core.admin.model.exception; /** * 超管不能玩游戏 diff --git a/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/util/SAdminOptUtil.java b/core/src/model_super_admin/java/com/pikolive/core/admin/util/SAdminOptUtil.java similarity index 88% rename from core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/util/SAdminOptUtil.java rename to core/src/model_super_admin/java/com/pikolive/core/admin/util/SAdminOptUtil.java index be7735d5a..58ebb49a1 100644 --- a/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/util/SAdminOptUtil.java +++ b/core/src/model_super_admin/java/com/pikolive/core/admin/util/SAdminOptUtil.java @@ -1,14 +1,14 @@ -package com.yizhuan.xchat_android_core.super_admin.util; +package com.pikolive.core.admin.util; import com.netease.nimlib.sdk.chatroom.model.ChatRoomKickOutEvent; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.kick.KickModel; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.room.model.AvRoomModel; -import com.yizhuan.xchat_android_core.super_admin.bean.KickOutExtBean; -import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.kick.KickModel; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core2.manager.IMNetEaseManager; +import com.pikolive.core.room.model.AvRoomModel; +import com.pikolive.core.admin.bean.KickOutExtBean; +import com.pikolive.core.utils.net.DontWarnObserver; import com.pikolive.library.utils.JavaUtil; import com.pikolive.library.utils.SingleToastUtil; diff --git a/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/util/SaAttachmentFactory.java b/core/src/model_super_admin/java/com/pikolive/core/admin/util/SaAttachmentFactory.java similarity index 86% rename from core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/util/SaAttachmentFactory.java rename to core/src/model_super_admin/java/com/pikolive/core/admin/util/SaAttachmentFactory.java index e9747e8bc..a7db903e8 100644 --- a/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/util/SaAttachmentFactory.java +++ b/core/src/model_super_admin/java/com/pikolive/core/admin/util/SaAttachmentFactory.java @@ -1,13 +1,13 @@ -package com.yizhuan.xchat_android_core.super_admin.util; +package com.pikolive.core.admin.util; import com.netease.nimlib.sdk.chatroom.ChatRoomMessageBuilder; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.super_admin.attachment.SuperAdminOpAttachment; -import com.yizhuan.xchat_android_core.super_admin.bean.SaOpInfo; -import com.yizhuan.xchat_android_core.user.UserModel; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.im.custom.bean.CustomAttachment; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core.admin.attachment.SuperAdminOpAttachment; +import com.pikolive.core.admin.bean.SaOpInfo; +import com.pikolive.core.user.UserModel; /** * create by lvzebiao @2019/8/22 diff --git a/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/util/SaMsgUtil.java b/core/src/model_super_admin/java/com/pikolive/core/admin/util/SaMsgUtil.java similarity index 90% rename from core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/util/SaMsgUtil.java rename to core/src/model_super_admin/java/com/pikolive/core/admin/util/SaMsgUtil.java index 2eea07ce3..3fe890653 100644 --- a/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/util/SaMsgUtil.java +++ b/core/src/model_super_admin/java/com/pikolive/core/admin/util/SaMsgUtil.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.super_admin.util; +package com.pikolive.core.admin.util; -import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment; +import com.pikolive.core.im.custom.bean.CustomAttachment; /** * 判断超管的自定义消息 是否需要加入公屏 diff --git a/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/util/SuperAdminUtil.java b/core/src/model_super_admin/java/com/pikolive/core/admin/util/SuperAdminUtil.java similarity index 90% rename from core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/util/SuperAdminUtil.java rename to core/src/model_super_admin/java/com/pikolive/core/admin/util/SuperAdminUtil.java index b5404eb8f..a44b1319b 100644 --- a/core/src/model_super_admin/java/com.yizhuan.xchat_android_core.super_admin/util/SuperAdminUtil.java +++ b/core/src/model_super_admin/java/com/pikolive/core/admin/util/SuperAdminUtil.java @@ -1,13 +1,13 @@ -package com.yizhuan.xchat_android_core.super_admin.util; +package com.pikolive.core.admin.util; import android.text.TextUtils; import com.netease.nim.uikit.common.util.log.LogUtil; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember; import com.netease.nimlib.sdk.chatroom.model.ChatRoomMessage; -import com.yizhuan.xchat_android_core.user.UserModel; -import com.yizhuan.xchat_android_core.user.bean.UserInfo; -import com.yizhuan.xchat_android_core.utils.ExtensionUtil; +import com.pikolive.core.user.UserModel; +import com.pikolive.core.user.bean.UserInfo; +import com.pikolive.core.utils.ExtensionUtil; import java.util.Map; diff --git a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/bean/BoxOpenStatusInfo.java b/core/src/model_treasure_box/java/com/pikolive/treasure_box/bean/BoxOpenStatusInfo.java similarity index 94% rename from core/src/model_treasure_box/java/com/yizhuan/treasure_box/bean/BoxOpenStatusInfo.java rename to core/src/model_treasure_box/java/com/pikolive/treasure_box/bean/BoxOpenStatusInfo.java index 4453a63ab..718986aa0 100644 --- a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/bean/BoxOpenStatusInfo.java +++ b/core/src/model_treasure_box/java/com/pikolive/treasure_box/bean/BoxOpenStatusInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.treasure_box.bean; +package com.pikolive.treasure_box.bean; import java.io.Serializable; diff --git a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/bean/ConfigImgUrl.java b/core/src/model_treasure_box/java/com/pikolive/treasure_box/bean/ConfigImgUrl.java similarity index 93% rename from core/src/model_treasure_box/java/com/yizhuan/treasure_box/bean/ConfigImgUrl.java rename to core/src/model_treasure_box/java/com/pikolive/treasure_box/bean/ConfigImgUrl.java index b7886f8c1..11e92527c 100644 --- a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/bean/ConfigImgUrl.java +++ b/core/src/model_treasure_box/java/com/pikolive/treasure_box/bean/ConfigImgUrl.java @@ -1,4 +1,4 @@ -package com.yizhuan.treasure_box.bean; +package com.pikolive.treasure_box.bean; import java.io.Serializable; diff --git a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/bean/HonourBuyKeyResultInfo.java b/core/src/model_treasure_box/java/com/pikolive/treasure_box/bean/HonourBuyKeyResultInfo.java similarity index 92% rename from core/src/model_treasure_box/java/com/yizhuan/treasure_box/bean/HonourBuyKeyResultInfo.java rename to core/src/model_treasure_box/java/com/pikolive/treasure_box/bean/HonourBuyKeyResultInfo.java index 0e8f85c3e..392b0735b 100644 --- a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/bean/HonourBuyKeyResultInfo.java +++ b/core/src/model_treasure_box/java/com/pikolive/treasure_box/bean/HonourBuyKeyResultInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.treasure_box.bean; +package com.pikolive.treasure_box.bean; import java.io.Serializable; diff --git a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/bean/HonourKeyInfo.java b/core/src/model_treasure_box/java/com/pikolive/treasure_box/bean/HonourKeyInfo.java similarity index 93% rename from core/src/model_treasure_box/java/com/yizhuan/treasure_box/bean/HonourKeyInfo.java rename to core/src/model_treasure_box/java/com/pikolive/treasure_box/bean/HonourKeyInfo.java index 61b90c113..87cd941a8 100644 --- a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/bean/HonourKeyInfo.java +++ b/core/src/model_treasure_box/java/com/pikolive/treasure_box/bean/HonourKeyInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.treasure_box.bean; +package com.pikolive.treasure_box.bean; import java.io.Serializable; diff --git a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/bean/KeyInfo.java b/core/src/model_treasure_box/java/com/pikolive/treasure_box/bean/KeyInfo.java similarity index 95% rename from core/src/model_treasure_box/java/com/yizhuan/treasure_box/bean/KeyInfo.java rename to core/src/model_treasure_box/java/com/pikolive/treasure_box/bean/KeyInfo.java index 1c6c08b75..ebb8a7187 100644 --- a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/bean/KeyInfo.java +++ b/core/src/model_treasure_box/java/com/pikolive/treasure_box/bean/KeyInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.treasure_box.bean; +package com.pikolive.treasure_box.bean; import java.io.Serializable; diff --git a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/bean/OpenBoxDrawResult.java b/core/src/model_treasure_box/java/com/pikolive/treasure_box/bean/OpenBoxDrawResult.java similarity index 90% rename from core/src/model_treasure_box/java/com/yizhuan/treasure_box/bean/OpenBoxDrawResult.java rename to core/src/model_treasure_box/java/com/pikolive/treasure_box/bean/OpenBoxDrawResult.java index ef188673d..c6ef7cd92 100644 --- a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/bean/OpenBoxDrawResult.java +++ b/core/src/model_treasure_box/java/com/pikolive/treasure_box/bean/OpenBoxDrawResult.java @@ -1,4 +1,4 @@ -package com.yizhuan.treasure_box.bean; +package com.pikolive.treasure_box.bean; import java.io.Serializable; import java.util.List; diff --git a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/bean/OpenBoxHonourResult.java b/core/src/model_treasure_box/java/com/pikolive/treasure_box/bean/OpenBoxHonourResult.java similarity index 95% rename from core/src/model_treasure_box/java/com/yizhuan/treasure_box/bean/OpenBoxHonourResult.java rename to core/src/model_treasure_box/java/com/pikolive/treasure_box/bean/OpenBoxHonourResult.java index 6c5ddc37c..48281fd09 100644 --- a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/bean/OpenBoxHonourResult.java +++ b/core/src/model_treasure_box/java/com/pikolive/treasure_box/bean/OpenBoxHonourResult.java @@ -1,4 +1,4 @@ -package com.yizhuan.treasure_box.bean; +package com.pikolive.treasure_box.bean; import java.io.Serializable; import java.util.List; diff --git a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/bean/OpenBoxResult.java b/core/src/model_treasure_box/java/com/pikolive/treasure_box/bean/OpenBoxResult.java similarity index 95% rename from core/src/model_treasure_box/java/com/yizhuan/treasure_box/bean/OpenBoxResult.java rename to core/src/model_treasure_box/java/com/pikolive/treasure_box/bean/OpenBoxResult.java index 5c227ba72..57e29ec4d 100644 --- a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/bean/OpenBoxResult.java +++ b/core/src/model_treasure_box/java/com/pikolive/treasure_box/bean/OpenBoxResult.java @@ -1,4 +1,4 @@ -package com.yizhuan.treasure_box.bean; +package com.pikolive.treasure_box.bean; import java.io.Serializable; import java.util.List; diff --git a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/bean/PrizeInfo.java b/core/src/model_treasure_box/java/com/pikolive/treasure_box/bean/PrizeInfo.java similarity index 97% rename from core/src/model_treasure_box/java/com/yizhuan/treasure_box/bean/PrizeInfo.java rename to core/src/model_treasure_box/java/com/pikolive/treasure_box/bean/PrizeInfo.java index 56c887141..7ad5afd67 100644 --- a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/bean/PrizeInfo.java +++ b/core/src/model_treasure_box/java/com/pikolive/treasure_box/bean/PrizeInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.treasure_box.bean; +package com.pikolive.treasure_box.bean; import java.io.Serializable; diff --git a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/bean/PrizeNewInfo.java b/core/src/model_treasure_box/java/com/pikolive/treasure_box/bean/PrizeNewInfo.java similarity index 96% rename from core/src/model_treasure_box/java/com/yizhuan/treasure_box/bean/PrizeNewInfo.java rename to core/src/model_treasure_box/java/com/pikolive/treasure_box/bean/PrizeNewInfo.java index 95073485b..6bd121fcb 100644 --- a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/bean/PrizeNewInfo.java +++ b/core/src/model_treasure_box/java/com/pikolive/treasure_box/bean/PrizeNewInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.treasure_box.bean; +package com.pikolive.treasure_box.bean; import java.io.Serializable; diff --git a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/bean/UserTicketInfo.kt b/core/src/model_treasure_box/java/com/pikolive/treasure_box/bean/UserTicketInfo.kt similarity index 78% rename from core/src/model_treasure_box/java/com/yizhuan/treasure_box/bean/UserTicketInfo.kt rename to core/src/model_treasure_box/java/com/pikolive/treasure_box/bean/UserTicketInfo.kt index b9ae43219..2aeaa795d 100644 --- a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/bean/UserTicketInfo.kt +++ b/core/src/model_treasure_box/java/com/pikolive/treasure_box/bean/UserTicketInfo.kt @@ -1,4 +1,4 @@ -package com.yizhuan.treasure_box.bean +package com.pikolive.treasure_box.bean data class UserTicketInfo( val diamond: Double = 0.0, diff --git a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/event/AutoOpenBoxEvent.java b/core/src/model_treasure_box/java/com/pikolive/treasure_box/event/AutoOpenBoxEvent.java similarity index 80% rename from core/src/model_treasure_box/java/com/yizhuan/treasure_box/event/AutoOpenBoxEvent.java rename to core/src/model_treasure_box/java/com/pikolive/treasure_box/event/AutoOpenBoxEvent.java index 58866d2cf..df998470d 100644 --- a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/event/AutoOpenBoxEvent.java +++ b/core/src/model_treasure_box/java/com/pikolive/treasure_box/event/AutoOpenBoxEvent.java @@ -1,6 +1,6 @@ -package com.yizhuan.treasure_box.event; +package com.pikolive.treasure_box.event; -import com.yizhuan.treasure_box.bean.OpenBoxResult; +import com.pikolive.treasure_box.bean.OpenBoxResult; import lombok.Data; diff --git a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/event/AutoOpenHonourBoxEvent.java b/core/src/model_treasure_box/java/com/pikolive/treasure_box/event/AutoOpenHonourBoxEvent.java similarity index 81% rename from core/src/model_treasure_box/java/com/yizhuan/treasure_box/event/AutoOpenHonourBoxEvent.java rename to core/src/model_treasure_box/java/com/pikolive/treasure_box/event/AutoOpenHonourBoxEvent.java index 463993302..0b3e6f910 100644 --- a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/event/AutoOpenHonourBoxEvent.java +++ b/core/src/model_treasure_box/java/com/pikolive/treasure_box/event/AutoOpenHonourBoxEvent.java @@ -1,6 +1,6 @@ -package com.yizhuan.treasure_box.event; +package com.pikolive.treasure_box.event; -import com.yizhuan.treasure_box.bean.OpenBoxHonourResult; +import com.pikolive.treasure_box.bean.OpenBoxHonourResult; import lombok.Data; diff --git a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/event/BoxBuyKeyEvent.java b/core/src/model_treasure_box/java/com/pikolive/treasure_box/event/BoxBuyKeyEvent.java similarity index 89% rename from core/src/model_treasure_box/java/com/yizhuan/treasure_box/event/BoxBuyKeyEvent.java rename to core/src/model_treasure_box/java/com/pikolive/treasure_box/event/BoxBuyKeyEvent.java index 248c4abdc..fc353b158 100644 --- a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/event/BoxBuyKeyEvent.java +++ b/core/src/model_treasure_box/java/com/pikolive/treasure_box/event/BoxBuyKeyEvent.java @@ -1,6 +1,6 @@ -package com.yizhuan.treasure_box.event; +package com.pikolive.treasure_box.event; -import com.yizhuan.treasure_box.bean.KeyInfo; +import com.pikolive.treasure_box.bean.KeyInfo; import lombok.Data; diff --git a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/event/HonourBoxBuyKeyEvent.java b/core/src/model_treasure_box/java/com/pikolive/treasure_box/event/HonourBoxBuyKeyEvent.java similarity index 89% rename from core/src/model_treasure_box/java/com/yizhuan/treasure_box/event/HonourBoxBuyKeyEvent.java rename to core/src/model_treasure_box/java/com/pikolive/treasure_box/event/HonourBoxBuyKeyEvent.java index e2b570397..ab853b600 100644 --- a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/event/HonourBoxBuyKeyEvent.java +++ b/core/src/model_treasure_box/java/com/pikolive/treasure_box/event/HonourBoxBuyKeyEvent.java @@ -1,6 +1,6 @@ -package com.yizhuan.treasure_box.event; +package com.pikolive.treasure_box.event; -import com.yizhuan.treasure_box.bean.HonourBuyKeyResultInfo; +import com.pikolive.treasure_box.bean.HonourBuyKeyResultInfo; import lombok.Data; diff --git a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/model/BoxModel.java b/core/src/model_treasure_box/java/com/pikolive/treasure_box/model/BoxModel.java similarity index 91% rename from core/src/model_treasure_box/java/com/yizhuan/treasure_box/model/BoxModel.java rename to core/src/model_treasure_box/java/com/pikolive/treasure_box/model/BoxModel.java index 9a61105cd..55e85e294 100644 --- a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/model/BoxModel.java +++ b/core/src/model_treasure_box/java/com/pikolive/treasure_box/model/BoxModel.java @@ -1,23 +1,23 @@ -package com.yizhuan.treasure_box.model; +package com.pikolive.treasure_box.model; -import com.yizhuan.treasure_box.bean.BoxOpenStatusInfo; -import com.yizhuan.treasure_box.bean.ConfigImgUrl; -import com.yizhuan.treasure_box.bean.HonourBuyKeyResultInfo; -import com.yizhuan.treasure_box.bean.HonourKeyInfo; -import com.yizhuan.treasure_box.bean.KeyInfo; -import com.yizhuan.treasure_box.bean.OpenBoxHonourResult; -import com.yizhuan.treasure_box.bean.OpenBoxResult; -import com.yizhuan.treasure_box.bean.PrizeInfo; -import com.yizhuan.treasure_box.bean.PrizeNewInfo; -import com.yizhuan.treasure_box.bean.UserTicketInfo; -import com.yizhuan.xchat_android_core.R; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.exception.FailReasonException; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.utils.net.BalanceNotEnoughExeption; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.treasure_box.bean.BoxOpenStatusInfo; +import com.pikolive.treasure_box.bean.ConfigImgUrl; +import com.pikolive.treasure_box.bean.HonourBuyKeyResultInfo; +import com.pikolive.treasure_box.bean.HonourKeyInfo; +import com.pikolive.treasure_box.bean.KeyInfo; +import com.pikolive.treasure_box.bean.OpenBoxHonourResult; +import com.pikolive.treasure_box.bean.OpenBoxResult; +import com.pikolive.treasure_box.bean.PrizeInfo; +import com.pikolive.treasure_box.bean.PrizeNewInfo; +import com.pikolive.treasure_box.bean.UserTicketInfo; +import com.pikolive.core.R; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.exception.FailReasonException; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core.utils.net.BalanceNotEnoughExeption; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.net.rxnet.RxNet; import com.pikolive.library.utils.ResUtil; diff --git a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/model/IBoxModel.java b/core/src/model_treasure_box/java/com/pikolive/treasure_box/model/IBoxModel.java similarity index 79% rename from core/src/model_treasure_box/java/com/yizhuan/treasure_box/model/IBoxModel.java rename to core/src/model_treasure_box/java/com/pikolive/treasure_box/model/IBoxModel.java index 98dece075..5de01431a 100644 --- a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/model/IBoxModel.java +++ b/core/src/model_treasure_box/java/com/pikolive/treasure_box/model/IBoxModel.java @@ -1,17 +1,17 @@ -package com.yizhuan.treasure_box.model; +package com.pikolive.treasure_box.model; -import com.yizhuan.treasure_box.bean.BoxOpenStatusInfo; -import com.yizhuan.treasure_box.bean.ConfigImgUrl; -import com.yizhuan.treasure_box.bean.HonourBuyKeyResultInfo; -import com.yizhuan.treasure_box.bean.HonourKeyInfo; -import com.yizhuan.treasure_box.bean.KeyInfo; -import com.yizhuan.treasure_box.bean.OpenBoxHonourResult; -import com.yizhuan.treasure_box.bean.OpenBoxResult; -import com.yizhuan.treasure_box.bean.PrizeInfo; -import com.yizhuan.treasure_box.bean.PrizeNewInfo; -import com.yizhuan.treasure_box.bean.UserTicketInfo; -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; +import com.pikolive.treasure_box.bean.BoxOpenStatusInfo; +import com.pikolive.treasure_box.bean.ConfigImgUrl; +import com.pikolive.treasure_box.bean.HonourBuyKeyResultInfo; +import com.pikolive.treasure_box.bean.HonourKeyInfo; +import com.pikolive.treasure_box.bean.KeyInfo; +import com.pikolive.treasure_box.bean.OpenBoxHonourResult; +import com.pikolive.treasure_box.bean.OpenBoxResult; +import com.pikolive.treasure_box.bean.PrizeInfo; +import com.pikolive.treasure_box.bean.PrizeNewInfo; +import com.pikolive.treasure_box.bean.UserTicketInfo; +import com.pikolive.core.base.IModel; +import com.pikolive.core.bean.response.ServiceResult; import java.util.List; diff --git a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/model/IRadishModel.java b/core/src/model_treasure_box/java/com/pikolive/treasure_box/model/IRadishModel.java similarity index 72% rename from core/src/model_treasure_box/java/com/yizhuan/treasure_box/model/IRadishModel.java rename to core/src/model_treasure_box/java/com/pikolive/treasure_box/model/IRadishModel.java index add703875..c60d0f71d 100644 --- a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/model/IRadishModel.java +++ b/core/src/model_treasure_box/java/com/pikolive/treasure_box/model/IRadishModel.java @@ -1,12 +1,12 @@ -package com.yizhuan.treasure_box.model; +package com.pikolive.treasure_box.model; -import com.yizhuan.treasure_box.bean.BoxOpenStatusInfo; -import com.yizhuan.treasure_box.bean.KeyInfo; -import com.yizhuan.treasure_box.bean.OpenBoxResult; -import com.yizhuan.treasure_box.bean.PrizeInfo; -import com.yizhuan.xchat_android_core.base.IModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.room.treasure_box.bean.BoxRankingInfo; +import com.pikolive.treasure_box.bean.BoxOpenStatusInfo; +import com.pikolive.treasure_box.bean.KeyInfo; +import com.pikolive.treasure_box.bean.OpenBoxResult; +import com.pikolive.treasure_box.bean.PrizeInfo; +import com.pikolive.core.base.IModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.room.treasure_box.bean.BoxRankingInfo; import java.util.List; diff --git a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/model/RadishModel.java b/core/src/model_treasure_box/java/com/pikolive/treasure_box/model/RadishModel.java similarity index 87% rename from core/src/model_treasure_box/java/com/yizhuan/treasure_box/model/RadishModel.java rename to core/src/model_treasure_box/java/com/pikolive/treasure_box/model/RadishModel.java index c5f77fe35..6aa2cd555 100644 --- a/core/src/model_treasure_box/java/com/yizhuan/treasure_box/model/RadishModel.java +++ b/core/src/model_treasure_box/java/com/pikolive/treasure_box/model/RadishModel.java @@ -1,18 +1,18 @@ -package com.yizhuan.treasure_box.model; +package com.pikolive.treasure_box.model; -import com.yizhuan.xchat_android_core.R; -import com.yizhuan.treasure_box.bean.BoxOpenStatusInfo; -import com.yizhuan.treasure_box.bean.KeyInfo; -import com.yizhuan.treasure_box.bean.OpenBoxResult; -import com.yizhuan.treasure_box.bean.PrizeInfo; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.community.CommunityConstant; -import com.yizhuan.xchat_android_core.exception.FailReasonException; -import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; -import com.yizhuan.xchat_android_core.room.treasure_box.bean.BoxRankingInfo; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.treasure_box.bean.BoxOpenStatusInfo; +import com.pikolive.treasure_box.bean.KeyInfo; +import com.pikolive.treasure_box.bean.OpenBoxResult; +import com.pikolive.treasure_box.bean.PrizeInfo; +import com.pikolive.core.R; +import com.pikolive.core.auth.AuthModel; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.community.CommunityConstant; +import com.pikolive.core.exception.FailReasonException; +import com.pikolive.core.manager.AvRoomDataManager; +import com.pikolive.core.room.treasure_box.bean.BoxRankingInfo; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.net.rxnet.RxNet; import com.pikolive.library.utils.ResUtil; @@ -47,7 +47,7 @@ public class RadishModel extends BaseModel implements IRadishModel { } @Override - public Single openBox(int boxType,int keyNum, boolean sendMessage) { + public Single openBox(int boxType, int keyNum, boolean sendMessage) { if (AvRoomDataManager.get().mCurrentRoomInfo == null) { return Single.error(new Throwable(ResUtil.getString(R.string.treasure_box_model_radishmodel_01))); } diff --git a/core/src/model_upgrade_app/java/com/yizhuan/xchat_android_core/upgrade/bean/NewestVersionInfo.java b/core/src/model_upgrade_app/java/com/pikolive/core/upgrade/bean/NewestVersionInfo.java similarity index 96% rename from core/src/model_upgrade_app/java/com/yizhuan/xchat_android_core/upgrade/bean/NewestVersionInfo.java rename to core/src/model_upgrade_app/java/com/pikolive/core/upgrade/bean/NewestVersionInfo.java index c6616fc0e..16ee31bd9 100644 --- a/core/src/model_upgrade_app/java/com/yizhuan/xchat_android_core/upgrade/bean/NewestVersionInfo.java +++ b/core/src/model_upgrade_app/java/com/pikolive/core/upgrade/bean/NewestVersionInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.upgrade.bean; +package com.pikolive.core.upgrade.bean; import lombok.Data; diff --git a/core/src/model_upgrade_app/java/com/yizhuan/xchat_android_core/upgrade/bean/UpgradeCache.java b/core/src/model_upgrade_app/java/com/pikolive/core/upgrade/bean/UpgradeCache.java similarity index 79% rename from core/src/model_upgrade_app/java/com/yizhuan/xchat_android_core/upgrade/bean/UpgradeCache.java rename to core/src/model_upgrade_app/java/com/pikolive/core/upgrade/bean/UpgradeCache.java index a88c11ebe..968f4a396 100644 --- a/core/src/model_upgrade_app/java/com/yizhuan/xchat_android_core/upgrade/bean/UpgradeCache.java +++ b/core/src/model_upgrade_app/java/com/pikolive/core/upgrade/bean/UpgradeCache.java @@ -1,4 +1,4 @@ -package com.yizhuan.xchat_android_core.upgrade.bean; +package com.pikolive.core.upgrade.bean; import lombok.Getter; import lombok.Setter; diff --git a/core/src/model_upgrade_app/java/com/yizhuan/xchat_android_core/upgrade/event/ImPushUpdateAppEvent.java b/core/src/model_upgrade_app/java/com/pikolive/core/upgrade/event/ImPushUpdateAppEvent.java similarity index 77% rename from core/src/model_upgrade_app/java/com/yizhuan/xchat_android_core/upgrade/event/ImPushUpdateAppEvent.java rename to core/src/model_upgrade_app/java/com/pikolive/core/upgrade/event/ImPushUpdateAppEvent.java index 80c005c9d..824bbcc80 100644 --- a/core/src/model_upgrade_app/java/com/yizhuan/xchat_android_core/upgrade/event/ImPushUpdateAppEvent.java +++ b/core/src/model_upgrade_app/java/com/pikolive/core/upgrade/event/ImPushUpdateAppEvent.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.upgrade.event; +package com.pikolive.core.upgrade.event; -import com.yizhuan.xchat_android_core.upgrade.bean.NewestVersionInfo; +import com.pikolive.core.upgrade.bean.NewestVersionInfo; /** * IM推送全局广播-发出事件-用户请求更新接口 diff --git a/core/src/model_upgrade_app/java/com/yizhuan/xchat_android_core/upgrade/model/IUpgradeModel.java b/core/src/model_upgrade_app/java/com/pikolive/core/upgrade/model/IUpgradeModel.java similarity index 75% rename from core/src/model_upgrade_app/java/com/yizhuan/xchat_android_core/upgrade/model/IUpgradeModel.java rename to core/src/model_upgrade_app/java/com/pikolive/core/upgrade/model/IUpgradeModel.java index b41e8b9f5..c4f440a0f 100644 --- a/core/src/model_upgrade_app/java/com/yizhuan/xchat_android_core/upgrade/model/IUpgradeModel.java +++ b/core/src/model_upgrade_app/java/com/pikolive/core/upgrade/model/IUpgradeModel.java @@ -1,6 +1,6 @@ -package com.yizhuan.xchat_android_core.upgrade.model; +package com.pikolive.core.upgrade.model; -import com.yizhuan.xchat_android_core.upgrade.bean.NewestVersionInfo; +import com.pikolive.core.upgrade.bean.NewestVersionInfo; import io.reactivex.Single; diff --git a/core/src/model_upgrade_app/java/com/yizhuan/xchat_android_core/upgrade/model/UpgradeModel.java b/core/src/model_upgrade_app/java/com/pikolive/core/upgrade/model/UpgradeModel.java similarity index 87% rename from core/src/model_upgrade_app/java/com/yizhuan/xchat_android_core/upgrade/model/UpgradeModel.java rename to core/src/model_upgrade_app/java/com/pikolive/core/upgrade/model/UpgradeModel.java index c550e3763..9b768cbe7 100644 --- a/core/src/model_upgrade_app/java/com/yizhuan/xchat_android_core/upgrade/model/UpgradeModel.java +++ b/core/src/model_upgrade_app/java/com/pikolive/core/upgrade/model/UpgradeModel.java @@ -1,10 +1,10 @@ -package com.yizhuan.xchat_android_core.upgrade.model; +package com.pikolive.core.upgrade.model; -import com.yizhuan.xchat_android_core.R; -import com.yizhuan.xchat_android_core.base.BaseModel; -import com.yizhuan.xchat_android_core.bean.response.ServiceResult; -import com.yizhuan.xchat_android_core.upgrade.bean.NewestVersionInfo; -import com.yizhuan.xchat_android_core.utils.net.RxHelper; +import com.pikolive.core.R; +import com.pikolive.core.base.BaseModel; +import com.pikolive.core.bean.response.ServiceResult; +import com.pikolive.core.upgrade.bean.NewestVersionInfo; +import com.pikolive.core.utils.net.RxHelper; import com.pikolive.library.net.rxnet.RxNet; import com.pikolive.library.utils.ResUtil;