From 749c9d104ab55bc947ad079c7bb99ddfef7a29d8 Mon Sep 17 00:00:00 2001
From: tanjunshui <tjs@20210106>
Date: Tue, 7 Sep 2021 19:58:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B2=A1=E6=9C=89=E9=99=90?=
 =?UTF-8?q?=E5=88=B6Shape,=E5=9C=A8xml=E4=B8=AD=E8=AE=BE=E7=BD=AEohos:mwhS?=
 =?UTF-8?q?hape=3D"3"=E5=AF=BC=E8=87=B4=E9=A1=B9=E7=9B=AE=E9=97=AA?=
 =?UTF-8?q?=E9=80=80=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/scwang/wave/app/slice/MainAbilitySlice.java  | 3 ++-
 app/src/main/resources/base/layout/ability_main.xml            | 2 +-
 library/src/main/java/com/scwang/wave/ShapeType.java           | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/scwang/wave/app/slice/MainAbilitySlice.java b/app/src/main/java/com/scwang/wave/app/slice/MainAbilitySlice.java
index 57fd78e..dfc9dd7 100644
--- a/app/src/main/java/com/scwang/wave/app/slice/MainAbilitySlice.java
+++ b/app/src/main/java/com/scwang/wave/app/slice/MainAbilitySlice.java
@@ -122,7 +122,7 @@ public class MainAbilitySlice extends AbilitySlice implements Slider.ValueChange
         radioContainer.setMarkChangedListener(this::onCheckedChanged);
         cbIsRunning.setChecked(multiWaveHeader.isRunning());
         cbUpSideDown.setChecked(multiWaveHeader.getScaleY() == -1f);
-        radioContainer.mark(0);
+
         sliderNumber.setProgressValue(5);
         sliderAngle.setProgressValue(multiWaveHeader.getGradientAngle());
         sliderVelocity.setProgressValue((int) (multiWaveHeader.getVelocity() * 10));
@@ -132,6 +132,7 @@ public class MainAbilitySlice extends AbilitySlice implements Slider.ValueChange
 
         sliderStartColor.setProgressColors(new int[]{Color.GREEN.getValue(),Color.CYAN.getValue(),Color.YELLOW.getValue(),Color.RED.getValue(),Color.MAGENTA.getValue(),Color.BLUE.getValue()});
         sliderCloseColor.setProgressColors(new int[]{Color.GREEN.getValue(),Color.CYAN.getValue(),Color.YELLOW.getValue(),Color.RED.getValue(),Color.MAGENTA.getValue(),Color.BLUE.getValue()});
+        radioContainer.mark(multiWaveHeader.getShape().ordinal());
     }
 
     /**
diff --git a/app/src/main/resources/base/layout/ability_main.xml b/app/src/main/resources/base/layout/ability_main.xml
index d4a186c..b8b683b 100644
--- a/app/src/main/resources/base/layout/ability_main.xml
+++ b/app/src/main/resources/base/layout/ability_main.xml
@@ -80,7 +80,7 @@
                         ohos:text_size="14fp"/>
 
                 <RadioButton
-                        ohos:id="$+id:radio_button_1"
+                        ohos:id="$+id:radio_button_3"
                         ohos:height="match_content"
                         ohos:width="match_content"
                         ohos:margin="5vp"
diff --git a/library/src/main/java/com/scwang/wave/ShapeType.java b/library/src/main/java/com/scwang/wave/ShapeType.java
index 3a71bc2..cb85ed0 100644
--- a/library/src/main/java/com/scwang/wave/ShapeType.java
+++ b/library/src/main/java/com/scwang/wave/ShapeType.java
@@ -24,7 +24,7 @@ public enum ShapeType {
      * @return ShapeType
      */
     public static ShapeType getShapeType(int index) {
-        if (index > ShapeType.values().length) {
+        if (index >= ShapeType.values().length) {
             return ShapeType.values()[0];
         }
         return ShapeType.values()[index];
-- 
Gitee