From 548a8486d8c7f5522efd1818f4ebde6e0544ab19 Mon Sep 17 00:00:00 2001 From: oujunhui <313127320@qq.com> Date: Wed, 13 May 2020 21:22:45 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=BD=91=E7=BB=9C=E5=AE=9E=E4=BD=93?= =?UTF-8?q?=E7=B1=BB=E8=BF=81=E7=A7=BB=E5=88=B0core?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erban/home/activity/CollectionRoomActivity.java | 2 +- .../erban/home/activity/HomeMoreRoomActivity.java | 4 +--- .../erban/home/adapter/CollectionRoomAdapter.java | 2 +- .../erban/home/adapter/HomeDynamicAdapter.java | 2 +- .../yizhuan/erban/home/adapter/HomePlayAdapter.java | 13 +------------ .../erban/home/adapter/HomeRoomFragmentAdapter.java | 4 +--- .../erban/home/fragment/GameHomeFragment.java | 10 ++++++---- .../erban/home/fragment/HomeDynamicFragment.java | 2 +- .../erban/home/fragment/HomePlayFragment.java | 2 +- .../erban/home/fragment/HomeTabHomeFragment.java | 3 +-- .../erban/home/fragment/HomeTabMapFragment.java | 2 +- .../yizhuan/erban/home/fragment/MainFragment.java | 2 +- .../com/yizhuan/erban/home/fragment/MeFragment.java | 4 +--- .../erban/home/model/CollectionRoomModel.java | 4 +--- .../com/yizhuan/erban/home/model/HomeModel.java | 8 ++++---- .../com/yizhuan/erban/home/model/IHomeModel.java | 6 +----- .../erban/home/presenter/HomeTabMapPresenter.java | 2 +- .../erban/home/presenter/IHomeMoreRoomView.java | 2 +- .../erban/home/presenter/IHomeTabMapView.java | 2 +- .../erban/home/presenter/MainFragmentPresenter.java | 3 +-- .../yizhuan/erban/home/view/IMainFragmentView.java | 4 +--- .../yizhuan/erban/ui/user/adapter/GiftAdapter.java | 2 -- .../home/bean/CollectionRoomInfo.java | 2 +- .../home/bean/HomeDynamicInfo.java | 2 +- .../home/bean/HomeDynamicResult.java | 2 +- .../xchat_android_core}/home/bean/HomePlayInfo.java | 2 +- .../home/bean/HomeTabMapInfo.java | 2 +- .../xchat_android_core}/home/bean/HomeTagInfo.java | 2 +- 28 files changed, 35 insertions(+), 62 deletions(-) rename {app/src/main/java/com/yizhuan/erban => core/src/diff_src_erban/java/com/yizhuan/xchat_android_core}/home/bean/CollectionRoomInfo.java (98%) rename {app/src/main/java/com/yizhuan/erban => core/src/diff_src_erban/java/com/yizhuan/xchat_android_core}/home/bean/HomeDynamicInfo.java (95%) rename {app/src/main/java/com/yizhuan/erban => core/src/diff_src_erban/java/com/yizhuan/xchat_android_core}/home/bean/HomeDynamicResult.java (75%) rename {app/src/main/java/com/yizhuan/erban => core/src/diff_src_erban/java/com/yizhuan/xchat_android_core}/home/bean/HomePlayInfo.java (98%) rename {app/src/main/java/com/yizhuan/erban => core/src/diff_src_erban/java/com/yizhuan/xchat_android_core}/home/bean/HomeTabMapInfo.java (97%) rename {app/src/main/java/com/yizhuan/erban => core/src/diff_src_erban/java/com/yizhuan/xchat_android_core}/home/bean/HomeTagInfo.java (92%) 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 aea22a9a3..bcbf97715 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 @@ -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; 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 39fd69a8c..7121c9799 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 @@ -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; diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/CollectionRoomAdapter.java b/app/src/main/java/com/yizhuan/erban/home/adapter/CollectionRoomAdapter.java index fdb433141..a5cc881f5 100644 --- a/app/src/main/java/com/yizhuan/erban/home/adapter/CollectionRoomAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/home/adapter/CollectionRoomAdapter.java @@ -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; /** diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/HomeDynamicAdapter.java b/app/src/main/java/com/yizhuan/erban/home/adapter/HomeDynamicAdapter.java index 6e63040c0..4fe4663a3 100644 --- a/app/src/main/java/com/yizhuan/erban/home/adapter/HomeDynamicAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/home/adapter/HomeDynamicAdapter.java @@ -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; diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/HomePlayAdapter.java b/app/src/main/java/com/yizhuan/erban/home/adapter/HomePlayAdapter.java index 8cd7e341c..12bc0f0a8 100644 --- a/app/src/main/java/com/yizhuan/erban/home/adapter/HomePlayAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/home/adapter/HomePlayAdapter.java @@ -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 diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/HomeRoomFragmentAdapter.java b/app/src/main/java/com/yizhuan/erban/home/adapter/HomeRoomFragmentAdapter.java index 36d551b40..b7b8549c4 100644 --- a/app/src/main/java/com/yizhuan/erban/home/adapter/HomeRoomFragmentAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/home/adapter/HomeRoomFragmentAdapter.java @@ -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; 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 2d2655198..869eb45fc 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 @@ -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 info) { boolean changed = false; + List 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++) { 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 db92ec268..5fd0ca523 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 @@ -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; 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 362f5dcf7..bfde77902 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 @@ -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; 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 62819c2a8..335b4bdf1 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 @@ -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; 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 67849e21c..d7be942f9 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 @@ -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; diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/MainFragment.java b/app/src/main/java/com/yizhuan/erban/home/fragment/MainFragment.java index 0ce64e75e..84a70fb7e 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/MainFragment.java +++ b/app/src/main/java/com/yizhuan/erban/home/fragment/MainFragment.java @@ -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; diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.java b/app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.java index ea0e8f293..334fd1c0c 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.java +++ b/app/src/main/java/com/yizhuan/erban/home/fragment/MeFragment.java @@ -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; diff --git a/app/src/main/java/com/yizhuan/erban/home/model/CollectionRoomModel.java b/app/src/main/java/com/yizhuan/erban/home/model/CollectionRoomModel.java index 9b0daef2a..24ebd0925 100644 --- a/app/src/main/java/com/yizhuan/erban/home/model/CollectionRoomModel.java +++ b/app/src/main/java/com/yizhuan/erban/home/model/CollectionRoomModel.java @@ -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; diff --git a/app/src/main/java/com/yizhuan/erban/home/model/HomeModel.java b/app/src/main/java/com/yizhuan/erban/home/model/HomeModel.java index 0492b2173..16c199c32 100644 --- a/app/src/main/java/com/yizhuan/erban/home/model/HomeModel.java +++ b/app/src/main/java/com/yizhuan/erban/home/model/HomeModel.java @@ -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; 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 index 3ab5ec879..3d93c5794 100644 --- a/app/src/main/java/com/yizhuan/erban/home/model/IHomeModel.java +++ b/app/src/main/java/com/yizhuan/erban/home/model/IHomeModel.java @@ -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; 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 c7bb94125..d04813f77 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,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; diff --git a/app/src/main/java/com/yizhuan/erban/home/presenter/IHomeMoreRoomView.java b/app/src/main/java/com/yizhuan/erban/home/presenter/IHomeMoreRoomView.java index c53096cf6..82e602d85 100644 --- a/app/src/main/java/com/yizhuan/erban/home/presenter/IHomeMoreRoomView.java +++ b/app/src/main/java/com/yizhuan/erban/home/presenter/IHomeMoreRoomView.java @@ -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; diff --git a/app/src/main/java/com/yizhuan/erban/home/presenter/IHomeTabMapView.java b/app/src/main/java/com/yizhuan/erban/home/presenter/IHomeTabMapView.java index e3a32304e..aac05e1f7 100644 --- a/app/src/main/java/com/yizhuan/erban/home/presenter/IHomeTabMapView.java +++ b/app/src/main/java/com/yizhuan/erban/home/presenter/IHomeTabMapView.java @@ -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; 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 0856c54df..83664d193 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,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; diff --git a/app/src/main/java/com/yizhuan/erban/home/view/IMainFragmentView.java b/app/src/main/java/com/yizhuan/erban/home/view/IMainFragmentView.java index aa3ad0d10..36f65721c 100644 --- a/app/src/main/java/com/yizhuan/erban/home/view/IMainFragmentView.java +++ b/app/src/main/java/com/yizhuan/erban/home/view/IMainFragmentView.java @@ -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; diff --git a/app/src/main/java/com/yizhuan/erban/ui/user/adapter/GiftAdapter.java b/app/src/main/java/com/yizhuan/erban/ui/user/adapter/GiftAdapter.java index 6e400e362..ca0d09059 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/user/adapter/GiftAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/ui/user/adapter/GiftAdapter.java @@ -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; diff --git a/app/src/main/java/com/yizhuan/erban/home/bean/CollectionRoomInfo.java b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/CollectionRoomInfo.java similarity index 98% rename from app/src/main/java/com/yizhuan/erban/home/bean/CollectionRoomInfo.java rename to core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/CollectionRoomInfo.java index 584bf1757..086f0fbea 100644 --- a/app/src/main/java/com/yizhuan/erban/home/bean/CollectionRoomInfo.java +++ b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/CollectionRoomInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.home.bean; +package com.yizhuan.xchat_android_core.home.bean; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/home/bean/HomeDynamicInfo.java b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/HomeDynamicInfo.java similarity index 95% rename from app/src/main/java/com/yizhuan/erban/home/bean/HomeDynamicInfo.java rename to core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/HomeDynamicInfo.java index 8f611bcb9..f4dee58c1 100644 --- a/app/src/main/java/com/yizhuan/erban/home/bean/HomeDynamicInfo.java +++ b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/HomeDynamicInfo.java @@ -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; diff --git a/app/src/main/java/com/yizhuan/erban/home/bean/HomeDynamicResult.java b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/HomeDynamicResult.java similarity index 75% rename from app/src/main/java/com/yizhuan/erban/home/bean/HomeDynamicResult.java rename to core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/HomeDynamicResult.java index 776b0dbe1..6d530eed9 100644 --- a/app/src/main/java/com/yizhuan/erban/home/bean/HomeDynamicResult.java +++ b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/HomeDynamicResult.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.home.bean; +package com.yizhuan.xchat_android_core.home.bean; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/home/bean/HomePlayInfo.java b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/HomePlayInfo.java similarity index 98% rename from app/src/main/java/com/yizhuan/erban/home/bean/HomePlayInfo.java rename to core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/HomePlayInfo.java index 47ce66753..271e0929f 100644 --- a/app/src/main/java/com/yizhuan/erban/home/bean/HomePlayInfo.java +++ b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/HomePlayInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.home.bean; +package com.yizhuan.xchat_android_core.home.bean; import java.util.List; diff --git a/app/src/main/java/com/yizhuan/erban/home/bean/HomeTabMapInfo.java b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/HomeTabMapInfo.java similarity index 97% rename from app/src/main/java/com/yizhuan/erban/home/bean/HomeTabMapInfo.java rename to core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/HomeTabMapInfo.java index 17dc959d5..3d819ccc0 100644 --- a/app/src/main/java/com/yizhuan/erban/home/bean/HomeTabMapInfo.java +++ b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/HomeTabMapInfo.java @@ -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; diff --git a/app/src/main/java/com/yizhuan/erban/home/bean/HomeTagInfo.java b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/HomeTagInfo.java similarity index 92% rename from app/src/main/java/com/yizhuan/erban/home/bean/HomeTagInfo.java rename to core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/HomeTagInfo.java index fcd6d4f1d..12c1729d5 100644 --- a/app/src/main/java/com/yizhuan/erban/home/bean/HomeTagInfo.java +++ b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/home/bean/HomeTagInfo.java @@ -1,4 +1,4 @@ -package com.yizhuan.erban.home.bean; +package com.yizhuan.xchat_android_core.home.bean; public class HomeTagInfo { From a3f0b6d4720d046b810a191dfb9f3a4e4fd6d350 Mon Sep 17 00:00:00 2001 From: oujunhui <313127320@qq.com> Date: Wed, 13 May 2020 22:19:30 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=85=A8=E9=83=A8?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E7=9A=84=E6=80=A7=E5=88=AB=E5=B9=B4=E9=BE=84?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E7=A7=81=E8=81=8A=E5=8F=91=E9=80=81?= =?UTF-8?q?=E7=A4=BC=E7=89=A9=E7=9A=84=E5=AD=97=E4=BD=93=E9=A2=9C=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/yizhuan/erban/MainActivity.java | 6 +++--- .../erban/home/adapter/CommunityNoticeAdapter.java | 13 ++----------- .../erban/home/fragment/HomeTabHomeFragment.java | 2 +- .../yizhuan/erban/ui/im/chat/MsgViewHolderGift.java | 6 +++--- .../res/layout/item_community_notice_list.xml | 13 +------------ .../xchat_android_constants/XChatConstants.java | 2 +- 6 files changed, 11 insertions(+), 31 deletions(-) diff --git a/app/src/main/java/com/yizhuan/erban/MainActivity.java b/app/src/main/java/com/yizhuan/erban/MainActivity.java index 3d3b3ac4c..7b32f80e7 100644 --- a/app/src/main/java/com/yizhuan/erban/MainActivity.java +++ b/app/src/main/java/com/yizhuan/erban/MainActivity.java @@ -856,7 +856,7 @@ public class MainActivity extends BaseMvpActivity @Override public void accept(UserInfo userInfo) throws Exception { if (userInfo != null) { - displayAvatarLayout(userInfo.getAvatar(), userInfo.getNick(), userInfo.getErbanNo()); + displayAvatarLayout(userInfo.getAvatar(), roomInfo.getTitle(), userInfo.getErbanNo()); } else { NimUserInfo nimUserInfo = NimUserInfoCache.getInstance().getUserInfo(roomInfo.getUid() + ""); if (nimUserInfo == null) { @@ -864,12 +864,12 @@ public class MainActivity extends BaseMvpActivity @Override public void onResult(int i, NimUserInfo nimUserInfo, Throwable throwable) { if (nimUserInfo != null) { - displayAvatarLayout(nimUserInfo.getAvatar(), userInfo.getNick(), userInfo.getUid()); + displayAvatarLayout(nimUserInfo.getAvatar(),roomInfo.getTitle(), userInfo.getUid()); } } }); } else { - displayAvatarLayout(nimUserInfo.getAvatar(), userInfo.getNick(), userInfo.getUid()); + displayAvatarLayout(nimUserInfo.getAvatar(), roomInfo.getTitle(), userInfo.getUid()); } } } diff --git a/app/src/main/java/com/yizhuan/erban/home/adapter/CommunityNoticeAdapter.java b/app/src/main/java/com/yizhuan/erban/home/adapter/CommunityNoticeAdapter.java index 48d0f8b42..e6680f046 100644 --- a/app/src/main/java/com/yizhuan/erban/home/adapter/CommunityNoticeAdapter.java +++ b/app/src/main/java/com/yizhuan/erban/home/adapter/CommunityNoticeAdapter.java @@ -33,19 +33,10 @@ public class CommunityNoticeAdapter extends BaseQuickAdapter - +