diff --git a/entry/build.gradle b/entry/build.gradle index be08d52fc9f06262e2db533fdc89a66083db5ace..b1c73588605186049ca42bc509155a355890689d 100644 --- a/entry/build.gradle +++ b/entry/build.gradle @@ -1,7 +1,6 @@ apply plugin: 'com.huawei.ohos.hap' apply plugin: 'com.huawei.ohos.decctest' ohos { - compileSdkVersion 6 defaultConfig { compatibleSdkVersion 5 diff --git a/speechutils/src/main/java/ee/ioc/phon/ohos/speechutils/view/MicButton.java b/speechutils/src/main/java/ee/ioc/phon/ohos/speechutils/view/MicButton.java index cb9dcfca2773e18a4c6448a45a6e06591200b350..87873e254514701c69d8b5782666943bea2e708a 100644 --- a/speechutils/src/main/java/ee/ioc/phon/ohos/speechutils/view/MicButton.java +++ b/speechutils/src/main/java/ee/ioc/phon/ohos/speechutils/view/MicButton.java @@ -88,9 +88,8 @@ public class MicButton extends Component implements Component.EstimateSizeListen */ private static final float NUM_001 = 0.01f; private static final String MICBUTTONTAG = "MICTAG"; - private final float num20 = 20f; + private static final float NUM_20 = 20f; private float rmsdbLevel = 0; - private float oldRadius; private PixelMapHolder pixelMapHolder; private RectFloat rectSrc; @@ -163,10 +162,9 @@ public class MicButton extends Component implements Component.EstimateSizeListen wavePaint.setColor(color); wavePaint.setAntiAlias(true); wavePaint.setStyle(Paint.Style.STROKE_STYLE); - wavePaint.setStrokeWidth(num20); + wavePaint.setStrokeWidth(NUM_20); addDrawTask(this); setEstimateSizeListener(this); - oldRadius = defaultRadius(); } /** @@ -197,12 +195,11 @@ public class MicButton extends Component implements Component.EstimateSizeListen @Override public void onDraw(Component component, Canvas canvas) { - canvas.drawCircle(width / ER, height / ER, getRadius(), wavePaint); - canvas.drawCircle(width / ER, height / ER, getRadius(), backgroundPaint); + canvas.drawCircle((float) (width / (double)ER), (float) (height /(double)ER), getRadius(), backgroundPaint); PixelMap pixelMap = getPixelMap(ResourceTable.Media_microphone); - rectSrc = new RectFloat((width - imageSize) / ER, - (height - imageSize) / ER, - width - ((width - imageSize) / ER), height - ((height - imageSize) / ER)); + rectSrc = new RectFloat((float) ((width - imageSize) / (double)ER), + (float)((height - imageSize) / (double)ER), + (float)(width - ((width - imageSize) / (double)ER)), (float)(height - ((height - imageSize) / (double)ER))); pixelMapHolder = new PixelMapHolder(pixelMap); canvas.drawPixelMapHolderRect(pixelMapHolder, rectSrc, wavePaint); } @@ -213,22 +210,10 @@ public class MicButton extends Component implements Component.EstimateSizeListen * @return 圆 */ private float getRadius() { - float percent = (float) (rmsdbLevel * Math.log(rmsdbLevel)) * NUM_001; + double percent = (rmsdbLevel * Math.log(rmsdbLevel)) * NUM_001; percent = Math.min(Math.max(percent, 0f), YIF); - percent = NUM_055 + NUM_045 * percent; - return percent * ((float) min) / ERF; - } - - /** - * 默认圆 - * - * @return float - */ - private float defaultRadius() { - float percent = (float) (1 * Math.log(0)) * NUM_001; - percent = Math.min(Math.max(percent, 0f), YIF); - percent = NUM_055 + NUM_045 * percent; - return percent * ((float) min) / ERF; + percent = (double)NUM_055 + (double)NUM_045 * percent; + return (float) (percent * ((float) min) / (double)ERF); } /**