From 388462ff72ff86eb76b6a89b2a649aafebd6bf7f Mon Sep 17 00:00:00 2001
From: HYL123698745 <1252347619@qq.com>
Date: Thu, 29 Jul 2021 10:23:18 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E5=86=85=E5=AE=B9?=
 =?UTF-8?q?=E3=80=91=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../demos/slice/AnimatedXYPlotAbilitySlice.java      |  5 ++---
 .../demos/slice/SimplePieChartAbilitySlice.java      |  4 +---
 .../demos/slice/XYPlotWithBgImgAbilitySlice.java     | 12 +-----------
 3 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/entry/src/main/java/com/ohosplot/demos/slice/AnimatedXYPlotAbilitySlice.java b/entry/src/main/java/com/ohosplot/demos/slice/AnimatedXYPlotAbilitySlice.java
index 160cac4..9ced42d 100644
--- a/entry/src/main/java/com/ohosplot/demos/slice/AnimatedXYPlotAbilitySlice.java
+++ b/entry/src/main/java/com/ohosplot/demos/slice/AnimatedXYPlotAbilitySlice.java
@@ -20,7 +20,6 @@ import com.ohosplot.base.NonNull;
 import com.ohosplot.bean.PointCfgBean;
 import com.ohosplot.demos.ResourceTable;
 import com.ohosplot.xy.*;
-
 import ohos.aafwk.ability.AbilitySlice;
 import ohos.aafwk.content.Intent;
 import ohos.agp.animation.Animator;
@@ -149,13 +148,13 @@ public class AnimatedXYPlotAbilitySlice extends AbilitySlice {
             public void onResume(Animator animator) {
             }
         });
+        animator.setDuration(1500);
+        animator.start();
     }
 
     @Override
     public void onActive() {
         super.onActive();
-        animator.setDuration(1500);
-        animator.start();
     }
 
     @Override
diff --git a/entry/src/main/java/com/ohosplot/demos/slice/SimplePieChartAbilitySlice.java b/entry/src/main/java/com/ohosplot/demos/slice/SimplePieChartAbilitySlice.java
index e31609d..46a4910 100644
--- a/entry/src/main/java/com/ohosplot/demos/slice/SimplePieChartAbilitySlice.java
+++ b/entry/src/main/java/com/ohosplot/demos/slice/SimplePieChartAbilitySlice.java
@@ -17,7 +17,6 @@
 package com.ohosplot.demos.slice;
 
 import com.ohosplot.demos.ResourceTable;
-
 import com.ohosplot.pie.PieChart;
 import com.ohosplot.pie.PieRenderer;
 import com.ohosplot.pie.Segment;
@@ -26,11 +25,9 @@ import com.ohosplot.util.PixelUtils;
 import ohos.aafwk.ability.AbilitySlice;
 import ohos.aafwk.content.Intent;
 import ohos.agp.animation.AnimatorValue;
-import ohos.agp.colors.RgbColor;
 import ohos.agp.components.Component;
 import ohos.agp.components.Slider;
 import ohos.agp.components.Text;
-import ohos.agp.components.element.ShapeElement;
 import ohos.agp.render.BlurDrawLooper;
 import ohos.agp.render.MaskFilter;
 import ohos.agp.utils.Color;
@@ -202,6 +199,7 @@ public class SimplePieChartAbilitySlice extends AbilitySlice {
     @Override
     public void onActive() {
         super.onActive();
+        setupIntroAnimation();
     }
 
     @Override
diff --git a/entry/src/main/java/com/ohosplot/demos/slice/XYPlotWithBgImgAbilitySlice.java b/entry/src/main/java/com/ohosplot/demos/slice/XYPlotWithBgImgAbilitySlice.java
index a7f5c84..826c3e6 100644
--- a/entry/src/main/java/com/ohosplot/demos/slice/XYPlotWithBgImgAbilitySlice.java
+++ b/entry/src/main/java/com/ohosplot/demos/slice/XYPlotWithBgImgAbilitySlice.java
@@ -1,9 +1,6 @@
 package com.ohosplot.demos.slice;
 
 import com.ohosplot.demos.ResourceTable;
-import com.ohosplot.ui.Anchor;
-import com.ohosplot.ui.HorizontalPositioning;
-import com.ohosplot.ui.VerticalPositioning;
 import com.ohosplot.util.PixelUtils;
 import com.ohosplot.xy.*;
 import ohos.aafwk.ability.AbilitySlice;
@@ -15,21 +12,15 @@ import ohos.agp.render.*;
 import ohos.agp.utils.Color;
 import ohos.agp.utils.Matrix;
 import ohos.agp.utils.RectFloat;
-import ohos.app.Context;
 import ohos.global.resource.RawFileEntry;
 import ohos.global.resource.Resource;
-import ohos.hiviewdfx.HiLog;
 import ohos.media.image.ImageSource;
 import ohos.media.image.PixelMap;
 import ohos.media.image.common.Size;
 
 import java.io.IOException;
-import java.security.SecureRandom;
 import java.text.DecimalFormat;
 import java.util.Arrays;
-import java.util.Optional;
-
-import static com.ohosplot.demos.check.Utils.getPathById;
 
 /**
  * XYPlotWithBgImgAbilitySlice
@@ -118,9 +109,8 @@ public class XYPlotWithBgImgAbilitySlice extends AbilitySlice {
         xVals[0] = 0;
         yVals[0] = 0;
 
-        SecureRandom random = new SecureRandom();
         for (int i = 1; i < SERIES_LEN; i += 1) {
-            xVals[i] = xVals[i - 1] + (random.nextInt() * i);
+            xVals[i] = xVals[i - 1] + (int) (Math.random() * i);
             yVals[i] = (int) (Math.random() * 140);
         }
 
-- 
Gitee