+ * Follow me */ public class ArcSeekBar extends View { @@ -90,7 +95,7 @@ public class ArcSeekBar extends View { /** * 着色器颜色 */ - private int[] mShaderColors = new int[]{0xFF4FEAAC,0xFFA8DD51,0xFFE8D30F,0xFFA8DD51,0xFF4FEAAC}; + private int[] mShaderColors = new int[]{0xFF4FEAAC, 0xFFA8DD51, 0xFFE8D30F, 0xFFA8DD51, 0xFF4FEAAC}; /** * 半径 @@ -243,139 +248,140 @@ public class ArcSeekBar extends View { public ArcSeekBar(Context context) { - this(context,null); + this(context, null); } public ArcSeekBar(Context context, AttributeSet attrs) { - this(context, attrs,0); + this(context, attrs, 0); } public ArcSeekBar(Context context, AttributeSet attrs, int defStyleAttr) { super(context, attrs, defStyleAttr); - init(context,attrs); + init(context, attrs); } /** * 初始化 + * * @param context * @param attrs */ - private void init(Context context,AttributeSet attrs){ - TypedArray a = context.obtainStyledAttributes(attrs,R.styleable.ArcSeekBar); + private void init(Context context, AttributeSet attrs) { + TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.ArcSeekBar); DisplayMetrics displayMetrics = getDisplayMetrics(); - mStrokeWidth = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP,12,displayMetrics); + mStrokeWidth = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 12, displayMetrics); - mLabelTextSize = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP,30,displayMetrics); + mLabelTextSize = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP, 30, displayMetrics); - mTickPadding = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP,2,displayMetrics); + mTickPadding = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 2, displayMetrics); - mTickStrokeWidth = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP,10,displayMetrics);; + mTickStrokeWidth = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 10, displayMetrics); - mThumbRadius = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP,8,displayMetrics); + mThumbRadius = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 8, displayMetrics); mThumbStrokeWidth = mThumbRadius; - mAllowableOffsets = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP,10,displayMetrics); + mAllowableOffsets = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 10, displayMetrics); - mThumbRadiusEnlarges = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP,2,displayMetrics); + mThumbRadiusEnlarges = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 2, displayMetrics); Drawable thumbDrawable = null; int size = a.getIndexCount(); - for(int i = 0;i < size;i++){ + for (int i = 0; i < size; i++) { int attr = a.getIndex(i); if (attr == R.styleable.ArcSeekBar_arcStrokeWidth) { - mStrokeWidth = a.getDimension(attr,mStrokeWidth); - }else if(attr == R.styleable.ArcSeekBar_arcStrokeCap){ - mStrokeCap = getStrokeCap(a.getInt(attr,3)); - }else if(attr == R.styleable.ArcSeekBar_arcNormalColor){ - mNormalColor = a.getColor(attr,mNormalColor); - }else if(attr == R.styleable.ArcSeekBar_arcProgressColor){ - mProgressColor = a.getColor(attr,mProgressColor); + mStrokeWidth = a.getDimension(attr, mStrokeWidth); + } else if (attr == R.styleable.ArcSeekBar_arcStrokeCap) { + mStrokeCap = getStrokeCap(a.getInt(attr, 3)); + } else if (attr == R.styleable.ArcSeekBar_arcNormalColor) { + mNormalColor = a.getColor(attr, mNormalColor); + } else if (attr == R.styleable.ArcSeekBar_arcProgressColor) { + mProgressColor = a.getColor(attr, mProgressColor); isShader = false; - }else if(attr == R.styleable.ArcSeekBar_arcStartAngle){ - mStartAngle = a.getInt(attr,mStartAngle); - }else if(attr == R.styleable.ArcSeekBar_arcSweepAngle){ - mSweepAngle = a.getInt(attr,mSweepAngle); - }else if(attr == R.styleable.ArcSeekBar_arcMax){ - int max = a.getInt(attr,mMax); - if(max > 0){ + } else if (attr == R.styleable.ArcSeekBar_arcStartAngle) { + mStartAngle = a.getInt(attr, mStartAngle); + } else if (attr == R.styleable.ArcSeekBar_arcSweepAngle) { + mSweepAngle = a.getInt(attr, mSweepAngle); + } else if (attr == R.styleable.ArcSeekBar_arcMax) { + int max = a.getInt(attr, mMax); + if (max > 0) { mMax = max; } - }else if(attr == R.styleable.ArcSeekBar_arcProgress){ - mProgress = a.getInt(attr,mProgress); - }else if(attr == R.styleable.ArcSeekBar_arcDuration){ - mDuration = a.getInt(attr,mDuration); - }else if(attr == R.styleable.ArcSeekBar_arcLabelText){ + } else if (attr == R.styleable.ArcSeekBar_arcProgress) { + mProgress = a.getInt(attr, mProgress); + } else if (attr == R.styleable.ArcSeekBar_arcDuration) { + mDuration = a.getInt(attr, mDuration); + } else if (attr == R.styleable.ArcSeekBar_arcLabelText) { mLabelText = a.getString(attr); - }else if(attr == R.styleable.ArcSeekBar_arcLabelTextSize){ - mLabelTextSize = a.getDimension(attr,mLabelTextSize); - }else if(attr == R.styleable.ArcSeekBar_arcLabelTextColor){ - mLabelTextColor = a.getColor(attr,mLabelTextColor); - }else if(attr == R.styleable.ArcSeekBar_arcLabelPaddingTop){ - mLabelPaddingTop = a.getDimension(attr,0); - }else if(attr == R.styleable.ArcSeekBar_arcLabelPaddingBottom){ - mLabelPaddingBottom = a.getDimension(attr,0); - }else if(attr == R.styleable.ArcSeekBar_arcLabelPaddingLeft){ - mLabelPaddingLeft = a.getDimension(attr,0); - }else if(attr == R.styleable.ArcSeekBar_arcLabelPaddingRight){ - mLabelPaddingRight = a.getDimension(attr,0); - }else if(attr == R.styleable.ArcSeekBar_arcShowLabel) { + } else if (attr == R.styleable.ArcSeekBar_arcLabelTextSize) { + mLabelTextSize = a.getDimension(attr, mLabelTextSize); + } else if (attr == R.styleable.ArcSeekBar_arcLabelTextColor) { + mLabelTextColor = a.getColor(attr, mLabelTextColor); + } else if (attr == R.styleable.ArcSeekBar_arcLabelPaddingTop) { + mLabelPaddingTop = a.getDimension(attr, 0); + } else if (attr == R.styleable.ArcSeekBar_arcLabelPaddingBottom) { + mLabelPaddingBottom = a.getDimension(attr, 0); + } else if (attr == R.styleable.ArcSeekBar_arcLabelPaddingLeft) { + mLabelPaddingLeft = a.getDimension(attr, 0); + } else if (attr == R.styleable.ArcSeekBar_arcLabelPaddingRight) { + mLabelPaddingRight = a.getDimension(attr, 0); + } else if (attr == R.styleable.ArcSeekBar_arcShowLabel) { isShowLabel = a.getBoolean(attr, true); - }else if(attr == R.styleable.ArcSeekBar_arcShowTick){ - isShowTick = a.getBoolean(attr,true); - }else if(attr == R.styleable.ArcSeekBar_arcTickStrokeWidth){ - mTickStrokeWidth = a.getDimension(attr,mTickStrokeWidth); - }else if(attr == R.styleable.ArcSeekBar_arcTickPadding){ - mTickPadding = a.getDimension(attr,mTickPadding); - }else if(attr == R.styleable.ArcSeekBar_arcTickSplitAngle){ - mTickSplitAngle = a.getInt(attr,5); - }else if(attr == R.styleable.ArcSeekBar_arcBlockAngle){ - mBlockAngle = a.getInt(attr,1); - }else if(attr == R.styleable.ArcSeekBar_arcTickOffsetAngle){ - mTickOffsetAngle = a.getInt(attr,0); - }else if(attr == R.styleable.ArcSeekBar_arcThumbStrokeWidth){ - mThumbStrokeWidth = a.getDimension(attr,mThumbStrokeWidth); - }else if(attr == R.styleable.ArcSeekBar_arcThumbColor){ - mThumbColor = a.getColor(attr,mThumbColor); - }else if(attr == R.styleable.ArcSeekBar_arcThumbRadius){ - mThumbRadius = a.getDimension(attr,mThumbRadius); - }else if(attr == R.styleable.ArcSeekBar_arcThumbDrawable){ + } else if (attr == R.styleable.ArcSeekBar_arcShowTick) { + isShowTick = a.getBoolean(attr, true); + } else if (attr == R.styleable.ArcSeekBar_arcTickStrokeWidth) { + mTickStrokeWidth = a.getDimension(attr, mTickStrokeWidth); + } else if (attr == R.styleable.ArcSeekBar_arcTickPadding) { + mTickPadding = a.getDimension(attr, mTickPadding); + } else if (attr == R.styleable.ArcSeekBar_arcTickSplitAngle) { + mTickSplitAngle = a.getInt(attr, 5); + } else if (attr == R.styleable.ArcSeekBar_arcBlockAngle) { + mBlockAngle = a.getInt(attr, 1); + } else if (attr == R.styleable.ArcSeekBar_arcTickOffsetAngle) { + mTickOffsetAngle = a.getInt(attr, 0); + } else if (attr == R.styleable.ArcSeekBar_arcThumbStrokeWidth) { + mThumbStrokeWidth = a.getDimension(attr, mThumbStrokeWidth); + } else if (attr == R.styleable.ArcSeekBar_arcThumbColor) { + mThumbColor = a.getColor(attr, mThumbColor); + } else if (attr == R.styleable.ArcSeekBar_arcThumbRadius) { + mThumbRadius = a.getDimension(attr, mThumbRadius); + } else if (attr == R.styleable.ArcSeekBar_arcThumbDrawable) { thumbDrawable = a.getDrawable(attr); - }else if(attr == R.styleable.ArcSeekBar_arcThumbRadiusEnlarges) { + } else if (attr == R.styleable.ArcSeekBar_arcThumbRadiusEnlarges) { mThumbRadiusEnlarges = a.getDimension(attr, mThumbRadiusEnlarges); - }else if(attr == R.styleable.ArcSeekBar_arcShowThumb) { + } else if (attr == R.styleable.ArcSeekBar_arcShowThumb) { isShowThumb = a.getBoolean(attr, isShowThumb); - }else if(attr == R.styleable.ArcSeekBar_arcAllowableOffsets){ - mAllowableOffsets = a.getDimension(attr,mAllowableOffsets); - }else if(attr == R.styleable.ArcSeekBar_arcEnabledDrag){ - isEnabledDrag = a.getBoolean(attr,true); - }else if(attr == R.styleable.ArcSeekBar_arcEnabledSingle){ - isEnabledSingle = a.getBoolean(attr,true); + } else if (attr == R.styleable.ArcSeekBar_arcAllowableOffsets) { + mAllowableOffsets = a.getDimension(attr, mAllowableOffsets); + } else if (attr == R.styleable.ArcSeekBar_arcEnabledDrag) { + isEnabledDrag = a.getBoolean(attr, true); + } else if (attr == R.styleable.ArcSeekBar_arcEnabledSingle) { + isEnabledSingle = a.getBoolean(attr, true); } } isShowPercentText = TextUtils.isEmpty(mLabelText); - if(thumbDrawable != null) { + if (thumbDrawable != null) { mThumbBitmap = getBitmapFormDrawable(thumbDrawable); } a.recycle(); - mProgressPercent = (int)(mProgress * 100.0f / mMax); + mProgressPercent = (int) (mProgress * 100.0f / mMax); mPaint = new Paint(); mTextPaint = new TextPaint(); - mTotalTickCount = (int)(mSweepAngle / (mTickSplitAngle + mBlockAngle)); + mTotalTickCount = (int) (mSweepAngle / (mTickSplitAngle + mBlockAngle)); - mDetector = new GestureDetector(getContext(), new GestureDetector.SimpleOnGestureListener(){ + mDetector = new GestureDetector(getContext(), new GestureDetector.SimpleOnGestureListener() { @Override public boolean onSingleTapUp(MotionEvent event) { - if(isInArc(event.getX(),event.getY())){ - updateDragThumb(event.getX(),event.getY(),true); - if(mOnChangeListener != null){ + if (isInArc(event.getX(), event.getY())) { + updateDragThumb(event.getX(), event.getY(), true); + if (mOnChangeListener != null) { mOnChangeListener.onSingleTapUp(); } return true; @@ -401,8 +407,8 @@ private Bitmap getBitmapFormDrawable(Drawable drawable) { return bitmap; } - private Paint.Cap getStrokeCap(int value){ - switch (value){ + private Paint.Cap getStrokeCap(int value) { + switch (value) { case 1: return Paint.Cap.BUTT; case 2: @@ -413,50 +419,52 @@ private Paint.Cap getStrokeCap(int value){ } - private DisplayMetrics getDisplayMetrics(){ + private DisplayMetrics getDisplayMetrics() { return getResources().getDisplayMetrics(); } + @SuppressLint("DrawAllocation") @Override protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { super.onMeasure(widthMeasureSpec, heightMeasureSpec); - int defaultValue = (int)TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP,200,getDisplayMetrics()); + int defaultValue = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 200, getDisplayMetrics()); - int width = measureHandler(widthMeasureSpec,defaultValue); - int height = measureHandler(heightMeasureSpec,defaultValue); + int width = measureHandler(widthMeasureSpec, defaultValue); + int height = measureHandler(heightMeasureSpec, defaultValue); //圆心坐标 - mCircleCenterX = (width + getPaddingLeft() - getPaddingRight())/ 2.0f; - mCircleCenterY = (height + getPaddingTop() - getPaddingBottom())/ 2.0f; + mCircleCenterX = (width + getPaddingLeft() - getPaddingRight()) / 2.0f; + mCircleCenterY = (height + getPaddingTop() - getPaddingBottom()) / 2.0f; //计算间距 - int padding = Math.max(getPaddingLeft() + getPaddingRight(),getPaddingTop() + getPaddingBottom()); + int padding = Math.max(getPaddingLeft() + getPaddingRight(), getPaddingTop() + getPaddingBottom()); //半径=视图宽度-横向或纵向内间距值 - 画笔宽度 - mRadius = (width - padding - Math.max(mStrokeWidth,mThumbStrokeWidth)) / 2.0f - mThumbRadius; + mRadius = (width - padding - Math.max(mStrokeWidth, mThumbStrokeWidth)) / 2.0f - mThumbRadius; //默认着色器 - mShader = new SweepGradient(mCircleCenterX,mCircleCenterX,mShaderColors,null); + mShader = new SweepGradient(mCircleCenterX, mCircleCenterX, mShaderColors, null); isMeasureCircle = true; - setMeasuredDimension(width,height); + setMeasuredDimension(width, height); } /** * 测量 + * * @param measureSpec * @param defaultSize * @return */ - private int measureHandler(int measureSpec,int defaultSize){ + private int measureHandler(int measureSpec, int defaultSize) { int result = defaultSize; int measureMode = MeasureSpec.getMode(measureSpec); int measureSize = MeasureSpec.getSize(measureSpec); - if(measureMode == MeasureSpec.EXACTLY){ + if (measureMode == MeasureSpec.EXACTLY) { result = measureSize; - }else if(measureMode == MeasureSpec.AT_MOST){ - result = Math.min(defaultSize,measureSize); + } else if (measureMode == MeasureSpec.AT_MOST) { + result = Math.min(defaultSize, measureSize); } return result; } @@ -473,22 +481,23 @@ protected void onDraw(Canvas canvas) { /** * 绘制弧形(默认为一个圆) + * * @param canvas */ - private void drawArc(Canvas canvas){ + private void drawArc(Canvas canvas) { mPaint.reset(); mPaint.setAntiAlias(true); mPaint.setStyle(Paint.Style.STROKE); - if(isShowTick){//是否显示刻度 + if (isShowTick) {//是否显示刻度 mPaint.setStrokeWidth(mTickStrokeWidth); - float circleRadius = mRadius - mTickPadding - mStrokeWidth; + float circleRadius = mRadius - mTickPadding - mStrokeWidth; float tickDiameter = circleRadius * 2; float tickStartX = mCircleCenterX - circleRadius; float tickStartY = mCircleCenterY - circleRadius; - RectF rectF = new RectF(tickStartX,tickStartY,tickStartX + tickDiameter,tickStartY + tickDiameter); + RectF rectF = new RectF(tickStartX, tickStartY, tickStartX + tickDiameter, tickStartY + tickDiameter); - final int currentBlockIndex = (int)(mProgressPercent / 100f * mTotalTickCount); + final int currentBlockIndex = (int) (mProgressPercent / 100f * mTotalTickCount); for (int i = 0; i < mTotalTickCount; i++) { if (i < currentBlockIndex) { @@ -501,7 +510,7 @@ private void drawArc(Canvas canvas){ //绘制刻度 canvas.drawArc(rectF, i * (mBlockAngle + mTickSplitAngle) + mStartAngle + mTickOffsetAngle, mBlockAngle, false, mPaint); } else { - if(mNormalColor != 0){ + if (mNormalColor != 0) { //未选中的刻度 mPaint.setShader(null); mPaint.setColor(mNormalColor); @@ -521,47 +530,47 @@ private void drawArc(Canvas canvas){ float diameter = mRadius * 2f; float startX = mCircleCenterX - mRadius; float startY = mCircleCenterY - mRadius; - RectF rectF1 = new RectF(startX,startY,startX + diameter,startY + diameter); + RectF rectF1 = new RectF(startX, startY, startX + diameter, startY + diameter); - if(mNormalColor != 0){ + if (mNormalColor != 0) { mPaint.setColor(mNormalColor); //绘制底层弧形 - canvas.drawArc(rectF1,mStartAngle,mSweepAngle,false,mPaint); + canvas.drawArc(rectF1, mStartAngle, mSweepAngle, false, mPaint); } //着色器不为空则设置着色器，反之用纯色 - if(isShader && mShader!=null){ + if (isShader && mShader != null) { mPaint.setShader(mShader); - }else{ + } else { mPaint.setColor(mProgressColor); } float ratio = getRatio(); - if(ratio != 0){ + if (ratio != 0) { //绘制当前进度弧形 - canvas.drawArc(rectF1,mStartAngle,mSweepAngle * ratio,false,mPaint); + canvas.drawArc(rectF1, mStartAngle, mSweepAngle * ratio, false, mPaint); } } - private void drawThumb(Canvas canvas){ - if(isShowThumb){ + private void drawThumb(Canvas canvas) { + if (isShowThumb) { mPaint.reset(); mPaint.setAntiAlias(true); float thumbAngle = mStartAngle + mSweepAngle * getRatio(); //已知圆心，半径，角度，求圆上的点坐标 - mThumbCenterX = (float) (mCircleCenterX + mRadius * Math.cos(Math.toRadians(thumbAngle))); + mThumbCenterX = (float) (mCircleCenterX + mRadius * Math.cos(Math.toRadians(thumbAngle))); mThumbCenterY = (float) (mCircleCenterY + mRadius * Math.sin(Math.toRadians(thumbAngle))); - if(mThumbBitmap != null) { + if (mThumbBitmap != null) { if (isCanDrag) { - int size = Math.min(mThumbBitmap.getWidth(), mThumbBitmap.getHeight()); + int size = Math.min(mThumbBitmap.getWidth(), mThumbBitmap.getHeight()); float ratio = (mThumbRadiusEnlarges * 2 + size) / size; int dstW = Math.round(mThumbBitmap.getWidth() * ratio); int dstH = Math.round(mThumbBitmap.getHeight() * ratio); - int dstLeft = (int)(mThumbCenterX - Math.round(dstW / 2.0f)); - int dstTop = (int)(mThumbCenterY - Math.round(dstH / 2.0f)); + int dstLeft = (int) (mThumbCenterX - Math.round(dstW / 2.0f)); + int dstTop = (int) (mThumbCenterY - Math.round(dstH / 2.0f)); Rect dstRect = new Rect(dstLeft, dstTop, dstLeft + dstW, dstTop + dstH); canvas.drawBitmap(mThumbBitmap, null, dstRect, mPaint); } else { @@ -573,10 +582,10 @@ private void drawThumb(Canvas canvas){ mPaint.setStyle(Paint.Style.FILL_AND_STROKE); mPaint.setStrokeWidth(mThumbStrokeWidth); mPaint.setColor(mThumbColor); - if(isCanDrag){ - canvas.drawCircle(mThumbCenterX,mThumbCenterY,mThumbRadius + mThumbRadiusEnlarges,mPaint); - }else{ - canvas.drawCircle(mThumbCenterX,mThumbCenterY,mThumbRadius,mPaint); + if (isCanDrag) { + canvas.drawCircle(mThumbCenterX, mThumbCenterY, mThumbRadius + mThumbRadiusEnlarges, mPaint); + } else { + canvas.drawCircle(mThumbCenterX, mThumbCenterY, mThumbRadius, mPaint); } } } @@ -585,10 +594,11 @@ private void drawThumb(Canvas canvas){ /** * 绘制中间的文本 + * * @param canvas */ - private void drawText(Canvas canvas){ - if(!isShowLabel){ + private void drawText(Canvas canvas) { + if (!isShowLabel) { return; } mTextPaint.reset(); @@ -604,31 +614,32 @@ private void drawText(Canvas canvas){ // 计算文字baseline float textBaseX = getWidth() / 2f + mLabelPaddingLeft - mLabelPaddingRight; float textBaseY = getHeight() - (getHeight() - fontHeight) / 2f - fontMetrics.bottom + mLabelPaddingTop - mLabelPaddingBottom; - if(isShowPercentText){//是否显示百分比 - canvas.drawText(mProgressPercent + "%",textBaseX,textBaseY,mTextPaint); - }else if(!TextUtils.isEmpty(mLabelText)){//显示自定义文本 - canvas.drawText(mLabelText,textBaseX,textBaseY,mTextPaint); + if (isShowPercentText) {//是否显示百分比 + canvas.drawText(mProgressPercent + "%", textBaseX, textBaseY, mTextPaint); + } else if (!TextUtils.isEmpty(mLabelText)) {//显示自定义文本 + canvas.drawText(mLabelText, textBaseX, textBaseY, mTextPaint); } } + @SuppressLint("ClickableViewAccessibility") @Override public boolean onTouchEvent(MotionEvent event) { - if(isEnabledDrag){ - switch (event.getAction()){ + if (isEnabledDrag) { + switch (event.getAction()) { case MotionEvent.ACTION_DOWN: - checkCanDrag(event.getX(),event.getY()); + checkCanDrag(event.getX(), event.getY()); break; case MotionEvent.ACTION_MOVE: - if(isCanDrag){ - updateDragThumb(event.getX(),event.getY(),false); + if (isCanDrag) { + updateDragThumb(event.getX(), event.getY(), false); } break; case MotionEvent.ACTION_UP: case MotionEvent.ACTION_CANCEL: getParent().requestDisallowInterceptTouchEvent(false); - if(mOnChangeListener != null){ + if (mOnChangeListener != null) { mOnChangeListener.onStopTrackingTouch(isCanDrag); } isCanDrag = false; @@ -638,7 +649,7 @@ public boolean onTouchEvent(MotionEvent event) { } } - if(isEnabledSingle){ + if (isEnabledSingle) { mDetector.onTouchEvent(event); } @@ -647,18 +658,19 @@ public boolean onTouchEvent(MotionEvent event) { /** * 判断坐标点是否在弧形上 + * * @param x * @param y * @return */ - private boolean isInArc(float x,float y){ - float distance = getDistance(mCircleCenterX,mCircleCenterY,x,y); - if(Math.abs(distance - mRadius) <= mStrokeWidth / 2f + mAllowableOffsets){ - if(mSweepAngle < 360){ - float angle = (getTouchDegrees(x,y) + mStartAngle) % 360; - if(mStartAngle + mSweepAngle <= 360){ + private boolean isInArc(float x, float y) { + float distance = getDistance(mCircleCenterX, mCircleCenterY, x, y); + if (Math.abs(distance - mRadius) <= mStrokeWidth / 2f + mAllowableOffsets) { + if (mSweepAngle < 360) { + float angle = (getTouchDegrees(x, y) + mStartAngle) % 360; + if (mStartAngle + mSweepAngle <= 360) { return angle >= mStartAngle && angle <= mStartAngle + mSweepAngle; - }else{ + } else { return angle >= mStartAngle || angle <= (mStartAngle + mSweepAngle) % 360; } } @@ -671,54 +683,57 @@ private boolean isInArc(float x,float y){ /** * 获取两点间距离 + * * @param x1 * @param y1 * @param x2 * @param y2 * @return */ - private float getDistance(float x1,float y1,float x2, float y2){ - return (float)Math.sqrt(Math.pow(x1 - x2,2) + Math.pow(y1 - y2,2)); + private float getDistance(float x1, float y1, float x2, float y2) { + return (float) Math.sqrt(Math.pow(x1 - x2, 2) + Math.pow(y1 - y2, 2)); } /** * 更新多拽进度 + * * @param x * @param y * @param isSingle */ - private void updateDragThumb(float x,float y,boolean isSingle){ - int progress = getProgressForAngle(getTouchDegrees(x,y)); - if(!isSingle){ - int tempProgressPercent = (int)(progress * 100.0f / mMax); + private void updateDragThumb(float x, float y, boolean isSingle) { + int progress = getProgressForAngle(getTouchDegrees(x, y)); + if (!isSingle) { + int tempProgressPercent = (int) (progress * 100.0f / mMax); //当滑动至至边界值时，增加进度校准机制 - if(mProgressPercent < 10 && tempProgressPercent > 90){ + if (mProgressPercent < 10 && tempProgressPercent > 90) { progress = 0; - }else if(mProgressPercent > 90 && tempProgressPercent < 10){ + } else if (mProgressPercent > 90 && tempProgressPercent < 10) { progress = mMax; } - int progressPercent = (int)(progress * 100.0f / mMax); + int progressPercent = (int) (progress * 100.0f / mMax); //拖动进度突变不允许超过30% - if(Math.abs(progressPercent - mProgressPercent) > 30){ + if (Math.abs(progressPercent - mProgressPercent) > 30) { return; } } - setProgress(progress,true); + setProgress(progress, true); } /** * 通过弧度换算得到当前精度 + * * @param angle * @return */ private int getProgressForAngle(float angle) { - int touchProgress = Math.round(1.0f * mMax / mSweepAngle * angle); - return touchProgress; + return Math.round(1.0f * mMax / mSweepAngle * angle); } /** * 获取触摸坐标的夹角度数 + * * @param x * @param y * @return @@ -727,9 +742,9 @@ private float getTouchDegrees(float x, float y) { float x1 = x - mCircleCenterX; float y1 = y - mCircleCenterY; //求触摸点弧形的夹角度数 - float angle = (float)(Math.atan2(y1,x1) * 180 / Math.PI); + float angle = (float) (Math.atan2(y1, x1) * 180 / Math.PI); angle -= mStartAngle; - while (angle < 0){ + while (angle < 0) { angle += 360; } return angle; @@ -737,13 +752,14 @@ private float getTouchDegrees(float x, float y) { /** * 检测是否可拖拽 + * * @param x * @param y */ - private void checkCanDrag(float x,float y){ - float distance = getDistance(mThumbCenterX,mThumbCenterY,x,y); + private void checkCanDrag(float x, float y) { + float distance = getDistance(mThumbCenterX, mThumbCenterY, x, y); isCanDrag = distance <= mThumbRadius + mAllowableOffsets; - if(mOnChangeListener != null){ + if (mOnChangeListener != null) { mOnChangeListener.onStartTrackingTouch(isCanDrag); } invalidate(); @@ -751,60 +767,65 @@ private void checkCanDrag(float x,float y){ /** * 显示进度动画效果（根据当前已有进度开始） + * * @param progress */ - public void showAppendAnimation(int progress){ - showAnimation(mProgress,progress,mDuration); + public void showAppendAnimation(int progress) { + showAnimation(mProgress, progress, mDuration); } /** * 显示进度动画效果 + * * @param progress */ - public void showAnimation(int progress){ - showAnimation(progress,mDuration); + public void showAnimation(int progress) { + showAnimation(progress, mDuration); } /** * 显示进度动画效果 + * * @param progress * @param duration 动画时长 */ - public void showAnimation(int progress,int duration){ - showAnimation(0,progress,duration); + public void showAnimation(int progress, int duration) { + showAnimation(0, progress, duration); } /** * 显示进度动画效果，从from到to变化 + * * @param from * @param to * @param duration 动画时长 */ - public void showAnimation(int from,int to,int duration){ - showAnimation(from,to,duration,null); + public void showAnimation(int from, int to, int duration) { + showAnimation(from, to, duration, null); } /** * 显示进度动画效果，从from到to变化 + * * @param from * @param to * @param duration 动画时长 * @param listener */ - public void showAnimation(int from, int to, int duration, Animator.AnimatorListener listener){ + public void showAnimation(int from, int to, int duration, Animator.AnimatorListener listener) { this.mDuration = duration; this.mProgress = from; - ValueAnimator valueAnimator = ValueAnimator.ofInt(from,to); + ValueAnimator valueAnimator = ValueAnimator.ofInt(from, to); valueAnimator.setDuration(duration); valueAnimator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() { @Override public void onAnimationUpdate(ValueAnimator animation) { - setProgress((int)animation.getAnimatedValue()); + setProgress((int) animation.getAnimatedValue()); } }); - if(listener!=null){ + if (listener != null) { valueAnimator.removeAllUpdateListeners(); valueAnimator.addListener(listener); } @@ -814,18 +835,20 @@ public void onAnimationUpdate(ValueAnimator animation) { /** * 进度比例 + * * @return */ - private float getRatio(){ - return mProgress * 1.0f /mMax; + private float getRatio() { + return mProgress * 1.0f / mMax; } /** * 设置最大进度 + * * @param max */ - public void setMax(int max){ - if(max > 0){ + public void setMax(int max) { + if (max > 0) { this.mMax = max; invalidate(); } @@ -833,35 +856,37 @@ public void setMax(int max){ /** * 设置当前进度 + * * @param progress */ - public void setProgress(int progress){ - setProgress(progress,false); + public void setProgress(int progress) { + setProgress(progress, false); } - private void setProgress(int progress,boolean fromUser){ - if(this.mProgress == progress) { + private void setProgress(int progress, boolean fromUser) { + if (this.mProgress == progress) { return; } - if(progress < 0){ + if (progress < 0) { progress = 0; - }else if(progress > mMax){ + } else if (progress > mMax) { progress = mMax; } this.mProgress = progress; - mProgressPercent = (int)(mProgress * 100.0f / mMax); + mProgressPercent = (int) (mProgress * 100.0f / mMax); invalidate(); - if(mOnChangeListener!=null){ - mOnChangeListener.onProgressChanged(mProgress,mMax,fromUser); + if (mOnChangeListener != null) { + mOnChangeListener.onProgressChanged(mProgress, mMax, fromUser); } } /** * 设置正常颜色 + * * @param color */ - public void setNormalColor(int color){ + public void setNormalColor(int color) { this.mNormalColor = color; invalidate(); } @@ -869,9 +894,10 @@ public void setNormalColor(int color){ /** * 设置着色器 + * * @param shader */ - public void setShader(Shader shader){ + public void setShader(Shader shader) { isShader = true; this.mShader = shader; invalidate(); @@ -879,13 +905,14 @@ public void setShader(Shader shader){ /** * 设置进度颜色（通过着色器实现渐变色） + * * @param colors */ - public void setProgressColor(int... colors){ - if(isMeasureCircle){ - Shader shader = new SweepGradient(mCircleCenterX,mCircleCenterX,colors,null); + public void setProgressColor(int... colors) { + if (isMeasureCircle) { + Shader shader = new SweepGradient(mCircleCenterX, mCircleCenterX, colors, null); setShader(shader); - }else{ + } else { mShaderColors = colors; isShader = true; } @@ -893,9 +920,10 @@ public void setProgressColor(int... colors){ /** * 设置进度颜色（纯色） + * * @param color */ - public void setProgressColor(int color){ + public void setProgressColor(int color) { isShader = false; this.mProgressColor = color; invalidate(); @@ -903,97 +931,187 @@ public void setProgressColor(int color){ /** * 设置进度颜色 + * * @param resId */ - public void setProgressColorResource(int resId){ + public void setProgressColorResource(int resId) { int color = getResources().getColor(resId); setProgressColor(color); } /** * 设置是否显示外环刻度 + * * @param isShowTick */ - public void setShowTick(boolean isShowTick){ + public void setShowTick(boolean isShowTick) { this.isShowTick = isShowTick; invalidate(); } + /** + * 开始角度(默认从12点钟方向开始) + * @return + */ public int getStartAngle() { return mStartAngle; } + /** + * 扫描角度(一个圆) + * @return + */ public int getSweepAngle() { return mSweepAngle; } + /** + * 圆心坐标x + * + * @return + */ public float getCircleCenterX() { return mCircleCenterX; } + /** + * 圆心坐标y + * + * @return + */ public float getCircleCenterY() { return mCircleCenterY; } + /** + * 获取半径 + * + * @return + */ public float getRadius() { return mRadius; } + /** + * 最大进度 + * + * @return + */ public int getMax() { return mMax; } - public int getProgress(){ + /** + * 当前进度 + * + * @return + */ + public int getProgress() { return mProgress; } + /** + * 标签内容 + * + * @return + */ public String getLabelText() { return mLabelText; } + /** + * 拖动按钮的半径 + * + * @return + */ public float getThumbRadius() { return mThumbRadius; } + /** + * 拖动按钮的中心点X坐标 + * + * @return + */ public float getThumbCenterX() { return mThumbCenterX; } + /** + * 拖动按钮的中心点Y坐标 + * + * @return + */ public float getThumbCenterY() { return mThumbCenterY; } + /** + * 触摸时可偏移距离 + * + * @return + */ public float getAllowableOffsets() { return mAllowableOffsets; } + /** + * 是否启用拖拽改变进度 + * + * @return + */ public boolean isEnabledDrag() { return isEnabledDrag; } + /** + * 是否启用点击改变进度 + * + * @return + */ public boolean isEnabledSingle() { return isEnabledSingle; } + /** + * 是否默认显示百分比为标签文字 + * + * @return + */ public boolean isShowPercentText() { return isShowPercentText; } + /** + * 是否显示刻度 + * + * @return + */ public boolean isShowTick() { return isShowTick; } + /** + * 是否显示拖动按钮 + * + * @return + */ public boolean isShowThumb() { return isShowThumb; } - + /** + * 获取触摸时按钮半径放大量 + * + * @return + */ public float getThumbRadiusEnlarges() { return mThumbRadiusEnlarges; } /** * 触摸时按钮半径放大量 + * * @param thumbRadiusEnlarges */ public void setThumbRadiusEnlarges(float thumbRadiusEnlarges) { @@ -1002,6 +1120,7 @@ public void setThumbRadiusEnlarges(float thumbRadiusEnlarges) { /** * 是否默认显示百分比为标签文字 + * * @param showPercentText */ public void setShowPercentText(boolean showPercentText) { @@ -1011,6 +1130,7 @@ public void setShowPercentText(boolean showPercentText) { /** * 是否显示拖动按钮 + * * @param showThumb */ public void setShowThumb(boolean showThumb) { @@ -1020,6 +1140,7 @@ public void setShowThumb(boolean showThumb) { /** * 触摸时可偏移距离：偏移量越大，触摸精度越小 + * * @param allowableOffsets */ public void setAllowableOffsets(float allowableOffsets) { @@ -1028,6 +1149,7 @@ public void setAllowableOffsets(float allowableOffsets) { /** * 是否启用拖拽 + * * @param enabledDrag 默认为 true，为 false 时 相当于{@link android.widget.ProgressBar} */ public void setEnabledDrag(boolean enabledDrag) { @@ -1037,20 +1159,22 @@ public void setEnabledDrag(boolean enabledDrag) { /** * 设置是否启用点击改变进度 + * * @param enabledSingle */ - public void setEnabledSingle(boolean enabledSingle){ + public void setEnabledSingle(boolean enabledSingle) { isEnabledSingle = enabledSingle; } /** * 设置中间文本标签内间距 + * * @param left * @param top * @param right * @param bottom */ - public void setLabelPadding(float left,float top,float right,float bottom){ + public void setLabelPadding(float left, float top, float right, float bottom) { this.mLabelPaddingLeft = left; this.mLabelPaddingTop = top; this.mLabelPaddingRight = right; @@ -1060,6 +1184,7 @@ public void setLabelPadding(float left,float top,float right,float bottom){ /** * 设置标签文本 + * * @param labelText */ public void setLabelText(String labelText) { @@ -1070,6 +1195,7 @@ public void setLabelText(String labelText) { /** * 进度百分比 + * * @return */ public int getProgressPercent() { @@ -1079,22 +1205,28 @@ public int getProgressPercent() { /** * 如果自定义设置过{@link #setLabelText(String)} 或通过xml设置过{@code app:labelText}则 * 返回{@link #mLabelText}，反之默认返回百分比{@link #mProgressPercent} + * * @return */ - public String getText(){ - if(isShowPercentText){ + public String getText() { + if (isShowPercentText) { return mProgressPercent + "%"; } return mLabelText; } + /** + * 获取文本标签的字体颜色 + * @return + */ public int getLabelTextColor() { return mLabelTextColor; } /** * 设置文本颜色 + * * @param color */ public void setLabelTextColor(int color) { @@ -1104,29 +1236,32 @@ public void setLabelTextColor(int color) { /** * 设置文本颜色 + * * @param resId 颜色资源id */ - public void setLabelTextColorResource(int resId){ + public void setLabelTextColorResource(int resId) { int color = getResources().getColor(resId); setLabelTextColor(color); } /** * 设置文本标签字体大小 - * @param textSize 单位：sp + * + * @param textSize 单位：sp */ - public void setLabelTextSize(float textSize){ - setLabelTextSize(TypedValue.COMPLEX_UNIT_SP,textSize); + public void setLabelTextSize(float textSize) { + setLabelTextSize(TypedValue.COMPLEX_UNIT_SP, textSize); } /** * 设置文本标签字体大小 - * @param unit 单位 一般使用{@link TypedValue#COMPLEX_UNIT_SP} - * @param textSize + * + * @param unit 单位 一般使用{@link TypedValue#COMPLEX_UNIT_SP} + * @param textSize 文本标签字体大小 */ - public void setLabelTextSize(int unit,float textSize){ - float size = TypedValue.applyDimension(unit,textSize,getDisplayMetrics()); - if(mLabelTextSize!= size){ + public void setLabelTextSize(int unit, float textSize) { + float size = TypedValue.applyDimension(unit, textSize, getDisplayMetrics()); + if (mLabelTextSize != size) { this.mLabelTextSize = size; invalidate(); } @@ -1144,7 +1279,6 @@ public void setThumbDrawable(int resId) { /** * 设置拖动按钮拇指图片 - * */ public void setThumbDrawable(Drawable drawable) { setThumbBitmap(getBitmapFormDrawable(drawable)); @@ -1163,28 +1297,34 @@ public void setThumbBitmap(Bitmap bitmap) { /** * 设置进度改变监听 + * * @param onChangeListener */ - public void setOnChangeListener(OnChangeListener onChangeListener){ + public void setOnChangeListener(OnChangeListener onChangeListener) { this.mOnChangeListener = onChangeListener; } - - public interface OnChangeListener{ + /** + * 进度改变监听器 + */ + public interface OnChangeListener { /** * 跟踪触摸事件开始时回调此方法 {@link MotionEvent#ACTION_DOWN} - * @param isCanDrag + * + * @param isCanDrag 是否可拖拽 */ void onStartTrackingTouch(boolean isCanDrag); /** * 进度改变时回调此方法 - * @param progress - * @param max - * @param fromUser + * + * @param progress 当前进度 + * @param max 最大进度 + * @param fromUser 是否是用户操作的 */ void onProgressChanged(float progress, float max, boolean fromUser); + /** * 跟踪触摸事件停止时回调此方法 {@link MotionEvent#ACTION_UP} */ @@ -1196,7 +1336,10 @@ public interface OnChangeListener{ void onSingleTapUp(); } - public abstract class OnSimpleChangeListener implements OnChangeListener{ + /** + * 简单的进度改变监听器 + */ + public abstract class OnSimpleChangeListener implements OnChangeListener { @Override public void onStartTrackingTouch(boolean isCanDrag) { diff --git a/build.gradle b/build.gradle index 683b200..9095278 100644 --- a/build.gradle +++ b/build.gradle @@ -2,8 +2,8 @@ buildscript { apply from: 'versions.gradle' }// Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id 'com.android.application' version '7.2.1' apply false - id 'com.android.library' version '7.2.1' apply false + id 'com.android.application' version '7.4.2' apply false + id 'com.android.library' version '7.4.2' apply false id 'org.jetbrains.kotlin.android' version '1.7.0' apply false id 'com.vanniktech.maven.publish' version '0.22.0' apply false } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 3aec897..99a7111 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,8 +18,8 @@ android.useAndroidX=true # Automatically convert third-party libraries to use AndroidX android.enableJetifier=true -VERSION_NAME=1.1.0 -VERSION_CODE=5 +VERSION_NAME=1.1.1 +VERSION_CODE=6 GROUP=com.github.jenly1314 POM_DESCRIPTION=ArcSeekBar for Android diff --git a/settings.gradle b/settings.gradle index 25f87f4..16f507d 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,9 +1,6 @@ pluginManagement { repositories { gradlePluginPortal() - maven { - url "https://maven.aliyun.com/repository/public" - } google() mavenCentral() } @@ -11,9 +8,6 @@ pluginManagement { dependencyResolutionManagement { repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) repositories { - maven { - url "https://maven.aliyun.com/repository/public" - } google() mavenCentral() } diff --git a/test.md b/test.md index a3fa4f8..8a8f4b6 100644 --- a/test.md +++ b/test.md @@ -1,5 +1,5 @@ -## 待发布版本 +## ~待发布版本~（已发布v1.1.1） 待发布版本暂使用 **Jit Pack** 仓库；待收集的一些问题测试稳定后，再统一发布正式版本至 **Maven Central** 仓库。 diff --git a/versions.gradle b/versions.gradle index c18eb97..53efef7 100644 --- a/versions.gradle +++ b/versions.gradle @@ -1,7 +1,7 @@ //App def app_version = [:] -app_version.versionCode = 5 -app_version.versionName = "1.1.0" +app_version.versionCode = 6 +app_version.versionName = "1.1.1" ext.app_version = app_version //build version