From bd79a2b9bd69f98762fb1ff2316156dfc41197aa Mon Sep 17 00:00:00 2001 From: lambert Date: Mon, 9 Sep 2019 11:18:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/heyongrui/main/HomeFragment.java | 2 +- .../zhihu/contract/ZhiHuDailyNewsContract.kt | 2 -- .../presenter/ZhiHuDailyNewsPresenter.kt | 19 ++++++------------ .../zhihu/view/ZhiHuDailyNewsActivity.kt | 6 ++++-- .../res/layout/activity_zhihu_daily_news.xml | 4 +++- module/src/main/res/layout/layout_banner.xml | 20 +++++++++++++++++++ 6 files changed, 34 insertions(+), 19 deletions(-) create mode 100644 module/src/main/res/layout/layout_banner.xml diff --git a/main/src/main/java/com/heyongrui/main/HomeFragment.java b/main/src/main/java/com/heyongrui/main/HomeFragment.java index 46fe96d..f2efcb7 100644 --- a/main/src/main/java/com/heyongrui/main/HomeFragment.java +++ b/main/src/main/java/com/heyongrui/main/HomeFragment.java @@ -65,7 +65,7 @@ protected void initView(Bundle savedInstanceState) { numberRunTv = mView.findViewById(R.id.number_run_tv); TextView tvHome = mView.findViewById(R.id.tv_home); - addOnClickListeners(this, tvHome); + addOnClickListeners(this, tvHome, tickerView, numberRunTv); } @Override diff --git a/module/src/main/java/com/heyongrui/module/zhihu/contract/ZhiHuDailyNewsContract.kt b/module/src/main/java/com/heyongrui/module/zhihu/contract/ZhiHuDailyNewsContract.kt index 8c66fcb..1a3ba9f 100644 --- a/module/src/main/java/com/heyongrui/module/zhihu/contract/ZhiHuDailyNewsContract.kt +++ b/module/src/main/java/com/heyongrui/module/zhihu/contract/ZhiHuDailyNewsContract.kt @@ -24,8 +24,6 @@ interface ZhiHuDailyNewsContract { abstract fun initRecyclerView(recyclerView: RecyclerView, listener: BaseQuickAdapter.OnItemClickListener): ModuleSectionAdapter - abstract fun getHeaderView(): Banner - abstract fun setBannerData(banner: Banner, bannersBeanList: List<*>?) abstract fun getZhiHuNewsLatest() diff --git a/module/src/main/java/com/heyongrui/module/zhihu/presenter/ZhiHuDailyNewsPresenter.kt b/module/src/main/java/com/heyongrui/module/zhihu/presenter/ZhiHuDailyNewsPresenter.kt index 3fa34bf..f7ff9e4 100644 --- a/module/src/main/java/com/heyongrui/module/zhihu/presenter/ZhiHuDailyNewsPresenter.kt +++ b/module/src/main/java/com/heyongrui/module/zhihu/presenter/ZhiHuDailyNewsPresenter.kt @@ -10,7 +10,6 @@ import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.alibaba.android.arouter.launcher.ARouter import com.blankj.utilcode.util.ConvertUtils -import com.blankj.utilcode.util.ScreenUtils import com.blankj.utilcode.util.ToastUtils import com.chad.library.adapter.base.BaseQuickAdapter import com.heyongrui.base.app.BaseApplication @@ -72,15 +71,6 @@ class ZhiHuDailyNewsPresenter : ZhiHuDailyNewsContract.Presenter() { return moduleSectionAdapter } - override fun getHeaderView(): Banner { - var banner = Banner(mContext) - val height = ScreenUtils.getScreenWidth() / 2 - banner.layoutParams = ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, height) - banner.setDelayTime(5000) - banner.setAutoPlay(true) - return banner - } - override fun setBannerData(banner: Banner, bannersBeanList: List<*>?) { if (bannersBeanList == null || bannersBeanList.isEmpty()) return banner.setPages(bannersBeanList, object : BannerViewHolder { @@ -103,9 +93,12 @@ class ZhiHuDailyNewsPresenter : ZhiHuDailyNewsContract.Presenter() { } }) - banner.setBannerAnimation(Transformer.Tablet) - banner.setIndicatorGravity(BannerConfig.CENTER) - banner.setBannerStyle(BannerConfig.CIRCLE_INDICATOR) + banner.setBannerAnimation(Transformer.Scale); + banner.setIndicatorGravity(BannerConfig.CENTER); + banner.setBannerStyle(BannerConfig.CIRCLE_INDICATOR); +// banner.setBannerAnimation(Transformer.Tablet) +// banner.setIndicatorGravity(BannerConfig.CENTER) +// banner.setBannerStyle(BannerConfig.CIRCLE_INDICATOR) banner.setOnBannerClickListener { datas, position -> var item = datas[position] if (item != null) { diff --git a/module/src/main/java/com/heyongrui/module/zhihu/view/ZhiHuDailyNewsActivity.kt b/module/src/main/java/com/heyongrui/module/zhihu/view/ZhiHuDailyNewsActivity.kt index 921135d..ad8d5f5 100644 --- a/module/src/main/java/com/heyongrui/module/zhihu/view/ZhiHuDailyNewsActivity.kt +++ b/module/src/main/java/com/heyongrui/module/zhihu/view/ZhiHuDailyNewsActivity.kt @@ -1,6 +1,7 @@ package com.heyongrui.module.zhihu.view import android.os.Bundle +import android.view.LayoutInflater import android.view.View import androidx.core.content.ContextCompat import com.alibaba.android.arouter.facade.annotation.Route @@ -96,10 +97,11 @@ class ZhiHuDailyNewsActivity : BaseActivity(), if (TimeUtil.isSameDay(Date(), mCalendar.time)) { mZhiHuAdapter.replaceData(addDataList) if (!isInitBanner()) { - mBanner = mPresenter.getHeaderView() + val headerView = LayoutInflater.from(this@ZhiHuDailyNewsActivity).inflate(R.layout.layout_banner, null) + mBanner = headerView.findViewById(R.id.banner) + mZhiHuAdapter.setHeaderView(headerView) } mPresenter?.setBannerData(mBanner, zhiHuDailyNewsDto?.top_stories) - mZhiHuAdapter.setHeaderView(mBanner) } else { mZhiHuAdapter.addData(addDataList) } diff --git a/module/src/main/res/layout/activity_zhihu_daily_news.xml b/module/src/main/res/layout/activity_zhihu_daily_news.xml index ebf2752..7664094 100644 --- a/module/src/main/res/layout/activity_zhihu_daily_news.xml +++ b/module/src/main/res/layout/activity_zhihu_daily_news.xml @@ -60,7 +60,9 @@ android:id="@+id/rlv_zhihu" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/window_background" /> + android:background="@color/window_background" + android:clipToPadding="false" + android:paddingTop="@dimen/dp_10" /> + + + + + \ No newline at end of file