From aac6213895b9ab976365a408970cbe2b0b479972 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=B8=86?= <446962864@qq.com>
Date: Sat, 31 Jul 2021 07:07:09 +0000
Subject: [PATCH 1/3] =?UTF-8?q?=E9=87=8D=E5=91=BD=E5=90=8D=20README.OPENRE?=
 =?UTF-8?q?SOURCE=20=E4=B8=BA=20README.OPENSOURCE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.OPENRESOURCE => README.OPENSOURCE | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename README.OPENRESOURCE => README.OPENSOURCE (100%)

diff --git a/README.OPENRESOURCE b/README.OPENSOURCE
similarity index 100%
rename from README.OPENRESOURCE
rename to README.OPENSOURCE
-- 
Gitee


From 1062ec9f60d08ea324152418f0b10c6048166164 Mon Sep 17 00:00:00 2001
From: ZYF949 <446962864@qq.com>
Date: Sat, 31 Jul 2021 15:11:40 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=B8=8A=E4=BC=A0gitee?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                                    | 4 ++--
 build.gradle                                                 | 3 +--
 entry/src/main/java/com/scwang/wave/app/FractionAbility.java | 2 +-
 entry/src/main/java/com/scwang/wave/app/MainAbility.java     | 2 +-
 entry/src/main/resources/base/layout/ability_fraction.xml    | 2 +-
 library/.gitignore                                           | 1 -
 library/build.gradle                                         | 2 +-
 library/src/main/java/com/scwang/wave/ColorSeekBar.java      | 1 -
 library/src/main/java/com/scwang/wave/MultiWaveHeader.java   | 2 +-
 library/src/main/java/com/scwang/wave/Util.java              | 2 +-
 10 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index bf1dfb5..28dd766 100644
--- a/README.md
+++ b/README.md
@@ -6,13 +6,13 @@
 * 所属系列：openharmony
 * 功能：MultiWaveHeader是一个可以高度定制每个波形的ohos水波控件
 * 项目移植状态：完成
-* 调用差异：无
+* 调用差异：Angle着色器旋转与原库有差异
 * 开发版本：sdk6，DevEco Studio 2.2 Beta1
 * 基线版本：Relesase 1.0.0
 
 #### 效果演示
 
-![](img/MultiWaveHeader.gif)
+![效果演示](https://images.gitee.com/uploads/images/2021/0728/163240_ac9d27c6_7918188.gif "weakhandler.gif")
 
 #### 安装教程
 
diff --git a/build.gradle b/build.gradle
index 0bee467..bfd5079 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ ohos {
         compatibleSdkVersion 5
     }
 }
-
+	
 buildscript {
     repositories {
         maven {
@@ -33,4 +33,3 @@ allprojects {
         }
     }
 }
-
diff --git a/entry/src/main/java/com/scwang/wave/app/FractionAbility.java b/entry/src/main/java/com/scwang/wave/app/FractionAbility.java
index 954cfef..f111517 100644
--- a/entry/src/main/java/com/scwang/wave/app/FractionAbility.java
+++ b/entry/src/main/java/com/scwang/wave/app/FractionAbility.java
@@ -175,4 +175,4 @@ public class FractionAbility extends Ability implements DiscreteSeekBar.OnProgre
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/entry/src/main/java/com/scwang/wave/app/MainAbility.java b/entry/src/main/java/com/scwang/wave/app/MainAbility.java
index 5bc0641..dfa897b 100644
--- a/entry/src/main/java/com/scwang/wave/app/MainAbility.java
+++ b/entry/src/main/java/com/scwang/wave/app/MainAbility.java
@@ -37,4 +37,4 @@ public class MainAbility extends Ability {
         intent.setOperation(operation);
         startAbility(intent);
     }
-}
+}
\ No newline at end of file
diff --git a/entry/src/main/resources/base/layout/ability_fraction.xml b/entry/src/main/resources/base/layout/ability_fraction.xml
index bfd0fdd..0492f61 100644
--- a/entry/src/main/resources/base/layout/ability_fraction.xml
+++ b/entry/src/main/resources/base/layout/ability_fraction.xml
@@ -84,7 +84,7 @@
         </DirectionalLayout>
 
         <RadioContainer
-            ohos:top_margin="5vp"
+            ohos:top_margin="10vp"
             ohos:id="$+id:radioGroup"
             ohos:height="match_content"
             ohos:width="match_parent"
