进度条

xiaoyao · xiaoyao · commit f4e24daa6329 · 2017-05-17T20:07:00.000+08:00
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -2,6 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.allen.androidcustomview">
 
+    <uses-permission android:name="android.permission.INTERNET"/>
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
@@ -22,7 +23,7 @@
         <activity android:name=".tagview.TagActivity" />
         <activity android:name=".activity.AnimationBtnActivity" />
         <activity android:name=".activity.ProgressBarActivity" />
-        <activity android:name=".activity.PayPsdViewActivity"></activity>
+        <activity android:name=".activity.PayPsdViewActivity"/>
     </application>
 
 </manifest>
diff --git a/app/src/main/java/com/allen/androidcustomview/activity/ProgressBarActivity.java b/app/src/main/java/com/allen/androidcustomview/activity/ProgressBarActivity.java
@@ -35,7 +35,7 @@ public void currentProgressListener(float currentProgress) {
         });
         circleProgressBarView.startProgressAnimation();
 
-        horizontalProgressBar.setProgress(70).setProgressListener(new HorizontalProgressBar.ProgressListener() {
+        horizontalProgressBar.setProgress(98).setProgressListener(new HorizontalProgressBar.ProgressListener() {
             @Override
             public void currentProgressListener(float currentProgress) {
             }
diff --git a/app/src/main/java/com/allen/androidcustomview/widget/CircleProgressBarView.java b/app/src/main/java/com/allen/androidcustomview/widget/CircleProgressBarView.java
@@ -134,7 +134,7 @@ public void onAnimationUpdate(ValueAnimator valueAnimator) {
                 currentProgress = value * 360 / 100;
 
                 if (progressListener != null) {
-                    progressListener.currentProgressListener(value);
+                    progressListener.currentProgressListener(roundTwo(value));
                 }
                 invalidate();
 
@@ -197,5 +197,12 @@ public CircleProgressBarView setProgressListener(ProgressListener listener) {
         progressListener = listener;
         return this;
     }
-
+    /**
+     * 将一个小数四舍五入，保留两位小数返回
+     * @param originNum
+     * @return
+     */
+    public static float roundTwo(float originNum) {
+        return (float) (Math.round(originNum * 10) / 10.0);
+    }
 }
diff --git a/app/src/main/java/com/allen/androidcustomview/widget/HorizontalProgressBar.java b/app/src/main/java/com/allen/androidcustomview/widget/HorizontalProgressBar.java
@@ -2,14 +2,27 @@
 
 import android.animation.ValueAnimator;
 import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
+import android.graphics.Path;
+import android.graphics.Rect;
+import android.graphics.RectF;
+import android.os.Build;
 import android.support.annotation.Nullable;
+import android.support.annotation.RequiresApi;
+import android.support.v7.widget.ViewUtils;
 import android.util.AttributeSet;
+import android.util.TypedValue;
 import android.view.View;
 import android.view.animation.DecelerateInterpolator;
 
+import com.allen.androidcustomview.R;
+
+import java.text.DecimalFormat;
+
 /**
  * Created by Allen on 2017/5/14.
  * <p>
@@ -18,9 +31,13 @@
 
 public class HorizontalProgressBar extends View {
 
+
     private Paint bgPaint;
     private Paint progressPaint;
 
+    private Paint tipPaint;
+    private Paint textPaint;
+
     private int width;
     private int height;
     /**
@@ -41,7 +58,7 @@ public class HorizontalProgressBar extends View {
     /**
      * 动画执行时间
      */
-    private int duration = 2000;
+    private int duration = 1000;
     /**
      * 动画延时启动时间
      */
@@ -51,16 +68,44 @@ public class HorizontalProgressBar extends View {
     private ProgressListener progressListener;
 
 
+    private Path path = new Path();
+
+    private int strokeWidth = 5;
+
+    private int tipHeight = 50;
+    private int tipWidth = 100;
+
+    private int dis = 10;
+
+
+    private float move;
+
+    private Rect textRect = new Rect();
+    private String textString;
+
+    private int bgColor = 0xFFe1e5e8;
+
+    private int progressColor = 0xFFf66b12;
+
+    private RectF rectF = new RectF();
     public HorizontalProgressBar(Context context) {
         super(context);
     }
 
     public HorizontalProgressBar(Context context, @Nullable AttributeSet attrs) {
         super(context, attrs);
 
-        bgPaint = getPaint(10, Color.GRAY);
-        progressPaint = getPaint(10, Color.RED);
+        bgPaint = getPaint(strokeWidth, bgColor);
+        progressPaint = getPaint(strokeWidth, progressColor);
+
+        tipPaint = getPaint(1, progressColor);
+        tipPaint.setStyle(Paint.Style.FILL);
 
+        textPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+        textPaint.setTextSize(20);
+        textPaint.setColor(Color.WHITE);
+        textPaint.setTextAlign(Paint.Align.CENTER);
+        textPaint.setAntiAlias(true);
     }
 
     private Paint getPaint(int strokeWidth, int color) {
@@ -74,6 +119,39 @@ private Paint getPaint(int strokeWidth, int color) {
         return paint;
     }
 
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+//        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+        setMeasuredDimension(measureWidth(widthMeasureSpec), measureHeight(heightMeasureSpec));
+    }
+
+    private int measureWidth(int measureSpec) {
+        int specMode = MeasureSpec.getMode(measureSpec);
+        int specSize = MeasureSpec.getSize(measureSpec);
+        //设置一个默认值，就是这个View的默认宽度为500，这个看我们自定义View的要求
+        int result = 300;
+        if (specMode == MeasureSpec.AT_MOST) {//相当于我们设置为wrap_content
+            result = specSize;
+        } else if (specMode == MeasureSpec.EXACTLY) {//相当于我们设置为match_parent或者为一个具体的值
+            result = specSize;
+        }
+        return result;
+    }
+
+    private int measureHeight(int measureSpec) {
+        int specMode = MeasureSpec.getMode(measureSpec);
+        int specSize = MeasureSpec.getSize(measureSpec);
+        int result = 100;
+        if (specMode == MeasureSpec.AT_MOST) {
+            result = specSize;
+        } else if (specMode == MeasureSpec.EXACTLY) {
+            result = specSize;
+        }
+        return result;
+    }
+
+
+
     @Override
     protected void onSizeChanged(int w, int h, int oldw, int oldh) {
         super.onSizeChanged(w, h, oldw, oldh);
@@ -87,11 +165,76 @@ protected void onSizeChanged(int w, int h, int oldw, int oldh) {
     protected void onDraw(Canvas canvas) {
         super.onDraw(canvas);
 
-        canvas.drawLine(0, getHeight() / 2, getWidth(), getHeight() / 2, bgPaint);
+//        canvas.drawLine(getPaddingLeft(), getHeight()-strokeWidth , getWidth(), getHeight()-strokeWidth , bgPaint);
+//
+//        canvas.drawLine(getPaddingLeft(), getHeight()-strokeWidth , currentProgress, getHeight()-strokeWidth , progressPaint);
+
+        canvas.drawLine(getPaddingLeft(), tipHeight +20 , getWidth(), tipHeight +20 , bgPaint);
+
+        canvas.drawLine(getPaddingLeft(), tipHeight +20 , currentProgress, tipHeight +20 , progressPaint);
+
+//        drawTipPath(canvas,move);
+        drawTipView(canvas);
+
+        drawText(canvas,textString);
+
+    }
+
+    private void drawTipPath(Canvas canvas, int move) {
+        path.moveTo(0+move,0);
+        path.lineTo(0+move, tipHeight);
+        path.lineTo((tipWidth -dis)/2+move, tipHeight);
+        path.lineTo((tipWidth -dis)/2+dis/2+move, tipHeight +5);
+        path.lineTo((tipWidth -dis)/2+dis+move, tipHeight);
+        path.lineTo(tipWidth +move, tipHeight);
+        path.lineTo(tipWidth +move,0);
+        path.close();
+
+        drawTipView(canvas);
+
 
-        canvas.drawLine(0, getHeight() / 2, currentProgress, getHeight() / 2, progressPaint);
+        path.reset();
     }
 
+    private void drawTipView(Canvas canvas) {
+        drawRoundRect(canvas);
+
+        drawTriangle(canvas);
+    }
+
+
+    private void drawRoundRect(Canvas canvas) {
+
+        rectF.set(move,0, tipWidth +move, tipHeight);
+        canvas.drawRoundRect(rectF,5,5,tipPaint);
+        canvas.drawPath(path,tipPaint);
+
+    }
+
+    private void drawTriangle(Canvas canvas) {
+        path.moveTo(tipWidth /2-dis+move, tipHeight);
+        path.lineTo(tipWidth /2+move, tipHeight +dis);
+        path.lineTo(tipWidth /2+dis+move, tipHeight);
+        canvas.drawPath(path,tipPaint);
+        path.reset();
+
+    }
+
+    /**
+     * 绘制文字
+     *
+     * @param canvas 画布
+     */
+    private void drawText(Canvas canvas, String textString) {
+        textRect.left = (int) move;
+        textRect.top = 0;
+        textRect.right = (int) (tipWidth +move);
+        textRect.bottom = tipHeight;
+        Paint.FontMetricsInt fontMetrics = textPaint.getFontMetricsInt();
+        int baseline = (textRect.bottom + textRect.top - fontMetrics.bottom - fontMetrics.top) / 2;
+        //文字绘制到整个布局的中心位置
+        canvas.drawText(textString+"%", textRect.centerX(), baseline, textPaint);
+    }
 
     private void initAnimation() {
         progressAnimator = ValueAnimator.ofFloat(0, mProgress);
@@ -102,11 +245,14 @@ private void initAnimation() {
             @Override
             public void onAnimationUpdate(ValueAnimator valueAnimator) {
                 float value = (float) valueAnimator.getAnimatedValue();
-
+                textString = formatNum(value);
                 currentProgress = value * width / 100;
                 if (progressListener != null) {
                     progressListener.currentProgressListener(value);
                 }
+                if (currentProgress>=(tipWidth /2)&&currentProgress<=(width- tipWidth /2)){
+                    move = currentProgress- tipWidth /2;
+                }
                 invalidate();
 
             }
@@ -125,10 +271,12 @@ public void startProgressAnimation() {
         progressAnimator.start();
     }
 
+    @RequiresApi(api = Build.VERSION_CODES.KITKAT)
     public void pauseProgressAnimation() {
         progressAnimator.pause();
     }
 
+    @RequiresApi(api = Build.VERSION_CODES.KITKAT)
     public void resumeProgressAnimation() {
         progressAnimator.resume();
     }
@@ -145,5 +293,48 @@ public HorizontalProgressBar setProgressListener(ProgressListener listener) {
         progressListener = listener;
         return this;
     }
+    /**
+     * 格式化数字(保留两位小数)
+     * @param money
+     * @return
+     */
+    public static String formatNumTwo(double money) {
+        DecimalFormat format = new DecimalFormat("0.00");
+        return format.format(money);
+    }
+
+    /**
+     * 格式化数字(保留两位小数)
+     * @param money
+     * @return
+     */
+    public static String formatNum(float money) {
+        DecimalFormat format = new DecimalFormat("0");
+        return format.format(money);
+    }
+
+    /**
+     * dp 2 px
+     *
+     * @param dpVal
+     */
+    protected int dp2px(int dpVal)
+    {
+        return (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP,
+                dpVal, getResources().getDisplayMetrics());
+    }
+
+    /**
+     * sp 2 px
+     *
+     * @param spVal
+     * @return
+     */
+    protected int sp2px(int spVal)
+    {
+        return (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP,
+                spVal, getResources().getDisplayMetrics());
+
+    }
 
 }
diff --git a/app/src/main/res/layout/activity_pregress_bar.xml b/app/src/main/res/layout/activity_pregress_bar.xml
@@ -20,7 +20,12 @@
         android:textSize="20sp" />
 
     <com.allen.androidcustomview.widget.HorizontalProgressBar
+        android:layout_marginTop="20dp"
         android:id="@+id/horizontal_progress_view"
         android:layout_width="match_parent"
-        android:layout_height="50dp" />
+        android:layout_height="wrap_content" />
+    <Button
+        android:text="@string/app_name"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
 </LinearLayout>
diff --git a/app/src/main/res/layout/activity_webview.xml b/app/src/main/res/layout/activity_webview.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical" android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <WebView
+        android:id="@+id/webview"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+</LinearLayout>
diff --git a/app/src/main/res/mipmap-xxhdpi/progress_tip_icon.png b/app/src/main/res/mipmap-xxhdpi/progress_tip_icon.png

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public void currentProgressListener(float currentProgress) {`
`35`	`35`	`});`
`36`	`36`	`circleProgressBarView.startProgressAnimation();`
`37`	`37`
`38`		`- horizontalProgressBar.setProgress(70).setProgressListener(new HorizontalProgressBar.ProgressListener() {`
	`38`	`+ horizontalProgressBar.setProgress(98).setProgressListener(new HorizontalProgressBar.ProgressListener() {`
`39`	`39`	`@Override`
`40`	`40`	`public void currentProgressListener(float currentProgress) {`
`41`	`41`	`}`