diff --git a/app/src/main/java/com/yizhuan/erban/MainActivity.java b/app/src/main/java/com/yizhuan/erban/MainActivity.java index 7b32f80e7..05a2ab118 100644 --- a/app/src/main/java/com/yizhuan/erban/MainActivity.java +++ b/app/src/main/java/com/yizhuan/erban/MainActivity.java @@ -65,7 +65,7 @@ import com.yizhuan.erban.decoration.view.widgets.ShowCarGuideDialog; import com.yizhuan.erban.family.view.activity.FamilyHomeActivity; import com.yizhuan.erban.guide.GuideActivity; import com.yizhuan.erban.home.dialog.RecommendRoomForNewerDialog; -import com.yizhuan.erban.home.event.HomeDynamicEvent; +import com.yizhuan.xchat_android_core.home.event.HomeDynamicEvent; import com.yizhuan.erban.home.fragment.CommunityNoticeAct; import com.yizhuan.erban.home.fragment.ContactsListFragment; import com.yizhuan.erban.home.fragment.GameHomeFragment; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyFragment.java b/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyFragment.java index 6c2c5be8f..17ed633e1 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyFragment.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyFragment.java @@ -45,8 +45,8 @@ import com.yizhuan.erban.base.BaseMvpActivity; import com.yizhuan.erban.common.widget.dialog.DialogManager; import com.yizhuan.erban.databinding.FragmentChatroomGameMainBinding; import com.yizhuan.erban.friend.view.SelectFriendActivity; -import com.yizhuan.erban.home.event.FollowRoomEvent; -import com.yizhuan.erban.home.model.CollectionRoomModel; +import com.yizhuan.xchat_android_core.home.event.FollowRoomEvent; +import com.yizhuan.xchat_android_core.home.model.CollectionRoomModel; import com.yizhuan.erban.treasure_box.widget.GoldBoxHelper; import com.yizhuan.erban.ui.widget.ButtonItem; import com.yizhuan.erban.ui.widget.ShareDialog; diff --git a/app/src/main/java/com/yizhuan/erban/avroom/widget/MessageView.java b/app/src/main/java/com/yizhuan/erban/avroom/widget/MessageView.java index 282403e64..03c1cb921 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/widget/MessageView.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/widget/MessageView.java @@ -10,7 +10,6 @@ import androidx.annotation.NonNull; import androidx.core.content.ContextCompat; import androidx.core.content.res.ResourcesCompat; import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.OrientationHelper; import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.SimpleItemAnimator; @@ -46,7 +45,6 @@ import com.netease.nimlib.sdk.msg.constant.SessionTypeEnum; import com.netease.nimlib.sdk.msg.model.IMMessage; import com.orhanobut.logger.Logger; import com.tongdaxing.erban.sadmin.utils.SaAttachmentToMsgUtil; -import com.trello.rxlifecycle3.android.FragmentEvent; import com.yizhuan.erban.R; import com.yizhuan.erban.UIHelper; import com.yizhuan.erban.avroom.activity.AVRoomActivity; @@ -55,8 +53,8 @@ import com.yizhuan.erban.avroom.game.PlayGameActivity; import com.yizhuan.erban.common.widget.CustomImageSpan; import com.yizhuan.erban.common.widget.OriginalDrawStatusClickSpan; import com.yizhuan.erban.common.widget.dialog.DialogManager; -import com.yizhuan.erban.home.event.FollowRoomEvent; -import com.yizhuan.erban.home.model.CollectionRoomModel; +import com.yizhuan.xchat_android_core.home.event.FollowRoomEvent; +import com.yizhuan.xchat_android_core.home.model.CollectionRoomModel; import com.yizhuan.erban.ui.widget.DividerItemDecoration; import com.yizhuan.erban.ui.widget.MyItemAnimator; import com.yizhuan.erban.ui.widget.UserInfoDialog; @@ -109,7 +107,6 @@ import com.yizhuan.xchat_android_core.magic.bean.MultiMagicReceivedInfo; import com.yizhuan.xchat_android_core.manager.AvRoomDataManager; import com.yizhuan.xchat_android_core.manager.IMMessageManager; import com.yizhuan.xchat_android_core.manager.IMNetEaseManager; -import com.yizhuan.xchat_android_core.manager.event.HistoryMessageEvent; 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; diff --git a/app/src/main/java/com/yizhuan/erban/home/activity/CollectionRoomActivity.java b/app/src/main/java/com/yizhuan/erban/home/activity/CollectionRoomActivity.java index bcbf97715..03594afad 100644 --- a/app/src/main/java/com/yizhuan/erban/home/activity/CollectionRoomActivity.java +++ b/app/src/main/java/com/yizhuan/erban/home/activity/CollectionRoomActivity.java @@ -15,7 +15,7 @@ import com.yizhuan.erban.avroom.activity.AVRoomActivity; import com.yizhuan.erban.base.BaseActivity; import com.yizhuan.erban.home.adapter.CollectionRoomAdapter; import com.yizhuan.xchat_android_core.home.bean.CollectionRoomInfo; -import com.yizhuan.erban.home.model.CollectionRoomModel; +import com.yizhuan.xchat_android_core.home.model.CollectionRoomModel; import com.yizhuan.xchat_android_core.auth.AuthModel; import com.yizhuan.xchat_android_library.utils.ListUtils; diff --git a/app/src/main/java/com/yizhuan/erban/home/activity/HomeMoreRoomActivity.java b/app/src/main/java/com/yizhuan/erban/home/activity/HomeMoreRoomActivity.java index 7121c9799..ba9164994 100644 --- a/app/src/main/java/com/yizhuan/erban/home/activity/HomeMoreRoomActivity.java +++ b/app/src/main/java/com/yizhuan/erban/home/activity/HomeMoreRoomActivity.java @@ -22,7 +22,7 @@ import com.yizhuan.erban.home.adapter.MainMagicIndicatorAdapter; import com.yizhuan.xchat_android_core.home.bean.HomeTagInfo; import com.yizhuan.erban.home.fragment.HomeTabMapFragment; import com.yizhuan.erban.home.presenter.HomeMorePresenter; -import com.yizhuan.erban.home.presenter.IHomeMoreRoomView; +import com.yizhuan.xchat_android_core.home.IHomeMoreRoomView; import com.yizhuan.erban.ui.widget.OnPageSelectedListener; import com.yizhuan.erban.ui.widget.magicindicator.MagicIndicator; import com.yizhuan.erban.ui.widget.magicindicator.ViewPagerHelper; diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/HomeMultiItemQuickAdapter.java b/app/src/main/java/com/yizhuan/erban/home/adapter/HomeMultiItemQuickAdapter.java deleted file mode 100644 index c944b1e86..000000000 --- a/app/src/main/java/com/yizhuan/erban/home/adapter/HomeMultiItemQuickAdapter.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.yizhuan.erban.home.adapter; - -import androidx.recyclerview.widget.RecyclerView; - -import com.netease.nim.uikit.common.ui.recyclerview.adapter.BaseMultiItemQuickAdapter; -import com.netease.nim.uikit.common.ui.recyclerview.holder.BaseViewHolder; -import com.yizhuan.erban.home.model.HomeMultiItem; - -import java.util.List; - -public class HomeMultiItemQuickAdapter extends BaseMultiItemQuickAdapter { - - - public HomeMultiItemQuickAdapter(RecyclerView recyclerView, List data) { - super(recyclerView, data); - } - - @Override - protected int getViewType(HomeMultiItem item) { - return 0; - } - - @Override - protected String getItemKey(HomeMultiItem item) { - return null; - } -} diff --git a/app/src/main/java/com/yizhuan/erban/home/event/FollowRoomEvent.java b/app/src/main/java/com/yizhuan/erban/home/event/FollowRoomEvent.java deleted file mode 100644 index bacd6afa7..000000000 --- a/app/src/main/java/com/yizhuan/erban/home/event/FollowRoomEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.yizhuan.erban.home.event; - -public class FollowRoomEvent { -} diff --git a/app/src/main/java/com/yizhuan/erban/home/event/RefreshHomeDataEvent.java b/app/src/main/java/com/yizhuan/erban/home/event/RefreshHomeDataEvent.java deleted file mode 100644 index 5331a6db0..000000000 --- a/app/src/main/java/com/yizhuan/erban/home/event/RefreshHomeDataEvent.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.yizhuan.erban.home.event; - -public class RefreshHomeDataEvent { -} diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/GameHomeFragment.java b/app/src/main/java/com/yizhuan/erban/home/fragment/GameHomeFragment.java index 869eb45fc..757e11304 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/GameHomeFragment.java +++ b/app/src/main/java/com/yizhuan/erban/home/fragment/GameHomeFragment.java @@ -54,7 +54,7 @@ import com.yizhuan.erban.home.adapter.BannerAdapter; import com.yizhuan.erban.home.adapter.HomeConcernsAdapter; import com.yizhuan.erban.home.adapter.MainMagicIndicatorAdapter; import com.yizhuan.xchat_android_core.home.bean.HomeTagInfo; -import com.yizhuan.erban.home.event.RefreshHomeDataEvent; +import com.yizhuan.xchat_android_core.home.event.RefreshHomeDataEvent; import com.yizhuan.erban.home.presenter.MainFragmentPresenter; import com.yizhuan.erban.home.view.IMainFragmentView; import com.yizhuan.erban.location.LocationManager; diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/HomeDynamicFragment.java b/app/src/main/java/com/yizhuan/erban/home/fragment/HomeDynamicFragment.java index 5fd0ca523..a69e8e14c 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/HomeDynamicFragment.java +++ b/app/src/main/java/com/yizhuan/erban/home/fragment/HomeDynamicFragment.java @@ -16,9 +16,9 @@ import com.yizhuan.erban.R; import com.yizhuan.erban.base.BaseFragment; import com.yizhuan.erban.home.adapter.HomeDynamicAdapter; import com.yizhuan.xchat_android_core.home.bean.HomeDynamicInfo; -import com.yizhuan.erban.home.event.HomeDynamicEvent; -import com.yizhuan.erban.home.event.RefreshHomeDataEvent; -import com.yizhuan.erban.home.model.HomeModel; +import com.yizhuan.xchat_android_core.home.event.HomeDynamicEvent; +import com.yizhuan.xchat_android_core.home.event.RefreshHomeDataEvent; +import com.yizhuan.xchat_android_core.home.model.GameHomeModel; import com.yizhuan.xchat_android_core.initial.InitialModel; import com.yizhuan.xchat_android_core.user.event.LoadLoginUserInfoEvent; import com.yizhuan.xchat_android_library.utils.ListUtils; @@ -103,7 +103,7 @@ public class HomeDynamicFragment extends BaseFragment{ @SuppressLint("CheckResult") private void getHomeDynamic(){ - HomeModel.get().getHomeDynamic().subscribe((serviceResult, throwable) -> { + GameHomeModel.get().getHomeDynamic().subscribe((serviceResult, throwable) -> { if (throwable != null) { } else { dynamicList.clear(); diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/HomePlayFragment.java b/app/src/main/java/com/yizhuan/erban/home/fragment/HomePlayFragment.java index bfde77902..63d97eb76 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/HomePlayFragment.java +++ b/app/src/main/java/com/yizhuan/erban/home/fragment/HomePlayFragment.java @@ -13,8 +13,8 @@ import com.yizhuan.erban.R; import com.yizhuan.erban.base.BaseFragment; import com.yizhuan.erban.home.adapter.HomePlayAdapter; import com.yizhuan.xchat_android_core.home.bean.HomePlayInfo; -import com.yizhuan.erban.home.event.RefreshHomeDataEvent; -import com.yizhuan.erban.home.model.HomeModel; +import com.yizhuan.xchat_android_core.home.event.RefreshHomeDataEvent; +import com.yizhuan.xchat_android_core.home.model.GameHomeModel; import com.yizhuan.xchat_android_core.user.event.LoadLoginUserInfoEvent; import com.yizhuan.xchat_android_library.utils.ListUtils; import com.yizhuan.xchat_android_library.utils.SizeUtils; @@ -101,7 +101,7 @@ public class HomePlayFragment extends BaseFragment{ } private void getHomPlay(){ - HomeModel.get().getHomePlay().subscribe((serviceResult, throwable) -> { + GameHomeModel.get().getHomePlay().subscribe((serviceResult, throwable) -> { if (throwable != null) { isLoading = false; } else { diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/HomeTabHomeFragment.java b/app/src/main/java/com/yizhuan/erban/home/fragment/HomeTabHomeFragment.java index 3b6affa97..7589a2b77 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/HomeTabHomeFragment.java +++ b/app/src/main/java/com/yizhuan/erban/home/fragment/HomeTabHomeFragment.java @@ -16,7 +16,7 @@ import com.yizhuan.erban.R; import com.yizhuan.erban.common.NoDataFragment; import com.yizhuan.erban.home.adapter.HomeRoomFragmentAdapter; import com.yizhuan.xchat_android_core.home.bean.HomeTabMapInfo; -import com.yizhuan.erban.home.model.HomeModel; +import com.yizhuan.xchat_android_core.home.model.GameHomeModel; import com.yizhuan.xchat_android_core.initial.InitialModel; import com.yizhuan.xchat_android_core.utils.net.RxHelper; import com.yizhuan.xchat_android_library.utils.ListUtils; @@ -107,7 +107,7 @@ public class HomeTabHomeFragment extends LazyLoadFragment { */ @SuppressLint("CheckResult") private void getData() { - HomeModel.get() + GameHomeModel.get() .getHomeTabHome(tabId) .compose(RxHelper.handleSchedulers()) .compose(bindUntilEvent(FragmentEvent.DESTROY_VIEW)) diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/HomeTabMapFragment.java b/app/src/main/java/com/yizhuan/erban/home/fragment/HomeTabMapFragment.java index d7be942f9..941dd500b 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/HomeTabMapFragment.java +++ b/app/src/main/java/com/yizhuan/erban/home/fragment/HomeTabMapFragment.java @@ -15,7 +15,7 @@ import com.yizhuan.erban.base.BaseMvpFragment; import com.yizhuan.erban.home.adapter.HomeRoomFragmentAdapter; import com.yizhuan.xchat_android_core.home.bean.HomeTabMapInfo; import com.yizhuan.erban.home.presenter.HomeTabMapPresenter; -import com.yizhuan.erban.home.presenter.IHomeTabMapView; +import com.yizhuan.xchat_android_core.home.IHomeTabMapView; import com.yizhuan.xchat_android_library.base.factory.CreatePresenter; import com.yizhuan.xchat_android_library.utils.ListUtils; diff --git a/app/src/main/java/com/yizhuan/erban/home/model/HomeMultiItem.java b/app/src/main/java/com/yizhuan/erban/home/model/HomeMultiItem.java deleted file mode 100644 index a1233b8bf..000000000 --- a/app/src/main/java/com/yizhuan/erban/home/model/HomeMultiItem.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.yizhuan.erban.home.model; - -import com.chad.library.adapter.base.entity.MultiItemEntity; - -public class HomeMultiItem implements MultiItemEntity { - public static final int TYPE_CONCERN_ROOM = 1; - public static final int TYPE_RECOMMEND_ROOM = 2; - public static final int TYPE_BANNER = 3; - public static final int TYPE_DYNAMIC = 4; - private int itemType; - - public HomeMultiItem(int itemType) { - this.itemType = itemType; - } - - @Override - public int getItemType() { - return itemType; - } -} diff --git a/app/src/main/java/com/yizhuan/erban/home/model/IHomeModel.java b/app/src/main/java/com/yizhuan/erban/home/model/IHomeModel.java deleted file mode 100644 index 3d93c5794..000000000 --- a/app/src/main/java/com/yizhuan/erban/home/model/IHomeModel.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.yizhuan.erban.home.model; - -import com.yizhuan.xchat_android_core.home.bean.HomeDynamicInfo; - -import io.reactivex.Single; - -/** - * create by lvzebiao @2020/1/8 - */ -public interface IHomeModel { - - /** - * 推荐动态 - */ - Single getHomeDynamic(); - -} diff --git a/app/src/main/java/com/yizhuan/erban/home/presenter/HomeMorePresenter.java b/app/src/main/java/com/yizhuan/erban/home/presenter/HomeMorePresenter.java index 721069985..5c4906521 100644 --- a/app/src/main/java/com/yizhuan/erban/home/presenter/HomeMorePresenter.java +++ b/app/src/main/java/com/yizhuan/erban/home/presenter/HomeMorePresenter.java @@ -6,7 +6,8 @@ import android.os.Bundle; import androidx.annotation.Nullable; import com.yizhuan.erban.base.BaseMvpPresenter; -import com.yizhuan.erban.home.model.HomeModel; +import com.yizhuan.xchat_android_core.home.IHomeMoreRoomView; +import com.yizhuan.xchat_android_core.home.model.GameHomeModel; public class HomeMorePresenter extends BaseMvpPresenter { @@ -22,7 +23,7 @@ public class HomeMorePresenter extends BaseMvpPresenter { @SuppressLint("CheckResult") public void getHomeTag(){ - HomeModel.get().getHomeTag().subscribe((homeTabResult, throwable) -> { + GameHomeModel.get().getHomeTag().subscribe((homeTabResult, throwable) -> { if (throwable != null) { if (mMvpView != null) { mMvpView.getHomeTagFail(); @@ -37,7 +38,7 @@ public class HomeMorePresenter extends BaseMvpPresenter { @SuppressLint("CheckResult") public void getHomeConcerns(){ - HomeModel.get().getHomeConcerns().subscribe((result, throwable) -> { + GameHomeModel.get().getHomeConcerns().subscribe((result, throwable) -> { if (throwable != null) { if (mMvpView != null) { mMvpView.getFollowRoomFail(); diff --git a/app/src/main/java/com/yizhuan/erban/home/presenter/HomeTabMapPresenter.java b/app/src/main/java/com/yizhuan/erban/home/presenter/HomeTabMapPresenter.java index d04813f77..6ef8b5797 100644 --- a/app/src/main/java/com/yizhuan/erban/home/presenter/HomeTabMapPresenter.java +++ b/app/src/main/java/com/yizhuan/erban/home/presenter/HomeTabMapPresenter.java @@ -1,8 +1,9 @@ package com.yizhuan.erban.home.presenter; import com.yizhuan.erban.base.BaseMvpPresenter; +import com.yizhuan.xchat_android_core.home.IHomeTabMapView; import com.yizhuan.xchat_android_core.home.bean.HomeTabMapInfo; -import com.yizhuan.erban.home.model.HomeModel; +import com.yizhuan.xchat_android_core.home.model.GameHomeModel; import com.yizhuan.xchat_android_core.Constants; import java.util.List; @@ -21,7 +22,7 @@ public class HomeTabMapPresenter extends BaseMvpPresenter { page++; } - HomeModel.get().getHomeTabMap(id, page, Constants.PAGE_SIZE) + GameHomeModel.get().getHomeTabMap(id, page, Constants.PAGE_SIZE) .compose(bindToLifecycle()).subscribe(new SingleObserver>() { @Override public void onSubscribe(Disposable d) { diff --git a/app/src/main/java/com/yizhuan/erban/home/presenter/MainFragmentPresenter.java b/app/src/main/java/com/yizhuan/erban/home/presenter/MainFragmentPresenter.java index 83664d193..cf052b8b6 100644 --- a/app/src/main/java/com/yizhuan/erban/home/presenter/MainFragmentPresenter.java +++ b/app/src/main/java/com/yizhuan/erban/home/presenter/MainFragmentPresenter.java @@ -7,6 +7,7 @@ import android.text.TextUtils; import com.netease.nim.uikit.common.util.log.LogUtil; import com.yizhuan.erban.base.BaseMvpPresenter; +import com.yizhuan.xchat_android_core.home.model.GameHomeModel; import com.yizhuan.xchat_android_core.home.bean.HomeTagInfo; import com.yizhuan.erban.home.view.IMainFragmentView; import com.yizhuan.xchat_android_core.auth.AuthModel; @@ -291,7 +292,7 @@ public class MainFragmentPresenter extends BaseMvpPresenter { * 获取首页banner */ public void getHomeBanner(String type) { - com.yizhuan.erban.home.model.HomeModel.get() + GameHomeModel.get() .getHomeBanner(type) .compose(bindToLifecycle()) .subscribe(new SingleObserver>() { @@ -319,7 +320,7 @@ public class MainFragmentPresenter extends BaseMvpPresenter { * 获取首页tag */ public void getHomeTag() { - com.yizhuan.erban.home.model.HomeModel.get() + GameHomeModel.get() .getHomeTag() .compose(bindToLifecycle()) .subscribe(new SingleObserver>() { @@ -372,7 +373,7 @@ public class MainFragmentPresenter extends BaseMvpPresenter { @SuppressLint("CheckResult") public void getHomeConcerns(){ - com.yizhuan.erban.home.model.HomeModel.get().getHomeConcerns().compose(RxHelper.handleException()) + GameHomeModel.get().getHomeConcerns().compose(RxHelper.handleException()) .subscribe((result, throwable) -> { if (throwable != null) { if (mMvpView != null) { diff --git a/app/src/main/java/com/yizhuan/erban/home/presenter/IHomeMoreRoomView.java b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/IHomeMoreRoomView.java similarity index 90% rename from app/src/main/java/com/yizhuan/erban/home/presenter/IHomeMoreRoomView.java rename to core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/IHomeMoreRoomView.java index 82e602d85..f5a6ca252 100644 --- a/app/src/main/java/com/yizhuan/erban/home/presenter/IHomeMoreRoomView.java +++ b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/IHomeMoreRoomView.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.home.presenter; +package com.yizhuan.xchat_android_core.home; import com.yizhuan.xchat_android_core.home.bean.HomeTagInfo; import com.yizhuan.xchat_android_core.home.bean.HomeConcernsInfo; diff --git a/app/src/main/java/com/yizhuan/erban/home/presenter/IHomeTabMapView.java b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/IHomeTabMapView.java similarity index 90% rename from app/src/main/java/com/yizhuan/erban/home/presenter/IHomeTabMapView.java rename to core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/IHomeTabMapView.java index aac05e1f7..c17d893be 100644 --- a/app/src/main/java/com/yizhuan/erban/home/presenter/IHomeTabMapView.java +++ b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/IHomeTabMapView.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.home.presenter; +package com.yizhuan.xchat_android_core.home; import com.yizhuan.xchat_android_core.home.bean.HomeTabMapInfo; import com.yizhuan.xchat_android_library.base.IMvpBaseView; 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 new file mode 100644 index 000000000..13c16b0b9 --- /dev/null +++ b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/event/FollowRoomEvent.java @@ -0,0 +1,4 @@ +package com.yizhuan.xchat_android_core.home.event; + +public class FollowRoomEvent { +} diff --git a/app/src/main/java/com/yizhuan/erban/home/event/HomeDynamicEvent.java b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/event/HomeDynamicEvent.java similarity index 85% rename from app/src/main/java/com/yizhuan/erban/home/event/HomeDynamicEvent.java rename to core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/event/HomeDynamicEvent.java index c0ec47ce2..584790849 100644 --- a/app/src/main/java/com/yizhuan/erban/home/event/HomeDynamicEvent.java +++ b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/event/HomeDynamicEvent.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.home.event; +package com.yizhuan.xchat_android_core.home.event; public class HomeDynamicEvent { private boolean isRunning; 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 new file mode 100644 index 000000000..711fa8366 --- /dev/null +++ b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/event/RefreshHomeDataEvent.java @@ -0,0 +1,4 @@ +package com.yizhuan.xchat_android_core.home.event; + +public class RefreshHomeDataEvent { +} diff --git a/app/src/main/java/com/yizhuan/erban/home/model/CollectionRoomModel.java b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/model/CollectionRoomModel.java similarity index 98% rename from app/src/main/java/com/yizhuan/erban/home/model/CollectionRoomModel.java rename to core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/model/CollectionRoomModel.java index 24ebd0925..97f172861 100644 --- a/app/src/main/java/com/yizhuan/erban/home/model/CollectionRoomModel.java +++ b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/model/CollectionRoomModel.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.home.model; +package com.yizhuan.xchat_android_core.home.model; import com.yizhuan.xchat_android_core.home.bean.CollectionRoomInfo; import com.yizhuan.xchat_android_core.auth.AuthModel; diff --git a/app/src/main/java/com/yizhuan/erban/home/model/HomeModel.java b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/model/GameHomeModel.java similarity index 96% rename from app/src/main/java/com/yizhuan/erban/home/model/HomeModel.java rename to core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/model/GameHomeModel.java index 16c199c32..db072f28d 100644 --- a/app/src/main/java/com/yizhuan/erban/home/model/HomeModel.java +++ b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/model/GameHomeModel.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.home.model; +package com.yizhuan.xchat_android_core.home.model; import com.yizhuan.xchat_android_core.home.bean.HomeDynamicInfo; import com.yizhuan.xchat_android_core.home.bean.HomePlayInfo; @@ -22,7 +22,7 @@ import retrofit2.http.Query; /** * */ -public class HomeModel extends BaseModel { +public class GameHomeModel extends BaseModel { private final Api api = RxNet.create(Api.class); @@ -84,11 +84,11 @@ public class HomeModel extends BaseModel { private static final class Helper { - public static final HomeModel INSTANCE = new HomeModel(); + public static final GameHomeModel INSTANCE = new GameHomeModel(); } - public static HomeModel get() { - return HomeModel.Helper.INSTANCE; + public static GameHomeModel get() { + return GameHomeModel.Helper.INSTANCE; }