Optimize code

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

@@ -136,8 +136,8 @@ public class HomeFragment extends BaseFragment {
 
     private void initBanner() {
         mViewPager
-                .setAutoPlay(false)
-                .setCanLoop(false)
+                .setAutoPlay(true)
+                .setCanLoop(true)
                 .setIndicatorSlideMode(IndicatorSlideMode.WORM)
                 .setInterval(5000)
                 .setScrollDuration(1200)

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

@@ -173,6 +173,9 @@ public class OthersFragment extends BaseFragment implements View.OnClickListener
         startActivity(new Intent(getActivity(), PhotoViewActivity.class));
     }
 
+    /**
+     * 注意：在项目中不需要使用该方法
+     */
     private void resetBannerViewPager() {
         try {
             Field mIndicatorView = BannerViewPager.class.getDeclaredField("mIndicatorView");

app/src/main/java/com/example/zhpan/circleviewpager/view/DrawableIndicator.java

@@ -158,8 +158,8 @@ public class DrawableIndicator extends BaseIndicatorView {
         return this;
     }
 
-    public static Bitmap getBitmapFromVectorDrawable(Context context, int drawableId) {
-        Drawable drawable = AppCompatDrawableManager.get().getDrawable(context, drawableId);
+    private static Bitmap getBitmapFromVectorDrawable(Context context, int drawableId) {
+        Drawable drawable = context.getResources().getDrawable(drawableId);
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
             drawable = (DrawableCompat.wrap(drawable)).mutate();
         }

app/src/main/java/com/example/zhpan/circleviewpager/view/FigureIndicatorView.java

@@ -54,14 +54,14 @@ public class FigureIndicatorView extends BaseIndicatorView {
         super.onDraw(canvas);
         if (getPageSize() > 1) {
             mPaint.setColor(backgroundColor);
-            canvas.drawCircle(getWidth() / 2, getHeight() / 2, radius, mPaint);
+            canvas.drawCircle(getWidth() / 2f, getHeight() / 2f, radius, mPaint);
             mPaint.setColor(textColor);
             mPaint.setTextSize(textSize);
             String text = getCurrentPosition() + 1 + "/" + getPageSize();
             int textWidth = (int) mPaint.measureText(text);
             Paint.FontMetricsInt fontMetricsInt = mPaint.getFontMetricsInt();
             int baseline = (getMeasuredHeight() - fontMetricsInt.bottom + fontMetricsInt.top) / 2 - fontMetricsInt.top;
-            canvas.drawText(text, (getWidth() - textWidth) / 2, baseline, mPaint);
+            canvas.drawText(text, (getWidth() - textWidth) / 2f, baseline, mPaint);
         }
     }
 

app/src/main/res/layout/activity_main.xml

@@ -41,7 +41,7 @@
                 android:drawableTop="@drawable/tab3_selector"
                 android:gravity="center_horizontal|bottom"
                 android:paddingBottom="@dimen/dp_5"
-                android:text="@string/tab3"
+                android:text="@string/tab2"
                 android:textColor="@drawable/text_color_selector" />
 
             <RadioButton
@@ -54,7 +54,7 @@
                 android:drawableTop="@drawable/tab2_selector"
                 android:gravity="center_horizontal|bottom"
                 android:paddingBottom="@dimen/dp_5"
-                android:text="@string/tab2"
+                android:text="@string/tab3"
                 android:textColor="@drawable/text_color_selector" />
 
             <RadioButton

bannerview/src/main/java/com/zhpan/bannerview/BannerViewPager.java

@@ -334,7 +334,7 @@ public class BannerViewPager<T, VH extends ViewHolder> extends RelativeLayout im
         mViewPager.setOverlapStyle(overlap);
         mViewPager.setPageMargin(overlap ? -bannerOptions.getPageMargin() : bannerOptions.getPageMargin());
         int offScreenPageLimit = bannerOptions.getOffScreenPageLimit();
-        mViewPager.setOffscreenPageLimit(offScreenPageLimit > 2 ? offScreenPageLimit : 2);
+        mViewPager.setOffscreenPageLimit(Math.max(offScreenPageLimit, 2));
         setPageTransformer(new ScaleInTransformer(scale));
     }