瀏覽代碼

allow parent InterceptTouchEvent when user input is disabled.

zhpanvip 5 年之前
父節點
當前提交
62ab98cd6a

二進制
app/release/app-release.apk


+ 3 - 3
app/src/main/java/com/example/zhpan/circleviewpager/fragment/HomeFragment.java

@@ -103,7 +103,7 @@ public class HomeFragment extends BaseFragment {
     private void initRecyclerView(View view) {
         recyclerView = view.findViewById(R.id.recycler_view);
         recyclerView.setLayoutManager(new LinearLayoutManager(getMContext()));
-        recyclerView.addHeadView(getHeaderView());
+        recyclerView.addHeadView(getHeaderView(),true);
         recyclerView.addItemDecoration(new DividerItemDecoration(getMContext(),
                 DividerItemDecoration.VERTICAL));
         articleAdapter = new ArticleAdapter(getMContext(), new ArrayList<>());
@@ -164,7 +164,7 @@ public class HomeFragment extends BaseFragment {
         HomeAdapter homeAdapter = new HomeAdapter();
         mViewPagerHorizontal
                 .setAutoPlay(true)
-                .setScrollDuration(1000)
+                .setScrollDuration(600)
                 .setIndicatorSlideMode(IndicatorSlideMode.WORM)
                 .setInterval(3000)
                 .setIndicatorGravity(IndicatorGravity.END)
@@ -184,7 +184,7 @@ public class HomeFragment extends BaseFragment {
 
         mViewPagerVertical
                 .setAutoPlay(true)
-                .setScrollDuration(600)
+                .setScrollDuration(500)
                 .setIndicatorStyle(IndicatorStyle.ROUND_RECT)
                 .setIndicatorSliderGap(getResources().getDimensionPixelOffset(R.dimen.dp_4))
                 .setIndicatorSliderWidth(getResources().getDimensionPixelOffset(R.dimen.dp_4), getResources().getDimensionPixelOffset(R.dimen.dp_10))

+ 1 - 1
app/src/main/java/com/example/zhpan/circleviewpager/fragment/PageFragment.java

@@ -91,7 +91,7 @@ public class PageFragment extends BaseFragment {
 
     private void setupBanner(@APageStyle int pageStyle) {
         mViewPager
-                .setPageMargin(getResources().getDimensionPixelOffset(R.dimen.dp_20))
+                .setPageMargin(getResources().getDimensionPixelOffset(R.dimen.dp_15))
                 .setRevealWidth(getResources().getDimensionPixelOffset(R.dimen.dp_10))
                 .setPageStyle(pageStyle)
                 .create(getPicList(4));

+ 1 - 2
app/src/main/res/layout/item_header_view.xml

@@ -48,6 +48,5 @@
         android:id="@+id/banner_view2"
         android:layout_width="match_parent"
         android:layout_height="@dimen/dp_120"
-        android:layout_below="@id/rl_banner1"
-        android:layout_marginTop="@dimen/dp_5" />
+        android:layout_below="@id/rl_banner1"/>
 </RelativeLayout>

+ 1 - 2
app/src/main/res/layout/item_home_banner.xml

@@ -5,6 +5,5 @@
     <com.zhpan.bannerview.BannerViewPager
         android:id="@+id/banner_view3"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_120"
-        android:layout_marginTop="@dimen/dp_5" />
+        android:layout_height="@dimen/dp_120"/>
 </LinearLayout>

+ 3 - 0
bannerview/src/main/java/com/zhpan/bannerview/BannerViewPager.java

@@ -185,6 +185,9 @@ public class BannerViewPager<T, VH extends BaseViewHolder<T>> extends RelativeLa
 
     @Override
     public boolean onInterceptTouchEvent(MotionEvent ev) {
+        if (!mViewPager.isUserInputEnabled()) {
+            return super.onInterceptTouchEvent(ev);
+        }
         switch (ev.getAction()) {
             case MotionEvent.ACTION_DOWN:
                 startX = (int) ev.getX();