diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/HomeFragment.kt b/app/src/main/java/com/yizhuan/erban/home/fragment/HomeFragment.kt index 131a5bcf1..86bcc0857 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/HomeFragment.kt +++ b/app/src/main/java/com/yizhuan/erban/home/fragment/HomeFragment.kt @@ -19,6 +19,7 @@ import com.yizhuan.erban.base.BaseViewBindingFragment import com.yizhuan.erban.databinding.FragmentHomeBinding import com.yizhuan.erban.home.HomeViewModel import com.yizhuan.erban.home.adapter.PartyMagicIndicatorAdapter +import com.yizhuan.erban.home.helper.BannerHelper import com.yizhuan.erban.home.helper.OpenRoomHelper import com.yizhuan.erban.ui.search.SearchActivity import com.yizhuan.erban.ui.webview.CommonWebViewActivity @@ -54,7 +55,21 @@ class HomeFragment : BaseViewBindingFragment(), View.OnClic onGetHomeTagSuccess(it) } } + homeViewModel.bannerLiveData.observe(this) { + it?.let { + BannerHelper.setBanner(binding.rollView, it) { _, _ -> + //首页_banner + ReportManager.get().reportEvent( + IReportConstants.MODULE_HOMEPAGE_CLICK, mapOf( + Pair(IReportConstants.HOMEPAGE_TYPE, IReportConstants.SIX), + Pair(IReportConstants.MODULE, IReportConstants.PEKO_HOMEPAGE) + ) + ) + } + } + } homeViewModel.getTagInfo() + homeViewModel.getBannerInfo() } private fun initListener() { diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/RecommendFragment.kt b/app/src/main/java/com/yizhuan/erban/home/fragment/RecommendFragment.kt index 52cd7bb09..6cd9c4c7a 100644 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/RecommendFragment.kt +++ b/app/src/main/java/com/yizhuan/erban/home/fragment/RecommendFragment.kt @@ -43,47 +43,12 @@ class RecommendFragment : BaseViewBindingFragment() { //是否需要刷新接口进行屏蔽房间操作 private var isShield = false - private var mRecommendBanner: BannerViewPager? = null - override fun init() { - mRecommendBanner = view?.findViewById(R.id.mRecommendBanner) initRefreshView() initChatTab() initHotRoomTab() showGameGuide() - homeViewModel.tabHomeLiveData.observe(this) { - it?.let { - if (ListUtils.isListEmpty(it)) { - mRecommendBanner?.visibility = View.GONE - return@observe - } else { - mRecommendBanner?.visibility = View.VISIBLE - } - - val roomsList: List = ArrayList(it) - - for (i in roomsList.indices) { - roomsList[i].itemType = HomeTabMapInfo.TYPE_NORMAL //对原始数据设置type - } - refreshRoomData(roomsList) - } - } - - homeViewModel.bannerLiveData.observe(this) { - it?.let { - BannerHelper.setBanner(binding.rollView, it) { _, _ -> - //首页_banner - ReportManager.get().reportEvent( - IReportConstants.MODULE_HOMEPAGE_CLICK, mapOf( - Pair(IReportConstants.HOMEPAGE_TYPE, IReportConstants.SIX), - Pair(IReportConstants.MODULE, IReportConstants.PEKO_HOMEPAGE) - ) - ) - } - } - } - binding.ivGameGuide.setOnClickListener { //首页_扩列聊天-创建游戏房 ReportManager.get().reportEvent( @@ -174,52 +139,6 @@ class RecommendFragment : BaseViewBindingFragment() { } } - /** - * 刷新数据 - */ - private fun refreshRoomData(roomList: List) { - mRecommendBanner?.adapter = HomeTopAdapter() - mRecommendBanner?.post { - val width = - UIUtil.getScreenWidth(mContext) - UIUtil.dip2px(mContext, 10.0) * 3 - val revealWidth = width / 3 - val bannerLayoutParams = mRecommendBanner?.layoutParams - bannerLayoutParams?.height = revealWidth + UIUtil.dip2px(mContext, 32.0) - mRecommendBanner?.layoutParams = bannerLayoutParams - setupBanner( - revealWidth, - revealWidth, - roomList - ) - } - } - - private fun setupBanner( - leftRevealWidth: Int, - rightRevealWidth: Int, - list: List - ) { - mRecommendBanner?.apply { - setLifecycleRegistry(lifecycle) - setPageMargin(UIUtil.dip2px(mContext, 10.0)) - setScrollDuration(800) - setRevealWidth(leftRevealWidth, rightRevealWidth) - setOnPageClickListener { _: View?, position: Int -> - //首页_热门房间 - val map = HashMap(3) - map[IReportConstants.HOMEPAGE_TYPE] = IReportConstants.FIVE - map[IReportConstants.MODULE] = IReportConstants.PEKO_HOMEPAGE - ReportManager.get().reportEvent(IReportConstants.MODULE_HOMEPAGE_CLICK, map) - AVRoomActivity.startForFromType( - mContext, - list[position].roomUid.toLong(), - AVRoomActivity.FROM_TYPE_RECOMMEND - ) - } - create(list) - } - } - override fun onLazyLoad() { super.onLazyLoad() loadData() @@ -234,8 +153,6 @@ class RecommendFragment : BaseViewBindingFragment() { } private fun loadData() { - homeViewModel.getBannerInfo() - homeViewModel.getHomeTabName() homeViewModel.getHomePlayV2() homeViewModel.getHotRoom() } diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/rollviewpager/RollPagerView.java b/app/src/main/java/com/yizhuan/erban/ui/widget/rollviewpager/RollPagerView.java index dd1524567..f80fe16a6 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/rollviewpager/RollPagerView.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/rollviewpager/RollPagerView.java @@ -123,7 +123,7 @@ public class RollPagerView extends RelativeLayout implements OnPageChangeListene mViewPager.setLayoutParams(new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)); addView(mViewPager); type.recycle(); - initHint(new ColorPointHintView(getContext(), Color.parseColor("#E3AC42"), Color.parseColor("#88ffffff"))); + initHint(new ColorPointHintView(getContext(), Color.parseColor("#9168FA"), Color.parseColor("#99B3B3C3"))); //手势处理 mGestureDetector = new GestureDetector(getContext(), new GestureDetector.SimpleOnGestureListener() { @Override diff --git a/app/src/main/res/drawable-xhdpi/bg_accompany.png b/app/src/main/res/drawable-xhdpi/bg_accompany.png new file mode 100644 index 000000000..704fa0699 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/bg_accompany.png differ diff --git a/app/src/main/res/drawable-xhdpi/bg_heartbeat.png b/app/src/main/res/drawable-xhdpi/bg_heartbeat.png new file mode 100644 index 000000000..ee87ffe31 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/bg_heartbeat.png differ diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 26fd2d29c..2053412aa 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -3,6 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" + xmlns:tools="http://schemas.android.com/tools" android:background="@color/bg_normal_1c1b22"> - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - #F5F6FA #1abbbccf #B8B7C7 + #FAFBFC diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 414c55ca3..465b63c43 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -5117,5 +5117,9 @@ 為了方便您下次登錄,請先設置登錄密碼 上次登錄 完成 + 心動戀愛 + 顏值女神聚集地 + 陪伴交友 + 有趣的人都在這 \ No newline at end of file