@@ -50,7 +50,7 @@ public abstract class BaseVisualizer extends ComponentContainer { protected AnimSpeed mAnimSpeed = AnimSpeed.MEDIUM; protected boolean isVisualizationEnabled = true; - private AudioWaver audioWaver; + private AudioWaver mAudioWaver; /** * 使用java代码实例化调用 @@ -189,10 +189,10 @@ public abstract class BaseVisualizer extends ComponentContainer { * @param audioSessionId of the media to be visualised */ public void setAudioSessionId(int audioSessionId) { - audioWaver = new AudioWaver(audioSessionId, this.getClass().getName()); - audioWaver.setActivated(false); - audioWaver.setDataSize(AudioWaver.getMaxDataSize()); - audioWaver.setWaveDataObserver(new AudioWaver.WaveDataObserver() { + mAudioWaver = new AudioWaver(audioSessionId, this.getClass().getName()); + mAudioWaver.setActivated(false); + mAudioWaver.setDataSize(AudioWaver.getMaxDataSize()); + mAudioWaver.setWaveDataObserver(new AudioWaver.WaveDataObserver() { @Override public void onWaveData(byte[] mBytes, int i) { BaseVisualizer.this.mRawAudioBytes = mBytes; @@ -205,6 +205,6 @@ public abstract class BaseVisualizer extends ComponentContainer { }); } }, AudioWaver.getMinInterval()); - audioWaver.setActivated(true); + mAudioWaver.setActivated(true); } } \ No newline at end of file diff --git a/audiovisualizer/src/main/java/com/gauravk/audiovisualizer/visualizer/BarVisualizer.java b/audiovisualizer/src/main/java/com/gauravk/audiovisualizer/visualizer/BarVisualizer.java index 112d62c..f5ed203 100644 --- a/audiovisualizer/src/main/java/com/gauravk/audiovisualizer/visualizer/BarVisualizer.java +++ b/audiovisualizer/src/main/java/com/gauravk/audiovisualizer/visualizer/BarVisualizer.java @@ -28,7 +28,6 @@ import ohos.agp.utils.Rect; import ohos.app.Context; import java.security.SecureRandom; -import java.util.Random; /** * Custom view to create bar visualizer @@ -135,7 +134,6 @@ public class BarVisualizer extends BaseVisualizer implements Component.DrawTask nBatchCount = 0; } } - super.addDrawTask(this::onDraw); } diff --git a/audiovisualizer/src/main/java/com/gauravk/audiovisualizer/visualizer/BlastVisualizer.java b/audiovisualizer/src/main/java/com/gauravk/audiovisualizer/visualizer/BlastVisualizer.java index ce844f9..eafa65a 100644 --- a/audiovisualizer/src/main/java/com/gauravk/audiovisualizer/visualizer/BlastVisualizer.java +++ b/audiovisualizer/src/main/java/com/gauravk/audiovisualizer/visualizer/BlastVisualizer.java @@ -79,6 +79,11 @@ public class BlastVisualizer extends BaseVisualizer implements Component.DrawTas mRadius = (int) (mRadius * 0.65 / 2); } + onDrawInit(component, canvas); + + } + + private void onDrawInit(Component component, Canvas canvas) { // create the path and draw if (isVisualizationEnabled && mRawAudioBytes != null) { if (mRawAudioBytes.length == 0) { @@ -113,6 +118,5 @@ public class BlastVisualizer extends BaseVisualizer implements Component.DrawTas mSpikePath.close(); canvas.drawPath(mSpikePath, mPaint); } - } } \ No newline at end of file diff --git a/audiovisualizer/src/main/java/com/gauravk/audiovisualizer/visualizer/BlobVisualizer.java b/audiovisualizer/src/main/java/com/gauravk/audiovisualizer/visualizer/BlobVisualizer.java index dc7c77d..f74b226 100644 --- a/audiovisualizer/src/main/java/com/gauravk/audiovisualizer/visualizer/BlobVisualizer.java +++ b/audiovisualizer/src/main/java/com/gauravk/audiovisualizer/visualizer/BlobVisualizer.java @@ -49,7 +49,6 @@ public class BlobVisualizer extends BaseVisualizer implements Component.DrawTask private boolean isFirstPlay = true; private float mAngleOffset; private float mChangeFactor; - private AudioManager audioManager; /** * 使用java代码实例化调用 @@ -84,7 +83,6 @@ public class BlobVisualizer extends BaseVisualizer implements Component.DrawTask @Override protected void init() { addDrawTask(this::onDraw); - audioManager = new AudioManager(getContext()); mRadius = -1; nPoints = (int) (mDensity * BLOB_MAX_POINTS); if (nPoints < BLOB_MIN_POINTS) { @@ -130,29 +128,7 @@ public class BlobVisualizer extends BaseVisualizer implements Component.DrawTask @Override public void onDraw(Component component, Canvas canvas) { double angle = 0; - // first time initialization - if (mRadius == -1) { - mRadius = getHeight() < getWidth() ? getHeight() : getWidth(); - - // 382 - mRadius = (int) (mRadius * 0.65 / 2); - - // 10.8 - mChangeFactor = getHeight() * mChangeFactor; - - // initialize bezier points - for (int i = 0; i < nPoints; i++, angle += mAngleOffset) { - float posX = (float) (getWidth() / 2 - + (mRadius) - * Math.cos(Math.toRadians(angle))); - - float posY = (float) (getHeight() / 2 - + (mRadius) - * Math.sin(Math.toRadians(angle))); - - mBezierPoints[i].modify(posX, posY); - } - } + angle = onDrawInit(angle); // create the path and draw if (isVisualizationEnabled && mRawAudioBytes != null) { @@ -163,62 +139,97 @@ public class BlobVisualizer extends BaseVisualizer implements Component.DrawTask mBlobPath.rewind(); // find the destination bezier point for a batch - for (int i = 0; i < nPoints; i++, angle += mAngleOffset) { + onDrawValuation(component, angle); - // 1=1 X=34 i=2 X=68 - int x = (int) Math.ceil((i + 1) * (mRawAudioBytes.length / nPoints)); - int t = 0; - if (x < 1024) { - t = ((byte) (-Math.abs(mRawAudioBytes[x]) + 128)) * (component.getHeight() / 4) / 128; - } + onDrawModification(); - float posX = (float) (getWidth() / 2 - + (mRadius + t) - * Math.cos(Math.toRadians(angle))); + // add an extra line to center cover the gap generated by last cubicTo + if (mPaintStyle == PaintStyle.FILL) { + mBlobPath.lineTo(getWidth() / 2, getHeight() / 2); + } + canvas.drawPath(mBlobPath, mPaint); + } + super.addDrawTask(this::onDraw); + } - float posY = (float) (getHeight() / 2 - + (mRadius + t) - * Math.sin(Math.toRadians(angle))); + private void onDrawModification() { + // set the first and last point as first - // calculate the new x based on change - if (posX - mBezierPoints[i].getPointX() > 0) { - mBezierPoints[i].modify(mBezierPoints[i].getPointX() + mChangeFactor, mBezierPoints[i].getPointY()); - } else { - mBezierPoints[i].modify(mBezierPoints[i].getPointX() - mChangeFactor, mBezierPoints[i].getPointY()); - } - - // calculate the new y based on change - if (posY - mBezierPoints[i].getPointY() > 0) { - mBezierPoints[i].modify(mBezierPoints[i].getPointX(), mBezierPoints[i].getPointY() + mChangeFactor); - } else { - mBezierPoints[i].modify(mBezierPoints[i].getPointX(), mBezierPoints[i].getPointY() - mChangeFactor); - } + mBezierPoints[nPoints].modify(mBezierPoints[0].getPointX(), mBezierPoints[0].getPointY()); + mBezierPoints[nPoints + 1].modify(mBezierPoints[0].getPointX(), mBezierPoints[0].getPointY()); + + // update the control points + mBezierSpline.updateCurveControlPoints(mBezierPoints); + Point[] firstCP = mBezierSpline.getFirstControlPoints(); + Point[] secondCP = mBezierSpline.getSecondControlPoints(); + + // create the path + mBlobPath.moveTo(mBezierPoints[0].getPointX(), mBezierPoints[0].getPointY()); + for (int i = 0; i < firstCP.length; i++) { + mBlobPath.cubicTo(firstCP[i].getPointX(), firstCP[i].getPointY(), + secondCP[i].getPointX(), secondCP[i].getPointY(), + mBezierPoints[i + 1].getPointX(), mBezierPoints[i + 1].getPointY()); + } + } + + private void onDrawValuation(Component component, double angle) { + for (int i = 0; i < nPoints; i++, angle += mAngleOffset) { + + // 1=1 X=34 i=2 X=68 + int x = (int) Math.ceil((i + 1) * (mRawAudioBytes.length / nPoints)); + int t = 0; + if (x < 1024) { + t = ((byte) (-Math.abs(mRawAudioBytes[x]) + 128)) * (component.getHeight() / 4) / 128; } - // set the first and last point as first + float posX = (float) (getWidth() / 2 + + (mRadius + t) + * Math.cos(Math.toRadians(angle))); - mBezierPoints[nPoints].modify(mBezierPoints[0].getPointX(), mBezierPoints[0].getPointY()); - mBezierPoints[nPoints + 1].modify(mBezierPoints[0].getPointX(), mBezierPoints[0].getPointY()); + float posY = (float) (getHeight() / 2 + + (mRadius + t) + * Math.sin(Math.toRadians(angle))); - // update the control points - mBezierSpline.updateCurveControlPoints(mBezierPoints); - Point[] firstCP = mBezierSpline.getFirstControlPoints(); - Point[] secondCP = mBezierSpline.getSecondControlPoints(); + // calculate the new x based on change + if (posX - mBezierPoints[i].getPointX() > 0) { + mBezierPoints[i].modify(mBezierPoints[i].getPointX() + mChangeFactor, mBezierPoints[i].getPointY()); + } else { + mBezierPoints[i].modify(mBezierPoints[i].getPointX() - mChangeFactor, mBezierPoints[i].getPointY()); + } - // create the path - mBlobPath.moveTo(mBezierPoints[0].getPointX(), mBezierPoints[0].getPointY()); - for (int i = 0; i < firstCP.length; i++) { - mBlobPath.cubicTo(firstCP[i].getPointX(), firstCP[i].getPointY(), - secondCP[i].getPointX(), secondCP[i].getPointY(), - mBezierPoints[i + 1].getPointX(), mBezierPoints[i + 1].getPointY()); + // calculate the new y based on change + if (posY - mBezierPoints[i].getPointY() > 0) { + mBezierPoints[i].modify(mBezierPoints[i].getPointX(), mBezierPoints[i].getPointY() + mChangeFactor); + } else { + mBezierPoints[i].modify(mBezierPoints[i].getPointX(), mBezierPoints[i].getPointY() - mChangeFactor); } + } + } - // add an extra line to center cover the gap generated by last cubicTo - if (mPaintStyle == PaintStyle.FILL) { - mBlobPath.lineTo(getWidth() / 2, getHeight() / 2); + private double onDrawInit(double angle) { + // first time initialization + if (mRadius == -1) { + mRadius = getHeight() < getWidth() ? getHeight() : getWidth(); + + // 382 + mRadius = (int) (mRadius * 0.65 / 2); + + // 10.8 + mChangeFactor = getHeight() * mChangeFactor; + + // initialize bezier points + for (int i = 0; i < nPoints; i++, angle += mAngleOffset) { + float posX = (float) (getWidth() / 2 + + (mRadius) + * Math.cos(Math.toRadians(angle))); + + float posY = (float) (getHeight() / 2 + + (mRadius) + * Math.sin(Math.toRadians(angle))); + + mBezierPoints[i].modify(posX, posY); } - canvas.drawPath(mBlobPath, mPaint); } - super.addDrawTask(this::onDraw); + return angle; } } \ No newline at end of file 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 6406bbf..1a872a5 100644 --- a/audiovisualizer/src/main/java/com/gauravk/audiovisualizer/visualizer/HiFiVisualizer.java +++ b/audiovisualizer/src/main/java/com/gauravk/audiovisualizer/visualizer/HiFiVisualizer.java @@ -3,8 +3,6 @@ package com.gauravk.audiovisualizer.visualizer; import com.gauravk.audiovisualizer.base.BaseVisualizer; import com.gauravk.audiovisualizer.model.PaintStyle; -import ohos.agp.colors.ColorSpec; -import ohos.agp.colors.RgbColor; import ohos.agp.components.AttrSet; import ohos.agp.components.Component; import ohos.agp.render.Canvas; @@ -28,7 +26,7 @@ public class HiFiVisualizer extends BaseVisualizer implements Component.DrawTask private int mRadius; private int mPoints; private int[] mHeights; - private Paint paint; + private Paint mPaint; // outward path private Path mPath; @@ -75,14 +73,14 @@ public class HiFiVisualizer extends BaseVisualizer implements Component.DrawTask } mHeights = new int[mPoints]; - paint = new Paint(); - paint.setColor(new Color(Color.getIntColor("#FCB8A3"))); - paint.setStrokeWidth(mStrokeWidth); + mPaint = new Paint(); + mPaint.setColor(new Color(Color.getIntColor("#FCB8A3"))); + mPaint.setStrokeWidth(mStrokeWidth); if (mPaintStyle == PaintStyle.FILL) { - paint.setStyle(Paint.Style.FILL_STYLE); + mPaint.setStyle(Paint.Style.FILL_STYLE); } else { - paint.setStyle(Paint.Style.STROKE_STYLE); + mPaint.setStyle(Paint.Style.STROKE_STYLE); } } @@ -97,13 +95,13 @@ public class HiFiVisualizer extends BaseVisualizer implements Component.DrawTask mPath1.reset(); // start the outward path from the last point - float cxL = (float) (getWidth() / 2 + Math.cos((360 - 360 / mPoints) * Math.PI / 180) * (mRadius + mHeights[mPoints - 1])); - float cyL = (float) (getHeight() / 2 - Math.sin((360 - 360 / mPoints) * Math.PI / 180) * (mRadius + mHeights[mPoints - 1])); + float cxL = (float) (getWidth() / 2 + Math.cos((360 - (double)(360 / mPoints)) * Math.PI / 180) * (mRadius + mHeights[mPoints - 1])); + float cyL = (float) (getHeight() / 2 - Math.sin((360 - (double)(360 / mPoints)) * Math.PI / 180) * (mRadius + mHeights[mPoints - 1])); mPath.moveTo(cxL, cyL); // start the inward path from the last point - float cxL1 = (float) (getWidth() / 2 + Math.cos((360 - 360 / mPoints) * Math.PI / 180) * (mRadius - mHeights[mPoints - 1])); - float cyL1 = (float) (getHeight() / 2 - Math.sin((360 - 360 / mPoints) * Math.PI / 180) * (mRadius - mHeights[mPoints - 1])); + float cxL1 = (float) (getWidth() / 2 + Math.cos((360 - (double)(360 / mPoints)) * Math.PI / 180) * (mRadius - mHeights[mPoints - 1])); + float cyL1 = (float) (getHeight() / 2 - Math.sin((360 - (double)(360 / mPoints)) * Math.PI / 180) * (mRadius - mHeights[mPoints - 1])); mPath1.moveTo(cxL1, cyL1); for (int i = 0; i < 360; i = i + 360 / mPoints) { // outward @@ -112,22 +110,22 @@ public class HiFiVisualizer extends BaseVisualizer implements Component.DrawTask float cy = (float) (getHeight() / 2 - Math.sin(i * Math.PI / 180) * (mRadius + mHeights[i * mPoints / 360])); // second bezier control point - float bx = (float) (getWidth() / 2 + Math.cos((i - (180 / mPoints)) * Math.PI / 180) * (mBezierControlPointLen + mHeights[i * mPoints / 360])); - float by = (float) (getHeight() / 2 - Math.sin((i - (180 / mPoints)) * Math.PI / 180) * (mBezierControlPointLen + mHeights[i * mPoints / 360])); + float bx = (float) (getWidth() / 2 + Math.cos((i - (double)((180 / mPoints))) * Math.PI / 180) * (mBezierControlPointLen + mHeights[i * mPoints / 360])); + float by = (float) (getHeight() / 2 - Math.sin((i - (double)((180 / mPoints))) * Math.PI / 180) * (mBezierControlPointLen + mHeights[i * mPoints / 360])); int lastPoint = i == 0 ? mPoints - 1 : i * mPoints / 360 - 1; // fist bezier control point - float ax = (float) (getWidth() / 2 + Math.cos((i - (180 / mPoints)) * Math.PI / 180) * (mBezierControlPointLen + mHeights[lastPoint])); - float ay = (float) (getHeight() / 2 - Math.sin((i - (180 / mPoints)) * Math.PI / 180) * (mBezierControlPointLen + mHeights[lastPoint])); + float ax = (float) (getWidth() / 2 + Math.cos((i - (double)((180 / mPoints))) * Math.PI / 180) * (mBezierControlPointLen + mHeights[lastPoint])); + float ay = (float) (getHeight() / 2 - Math.sin((i - (double)((180 / mPoints))) * Math.PI / 180) * (mBezierControlPointLen + mHeights[lastPoint])); mPath.cubicTo(ax, ay, bx, by, cx, cy); // inward float cx1 = (float) (getWidth() / 2 + Math.cos(i * Math.PI / 180) * (mRadius - mHeights[i * mPoints / 360])); float cy1 = (float) (getHeight() / 2 - Math.sin(i * Math.PI / 180) * (mRadius - mHeights[i * mPoints / 360])); - float bx1 = (float) (getWidth() / 2 + Math.cos((i - (180 / mPoints)) * Math.PI / 180) * (mBezierControlPointLen - mHeights[i * mPoints / 360])); - float by1 = (float) (getHeight() / 2 - Math.sin((i - (180 / mPoints)) * Math.PI / 180) * (mBezierControlPointLen - mHeights[i * mPoints / 360])); - float ax1 = (float) (getWidth() / 2 + Math.cos((i - (180 / mPoints)) * Math.PI / 180) * (mBezierControlPointLen - mHeights[lastPoint])); - float ay1 = (float) (getHeight() / 2 - Math.sin((i - (180 / mPoints)) * Math.PI / 180) * (mBezierControlPointLen - mHeights[lastPoint])); + float bx1 = (float) (getWidth() / 2 + Math.cos((i - (double)((180 / mPoints))) * Math.PI / 180) * (mBezierControlPointLen - mHeights[i * mPoints / 360])); + float by1 = (float) (getHeight() / 2 - Math.sin((i - (double)((180 / mPoints))) * Math.PI / 180) * (mBezierControlPointLen - mHeights[i * mPoints / 360])); + float ax1 = (float) (getWidth() / 2 + Math.cos((i - (double)((180 / mPoints))) * Math.PI / 180) * (mBezierControlPointLen - mHeights[lastPoint])); + float ay1 = (float) (getHeight() / 2 - Math.sin((i - (double)((180 / mPoints))) * Math.PI / 180) * (mBezierControlPointLen - mHeights[lastPoint])); mPath1.cubicTo(ax1, ay1, bx1, by1, cx1, cy1); canvas.drawLine(cx, cy, cx1, cy1, mPaint); } diff --git a/audiovisualizer/src/main/java/com/gauravk/audiovisualizer/visualizer/WaveVisualizer.java b/audiovisualizer/src/main/java/com/gauravk/audiovisualizer/visualizer/WaveVisualizer.java index d9cbe3e..4f4d2ea 100644 --- a/audiovisualizer/src/main/java/com/gauravk/audiovisualizer/visualizer/WaveVisualizer.java +++ b/audiovisualizer/src/main/java/com/gauravk/audiovisualizer/visualizer/WaveVisualizer.java @@ -123,27 +123,7 @@ public class WaveVisualizer extends BaseVisualizer implements Component.DrawTask @Override public void onDraw(Component component, Canvas canvas) { - if (mWidthOffset == -1) { - canvas.getLocalClipBounds(mClipBounds); - - mWidthOffset = component.getWidth() / nPoints; - - //initialize bezier points - for (int i = 0; i < mBezierPoints.length; i++) { - float posX = mClipBounds.left + (i * mWidthOffset); - - float posY; - if (mPositionGravity == PositionGravity.TOP) { - posY = mClipBounds.top; - } else { - posY = mClipBounds.bottom; - } - - mSrcY[i] = posY; - mDestY[i] = posY; - mBezierPoints[i].modify(posX, posY); - } - } + onDrawInit(component, canvas); // create the path and draw if (isVisualizationEnabled && mRawAudioBytes != null) { @@ -153,67 +133,99 @@ public class WaveVisualizer extends BaseVisualizer implements Component.DrawTask mWavePath.rewind(); - // find the destination bezier point for a batch - if (nBatchCount == 0) { - float randPosY = mDestY[mRandom.nextInt(nPoints)]; - for (int i = 0; i < mBezierPoints.length; i++) { - int x = (int) Math.ceil((i + 1) * (mRawAudioBytes.length / nPoints)); - - int t = 0; - if (x < 1024) { - t = component.getHeight() - + ((byte) (Math.abs(mRawAudioBytes[x]) + 128)) * component.getHeight() / 128; - } - - float posY; - if (mPositionGravity == PositionGravity.TOP) { - posY = mClipBounds.bottom - t; - } else { - posY = mClipBounds.top + t; - } - - //change the source and destination y - mSrcY[i] = mDestY[i]; - mDestY[i] = posY; - } - - mDestY[mBezierPoints.length - 1] = randPosY; - } + onDrawModification(component); // increment batch count nBatchCount++; - // for smoothing animation + onDrawPainting(); + canvas.drawPath(mWavePath, mPaint); + } + super.addDrawTask(this::onDraw); + } + + private void onDrawPainting() { + // for smoothing animation + for (int i = 0; i < mBezierPoints.length; i++) { + mBezierPoints[i].modify(mBezierPoints[i].getPointX(), mSrcY[i] + (((float) (nBatchCount) / mMaxBatchCount) * (mDestY[i] - mSrcY[i]))); + } + + // reset the batch count + if (nBatchCount == mMaxBatchCount) { + nBatchCount = 0; + } + + // calculate the bezier curve control points + for (int i = 1; i < mBezierPoints.length; i++) { + mBezierControlPoints1[i].modify((mBezierPoints[i].getPointX() + mBezierPoints[i - 1].getPointX()) / 2, mBezierPoints[i - 1].getPointY()); + mBezierControlPoints2[i].modify((mBezierPoints[i].getPointX() + mBezierPoints[i - 1].getPointX()) / 2, mBezierPoints[i].getPointY()); + } + + // create the path + mWavePath.moveTo(mBezierPoints[0].getPointX(), mBezierPoints[0].getPointY()); + for (int i = 1; i < mBezierPoints.length; i++) { + mWavePath.cubicTo(mBezierControlPoints1[i].getPointX(), mBezierControlPoints1[i].getPointY(), + mBezierControlPoints2[i].getPointX(), mBezierControlPoints2[i].getPointY(), + mBezierPoints[i].getPointX(), mBezierPoints[i].getPointY()); + } + + if (mPaintStyle == PaintStyle.FILL) { + mWavePath.lineTo(mClipBounds.right, mClipBounds.bottom); + mWavePath.lineTo(mClipBounds.left, mClipBounds.bottom); + mWavePath.close(); + } + } + + private void onDrawModification(Component component) { + // find the destination bezier point for a batch + if (nBatchCount == 0) { + float randPosY = mDestY[mRandom.nextInt(nPoints)]; for (int i = 0; i < mBezierPoints.length; i++) { - mBezierPoints[i].modify(mBezierPoints[i].getPointX(), mSrcY[i] + (((float) (nBatchCount) / mMaxBatchCount) * (mDestY[i] - mSrcY[i]))); - } + int x = (int) Math.ceil((i + 1) * (mRawAudioBytes.length / nPoints)); - // reset the batch count - if (nBatchCount == mMaxBatchCount) { - nBatchCount = 0; - } + int t = 0; + if (x < 1024) { + t = component.getHeight() + + ((byte) (Math.abs(mRawAudioBytes[x]) + 128)) * component.getHeight() / 128; + } - // calculate the bezier curve control points - for (int i = 1; i < mBezierPoints.length; i++) { - mBezierControlPoints1[i].modify((mBezierPoints[i].getPointX() + mBezierPoints[i - 1].getPointX()) / 2, mBezierPoints[i - 1].getPointY()); - mBezierControlPoints2[i].modify((mBezierPoints[i].getPointX() + mBezierPoints[i - 1].getPointX()) / 2, mBezierPoints[i].getPointY()); - } + float posY; + if (mPositionGravity == PositionGravity.TOP) { + posY = mClipBounds.bottom - t; + } else { + posY = mClipBounds.top + t; + } - // create the path - mWavePath.moveTo(mBezierPoints[0].getPointX(), mBezierPoints[0].getPointY()); - for (int i = 1; i < mBezierPoints.length; i++) { - mWavePath.cubicTo(mBezierControlPoints1[i].getPointX(), mBezierControlPoints1[i].getPointY(), - mBezierControlPoints2[i].getPointX(), mBezierControlPoints2[i].getPointY(), - mBezierPoints[i].getPointX(), mBezierPoints[i].getPointY()); + //change the source and destination y + mSrcY[i] = mDestY[i]; + mDestY[i] = posY; } - if (mPaintStyle == PaintStyle.FILL) { - mWavePath.lineTo(mClipBounds.right, mClipBounds.bottom); - mWavePath.lineTo(mClipBounds.left, mClipBounds.bottom); - mWavePath.close(); + mDestY[mBezierPoints.length - 1] = randPosY; + } + } + + private void onDrawInit(Component component, Canvas canvas) { + if (mWidthOffset == -1) { + canvas.getLocalClipBounds(mClipBounds); + + mWidthOffset = component.getWidth() / nPoints; + + //initialize bezier points + for (int i = 0; i < mBezierPoints.length; i++) { + float posX = mClipBounds.left + (i * mWidthOffset); + + float posY; + if (mPositionGravity == PositionGravity.TOP) { + posY = mClipBounds.top; + } else { + posY = mClipBounds.bottom; + } + + mSrcY[i] = posY; + mDestY[i] = posY; + mBezierPoints[i].modify(posX, posY); } - canvas.drawPath(mWavePath, mPaint); } - super.addDrawTask(this::onDraw); } } \ No newline at end of file diff --git a/entry/src/main/java/com/gauravk/audiovisualizersample/slice/MainAbilitySlice.java b/entry/src/main/java/com/gauravk/audiovisualizersample/slice/MainAbilitySlice.java index d8e6bfa..1dcb47f 100644 --- a/entry/src/main/java/com/gauravk/audiovisualizersample/slice/MainAbilitySlice.java +++ b/entry/src/main/java/com/gauravk/audiovisualizersample/slice/MainAbilitySlice.java @@ -9,10 +9,12 @@ import ohos.aafwk.content.Operation; import ohos.agp.components.Component; import ohos.bundle.IBundleManager; import ohos.global.resource.RawFileDescriptor; +import ohos.hiviewdfx.HiLog; import ohos.media.common.Source; import ohos.media.player.Player; import java.io.IOException; +import java.util.logging.Logger; public class MainAbilitySlice extends AbilitySlice implements Component.ClickedListener { @@ -46,7 +48,7 @@ public class MainAbilitySlice extends AbilitySlice implements Component.ClickedL impl.prepare(); impl.play(); } catch (IOException e) { - e.printStackTrace(); + Logger.getGlobal().finest(e.getMessage()); } } diff --git a/entry/src/main/java/com/gauravk/audiovisualizersample/ui/MusicStreamAbility.java b/entry/src/main/java/com/gauravk/audiovisualizersample/ui/MusicStreamAbility.java index c7d5804..7690931 100644 --- a/entry/src/main/java/com/gauravk/audiovisualizersample/ui/MusicStreamAbility.java +++ b/entry/src/main/java/com/gauravk/audiovisualizersample/ui/MusicStreamAbility.java @@ -21,6 +21,7 @@ import java.net.MalformedURLException; import java.net.URL; import java.util.Timer; import java.util.TimerTask; +import java.util.logging.Logger; public class MusicStreamAbility extends Ability { private Image imgButton; @@ -102,16 +103,16 @@ public class MusicStreamAbility extends Ability { timer.cancel(); toastDialog.remove(); } catch (MalformedURLException e) { - e.printStackTrace(); + Logger.getGlobal().finest(e.getMessage()); } catch (IOException e) { - e.printStackTrace(); + Logger.getGlobal().finest(e.getMessage()); } finally { try { if (inputStream != null) { inputStream.close(); } } catch (IOException e) { - e.printStackTrace(); + Logger.getGlobal().finest(e.getMessage()); } } } diff --git a/entry/src/main/java/com/gauravk/audiovisualizersample/util/PermissionUtils.java b/entry/src/main/java/com/gauravk/audiovisualizersample/util/PermissionUtils.java index 716b521..3b4c13a 100644 --- a/entry/src/main/java/com/gauravk/audiovisualizersample/util/PermissionUtils.java +++ b/entry/src/main/java/com/gauravk/audiovisualizersample/util/PermissionUtils.java @@ -49,5 +49,5 @@ public class PermissionUtils { /** * 权限数组 */ - public static String[] permission = {MICROPHONE, READ_MEDIA, WRITE_MEDIA,RECORD_AUDIO, INTERNET}; + public static final String[] permission = {MICROPHONE, READ_MEDIA, WRITE_MEDIA,RECORD_AUDIO, INTERNET}; } \ No newline at end of file diff --git a/entry/src/main/java/com/gauravk/audiovisualizersample/util/PlaySoundUtil.java b/entry/src/main/java/com/gauravk/audiovisualizersample/util/PlaySoundUtil.java index a3084ea..6b8ad59 100644 --- a/entry/src/main/java/com/gauravk/audiovisualizersample/util/PlaySoundUtil.java +++ b/entry/src/main/java/com/gauravk/audiovisualizersample/util/PlaySoundUtil.java @@ -3,6 +3,7 @@ package com.gauravk.audiovisualizersample.util; import ohos.media.audio.*; import java.io.InputStream; +import java.util.logging.Logger; public class PlaySoundUtil { private final int SAMPLE_RATE = 192000; @@ -51,7 +52,7 @@ public class PlaySoundUtil { } soundInputStream.close(); } catch (Exception e) { - e.printStackTrace(); + Logger.getGlobal().finest(e.getMessage()); } if (audioRenderer.getState() == AudioRenderer.State.STATE_PLAYING) { audioRenderer.pause(); diff --git a/entry/src/ohosTest/java/com/github/gabrielbb/cutout/ExampleTest.java b/entry/src/ohosTest/java/com/github/gabrielbb/cutout/ExampleTest.java index a59f770..c5b52fa 100644 --- a/entry/src/ohosTest/java/com/github/gabrielbb/cutout/ExampleTest.java +++ b/entry/src/ohosTest/java/com/github/gabrielbb/cutout/ExampleTest.java @@ -3,7 +3,7 @@ package com.github.gabrielbb.cutout; import org.junit.Test; public class ExampleTest { - // UI项目不涉及单元测试用例 + //不涉及单元测试用例 @Test public void onStart() { } -- Gitee From 83c1a0a71ef1fbd2f52984ec58935b1e29e65741 Mon Sep 17 00:00:00 2001 From: ZYF949 <446962864@qq.com> Date: Mon, 7 Jun 2021 18:59:31 +0800 Subject: [PATCH 5/5] =?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 | 4 ++-- README.OPENRESOURCE.md | 2 +- README.md | 4 ++-- .../audiovisualizer/visualizer/CircleLineVisualizer.java | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 644c92e..a191011 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,5 +3,5 @@ ohos第一个版本 * 实现了原库大部分api -* 因为缺少对应api，当前仅支持播放wav音频时背景联动，若播放mp3则背景不联动 -* CIRCLEINE黑色边角设置对应颜色无效果，暂未实现 \ No newline at end of file +* 因为缺少对应api，Stream visualizer模式下，播放音乐控件没有联动效果 +* Circleine visualizer模式下，黑色边角设置对应颜色无效果 \ No newline at end of file diff --git a/README.OPENRESOURCE.md b/README.OPENRESOURCE.md index 31a4954..b878057 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": "0.9.1", + "Version Number": "v0.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 8630e66..1965b45 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ * 项目移植状态：当前仅支持播放wav格式音频，若想播放mp3音频，背景无法联动 * 调用差异：无 * 开发版本：sdk5，DevEco Studio 2.1 Release -* 基线版本：Relesase版本号0.9.1 +* 基线版本：Relesase版本号v0.9.1 #### 效果演示 @@ -37,7 +37,7 @@ dependencies { } ``` -在sdk5，DevEco Studio2.1 beta4下项目可直接运行 如无法运行，删除项目.gradle,.idea,build,gradle,build.gradle文件， 并依据自己的版本创建新项目，将新项目的对应文件复制到根目录下 +在sdk5，DevEco Studio 2.1 Release下项目可直接运行 如无法运行，删除项目.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 1115c6a..8d0c5a2 100644 --- a/audiovisualizer/src/main/java/com/gauravk/audiovisualizer/visualizer/CircleLineVisualizer.java +++ b/audiovisualizer/src/main/java/com/gauravk/audiovisualizer/visualizer/CircleLineVisualizer.java @@ -160,7 +160,7 @@ public class CircleLineVisualizer extends BaseVisualizer implements Component.Dr * @param h 0 * @param oldw 1176 * @param oldh 1800 - * @return + * @return boolean */ @Override public boolean onArrange(int w, int h, int oldw, int oldh) { -- Gitee