优化

HeYongRui · Sep 9, 2019 · bd79a2b · bd79a2b
1 parent 5a59854
commit bd79a2b
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 19 deletions.
diff --git 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
@@ -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
@@ -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<Any> {
@@ -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
@@ -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<ZhiHuDailyNewsContract.Presenter>(),
         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
@@ -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" />
 
         <com.scwang.smartrefresh.layout.footer.ClassicsFooter
             android:layout_width="match_parent"

diff --git a/module/src/main/res/layout/layout_banner.xml b/module/src/main/res/layout/layout_banner.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <com.ms.banner.Banner
+        android:id="@+id/banner"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:clipChildren="false"
+        app:delay_time="3000"
+        app:is_auto_play="true"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintDimensionRatio="2"
+        app:layout_constraintTop_toTopOf="parent"
+        app:page_left_margin="@dimen/dp_20"
+        app:page_right_margin="@dimen/dp_20" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>