yinmeng/yinmeng-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop_new' into develop_new

Browse Source
This commit is contained in:
memory
2020-05-13 23:46:00 +08:00
parent 1d03ba2c2e f801a8f1bd
commit 19ae70cebc
25 changed files with 46 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/yizhuan/erban/MainActivity.java
View File

@@ -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;

4
app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyFragment.java
View File

@@ -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;

7
app/src/main/java/com/yizhuan/erban/avroom/widget/MessageView.java
View File

@@ -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;

2
app/src/main/java/com/yizhuan/erban/home/activity/CollectionRoomActivity.java
View File

@@ -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;

2
app/src/main/java/com/yizhuan/erban/home/activity/HomeMoreRoomActivity.java
View File

@@ -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;

27
app/src/main/java/com/yizhuan/erban/home/adapter/HomeMultiItemQuickAdapter.java
View File

@@ -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<HomeMultiItem, BaseViewHolder> {
public HomeMultiItemQuickAdapter(RecyclerView recyclerView, List<HomeMultiItem> data) {
super(recyclerView, data);
}
@Override
protected int getViewType(HomeMultiItem item) {
return 0;
}
@Override
protected String getItemKey(HomeMultiItem item) {
return null;
}
}

4
app/src/main/java/com/yizhuan/erban/home/event/FollowRoomEvent.java
View File

@@ -1,4 +0,0 @@
package com.yizhuan.erban.home.event;
public class FollowRoomEvent {
}

4
app/src/main/java/com/yizhuan/erban/home/event/RefreshHomeDataEvent.java
View File

@@ -1,4 +0,0 @@
package com.yizhuan.erban.home.event;
public class RefreshHomeDataEvent {
}

2
app/src/main/java/com/yizhuan/erban/home/fragment/GameHomeFragment.java
View File

@@ -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;

8
app/src/main/java/com/yizhuan/erban/home/fragment/HomeDynamicFragment.java
View File

@@ -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();

6
app/src/main/java/com/yizhuan/erban/home/fragment/HomePlayFragment.java
View File

@@ -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 {

4
app/src/main/java/com/yizhuan/erban/home/fragment/HomeTabHomeFragment.java
View File

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

2
app/src/main/java/com/yizhuan/erban/home/fragment/HomeTabMapFragment.java
View File

@@ -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;

20
app/src/main/java/com/yizhuan/erban/home/model/HomeMultiItem.java
View File

@@ -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;
}
}

17
app/src/main/java/com/yizhuan/erban/home/model/IHomeModel.java
View File

@@ -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<HomeDynamicInfo> getHomeDynamic();
}

7
app/src/main/java/com/yizhuan/erban/home/presenter/HomeMorePresenter.java
View File

@@ -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<IHomeMoreRoomView> {
@@ -22,7 +23,7 @@ public class HomeMorePresenter extends BaseMvpPresenter<IHomeMoreRoomView> {
@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<IHomeMoreRoomView> {
@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();

5
app/src/main/java/com/yizhuan/erban/home/presenter/HomeTabMapPresenter.java
View File

@@ -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<IHomeTabMapView> {
page++;
}
HomeModel.get().getHomeTabMap(id, page, Constants.PAGE_SIZE)
GameHomeModel.get().getHomeTabMap(id, page, Constants.PAGE_SIZE)
.compose(bindToLifecycle()).subscribe(new SingleObserver<List<HomeTabMapInfo>>() {
@Override
public void onSubscribe(Disposable d) {

7
app/src/main/java/com/yizhuan/erban/home/presenter/MainFragmentPresenter.java
View File

@@ -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<IMainFragmentView> {
* 获取首页banner
*/
public void getHomeBanner(String type) {
com.yizhuan.erban.home.model.HomeModel.get()
GameHomeModel.get()
.getHomeBanner(type)
.compose(bindToLifecycle())
.subscribe(new SingleObserver<List<BannerInfo>>() {
@@ -319,7 +320,7 @@ public class MainFragmentPresenter extends BaseMvpPresenter<IMainFragmentView> {
* 获取首页tag
*/
public void getHomeTag() {
com.yizhuan.erban.home.model.HomeModel.get()
GameHomeModel.get()
.getHomeTag()
.compose(bindToLifecycle())
.subscribe(new SingleObserver<List<HomeTagInfo>>() {
@@ -372,7 +373,7 @@ public class MainFragmentPresenter extends BaseMvpPresenter<IMainFragmentView> {
@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) {

2
app/src/main/java/com/yizhuan/erban/home/presenter/IHomeMoreRoomView.java → core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/IHomeMoreRoomView.java
View File

@@ -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;

2
app/src/main/java/com/yizhuan/erban/home/presenter/IHomeTabMapView.java → core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/IHomeTabMapView.java
View File

@@ -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;

4
core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/event/FollowRoomEvent.java Normal file
View File

@@ -0,0 +1,4 @@
package com.yizhuan.xchat_android_core.home.event;
public class FollowRoomEvent {
}

2
app/src/main/java/com/yizhuan/erban/home/event/HomeDynamicEvent.java → core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/event/HomeDynamicEvent.java
View File

@@ -1,4 +1,4 @@
package com.yizhuan.erban.home.event;
package com.yizhuan.xchat_android_core.home.event;
public class HomeDynamicEvent {
private boolean isRunning;

4
core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/event/RefreshHomeDataEvent.java Normal file
View File

@@ -0,0 +1,4 @@
package com.yizhuan.xchat_android_core.home.event;
public class RefreshHomeDataEvent {
}

2
app/src/main/java/com/yizhuan/erban/home/model/CollectionRoomModel.java → core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/model/CollectionRoomModel.java
View File

@@ -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;

10
app/src/main/java/com/yizhuan/erban/home/model/HomeModel.java → core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/model/GameHomeModel.java
View File

@@ -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;
}