moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

网络实体类迁移到core

Browse Source
This commit is contained in:
oujunhui
2020-05-13 21:22:45 +08:00
parent 67ef646c1b
commit 548a8486d8
28 changed files with 35 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,7 +14,7 @@ import com.yizhuan.erban.R;
import com.yizhuan.erban.avroom.activity.AVRoomActivity;
import com.yizhuan.erban.base.BaseActivity;
import com.yizhuan.erban.home.adapter.CollectionRoomAdapter;
import com.yizhuan.erban.home.bean.CollectionRoomInfo;
import com.yizhuan.xchat_android_core.home.bean.CollectionRoomInfo;
import com.yizhuan.erban.home.model.CollectionRoomModel;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_library.utils.ListUtils;

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

@@ -19,17 +19,15 @@ import com.yizhuan.erban.avroom.adapter.RoomContributeListAdapter;
import com.yizhuan.erban.base.BaseMvpActivity;
import com.yizhuan.erban.home.adapter.HomeConcernsAdapter;
import com.yizhuan.erban.home.adapter.MainMagicIndicatorAdapter;
import com.yizhuan.erban.home.bean.HomeTagInfo;
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.erban.ui.search.RoomHistoryAdapter;
import com.yizhuan.erban.ui.widget.OnPageSelectedListener;
import com.yizhuan.erban.ui.widget.magicindicator.MagicIndicator;
import com.yizhuan.erban.ui.widget.magicindicator.ViewPagerHelper;
import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator;
import com.yizhuan.erban.ui.widget.recyclerview.decoration.VerticalDecoration;
import com.yizhuan.xchat_android_core.bean.RoomHistoryInfo;
import com.yizhuan.xchat_android_core.home.bean.HomeConcernsInfo;
import com.yizhuan.xchat_android_core.statistic.StatisticManager;
import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol;

2
app/src/main/java/com/yizhuan/erban/home/adapter/CollectionRoomAdapter.java
View File

