From 0abdc78f9a3dcbbabc5e83225e2b9c9786afb18a Mon Sep 17 00:00:00 2001 From: qiuguojun Date: Wed, 7 Jul 2021 17:46:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4findbugs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 6 +++--- audiovisualizer/build.gradle | 2 +- .../com/chibde/visualizer/LineVisualizer.java | 2 +- build.gradle | 7 +++---- entry/build.gradle | 2 +- entry/src/main/config.json | 19 +++++++++++++------ .../audiovisualizer/util/PlaySoundUtil.java | 17 ++++++++++++++++- 7 files changed, 38 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index ab55dbf..e764e54 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ - 功能：实现音频可视化 - 项目移植状态：主功能完成 - 调用差异：无 -- 开发版本：sdk5，DevEco Studio2.1 Release +- 开发版本：sdk6，DevEco Studio2.2 Beta1 - 基线版本：Release v2.2.0 #### 效果演示 @@ -33,7 +33,7 @@ allprojects { } ``` -在sdk5，DevEco Studio2.1 Release下项目可直接运行 +在sdk6，DevEco Studio2.2 Beta1下项目可直接运行 如无法运行，删除项目.gradle,.idea,build,gradle,build.gradle文件， 并依据自己的版本创建新项目，将新项目的对应文件复制到根目录下 @@ -61,7 +61,7 @@ CodeCheck代码测试无异常 CloudTest代码测试无异常 -火绒安全病毒安全检测通过 +病毒安全检测通过 当前版本demo功能与原组件基本无差异 diff --git a/audiovisualizer/build.gradle b/audiovisualizer/build.gradle index 312bc1c..40fa835 100644 --- a/audiovisualizer/build.gradle +++ b/audiovisualizer/build.gradle @@ -1,6 +1,6 @@ apply plugin: 'com.huawei.ohos.library' ohos { - compileSdkVersion 5 + compileSdkVersion 6 defaultConfig { compatibleSdkVersion 5 } diff --git a/audiovisualizer/src/main/java/com/chibde/visualizer/LineVisualizer.java b/audiovisualizer/src/main/java/com/chibde/visualizer/LineVisualizer.java index 06d1832..bfb8baf 100644 --- a/audiovisualizer/src/main/java/com/chibde/visualizer/LineVisualizer.java +++ b/audiovisualizer/src/main/java/com/chibde/visualizer/LineVisualizer.java @@ -31,7 +31,7 @@ import ohos.app.Context; */ public class LineVisualizer extends BaseVisualizer implements Component.DrawTask { private float[] points; - private Rect rect = new Rect(); + private final Rect rect = new Rect(); private float strokeWidth = 0.005f; /** diff --git a/build.gradle b/build.gradle index 7d1cef8..afb5e74 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ import java.lang.annotation.Target apply plugin: 'com.huawei.ohos.app' ohos { - compileSdkVersion 5 + compileSdkVersion 6 defaultConfig { compatibleSdkVersion 5 @@ -13,7 +13,6 @@ ohos { buildscript { repositories { - maven { url 'https://mirrors.huaweicloud.com/repository/maven/' } @@ -23,8 +22,8 @@ buildscript { jcenter() } dependencies { - classpath 'com.huawei.ohos:hap:2.4.4.2' - classpath 'com.huawei.ohos:decctest:1.0.0.7' + classpath 'com.huawei.ohos:hap:2.4.5.0' + classpath 'com.huawei.ohos:decctest:1.2.4.1' } } diff --git a/entry/build.gradle b/entry/build.gradle index 4365071..7a72889 100644 --- a/entry/build.gradle +++ b/entry/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.huawei.ohos.hap' apply plugin: 'com.huawei.ohos.decctest' ohos { - compileSdkVersion 5 + compileSdkVersion 6 defaultConfig { compatibleSdkVersion 5 } diff --git a/entry/src/main/config.json b/entry/src/main/config.json index c8d652e..5200829 100644 --- a/entry/src/main/config.json +++ b/entry/src/main/config.json @@ -5,18 +5,25 @@ "version": { "code": 1000000, "name": "1.0.0" - }, - "apiVersion": { - "compatible": 4, - "target": 5, - "releaseType": "Release" } }, "deviceConfig": {}, "module": { "reqPermissions": [ { - "name": "ohos.permission.MICROPHONE" + "name": "ohos.permission.MICROPHONE", + "reason": "用于麦克风权限申请", + "usedScene": { + "ability": [ + "com.chibde.audiovisualizer.sample.visualizer.LineVisualizerAbility", + "com.chibde.audiovisualizer.sample.visualizer.BarVisualizerAbility", + "com.chibde.audiovisualizer.sample.visualizer.CircleBarVisualizerAbility", + "com.chibde.audiovisualizer.sample.visualizer.LineBarVisualizerAbility", + "com.chibde.audiovisualizer.sample.visualizer.SquareBarVisualizerAbility", + "com.chibde.audiovisualizer.sample.visualizer.CircleVisualizerAbility" + ], + "when": "always" + } } ], "package": "com.chibde.visualizer", diff --git a/entry/src/main/java/com/chibde/audiovisualizer/util/PlaySoundUtil.java b/entry/src/main/java/com/chibde/audiovisualizer/util/PlaySoundUtil.java index 68a5ec1..5ff75bc 100644 --- a/entry/src/main/java/com/chibde/audiovisualizer/util/PlaySoundUtil.java +++ b/entry/src/main/java/com/chibde/audiovisualizer/util/PlaySoundUtil.java @@ -1,3 +1,18 @@ +/* + * Copyright (C) 2021 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.chibde.audiovisualizer.util; import ohos.media.audio.AudioRenderer; @@ -10,7 +25,7 @@ import java.io.InputStream; public class PlaySoundUtil { private AudioStreamInfo audioStreamInfo = null; private AudioRendererInfo audioRendererInfo = null; - private AudioRenderer.PlayMode playMode = AudioRenderer.PlayMode.MODE_STREAM; + private final AudioRenderer.PlayMode playMode = AudioRenderer.PlayMode.MODE_STREAM; private AudioRenderer audioRenderer = null; private InputStream soundInputStream = null; -- Gitee