@@ -102,6 +102,11 @@ public class CircleProgressView extends View {
102102 */
103103 private int mBlockAngle = 1 ;
104104
105+ /**
106+ * 刻度偏移的角度大小
107+ */
108+ private float mTickOffsetAngle = 0 ;
109+
105110 /**
106111 * 总刻度数
107112 */
@@ -243,6 +248,8 @@ private void init(Context context,AttributeSet attrs){
243248 mTickSplitAngle = a .getInt (attr ,mTickSplitAngle );
244249 }else if (attr == R .styleable .CircleProgressView_cpvBlockAngle ){
245250 mBlockAngle = a .getInt (attr ,mBlockAngle );
251+ }else if (attr == R .styleable .CircleProgressView_cpvTickOffsetAngle ){
252+ mTickOffsetAngle = a .getInt (attr ,0 );
246253 }else if (attr == R .styleable .CircleProgressView_cpvTurn ){
247254 isTurn = a .getBoolean (attr ,isTurn );
248255 }else if (attr == R .styleable .CircleProgressView_cpvCapRound ){
@@ -352,7 +359,7 @@ private void drawArc(Canvas canvas){
352359 mPaint .setShader (null );
353360 mPaint .setColor (mNormalColor );
354361 //绘制外边框刻度
355- canvas .drawArc (rectF , i * (mBlockAngle + mTickSplitAngle ) + mStartAngle , mBlockAngle , false , mPaint );
362+ canvas .drawArc (rectF , i * (mBlockAngle + mTickSplitAngle ) + mStartAngle + mTickOffsetAngle , mBlockAngle , false , mPaint );
356363 }
357364
358365 for (int i = currentBlockIndex ; i < currentBlockIndex + currentBlockIndex ; i ++) {
@@ -363,7 +370,7 @@ private void drawArc(Canvas canvas){
363370 mPaint .setColor (mProgressColor );
364371 }
365372 //绘制外边框刻度
366- canvas .drawArc (rectF , i * (mBlockAngle + mTickSplitAngle ) + mStartAngle , mBlockAngle , false , mPaint );
373+ canvas .drawArc (rectF , i * (mBlockAngle + mTickSplitAngle ) + mStartAngle + mTickOffsetAngle , mBlockAngle , false , mPaint );
367374 }
368375 }else {
369376 for (int i = 0 ; i < mTotalTickCount ; i ++) {
@@ -375,13 +382,13 @@ private void drawArc(Canvas canvas){
375382 mPaint .setColor (mProgressColor );
376383 }
377384 //绘制外边框刻度
378- canvas .drawArc (rectF , i * (mBlockAngle + mTickSplitAngle ) + mStartAngle , mBlockAngle , false , mPaint );
385+ canvas .drawArc (rectF , i * (mBlockAngle + mTickSplitAngle ) + mStartAngle + mTickOffsetAngle , mBlockAngle , false , mPaint );
379386 } else if (mNormalColor != 0 ){
380387 //未选中的刻度
381388 mPaint .setShader (null );
382389 mPaint .setColor (mNormalColor );
383390 //绘制外边框刻度
384- canvas .drawArc (rectF , i * (mBlockAngle + mTickSplitAngle ) + mStartAngle , mBlockAngle , false , mPaint );
391+ canvas .drawArc (rectF , i * (mBlockAngle + mTickSplitAngle ) + mStartAngle + mTickOffsetAngle , mBlockAngle , false , mPaint );
385392 }
386393
387394 }
@@ -440,9 +447,9 @@ private void drawText(Canvas canvas){
440447 mTextPaint .setTextAlign (Paint .Align .CENTER );
441448
442449 Paint .FontMetrics fontMetrics = mTextPaint .getFontMetrics ();
443- // 计算文字高度
450+ // 计算文字高度
444451 float fontHeight = fontMetrics .bottom - fontMetrics .top ;
445- // 计算文字baseline
452+ // 计算文字baseline
446453 float textBaseX = getWidth () / 2 + mLabelPaddingLeft - mLabelPaddingRight ;
447454 float textBaseY = getHeight () - (getHeight () - fontHeight ) / 2 - fontMetrics .bottom + mLabelPaddingTop - mLabelPaddingBottom ;
448455 if (isShowPercentText ){//是否显示百分比
@@ -660,6 +667,36 @@ public String getLabelText() {
660667 return mLabelText ;
661668 }
662669
670+ public boolean isShowLabel () {
671+ return isShowLabel ;
672+ }
673+
674+ public boolean isShowPercentText () {
675+ return isShowPercentText ;
676+ }
677+
678+ public boolean isShowTick () {
679+ return isShowTick ;
680+ }
681+
682+ public boolean isTurn () {
683+ return isTurn ;
684+ }
685+
686+ public boolean isCapRound () {
687+ return isCapRound ;
688+ }
689+
690+ public void setShowLabel (boolean showLabel ) {
691+ isShowLabel = showLabel ;
692+ invalidate ();
693+ }
694+
695+ public void setShowPercentText (boolean showPercentText ) {
696+ isShowPercentText = showPercentText ;
697+ invalidate ();
698+ }
699+
663700 public void setLabelPaddingLeft (float labelPaddingLeft ) {
664701 this .mLabelPaddingLeft = labelPaddingLeft ;
665702 invalidate ();
0 commit comments