@@ -5,7 +5,7 @@ import android.widget.ImageView;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.yizhuan.erban.R;
import com.yizhuan.erban.home.bean.CollectionRoomInfo;
import com.yizhuan.xchat_android_core.home.bean.CollectionRoomInfo;
import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2;
/**

2
app/src/main/java/com/yizhuan/erban/home/adapter/HomeDynamicAdapter.java
View File

@@ -14,7 +14,7 @@ import com.yizhuan.erban.R;
import com.yizhuan.erban.avroom.activity.AVRoomActivity;
import com.yizhuan.erban.community.dynamic.view.DynamicDetailActivity;
import com.yizhuan.erban.community.widget.DynamicNickDetailWidget;
import com.yizhuan.erban.home.bean.HomeDynamicInfo;
import com.yizhuan.xchat_android_core.home.bean.HomeDynamicInfo;
import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2;
import com.yizhuan.xchat_android_core.community.dynamic.DynamicModel;
import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver;

13
app/src/main/java/com/yizhuan/erban/home/adapter/HomePlayAdapter.java
View File

@@ -2,27 +2,16 @@ package com.yizhuan.erban.home.adapter;
import android.content.Context;
import android.view.View;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.netease.nim.uikit.common.util.log.LogUtil;
import com.netease.nim.uikit.support.glide.GlideApp;
import com.yizhuan.erban.R;
import com.yizhuan.erban.avroom.activity.AVRoomActivity;
import com.yizhuan.erban.common.widget.CircleImageView;
import com.yizhuan.erban.community.dynamic.view.DynamicDetailActivity;
import com.yizhuan.erban.community.widget.DynamicNickDetailWidget;
import com.yizhuan.erban.home.bean.HomePlayInfo;
import com.yizhuan.xchat_android_core.home.bean.HomePlayInfo;
import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2;
import com.yizhuan.xchat_android_core.community.dynamic.DynamicModel;
import com.yizhuan.xchat_android_core.utils.TextUtils;
import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver;
import com.yizhuan.xchat_android_core.utils.net.RxHelper;
import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
/**
* create by lvzebiao @2019/11/13

4
app/src/main/java/com/yizhuan/erban/home/adapter/HomeRoomFragmentAdapter.java
View File

@@ -2,7 +2,6 @@ package com.yizhuan.erban.home.adapter;
import android.content.Context;
import android.graphics.Color;
import android.graphics.drawable.Drawable;
import android.text.TextUtils;
import android.view.View;
import android.widget.ImageView;
@@ -10,10 +9,9 @@ import android.widget.ImageView;
import com.chad.library.adapter.base.BaseMultiItemQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.netease.nim.uikit.support.glide.GlideApp;
import com.netease.nim.uikit.support.glide.GlideRequest;
import com.yizhuan.erban.R;
import com.yizhuan.erban.avroom.activity.AVRoomActivity;
import com.yizhuan.erban.home.bean.HomeTabMapInfo;
import com.yizhuan.xchat_android_core.home.bean.HomeTabMapInfo;
import com.yizhuan.erban.ui.utils.ImageLoadUtils;
import com.yizhuan.erban.ui.widget.LivingIconView;

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

@@ -13,8 +13,6 @@ import android.text.Spannable;
import android.text.SpannableStringBuilder;
import android.text.style.ForegroundColorSpan;
import android.util.Log;
import android.view.GestureDetector;
import android.view.MotionEvent;
import android.view.View;
import android.view.ViewGroup;
import android.widget.FrameLayout;
@@ -25,7 +23,6 @@ import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.content.ContextCompat;
import androidx.core.widget.NestedScrollView;
import androidx.databinding.DataBindingUtil;
import androidx.fragment.app.Fragment;
import androidx.recyclerview.widget.LinearLayoutManager;
@@ -56,7 +53,7 @@ import com.yizhuan.erban.home.activity.HomeMoreRoomActivity;
import com.yizhuan.erban.home.adapter.BannerAdapter;
import com.yizhuan.erban.home.adapter.HomeConcernsAdapter;
import com.yizhuan.erban.home.adapter.MainMagicIndicatorAdapter;
import com.yizhuan.erban.home.bean.HomeTagInfo;
import com.yizhuan.xchat_android_core.home.bean.HomeTagInfo;
import com.yizhuan.erban.home.event.RefreshHomeDataEvent;
import com.yizhuan.erban.home.presenter.MainFragmentPresenter;
import com.yizhuan.erban.home.view.IMainFragmentView;
@@ -611,15 +608,20 @@ public class GameHomeFragment extends BaseMvpFragment<IMainFragmentView, MainFra
@Override
public void onGetHomeTagSuccess(List<HomeTagInfo> info) {
boolean changed = false;
List<CharSequence> oldTabInfoList = new ArrayList<>(mTabInfoList);
for (HomeTagInfo tagInfo : info) {
if (!oldTabInfoList.contains(tagInfo.getName())) {
changed = true;
break;
}
}
//只有HomeTagInfo发生改变才刷新数据,否则刷新当前可见的那个Fragment
if (changed) {
LogUtils.e(changed+":oldTabInfoList");
mTabInfoList.clear();
mFragments.clear();
for (int i = 0; i < info.size(); i++) {

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

@@ -15,7 +15,7 @@ import androidx.recyclerview.widget.RecyclerView;
import com.yizhuan.erban.R;
import com.yizhuan.erban.base.BaseFragment;
import com.yizhuan.erban.home.adapter.HomeDynamicAdapter;
import com.yizhuan.erban.home.bean.HomeDynamicInfo;
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;

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

@@ -12,7 +12,7 @@ import android.view.ViewGroup;
import com.yizhuan.erban.R;
import com.yizhuan.erban.base.BaseFragment;
import com.yizhuan.erban.home.adapter.HomePlayAdapter;
import com.yizhuan.erban.home.bean.HomePlayInfo;
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.user.event.LoadLoginUserInfoEvent;

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

@@ -11,12 +11,11 @@ import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.coorchice.library.utils.LogUtils;
import com.trello.rxlifecycle3.android.FragmentEvent;
import com.yizhuan.erban.R;
import com.yizhuan.erban.common.NoDataFragment;
import com.yizhuan.erban.home.adapter.HomeRoomFragmentAdapter;
import com.yizhuan.erban.home.bean.HomeTabMapInfo;
import com.yizhuan.xchat_android_core.home.bean.HomeTabMapInfo;
import com.yizhuan.erban.home.model.HomeModel;
import com.yizhuan.xchat_android_core.initial.InitialModel;
import com.yizhuan.xchat_android_core.utils.net.RxHelper;

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

@@ -13,7 +13,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
import com.yizhuan.erban.R;
import com.yizhuan.erban.base.BaseMvpFragment;
import com.yizhuan.erban.home.adapter.HomeRoomFragmentAdapter;
import com.yizhuan.erban.home.bean.HomeTabMapInfo;
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_library.base.factory.CreatePresenter;

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

@@ -18,7 +18,7 @@ import com.yizhuan.erban.base.BaseMvpFragment;
import com.yizhuan.erban.common.widget.dialog.DialogManager;
import com.yizhuan.erban.home.adapter.FragmentViewPagerAdapter;
import com.yizhuan.erban.home.adapter.TopMagicIndicatorAdapter;
import com.yizhuan.erban.home.bean.HomeTagInfo;
import com.yizhuan.xchat_android_core.home.bean.HomeTagInfo;
import com.yizhuan.erban.home.dialog.CreateRoomDialog;
import com.yizhuan.erban.home.presenter.MainFragmentPresenter;
import com.yizhuan.erban.home.view.IMainFragmentTabBg;

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

@@ -20,8 +20,7 @@ import com.yizhuan.erban.common.widget.dialog.DialogManager;
import com.yizhuan.erban.databinding.FragmentMeBinding;
import com.yizhuan.erban.decoration.view.MyDecorationActivity;
import com.yizhuan.erban.home.activity.CollectionRoomActivity;
import com.yizhuan.erban.home.bean.HomeTagInfo;
import com.yizhuan.erban.home.dialog.CreateRoomDialog;
import com.yizhuan.xchat_android_core.home.bean.HomeTagInfo;
import com.yizhuan.erban.home.presenter.MainFragmentPresenter;
import com.yizhuan.erban.home.view.IMainFragmentView;
import com.yizhuan.erban.module_hall.hall.activity.ModuleHallActivity;
@@ -37,7 +36,6 @@ import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.certification.CertificationModel;
import com.yizhuan.xchat_android_core.customer_server.CustomerServerModel;
import com.yizhuan.xchat_android_core.decoration.headwear.bean.HeadWearInfo;
import com.yizhuan.xchat_android_core.family.bean.HomeBannerInfo;
import com.yizhuan.xchat_android_core.home.bean.BannerInfo;
import com.yizhuan.xchat_android_core.home.bean.HomeConcernsInfo;
import com.yizhuan.xchat_android_core.home.bean.TagListInfo;

4
app/src/main/java/com/yizhuan/erban/home/model/CollectionRoomModel.java
View File

@@ -1,13 +1,11 @@
package com.yizhuan.erban.home.model;
import com.yizhuan.erban.home.bean.CollectionRoomInfo;
import com.yizhuan.erban.ui.praise.Utils;
import com.yizhuan.xchat_android_core.home.bean.CollectionRoomInfo;
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.yizhuan.xchat_android_library.net.rxnet.RxNet;
import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
import io.reactivex.Single;
import io.reactivex.SingleSource;

8
app/src/main/java/com/yizhuan/erban/home/model/HomeModel.java
View File

@@ -1,9 +1,9 @@
package com.yizhuan.erban.home.model;
import com.yizhuan.erban.home.bean.HomeDynamicInfo;
import com.yizhuan.erban.home.bean.HomePlayInfo;
import com.yizhuan.erban.home.bean.HomeTabMapInfo;
import com.yizhuan.erban.home.bean.HomeTagInfo;
import com.yizhuan.xchat_android_core.home.bean.HomeDynamicInfo;
import com.yizhuan.xchat_android_core.home.bean.HomePlayInfo;
import com.yizhuan.xchat_android_core.home.bean.HomeTabMapInfo;
import com.yizhuan.xchat_android_core.home.bean.HomeTagInfo;
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;

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

@@ -1,10 +1,6 @@
package com.yizhuan.erban.home.model;
import com.yizhuan.erban.home.bean.HomeDynamicInfo;
import com.yizhuan.xchat_android_core.community.bean.WorldDynamicBean;
import com.yizhuan.xchat_android_core.community.bean.WorldDynamicListResult;
import java.util.List;
import com.yizhuan.xchat_android_core.home.bean.HomeDynamicInfo;
import io.reactivex.Single;

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

@@ -1,7 +1,7 @@
package com.yizhuan.erban.home.presenter;
import com.yizhuan.erban.base.BaseMvpPresenter;
import com.yizhuan.erban.home.bean.HomeTabMapInfo;
import com.yizhuan.xchat_android_core.home.bean.HomeTabMapInfo;
import com.yizhuan.erban.home.model.HomeModel;
import com.yizhuan.xchat_android_core.Constants;

2
app/src/main/java/com/yizhuan/erban/home/presenter/IHomeMoreRoomView.java
View File

@@ -1,6 +1,6 @@
package com.yizhuan.erban.home.presenter;
import com.yizhuan.erban.home.bean.HomeTagInfo;
import com.yizhuan.xchat_android_core.home.bean.HomeTagInfo;
import com.yizhuan.xchat_android_core.home.bean.HomeConcernsInfo;
import com.yizhuan.xchat_android_library.base.IMvpBaseView;

2
app/src/main/java/com/yizhuan/erban/home/presenter/IHomeTabMapView.java
View File

@@ -1,6 +1,6 @@
package com.yizhuan.erban.home.presenter;
import com.yizhuan.erban.home.bean.HomeTabMapInfo;
import com.yizhuan.xchat_android_core.home.bean.HomeTabMapInfo;
import com.yizhuan.xchat_android_library.base.IMvpBaseView;
import java.util.List;

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

@@ -7,10 +7,9 @@ import android.text.TextUtils;
import com.netease.nim.uikit.common.util.log.LogUtil;
import com.yizhuan.erban.base.BaseMvpPresenter;
import com.yizhuan.erban.home.bean.HomeTagInfo;
import com.yizhuan.xchat_android_core.home.bean.HomeTagInfo;
import com.yizhuan.erban.home.view.IMainFragmentView;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.family.bean.HomeBannerInfo;
import com.yizhuan.xchat_android_core.home.bean.BannerInfo;
import com.yizhuan.xchat_android_core.home.bean.TagListInfo;
import com.yizhuan.xchat_android_core.home.model.HomeModel;

4
app/src/main/java/com/yizhuan/erban/home/view/IMainFragmentView.java
View File

@@ -1,12 +1,10 @@
package com.yizhuan.erban.home.view;
import com.yizhuan.erban.home.bean.HomeTagInfo;
import com.yizhuan.xchat_android_core.family.bean.HomeBannerInfo;
import com.yizhuan.xchat_android_core.home.bean.HomeTagInfo;
import com.yizhuan.xchat_android_core.home.bean.BannerInfo;
import com.yizhuan.xchat_android_core.home.bean.HomeConcernsInfo;
import com.yizhuan.xchat_android_core.home.bean.TagListInfo;
import com.yizhuan.xchat_android_library.base.IMvpBaseView;
import com.yizhuan.xchat_android_core.home.bean.HomeItem;
import java.util.List;

2
app/src/main/java/com/yizhuan/erban/ui/user/adapter/GiftAdapter.java
View File

@@ -6,10 +6,8 @@ import android.widget.ImageView;
import androidx.annotation.Nullable;
import com.chad.library.adapter.base.BaseMultiItemQuickAdapter;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.yizhuan.erban.R;
import com.yizhuan.erban.home.bean.HomeTabMapInfo;
import com.yizhuan.erban.ui.utils.ImageLoadUtils;
import com.yizhuan.xchat_android_core.user.bean.UserDetailInfo;

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

@@ -1,4 +1,4 @@
package com.yizhuan.erban.home.bean;
package com.yizhuan.xchat_android_core.home.bean;
import java.util.List;

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

@@ -1,4 +1,4 @@
package com.yizhuan.erban.home.bean;
package com.yizhuan.xchat_android_core.home.bean;
import com.yizhuan.xchat_android_core.user.bean.BaseUserInfo;

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

@@ -1,4 +1,4 @@
package com.yizhuan.erban.home.bean;
package com.yizhuan.xchat_android_core.home.bean;
import java.util.List;

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

@@ -1,4 +1,4 @@
package com.yizhuan.erban.home.bean;
package com.yizhuan.xchat_android_core.home.bean;
import java.util.List;

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

@@ -1,4 +1,4 @@
package com.yizhuan.erban.home.bean;
package com.yizhuan.xchat_android_core.home.bean;
import com.chad.library.adapter.base.entity.MultiItemEntity;

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

@@ -1,4 +1,4 @@
package com.yizhuan.erban.home.bean;
package com.yizhuan.xchat_android_core.home.bean;
public class HomeTagInfo {