RECT_ROUND style support WORM Slide mode.

app/src/main/java/com/example/zhpan/circleviewpager/fragment/IndicatorFragment.java

@@ -162,7 +162,7 @@ public class IndicatorFragment extends BaseFragment {
         if (mSlideMode == IndicatorSlideMode.SMOOTH || mSlideMode == IndicatorSlideMode.WORM) {
             return getResources().getDimensionPixelOffset(R.dimen.dp_10);
         } else {
-            return getResources().getDimensionPixelOffset(R.dimen.dp_4);
+            return getResources().getDimensionPixelOffset(R.dimen.dp_10);
         }
     }
 }

bannerview/src/main/java/com/zhpan/bannerview/indicator/drawer/BaseDrawer.java

@@ -50,4 +50,8 @@ public abstract class BaseDrawer implements IDrawer {
         }
 
     }
+
+    protected boolean isWidthEquals() {
+        return mIndicatorOptions.getNormalIndicatorWidth() == mIndicatorOptions.getCheckedIndicatorWidth();
+    }
 }

bannerview/src/main/java/com/zhpan/bannerview/indicator/drawer/CircleDrawer.java

@@ -45,12 +45,12 @@ public class CircleDrawer extends BaseDrawer {
     @Override
     public void onDraw(Canvas canvas) {
         if (mIndicatorOptions.getPageSize() > 1) {
-            drawableNormal(canvas);
+            drawNormal(canvas);
             drawSlider(canvas);
         }
     }
 
-    private void drawableNormal(Canvas canvas) {
+    private void drawNormal(Canvas canvas) {
         float normalIndicatorWidth = mIndicatorOptions.getNormalIndicatorWidth();
         mPaint.setColor(mIndicatorOptions.getNormalColor());
         for (int i = 0; i < mIndicatorOptions.getPageSize(); i++) {

bannerview/src/main/java/com/zhpan/bannerview/indicator/drawer/DashDrawer.java

@@ -50,7 +50,7 @@ public class DashDrawer extends BaseDrawer {
                         break;
                     case IndicatorSlideMode.SMOOTH:
                     case IndicatorSlideMode.WORM:
-                        if (mIndicatorOptions.getNormalIndicatorWidth() == mIndicatorOptions.getCheckedIndicatorWidth()) {
+                        if (isWidthEquals()) {
                             smoothSlide(canvas, i);
                         } else {
                             normalSlide(canvas, i);

bannerview/src/main/java/com/zhpan/bannerview/indicator/drawer/RoundRectDrawer.java

@@ -5,6 +5,7 @@ import android.graphics.RectF;
 
 import com.zhpan.bannerview.constants.IndicatorSlideMode;
 import com.zhpan.bannerview.manager.IndicatorOptions;
+import com.zhpan.bannerview.utils.BannerUtils;
 
 /**
  * <pre>
@@ -26,11 +27,11 @@ public class RoundRectDrawer extends BaseDrawer {
     public MeasureResult onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
         maxWidth = Math.max(mIndicatorOptions.getNormalIndicatorWidth(), mIndicatorOptions.getCheckedIndicatorWidth());
         minWidth = Math.min(mIndicatorOptions.getNormalIndicatorWidth(), mIndicatorOptions.getCheckedIndicatorWidth());
-        mMeasureResult.setMeasureResult(getMeasureWidth(), (int) mIndicatorOptions.getSliderHeight());
+        mMeasureResult.setMeasureResult(measureWidth(), (int) mIndicatorOptions.getSliderHeight());
         return mMeasureResult;
     }
 
-    private int getMeasureWidth() {
+    private int measureWidth() {
         int pageSize = mIndicatorOptions.getPageSize();
         float indicatorGap = mIndicatorOptions.getIndicatorGap();
         return (int) ((pageSize - 1) * indicatorGap + maxWidth + (pageSize - 1) * minWidth);
@@ -38,82 +39,85 @@ public class RoundRectDrawer extends BaseDrawer {
 
     @Override
     public void onDraw(Canvas canvas) {
-        drawIndicator(canvas);
-    }
-
-    private void drawIndicator(Canvas canvas) {
         int pageSize = mIndicatorOptions.getPageSize();
         if (pageSize > 1) {
-            for (int i = 0; i < pageSize; i++) {
-                switch (mIndicatorOptions.getSlideMode()) {
-                    case IndicatorSlideMode.NORMAL:
-                        normalSlide(canvas, i);
-                        break;
-                    case IndicatorSlideMode.SMOOTH:
-                    case IndicatorSlideMode.WORM:
-                        if (mIndicatorOptions.getNormalIndicatorWidth() == mIndicatorOptions.getCheckedIndicatorWidth()) {
-                            smoothSlide(canvas, i);
-                        } else {
-                            normalSlide(canvas, i);
-                        }
-                        break;
+            if (isWidthEquals() && mIndicatorOptions.getSlideMode() != IndicatorSlideMode.NORMAL) {
+                drawUncheckedSlider(canvas, pageSize);
+                drawCheckedSlider(canvas);
+            } else {    // 单独处理normalWidth与checkedWidth不一致的情况
+                for (int i = 0; i < pageSize; i++) {
+                    drawInequalitySlider(canvas, i);
                 }
             }
         }
     }
 
-    private void normalSlide(Canvas canvas, int i) {
-        float normalIndicatorWidth = mIndicatorOptions.getNormalIndicatorWidth();
+    private void drawUncheckedSlider(Canvas canvas, int pageSize) {
+        for (int i = 0; i < pageSize; i++) {
+            mPaint.setColor(mIndicatorOptions.getNormalColor());
+            float sliderHeight = mIndicatorOptions.getSliderHeight();
+            float left = i * (maxWidth) + i * +mIndicatorOptions.getIndicatorGap() + (maxWidth - minWidth);
+            RectF rectF = new RectF(left, 0, left + minWidth, sliderHeight);
+            canvas.drawRoundRect(rectF, sliderHeight, sliderHeight, mPaint);
+        }
+    }
+
+    private void drawInequalitySlider(Canvas canvas, int i) {
         int normalColor = mIndicatorOptions.getNormalColor();
         float indicatorGap = mIndicatorOptions.getIndicatorGap();
         float sliderHeight = mIndicatorOptions.getSliderHeight();
         int currentPosition = mIndicatorOptions.getCurrentPosition();
         RectF rectF;
-        if (normalIndicatorWidth == mIndicatorOptions.getCheckedIndicatorWidth()) {
+        if (i < currentPosition) {
             mPaint.setColor(normalColor);
-            float left = i * (normalIndicatorWidth) + i * +indicatorGap;
-            rectF = new RectF(left, 0, left + normalIndicatorWidth, sliderHeight);
+            float left = i * minWidth + i * indicatorGap;
+            rectF = new RectF(left, 0, left + minWidth, sliderHeight);
+            canvas.drawRoundRect(rectF, sliderHeight, sliderHeight, mPaint);
+        } else if (i == currentPosition) {
+            mPaint.setColor(mIndicatorOptions.getCheckedColor());
+            float left = i * minWidth + i * indicatorGap;
+            rectF = new RectF(left, 0, left + minWidth + (maxWidth - minWidth), sliderHeight);
             canvas.drawRoundRect(rectF, sliderHeight, sliderHeight, mPaint);
-            drawSliderStyle(canvas);
         } else {
-            if (i < currentPosition) {
-                mPaint.setColor(normalColor);
-                float left = i * minWidth + i * indicatorGap;
-                rectF = new RectF(left, 0, left + minWidth, sliderHeight);
-                canvas.drawRoundRect(rectF, sliderHeight, sliderHeight, mPaint);
-            } else if (i == currentPosition) {
-                mPaint.setColor(mIndicatorOptions.getCheckedColor());
-                float left = i * minWidth + i * indicatorGap;
-                rectF = new RectF(left, 0, left + minWidth + (maxWidth - minWidth), sliderHeight);
-                canvas.drawRoundRect(rectF, sliderHeight, sliderHeight, mPaint);
-            } else {
-                mPaint.setColor(normalColor);
-                float left = i * minWidth + i * indicatorGap + (maxWidth - minWidth);
-                rectF = new RectF(left, 0, left + minWidth, sliderHeight);
-                canvas.drawRoundRect(rectF, sliderHeight, sliderHeight, mPaint);
-            }
+            mPaint.setColor(normalColor);
+            float left = i * minWidth + i * indicatorGap + (maxWidth - minWidth);
+            rectF = new RectF(left, 0, left + minWidth, sliderHeight);
+            canvas.drawRoundRect(rectF, sliderHeight, sliderHeight, mPaint);
         }
     }
 
-    private void smoothSlide(Canvas canvas, int i) {
-        mPaint.setColor(mIndicatorOptions.getNormalColor());
+    private void drawCheckedSlider(Canvas canvas) {
+        mPaint.setColor(mIndicatorOptions.getCheckedColor());
+        switch (mIndicatorOptions.getSlideMode()) {
+            case IndicatorSlideMode.SMOOTH:
+                drawSmoothSlider(canvas);
+                break;
+            case IndicatorSlideMode.WORM:
+                drawWormSlider(canvas);
+                break;
+        }
+    }
+
+    private RectF rectF = new RectF();
+
+    private void drawWormSlider(Canvas canvas) {
         float sliderHeight = mIndicatorOptions.getSliderHeight();
-        float left = i * (maxWidth) + i * +mIndicatorOptions.getIndicatorGap() + (maxWidth - minWidth);
-        RectF rectF = new RectF(left, 0, left + minWidth, sliderHeight);
+        float slideProgress = mIndicatorOptions.getSlideProgress();
+        int currentPosition = mIndicatorOptions.getCurrentPosition();
+        float distance = mIndicatorOptions.getIndicatorGap() + mIndicatorOptions.getNormalIndicatorWidth();
+        float startCoordinateX = BannerUtils.getCoordinateX(mIndicatorOptions, maxWidth, currentPosition);
+        float left = startCoordinateX + Math.max(distance * (slideProgress - 0.5f) * 2.0f, 0) - mIndicatorOptions.getNormalIndicatorWidth() / 2;
+        float right = startCoordinateX + Math.min((distance * slideProgress * 2), distance) + mIndicatorOptions.getNormalIndicatorWidth() / 2;
+        rectF.set(left, 0, right, sliderHeight);
         canvas.drawRoundRect(rectF, sliderHeight, sliderHeight, mPaint);
-        drawSliderStyle(canvas);
     }
 
-    private void drawSliderStyle(Canvas canvas) {
-        mPaint.setColor(mIndicatorOptions.getCheckedColor());
+    private void drawSmoothSlider(Canvas canvas) {
         int currentPosition = mIndicatorOptions.getCurrentPosition();
         float indicatorGap = mIndicatorOptions.getIndicatorGap();
         float sliderHeight = mIndicatorOptions.getSliderHeight();
         float left = currentPosition * (maxWidth) + currentPosition * +indicatorGap + (maxWidth + indicatorGap) * mIndicatorOptions.getSlideProgress();
         RectF rectF = new RectF(left, 0, left + maxWidth, sliderHeight);
         canvas.drawRoundRect(rectF, sliderHeight, sliderHeight, mPaint);
-//        canvas.drawRect(left, 0, left + maxWidth, mIndicatorOptions.getSliderHeight(), mPaint);
     }
-
-
 }