From 83e0ec1bd047083fd5ca7b543dda41552c2484a7 Mon Sep 17 00:00:00 2001
From: JiangJun <2680104782@qq.com>
Date: Sat, 9 Oct 2021 15:47:12 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=E3=80=91=EF=BC=9A=E7=AB=96=E5=B1=8F=E9=94=81=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 entry/src/main/config.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/entry/src/main/config.json b/entry/src/main/config.json
index c8b55cf..53e10c0 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",
-- 
Gitee


From fd6c683e37eb6e5c8c1d0c7f9d89af16441f4c8e Mon Sep 17 00:00:00 2001
From: JiangJun <2680104782@qq.com>
Date: Sat, 9 Oct 2021 16:39:40 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=E3=80=91=EF=BC=9A=E5=9C=86=E7=8E=AF=E8=BF=9B=E5=BA=A6?=
 =?UTF-8?q?=E5=B0=BE=E9=83=A8=E8=A6=86=E7=9B=96=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                        |  5 +++++
 README.md                                           |  4 ++--
 .../liulishuo/magicprogresswidget/ConstantUtil.java | 11 +++++++++++
 .../magicprogresswidget/MagicProgressCircle.java    | 13 ++++++++++---
 4 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 818a7de..f7e24c7 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 841b28d..0328a3b 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/library/src/main/java/com/liulishuo/magicprogresswidget/ConstantUtil.java b/library/src/main/java/com/liulishuo/magicprogresswidget/ConstantUtil.java
index 595385a..fd0400e 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 5f96271..5d51102 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)) {
-- 
Gitee