diff --git a/library/.gitignore b/library/.gitignore
index 93c92c9..796b96d 100644
--- a/library/.gitignore
+++ b/library/.gitignore
@@ -1,2 +1 @@
 /build
-/*.iml
diff --git a/library/build.gradle b/library/build.gradle
index b295ded..41ccbc4 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -13,7 +13,7 @@ ohos {
             }
         }
     }
-
+    
 }
 
 dependencies {
diff --git a/library/src/main/java/com/scwang/wave/ColorSeekBar.java b/library/src/main/java/com/scwang/wave/ColorSeekBar.java
index 5e84761..5efe10f 100644
--- a/library/src/main/java/com/scwang/wave/ColorSeekBar.java
+++ b/library/src/main/java/com/scwang/wave/ColorSeekBar.java
@@ -119,7 +119,6 @@ public class ColorSeekBar extends Component implements Component.TouchEventListe
         MmiPoint point = touchEvent.getPointerPosition(touchEvent.getIndex());
 
         // 1080/100=10.8
-        int width = getWidth();
         float eachWidth = (getWidth() - rightPadding - leftPadding) / 100;
         switch (touchEvent.getAction()) {
             case TouchEvent.PRIMARY_POINT_DOWN:
diff --git a/library/src/main/java/com/scwang/wave/MultiWaveHeader.java b/library/src/main/java/com/scwang/wave/MultiWaveHeader.java
index 51d5a1f..3a46cbb 100644
--- a/library/src/main/java/com/scwang/wave/MultiWaveHeader.java
+++ b/library/src/main/java/com/scwang/wave/MultiWaveHeader.java
@@ -615,4 +615,4 @@ public class MultiWaveHeader extends ComponentContainer implements ComponentCont
             throw new IllegalArgumentException("alpha must be between 0 and 255.");
         }
     }
-}
+}
\ No newline at end of file
diff --git a/library/src/main/java/com/scwang/wave/Util.java b/library/src/main/java/com/scwang/wave/Util.java
index 489f9c4..d8b5e51 100644
--- a/library/src/main/java/com/scwang/wave/Util.java
+++ b/library/src/main/java/com/scwang/wave/Util.java
@@ -40,4 +40,4 @@ public class Util {
     public static int vp2px(float dpVal, Context context) {
         return AttrHelper.vp2px(dpVal, context);
     }
-}
+}
\ No newline at end of file
-- 
Gitee


From b9bc792453891af0520033e6c8189b87454729e8 Mon Sep 17 00:00:00 2001
From: ZYF949 <446962864@qq.com>
Date: Mon, 2 Aug 2021 17:11:37 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=B8=8A=E4=BC=A0gitee?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md | 3 +--
 README.md    | 6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8fa3081..5e5b93b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,5 +4,4 @@ ohos第一个版本
 
 * 实现了原库基本功能
 * 由于着色器差异，Angle值与原库有差异
-* 在部分真机中，首页滑动seekbar在最右侧上方角标显示不全
-* 与原库调用无差异
\ No newline at end of file
+* 在部分真机中，首页滑动seekbar在最右侧上方角标显示不全
\ No newline at end of file
diff --git a/README.md b/README.md
index 28dd766..c211150 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 * 项目名称：MultiWaveHeader
 * 所属系列：openharmony
 * 功能：MultiWaveHeader是一个可以高度定制每个波形的ohos水波控件
-* 项目移植状态：完成
+* 项目移植状态：主功能完成
 * 调用差异：Angle着色器旋转与原库有差异
 * 开发版本：sdk6，DevEco Studio 2.2 Beta1
 * 基线版本：Relesase 1.0.0
@@ -37,11 +37,11 @@ dependencies {
  }
 ```
 
-在sdk6，DevEco Studio2.2 Beta1下项目可直接运行 如无法运行，删除项目.gradle,.idea,build,gradle,build.gradle文件， 并依据自己的版本创建新项目，将新项目的对应文件复制到根目录下
+在sdk6，DevEco Studio 2.2 Beta1下项目可直接运行 如无法运行，删除项目.gradle,.idea,build,gradle,build.gradle文件， 并依据自己的版本创建新项目，将新项目的对应文件复制到根目录下
 
 #### 使用说明
 
-在布局中引入对应的自定义控件用于绘制波纹
+在布局中引入对应的自定义布局用于绘制波纹
 
 ```txt
 <com.scwang.wave.MultiWaveHeader
-- 
Gitee