2.6.5 (#79)

* Fix a bug. * Optimize code * Update Readme.
zhpanvip · Jan 4, 2020 · e2de297 · e2de297
1 parent aeba256
commit e2de297
Show file tree

Hide file tree

Showing 32 changed files with 190 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -27,22 +27,33 @@
 
 ### 2.setIndicatorStyle
 
-BannerViewPager supports three Indicator Styles now. It's also support to custom indicator style,just need extends BaseIndicatorView or implement the IIndicator and override methods, then you can draw Indicators for whatever you want.
+BannerViewPager supports three Indicator Styles now. 
 
 [Sample Click Here](https://github.com/zhpanvip/BannerViewPager/blob/master/app/src/main/java/com/example/zhpan/circleviewpager/fragment/IndicatorFragment.java)
 
 | CIRCLE | DASH | ROUND_RECT |
 |--|--|--|
 | ![CIRCLE](https://github.com/zhpanvip/BannerViewPager/blob/master/image/style_circle.gif) | ![DASH](https://github.com/zhpanvip/BannerViewPager/blob/master/image/style_dash.gif) | ![NORMAL](https://github.com/zhpanvip/BannerViewPager/blob/master/image/style_round_rect.gif) |
 
-### 3.setIndicatorSlideMode
+### 3.Custom Indicator
+
+It's also support to custom indicator style,just need extends BaseIndicatorView or implement the IIndicator and override methods, then you can draw Indicators for whatever you want.
+
+[Sample Click Here](https://github.com/zhpanvip/BannerViewPager/blob/master/app/src/main/java/com/example/zhpan/circleviewpager/fragment/OthersFragment.java)
+
+| Figure Indicator | Drawable Indicator | Indicator below of Banner |
+|--|--|--|
+| ![CIRCLE](https://github.com/zhpanvip/BannerViewPager/blob/master/image/style_custom.gif) | ![DASH](https://github.com/zhpanvip/BannerViewPager/blob/master/image/style_custom1.gif) | ![NORMAL](https://github.com/zhpanvip/BannerViewPager/blob/master/image/style_custom2.gif) |
+
+
+### 4.setIndicatorSlideMode
 
 | NORMAL | SMOOTH |
 |--|--|
 | ![NORMAL](https://github.com/zhpanvip/BannerViewPager/blob/master/image/slide_normal.gif) |  ![SMOOTH](https://github.com/zhpanvip/BannerViewPager/blob/master/image/slide_smooth.gif) |
 
 
-### 4.setPageTransformerStyle
+### 5.setPageTransformerStyle
 
 [Sample Click Here](https://github.com/zhpanvip/BannerViewPager/blob/master/app/src/main/java/com/example/zhpan/circleviewpager/activity/WelcomeActivity.java)
 
@@ -384,6 +395,14 @@ public class FigureIndicatorView extends BaseIndicatorView {
  - [x] Fix issue #34 which Indicator smooth slide problem(2.6.1).
  - [ ] Migrate to ViewPager2 （3.0.0）
 
+## Sponsor
+
+**开源不易 随心赞赏**
+
+| Alipay | WeChat Pay |
+|--|--|
+| ![NORMAL](https://github.com/zhpanvip/BannerViewPager/blob/master/image/pay_alipay.jpb) |  ![SMOOTH](https://github.com/zhpanvip/BannerViewPager/blob/master/image/pay_wechat.png) |
+
 
 ## If you have any question you can scan the QR code to join the QQ group to communicate.
 

diff --git a/README_CN.md b/README_CN.md
@@ -28,22 +28,34 @@
 | ![MULTI_PAGE](https://github.com/zhpanvip/BannerViewPager/blob/master/image/page_style_multi.gif) |![MULTI_PAGE](https://github.com/zhpanvip/BannerViewPager/blob/master/image/page_style_multi_scale.gif) |![MULTI_PAGE](https://github.com/zhpanvip/BannerViewPager/blob/master/image/page_style_multi_overlay.gif) |
 
 ### 2.setIndicatorStyle
-BannerViewPager支持多种IndicatorViewStyle,同时还提供了完全自定义IndicatorView的功能。只要继承BaseIndicatorView或者实现IIndicator接口，并重写相应方法，就可以为所欲为的打造任意的Indicator了。
+BannerViewPager目前已支持三种IndicatorViewStyle,分别如下：
 
 [IndicatorViewStyle Demo](https://github.com/zhpanvip/BannerViewPager/blob/master/app/src/main/java/com/example/zhpan/circleviewpager/fragment/IndicatorFragment.java)
 
 | CIRCLE | DASH | ROUND_RECT |
 |--|--|--|
 | ![CIRCLE](https://github.com/zhpanvip/BannerViewPager/blob/master/image/style_circle.gif) | ![DASH](https://github.com/zhpanvip/BannerViewPager/blob/master/image/style_dash.gif) | ![NORMAL](https://github.com/zhpanvip/BannerViewPager/blob/master/image/style_round_rect.gif) |
 
-### 3.setIndicatorSlideMode
+### 3.Custom Indicator
+
+同时BannerViewPager还提供了自定义IndicatorView的功能。只要继承BaseIndicatorView或者实现IIndicator接口，并重写相应方法，就可以为所欲为的打造任意的Indicator了。
+
+[Sample Click Here](https://github.com/zhpanvip/BannerViewPager/blob/master/app/src/main/java/com/example/zhpan/circleviewpager/fragment/OthersFragment.java)
+
+| Figure Indicator | Drawable Indicator | Indicator below of Banner |
+|--|--|--|
+| ![CIRCLE](https://github.com/zhpanvip/BannerViewPager/blob/master/image/style_custom.gif) | ![DASH](https://github.com/zhpanvip/BannerViewPager/blob/master/image/style_custom1.gif) | ![NORMAL](https://github.com/zhpanvip/BannerViewPager/blob/master/image/style_custom2.gif) |
+
+
+
+### 4.setIndicatorSlideMode
 
 | NORMAL | SMOOTH |
 |--|--|
 | ![NORMAL](https://github.com/zhpanvip/BannerViewPager/blob/master/image/slide_normal.gif) |  ![SMOOTH](https://github.com/zhpanvip/BannerViewPager/blob/master/image/slide_smooth.gif) |
 
 
-### 4.setPageTransformerStyle
+### 5.setPageTransformerStyle
 
 [TransformStyle Demo](https://github.com/zhpanvip/BannerViewPager/blob/master/app/src/main/java/com/example/zhpan/circleviewpager/activity/WelcomeActivity.java)
 
@@ -52,7 +64,6 @@ BannerViewPager支持多种IndicatorViewStyle,同时还提供了完全自定义I
 | 预览 | ![STACK](https://github.com/zhpanvip/BannerViewPager/blob/master/image/transform_stack.gif) | ![ROTATE_DOWN](https://github.com/zhpanvip/BannerViewPager/blob/master/image/transform_rotate.gif) | ![DEPTH](https://github.com/zhpanvip/BannerViewPager/blob/master/image/transform_depth.gif)  |![ACCORDION](https://github.com/zhpanvip/BannerViewPager/blob/master/image/transform_accordion.gif)  |
 
 
-
 ## 开放API
 
 | 方法名 | 方法描述 | 说明 |
@@ -385,6 +396,14 @@ public class FigureIndicatorView extends BaseIndicatorView {
  - [x] 修复 issue #34 Indicator 在Smooth模式下存在的问题 (2.6.1).
  - [ ] ViewPager更换为ViewPager2 （3.0.0）
 
+## Sponsor
+
+**开源不易 随心赞赏**
+
+| 支付宝 | 微信支付 |
+|--|--|
+| ![NORMAL](https://github.com/zhpanvip/BannerViewPager/blob/master/image/pay_alipay.jpb) |  ![SMOOTH](https://github.com/zhpanvip/BannerViewPager/blob/master/image/pay_wechat.png) |
+
 
 ## 有问题可以扫码加QQ群交流
 

diff --git a/app/release/app-release.apk b/app/release/app-release.apk
diff --git a/app/src/main/java/com/example/zhpan/circleviewpager/fragment/BaseFragment.kt b/app/src/main/java/com/example/zhpan/circleviewpager/fragment/BaseFragment.kt
@@ -44,7 +44,7 @@ abstract class BaseFragment : RxFragment() {
     protected fun initData(j: Int) {
         mDrawableList.clear()
         for (i in 0..j) {
-            val drawable = resources.getIdentifier("t$i", "drawable", mContext.packageName)
+            val drawable = resources.getIdentifier("bg_card$i", "drawable", mContext.packageName)
             mDrawableList.add(drawable)
         }
     }

diff --git a/app/src/main/res/drawable-xxhdpi/t0.jpg b/app/src/main/res/drawable-xxhdpi/t0.jpg
diff --git a/app/src/main/res/drawable-xxhdpi/t1.jpg b/app/src/main/res/drawable-xxhdpi/t1.jpg
diff --git a/app/src/main/res/drawable-xxhdpi/t2.jpg b/app/src/main/res/drawable-xxhdpi/t2.jpg
diff --git a/app/src/main/res/drawable-xxhdpi/t3.jpg b/app/src/main/res/drawable-xxhdpi/t3.jpg
diff --git a/app/src/main/res/drawable/bg_card0.xml b/app/src/main/res/drawable/bg_card0.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" >
+
+<!-- 实心 -->
+<solid android:color="#CCFF99" />
+<!-- 边框 -->
+<!--<stroke
+    android:width="0.5dp"
+    android:color="#e35d5e" />-->
+<!-- 圆角 -->
+<corners android:radius="0dp" />
+<!-- 边距 -->
+<padding
+    android:bottom="0dp"
+    android:left="0dp"
+    android:right="0dp"
+    android:top="0dp" />
+<!-- 渐变 -->
+<!--<gradient
+    android:angle="270"
+    android:endColor="#FFFF782"
+    android:startColor="#13C7AF" />-->
+
+</shape>
diff --git a/app/src/main/res/drawable/bg_card1.xml b/app/src/main/res/drawable/bg_card1.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" >
+
+<!-- 实心 -->
+<solid android:color="#41F1E5" />
+<!-- 边框 -->
+<!--<stroke
+    android:width="0.5dp"
+    android:color="#e35d5e" />-->
+<!-- 圆角 -->
+<corners android:radius="0dp" />
+<!-- 边距 -->
+<padding
+    android:bottom="0dp"
+    android:left="0dp"
+    android:right="0dp"
+    android:top="0dp" />
+<!-- 渐变 -->
+<!--<gradient
+    android:angle="270"
+    android:endColor="#FFFF782"
+    android:startColor="#13C7AF" />-->
+
+</shape>
diff --git a/app/src/main/res/drawable/bg_card2.xml b/app/src/main/res/drawable/bg_card2.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" >
+
+<!-- 实心 -->
+<solid android:color="#8D41F1" />
+<!-- 边框 -->
+<!--<stroke
+    android:width="0.5dp"
+    android:color="#e35d5e" />-->
+<!-- 圆角 -->
+<corners android:radius="0dp" />
+<!-- 边距 -->
+<padding
+    android:bottom="0dp"
+    android:left="0dp"
+    android:right="0dp"
+    android:top="0dp" />
+<!-- 渐变 -->
+<!--<gradient
+    android:angle="270"
+    android:endColor="#FFFF782"
+    android:startColor="#13C7AF" />-->
+
+</shape>
diff --git a/app/src/main/res/drawable/bg_card3.xml b/app/src/main/res/drawable/bg_card3.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" >
+
+<!-- 实心 -->
+<solid android:color="#FF99CC" />
+<!-- 边框 -->
+<!--<stroke
+    android:width="0.5dp"
+    android:color="#e35d5e" />-->
+<!-- 圆角 -->
+<corners android:radius="0dp" />
+<!-- 边距 -->
+<padding
+    android:bottom="0dp"
+    android:left="0dp"
+    android:right="0dp"
+    android:top="0dp" />
+<!-- 渐变 -->
+<!--<gradient
+    android:angle="270"
+    android:endColor="#FFFF782"
+    android:startColor="#13C7AF" />-->
+
+</shape>
diff --git a/bannerview/src/main/java/com/zhpan/bannerview/BannerViewPager.java b/bannerview/src/main/java/com/zhpan/bannerview/BannerViewPager.java
@@ -117,19 +117,57 @@ protected void onAttachedToWindow() {
     //  触碰控件的时候，翻页应该停止，离开的时候如果之前是开启了翻页的话则重新启动翻页
     @Override
     public boolean dispatchTouchEvent(MotionEvent ev) {
-        int action = ev.getAction();
-        if (action == MotionEvent.ACTION_UP || action == MotionEvent.ACTION_CANCEL || action == MotionEvent.ACTION_OUTSIDE) {
-            // 开始翻页
-            setLooping(false);
-            startLoop();
-        } else if (action == MotionEvent.ACTION_DOWN) {
-            // 停止翻页
-            setLooping(true);
-            stopLoop();
+        switch (ev.getAction()) {
+            case MotionEvent.ACTION_UP:
+            case MotionEvent.ACTION_CANCEL:
+            case MotionEvent.ACTION_OUTSIDE:
+                setLooping(false);
+                startLoop();
+                break;
+            case MotionEvent.ACTION_DOWN:
+                setLooping(true);
+                stopLoop();
+                break;
         }
         return super.dispatchTouchEvent(ev);
     }
 
+//    private int startX, startY;
+//    @Override
+//    public boolean dispatchTouchEvent(MotionEvent ev) {
+//        switch (ev.getAction()) {
+//            case MotionEvent.ACTION_DOWN:
+//                setLooping(true);
+//                stopLoop();
+//                startX = (int) ev.getX();
+//                startY = (int) ev.getY();
+//                getParent().requestDisallowInterceptTouchEvent(true);
+//                break;
+//            case MotionEvent.ACTION_MOVE:
+//                int endX = (int) ev.getX();
+//                int endY = (int) ev.getY();
+//                int disX = Math.abs(endX - startX);
+//                int disY = Math.abs(endY - startY);
+//                if (disX > disY) {
+//                    getParent().requestDisallowInterceptTouchEvent(true);
+//                } else {
+//                    getParent().requestDisallowInterceptTouchEvent(false);
+//                }
+//                break;
+//            case MotionEvent.ACTION_UP:
+//            case MotionEvent.ACTION_CANCEL:
+//                setLooping(false);
+//                startLoop();
+//                getParent().requestDisallowInterceptTouchEvent(false);
+//                break;
+//            case MotionEvent.ACTION_OUTSIDE:
+//                setLooping(false);
+//                startLoop();
+//                break;
+//        }
+//        return super.dispatchTouchEvent(ev);
+//    }
+
     @Override
     public void onPageSelected(int position) {
         int size = mBannerPagerAdapter.getListSize();
@@ -247,6 +285,7 @@ private void setupViewPager(List<T> list) {
         if (holderCreator == null) {
             throw new NullPointerException("You must set HolderCreator for BannerViewPager");
         }
+        currentPosition = 0;
         if (list.size() > 0 && isCanLoop()) {
             currentPosition = MAX_VALUE / 2 - ((MAX_VALUE / 2) % list.size()) + 1;
         }

diff --git a/image/custom_indicator.gif b/image/custom_indicator.gif
diff --git a/image/page_style_multi.gif b/image/page_style_multi.gif
diff --git a/image/page_style_multi_overlay.gif b/image/page_style_multi_overlay.gif
diff --git a/image/page_style_multi_scale.gif b/image/page_style_multi_scale.gif
diff --git a/image/pay_alipay.jpg b/image/pay_alipay.jpg
diff --git a/image/pay_wechat.png b/image/pay_wechat.png
diff --git a/image/preview1.gif b/image/preview1.gif
diff --git a/image/preview2.gif b/image/preview2.gif
diff --git a/image/preview3.gif b/image/preview3.gif
diff --git a/image/qq_group.png b/image/qq_group.png
diff --git a/image/qrcode.png b/image/qrcode.png
diff --git a/image/slide_normal.gif b/image/slide_normal.gif
diff --git a/image/slide_smooth.gif b/image/slide_smooth.gif
diff --git a/image/style_circle.gif b/image/style_circle.gif
diff --git a/image/style_custom1.gif b/image/style_custom1.gif
diff --git a/image/style_custom2.gif b/image/style_custom2.gif
diff --git a/image/style_custum.gif b/image/style_custum.gif
diff --git a/image/style_dash.gif b/image/style_dash.gif
diff --git a/image/style_round_rect.gif b/image/style_round_rect.gif