From 375ea28c712fcd1c430dce6188790e3114f36bc3 Mon Sep 17 00:00:00 2001 From: ZYF949 <446962864@qq.com> Date: Mon, 5 Jul 2021 10:26:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0gitee?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 14 ------------ CHANGELOG.md | 4 ++-- README.OPENRESOURCE.md | 2 +- README.md | 4 ++-- .../visualizer/CircleLineVisualizer.java | 5 ++--- .../visualizer/HiFiVisualizer.java | 7 +++--- .../utils/BezierSplineTest.java | 22 ------------------- build.gradle | 4 ++-- .../resources/base/layout/activity_hi_fi.xml | 2 +- 9 files changed, 13 insertions(+), 51 deletions(-) delete mode 100644 .gitignore delete mode 100644 audiovisualizer/src/ohosTest/java/com/gauravk/audiovisualizer/utils/BezierSplineTest.java diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 603b140..0000000 --- a/.gitignore +++ /dev/null @@ -1,14 +0,0 @@ -*.iml -.gradle -/local.properties -/.idea/caches -/.idea/libraries -/.idea/modules.xml -/.idea/workspace.xml -/.idea/navEditor.xml -/.idea/assetWizardSettings.xml -.DS_Store -/build -/captures -.externalNativeBuild -.cxx diff --git a/CHANGELOG.md b/CHANGELOG.md index a191011..66f9686 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,6 @@ ohos第一个版本 -* 实现了原库大部分api -* 因为缺少对应api，Stream visualizer模式下，播放音乐控件没有联动效果 +* 实现了原库基本功能 +* 因为缺少对应api，Stream visualizer模式下，播放音乐控件没有背景联动效果 * Circleine visualizer模式下，黑色边角设置对应颜色无效果 \ No newline at end of file diff --git a/README.OPENRESOURCE.md b/README.OPENRESOURCE.md index b878057..31a4954 100644 --- a/README.OPENRESOURCE.md +++ b/README.OPENRESOURCE.md @@ -5,7 +5,7 @@ "Name": "audio-visualizer-android", "License": "Apache License", "License File": "LICENSE", - "Version Number": "v0.9.1", + "Version Number": "0.9.1", "Upstream URL": "https://github.com/gauravk95/audio-visualizer-android", "Description": "A light-weight and easy-to-use Audio Visualizer for Android using the Android Canvas." } diff --git a/README.md b/README.md index 1965b45..8630e66 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ * 项目移植状态：当前仅支持播放wav格式音频，若想播放mp3音频，背景无法联动 * 调用差异：无 * 开发版本：sdk5，DevEco Studio 2.1 Release -* 基线版本：Relesase版本号v0.9.1 +* 基线版本：Relesase版本号0.9.1 #### 效果演示 @@ -37,7 +37,7 @@ dependencies { } ``` -在sdk5，DevEco Studio 2.1 Release下项目可直接运行 如无法运行，删除项目.gradle,.idea,build,gradle,build.gradle文件， 并依据自己的版本创建新项目，将新项目的对应文件复制到根目录下 +在sdk5，DevEco Studio2.1 beta4下项目可直接运行 如无法运行，删除项目.gradle,.idea,build,gradle,build.gradle文件， 并依据自己的版本创建新项目，将新项目的对应文件复制到根目录下 #### 使用说明 diff --git a/audiovisualizer/src/main/java/com/gauravk/audiovisualizer/visualizer/CircleLineVisualizer.java b/audiovisualizer/src/main/java/com/gauravk/audiovisualizer/visualizer/CircleLineVisualizer.java index 8d0c5a2..a125947 100644 --- a/audiovisualizer/src/main/java/com/gauravk/audiovisualizer/visualizer/CircleLineVisualizer.java +++ b/audiovisualizer/src/main/java/com/gauravk/audiovisualizer/visualizer/CircleLineVisualizer.java @@ -155,9 +155,8 @@ public class CircleLineVisualizer extends BaseVisualizer implements Component.Dr /** * 大小发生变化调用 - * - * @param w 0 - * @param h 0 + * @param w 0 + * @param h 0 * @param oldw 1176 * @param oldh 1800 * @return boolean diff --git a/audiovisualizer/src/main/java/com/gauravk/audiovisualizer/visualizer/HiFiVisualizer.java b/audiovisualizer/src/main/java/com/gauravk/audiovisualizer/visualizer/HiFiVisualizer.java index 1a872a5..f599f47 100644 --- a/audiovisualizer/src/main/java/com/gauravk/audiovisualizer/visualizer/HiFiVisualizer.java +++ b/audiovisualizer/src/main/java/com/gauravk/audiovisualizer/visualizer/HiFiVisualizer.java @@ -64,7 +64,8 @@ public class HiFiVisualizer extends BaseVisualizer implements Component.DrawTask mRadius = -1; mPath = new Path(); mPath1 = new Path(); - mPaint.setStyle(Paint.Style.STROKE_STYLE); + + mPaint = new Paint(); mPaint.setAntiAlias(true); mPaint.setStrokeWidth(1.0f); mPoints = (int) (BAR_MAX_POINTS * mDensity); @@ -73,13 +74,11 @@ public class HiFiVisualizer extends BaseVisualizer implements Component.DrawTask } mHeights = new int[mPoints]; - mPaint = new Paint(); mPaint.setColor(new Color(Color.getIntColor("#FCB8A3"))); mPaint.setStrokeWidth(mStrokeWidth); if (mPaintStyle == PaintStyle.FILL) { mPaint.setStyle(Paint.Style.FILL_STYLE); - } - else { + } else { mPaint.setStyle(Paint.Style.STROKE_STYLE); } } diff --git a/audiovisualizer/src/ohosTest/java/com/gauravk/audiovisualizer/utils/BezierSplineTest.java b/audiovisualizer/src/ohosTest/java/com/gauravk/audiovisualizer/utils/BezierSplineTest.java deleted file mode 100644 index f44b340..0000000 --- a/audiovisualizer/src/ohosTest/java/com/gauravk/audiovisualizer/utils/BezierSplineTest.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.gauravk.audiovisualizer.utils; - -import ohos.agp.utils.Point; -import org.junit.Test; - -public class BezierSplineTest { - BezierSpline bezierSpline = new BezierSpline(12); - @Test - public void updateCurveControlPoints() { - bezierSpline.updateCurveControlPoints(new Point[]{}); - } - - @Test - public void getFirstControlPoints() { - bezierSpline.getFirstControlPoints(); - } - - @Test - public void getSecondControlPoints() { - bezierSpline.getSecondControlPoints(); - } -} \ No newline at end of file diff --git a/build.gradle b/build.gradle index abbbc5f..dda524f 100644 --- a/build.gradle +++ b/build.gradle @@ -22,8 +22,8 @@ buildscript { jcenter() } dependencies { - classpath 'com.huawei.ohos:hap:2.4.4.2' - classpath 'com.huawei.ohos:decctest:1.0.0.6' + classpath 'com.huawei.ohos:hap:2.4.5.0' + classpath 'com.huawei.ohos:decctest:1.2.4.1' } } diff --git a/entry/src/main/resources/base/layout/activity_hi_fi.xml b/entry/src/main/resources/base/layout/activity_hi_fi.xml index 05decb3..622e55c 100644 --- a/entry/src/main/resources/base/layout/activity_hi_fi.xml +++ b/entry/src/main/resources/base/layout/activity_hi_fi.xml @@ -23,6 +23,6 @@ app:avColor="#FF5722" app:avSpeed="medium" app:avDensity="0.25" - app:avType="" + app:avType="outline" app:avWidth="0vp"/> \ No newline at end of file -- Gitee