diff --git a/CHANGELOG.md b/CHANGELOG.md index 818a7decbed63f010040a9d87528412c391b73bf..f7e24c77aff2602b0c5edab77c71364f604ebb34 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +## 1.0.2 +ohos 1.0.2版本 +* 正式版本 +* 圆环尾部覆盖功能优化 + ## 1.0.1 ohos 1.0.1版本 * 正式版本 diff --git a/README.md b/README.md index 841b28db724a748ea016a1e311161471dee8c526..0328a3be06613a100f9f852c09aa217d045a3e1e 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ allprojects { 2.在entry模块的build.gradle文件中, ``` dependencies { - implementation('com.gitee.chinasoft_ohos:MagicProgressWidget:1.0.1') + implementation('com.gitee.chinasoft_ohos:MagicProgressWidget:1.0.2') ...... } ``` @@ -124,7 +124,7 @@ CloudTest代码测试无异常 ## 版本迭代 -1.0.1 +1.0.2 ## 版权和许可信息 ``` diff --git a/entry/src/main/config.json b/entry/src/main/config.json index c8b55cf1b205413ce18d74661ccfe9712650199c..53e10c0a8247255e1f17c765e821daed432fab08 100644 --- a/entry/src/main/config.json +++ b/entry/src/main/config.json @@ -47,7 +47,7 @@ ] } ], - "orientation": "unspecified", + "orientation": "portrait", "name": "com.liulishuo.magicprogress.demo.ability.MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", diff --git a/library/src/main/java/com/liulishuo/magicprogresswidget/ConstantUtil.java b/library/src/main/java/com/liulishuo/magicprogresswidget/ConstantUtil.java index 595385a4234a101ea41825d940bc35ad2c02cc78..fd0400e6b9a93ca9cf1633f5d6ec507b3e468894 100644 --- a/library/src/main/java/com/liulishuo/magicprogresswidget/ConstantUtil.java +++ b/library/src/main/java/com/liulishuo/magicprogresswidget/ConstantUtil.java @@ -76,4 +76,15 @@ public abstract class ConstantUtil { * END_B */ public static final int END_B = 0xFF; + + /** + * 随机最大值 + */ + public static final float CIR_MAX = 100f; + + /** + * CIRCLE_97 + */ + public static final int CIRCLE_97 = 97; + } diff --git a/library/src/main/java/com/liulishuo/magicprogresswidget/MagicProgressCircle.java b/library/src/main/java/com/liulishuo/magicprogresswidget/MagicProgressCircle.java index 5f96271ae19db3ff8ff0cff3abcc791beb66e07a..5d511023c962f1e25baab83b301d6a7f6145211f 100644 --- a/library/src/main/java/com/liulishuo/magicprogresswidget/MagicProgressCircle.java +++ b/library/src/main/java/com/liulishuo/magicprogresswidget/MagicProgressCircle.java @@ -183,12 +183,20 @@ public class MagicProgressCircle extends Component implements Imag, Component.Dr @Override public void setPercent(float percent) { + // 这里动画效果在值位于98-99时处于覆盖情况,做特殊处理 + if (percent > ConstantUtil.CIRCLE_97 / ConstantUtil.CIR_MAX && percent < 1) { + percent = ConstantUtil.CIRCLE_97 / ConstantUtil.CIR_MAX; + } float pc = pcInt(percent); anim(0, pc, (long) (pc * maxTime)); } @Override public void setPercent(float percent, long durationMillis) { + // 这里动画效果在值位于98-99时处于覆盖情况,做特殊处理 + if (percent > ConstantUtil.CIRCLE_97 / ConstantUtil.CIR_MAX && percent < 1) { + percent = ConstantUtil.CIRCLE_97 / ConstantUtil.CIR_MAX; + } float pc = pcInt(percent); anim(0, pc, durationMillis); } @@ -386,7 +394,6 @@ public class MagicProgressCircle extends Component implements Imag, Component.Dr setDrawPc(canvas, drawPc, cx, cy); } canvas.restoreToCount(restore); - postLayout(); } /** @@ -394,8 +401,8 @@ public class MagicProgressCircle extends Component implements Imag, Component.Dr * * @param canvas 设置cvs * @param drawPc 填入值 - * @param cx 旋转x值 - * @param cy 旋转y值 + * @param cx 旋转x值 + * @param cy 旋转y值 */ private void setDrawPc(Canvas canvas, float drawPc, int cx, int cy) { if (drawPc < 1 || (isFootOverHead && drawPc == 1)) {