diff --git a/entry/src/main/java/com/ohos/speechutilsdemo/ListProvider.java b/entry/src/main/java/com/ohos/speechutilsdemo/ListProvider.java index 22a37fbe0eab86ad391cf320ee98d30b1d4482da..23b11b975fe3f1e9842bd836997125431e09b818 100644 --- a/entry/src/main/java/com/ohos/speechutilsdemo/ListProvider.java +++ b/entry/src/main/java/com/ohos/speechutilsdemo/ListProvider.java @@ -15,13 +15,14 @@ package com.ohos.speechutilsdemo; -import com.ohos.speechutilsdemo.slice.MainAbilitySlice; import ohos.agp.components.BaseItemProvider; import ohos.agp.components.Component; import ohos.agp.components.ComponentContainer; import ohos.agp.components.LayoutScatter; import ohos.agp.components.Text; +import com.ohos.speechutilsdemo.slice.MainAbilitySlice; + import java.util.List; /** @@ -36,8 +37,8 @@ public class ListProvider extends BaseItemProvider { /** * 构造 * - * @param mainAbilitySlice - * @param data + * @param mainAbilitySlice AbilitySlice + * @param data 数据 */ public ListProvider(MainAbilitySlice mainAbilitySlice, List data) { this.data = data; diff --git a/entry/src/main/java/com/ohos/speechutilsdemo/MainAbility.java b/entry/src/main/java/com/ohos/speechutilsdemo/MainAbility.java index d22b95d83d7a9842c4f6394188bc60b1c4124867..afd24cfe5d3bb8daf2ee53608ae864b7a62153ac 100644 --- a/entry/src/main/java/com/ohos/speechutilsdemo/MainAbility.java +++ b/entry/src/main/java/com/ohos/speechutilsdemo/MainAbility.java @@ -16,13 +16,15 @@ package com.ohos.speechutilsdemo; import com.ohos.speechutilsdemo.slice.MainAbilitySlice; -import ee.ioc.phon.ohos.speechutils.utils.Define; + import ohos.aafwk.ability.Ability; import ohos.aafwk.content.Intent; import ohos.agp.window.dialog.ToastDialog; import ohos.agp.window.service.WindowManager; import ohos.bundle.IBundleManager; +import ee.ioc.phon.ohos.speechutils.utils.Define; + /** * 主页面 * diff --git a/entry/src/main/java/com/ohos/speechutilsdemo/SuperButton.java b/entry/src/main/java/com/ohos/speechutilsdemo/SuperButton.java index fc30a26c9fb648f6fa9b0e917e641bf37a243333..37fa0d7a055bed95aaf37be5b6bdea5adebe11c5 100644 --- a/entry/src/main/java/com/ohos/speechutilsdemo/SuperButton.java +++ b/entry/src/main/java/com/ohos/speechutilsdemo/SuperButton.java @@ -69,8 +69,8 @@ public class SuperButton extends Button implements Component.DrawTask, /** * 构造 * - * @param context - * @param attrSet + * @param context 上下文 + * @param attrSet 属性参数 */ public SuperButton(Context context, AttrSet attrSet) { this(context, attrSet, null); @@ -79,9 +79,9 @@ public class SuperButton extends Button implements Component.DrawTask, /** * 构造 * - * @param context - * @param attrSet - * @param styleName + * @param context 上下文 + * @param attrSet 属性参数 + * @param styleName 样式名字 */ public SuperButton(Context context, AttrSet attrSet, String styleName) { super(context, attrSet, styleName); @@ -215,7 +215,7 @@ public class SuperButton extends Button implements Component.DrawTask, /** * 设置形状 * - * @param shape + * @param shape shape形状 * @return button */ public SuperButton setShape(int shape) { @@ -227,7 +227,7 @@ public class SuperButton extends Button implements Component.DrawTask, /** * 设置状态选择器颜色 * - * @param selectColor3 + * @param selectColor3 RgbColor值 * @return button */ public SuperButton setShapeSelectorColor(RgbColor selectColor3) { @@ -277,7 +277,7 @@ public class SuperButton extends Button implements Component.DrawTask, /** * 设置背景渐变方向 * - * @param orientation + * @param orientation ShapeElement.Orientation * @return button */ public SuperButton setShapeGradientOrientation(ShapeElement.Orientation orientation) { @@ -289,7 +289,7 @@ public class SuperButton extends Button implements Component.DrawTask, /** * 设置不能点击状态的颜色 * - * @param color + * @param color RgbColor值 * @return button */ public SuperButton setDisabledColor(RgbColor color) { diff --git a/entry/src/main/java/com/ohos/speechutilsdemo/slice/AsrAbilitySlice.java b/entry/src/main/java/com/ohos/speechutilsdemo/slice/AsrAbilitySlice.java index 14d005c6319cf61997631d6c906cf843fbd4ba89..86e5d5eed8904bc88e538250d2f30f47ad8a2569 100644 --- a/entry/src/main/java/com/ohos/speechutilsdemo/slice/AsrAbilitySlice.java +++ b/entry/src/main/java/com/ohos/speechutilsdemo/slice/AsrAbilitySlice.java @@ -16,6 +16,7 @@ package com.ohos.speechutilsdemo.slice; import com.ohos.speechutilsdemo.ResourceTable; + import ee.ioc.phon.ohos.speechutils.abilityslice.AsrBaseAbilitySlice; import ee.ioc.phon.ohos.speechutils.view.MicButton; import ohos.agp.components.Text; @@ -45,11 +46,11 @@ public class AsrAbilitySlice extends AsrBaseAbilitySlice { recorderView.setTouchEventListener((component, touchEvent) -> { switch (touchEvent.getAction()) { case TouchEvent.PRIMARY_POINT_DOWN: - HiLog.info(LABEL_LOG, "按钮按下"); + HiLog.info(LABEL_LOG, "buttonDowm"); startRecoding(); break; case TouchEvent.PRIMARY_POINT_UP: - HiLog.info(LABEL_LOG, "按钮松开"); + HiLog.info(LABEL_LOG, "buttonUp"); stopRecoding(); break; default: diff --git a/entry/src/main/java/com/ohos/speechutilsdemo/slice/MainAbilitySlice.java b/entry/src/main/java/com/ohos/speechutilsdemo/slice/MainAbilitySlice.java index c987746db2aa4465c329150ff32a271d30a61f11..dd0e376ee29f0eb340957093d802c450c03c92f0 100644 --- a/entry/src/main/java/com/ohos/speechutilsdemo/slice/MainAbilitySlice.java +++ b/entry/src/main/java/com/ohos/speechutilsdemo/slice/MainAbilitySlice.java @@ -17,7 +17,9 @@ package com.ohos.speechutilsdemo.slice; import com.ohos.speechutilsdemo.ListProvider; import com.ohos.speechutilsdemo.ResourceTable; + import ee.ioc.phon.ohos.speechutils.utils.LogUtils; + import ohos.aafwk.ability.AbilitySlice; import ohos.aafwk.content.Intent; import ohos.agp.components.Component; @@ -48,11 +50,7 @@ public class MainAbilitySlice extends AbilitySlice { try { initListContainer(); - } catch (NotExistException e) { - LogUtils.log(LogUtils.DEBUG, mainAbilitySliceTag, e.getMessage()); - } catch (WrongTypeException e) { - LogUtils.log(LogUtils.DEBUG, mainAbilitySliceTag, e.getMessage()); - } catch (IOException e) { + } catch (NotExistException | WrongTypeException | IOException e) { LogUtils.log(LogUtils.DEBUG, mainAbilitySliceTag, e.getMessage()); } } @@ -69,8 +67,8 @@ public class MainAbilitySlice extends AbilitySlice { listContainer.setItemProvider(listProvider); listContainer.setItemClickedListener(new ListContainer.ItemClickedListener() { @Override - public void onItemClicked(ListContainer listContainer, Component component, int i, long l) { - String item = (String) listContainer.getItemProvider().getItem(i); + public void onItemClicked(ListContainer listContainer, Component component, int position, long id) { + String item = (String) listContainer.getItemProvider().getItem(position); if (item.equals(getAbility().getString(ResourceTable.String_SpeechToText))) { /** * 语音转文字 diff --git a/entry/src/main/java/com/ohos/speechutilsdemo/slice/TtsAbilitySlice.java b/entry/src/main/java/com/ohos/speechutilsdemo/slice/TtsAbilitySlice.java index 6ccf5f211acd307502d83e6b0826c3c18363f6ac..ec5d27ca4c5a24e321266744c06317bc711b6a71 100644 --- a/entry/src/main/java/com/ohos/speechutilsdemo/slice/TtsAbilitySlice.java +++ b/entry/src/main/java/com/ohos/speechutilsdemo/slice/TtsAbilitySlice.java @@ -16,7 +16,9 @@ package com.ohos.speechutilsdemo.slice; import com.ohos.speechutilsdemo.ResourceTable; + import ee.ioc.phon.ohos.speechutils.abilityslice.TtsBaseAbilitySlice; + import ohos.agp.components.Button; import ohos.agp.components.Component; import ohos.agp.components.Text; @@ -83,7 +85,7 @@ public class TtsAbilitySlice extends TtsBaseAbilitySlice { /** * 耗费时间 * - * @param info + * @param info 耗费时间 */ @Override public void showInfo(String info) { diff --git a/entry/src/ohosTest/java/com/ohos/speechutilsdemo/ExampleOhosTest.java b/entry/src/ohosTest/java/com/ohos/speechutilsdemo/ExampleOhosTest.java index 5971621c75192a7a9bd6c0a335f02f2e7582c830..b32a17f568ffaff50419361df41d8736f82fe8fa 100644 --- a/entry/src/ohosTest/java/com/ohos/speechutilsdemo/ExampleOhosTest.java +++ b/entry/src/ohosTest/java/com/ohos/speechutilsdemo/ExampleOhosTest.java @@ -7,16 +7,18 @@ import ohos.ai.tts.TtsClient; import ohos.ai.tts.TtsListener; import ohos.ai.tts.TtsParams; import ohos.ai.tts.constants.TtsEvent; -import ohos.hiviewdfx.HiLog; import ohos.utils.PacMap; import org.junit.Test; -import java.util.Timer; -import java.util.TimerTask; import java.util.UUID; import static org.junit.Assert.assertEquals; +/** + * 单元测试 + * + * @since 2021-05-10 + */ public class ExampleOhosTest { @Test public void testBundleName() { @@ -27,7 +29,7 @@ public class ExampleOhosTest { /** * 监听事件 */ - TtsListener ttsListener = new TtsListener() { + TtsListener ttsListener = new TtsListener() { @Override public void onEvent(int eventType, PacMap pacMap) { if (eventType == TtsEvent.CREATE_TTS_CLIENT_SUCCESS) { @@ -50,7 +52,7 @@ public class ExampleOhosTest { } @Override - public void onError(String s, String s1) { + public void onError(String errorInfo, String s1) { } @Override diff --git a/entry/src/test/java/com/huawei/hm_speechutilsdemo/ExampleTest.java b/entry/src/test/java/com/huawei/hm_speechutilsdemo/ExampleTest.java index fd60bc8dac85945be75c1be37d59169da68facae..2db1eaa64fea61006b395c410611cb52305cce0e 100644 --- a/entry/src/test/java/com/huawei/hm_speechutilsdemo/ExampleTest.java +++ b/entry/src/test/java/com/huawei/hm_speechutilsdemo/ExampleTest.java @@ -2,6 +2,11 @@ package com.huawei.hm_speechutilsdemo; import org.junit.Test; +/** + * Test + * + * @since 2021-05-10 + */ public class ExampleTest { @Test public void onStart() { diff --git a/speechutils/src/main/java/ee/ioc/phon/ohos/speechutils/abilityslice/AsrBaseAbilitySlice.java b/speechutils/src/main/java/ee/ioc/phon/ohos/speechutils/abilityslice/AsrBaseAbilitySlice.java index 51d71d0e3211deb1930b53c66c167070d7ac28fe..f5c49437372eb4a22a74185a52fb5f9d298ee380 100644 --- a/speechutils/src/main/java/ee/ioc/phon/ohos/speechutils/abilityslice/AsrBaseAbilitySlice.java +++ b/speechutils/src/main/java/ee/ioc/phon/ohos/speechutils/abilityslice/AsrBaseAbilitySlice.java @@ -16,9 +16,11 @@ package ee.ioc.phon.ohos.speechutils.abilityslice; import com.google.gson.Gson; + import ee.ioc.phon.ohos.speechutils.utils.Define; import ee.ioc.phon.ohos.speechutils.utils.LogUtils; import ee.ioc.phon.ohos.speechutils.utils.ResultInfo; + import ohos.aafwk.ability.AbilitySlice; import ohos.aafwk.content.Intent; import ohos.ai.asr.AsrClient; @@ -71,8 +73,8 @@ public abstract class AsrBaseAbilitySlice extends AbilitySlice implements RmsCha } @Override - public void onError(int i) { - HiLog.info(LABEL_LOG, "onError = " + i); + public void onError(int id) { + HiLog.info(LABEL_LOG, "onError = " + id); } @Override @@ -91,7 +93,7 @@ public abstract class AsrBaseAbilitySlice extends AbilitySlice implements RmsCha } @Override - public void onEvent(int i, PacMap pacMap) { + public void onEvent(int evenCode, PacMap pacMap) { HiLog.info(LABEL_LOG, "onEvent"); } @@ -109,9 +111,7 @@ public abstract class AsrBaseAbilitySlice extends AbilitySlice implements RmsCha private Runnable runnable = new Runnable() { @Override public void run() { - HiLog.info(LABEL_LOG, "监听线程启动 = " + Thread.currentThread().getName()); while (isFlag) { - // buffer需要替换为真实的音频数据 byte[] buffer = new byte[Define.BYTE_BUFFER]; /** * 对于长度大于1280的音频,需要多次调用writePcm分段传输 @@ -171,14 +171,14 @@ public abstract class AsrBaseAbilitySlice extends AbilitySlice implements RmsCha mAudioCapturer.stop(); asrClient.stopListening(); asrClient.cancel(); - HiLog.info(LABEL_LOG, "停止监听"); + HiLog.info(LABEL_LOG, "stopListen"); } /** * 开始监听 */ protected void startRecoding() { - HiLog.info(LABEL_LOG, "开始监听"); + HiLog.info(LABEL_LOG, "startListen"); asrClient.startListening(initIntent); mAudioCapturer.start(); isFlag = true; @@ -188,7 +188,7 @@ public abstract class AsrBaseAbilitySlice extends AbilitySlice implements RmsCha /** * 能力变化 * - * @param energyV + * @param energyV 能量值 */ private void rmsChanged(float energyV) { HiLog.info(LABEL_LOG, "onRmsChanged = " + energyV); @@ -206,7 +206,7 @@ public abstract class AsrBaseAbilitySlice extends AbilitySlice implements RmsCha asd = 1; } showRmsChanged(asd); - HiLog.info(LABEL_LOG, "能量值 = " + asd); + HiLog.info(LABEL_LOG, "energy = " + asd); } }, 0); } @@ -260,8 +260,6 @@ public abstract class AsrBaseAbilitySlice extends AbilitySlice implements RmsCha /** * 布局 - * - * @return */ public abstract void initView(); diff --git a/speechutils/src/main/java/ee/ioc/phon/ohos/speechutils/abilityslice/RmsChangedInterface.java b/speechutils/src/main/java/ee/ioc/phon/ohos/speechutils/abilityslice/RmsChangedInterface.java index 26cddfbeebc17d174faf42c2d9dabb13b8315a7c..5625db43586e96953d09a2dc7acefd9f1f6e3c56 100644 --- a/speechutils/src/main/java/ee/ioc/phon/ohos/speechutils/abilityslice/RmsChangedInterface.java +++ b/speechutils/src/main/java/ee/ioc/phon/ohos/speechutils/abilityslice/RmsChangedInterface.java @@ -24,7 +24,7 @@ public interface RmsChangedInterface { /** * 能量变化 * - * @param chage + * @param chage 能力值 */ void showRmsChanged(float chage); } diff --git a/speechutils/src/main/java/ee/ioc/phon/ohos/speechutils/abilityslice/ShowAsrResult.java b/speechutils/src/main/java/ee/ioc/phon/ohos/speechutils/abilityslice/ShowAsrResult.java index 14e26ac3385d48948b83a284be4cf2d4986b9297..ad0d163f21fa1740fde9cf5f224824038c50d8ab 100644 --- a/speechutils/src/main/java/ee/ioc/phon/ohos/speechutils/abilityslice/ShowAsrResult.java +++ b/speechutils/src/main/java/ee/ioc/phon/ohos/speechutils/abilityslice/ShowAsrResult.java @@ -24,7 +24,7 @@ public interface ShowAsrResult { /** * 识别结果 * - * @param info + * @param info 转换结果 */ void showAsrResult(String info); } diff --git a/speechutils/src/main/java/ee/ioc/phon/ohos/speechutils/abilityslice/TtsBaseAbilitySlice.java b/speechutils/src/main/java/ee/ioc/phon/ohos/speechutils/abilityslice/TtsBaseAbilitySlice.java index 311a1b81e2d54a766765a8c111342c4dd27ee794..d63a7c68cd2eb4fd3dd7289b2101f36406651a06 100644 --- a/speechutils/src/main/java/ee/ioc/phon/ohos/speechutils/abilityslice/TtsBaseAbilitySlice.java +++ b/speechutils/src/main/java/ee/ioc/phon/ohos/speechutils/abilityslice/TtsBaseAbilitySlice.java @@ -43,7 +43,13 @@ public abstract class TtsBaseAbilitySlice extends AbilitySlice implements TtsSho private static final int EVENT_MSG_INIT = 0x1000001; private static final int EVENT_MSG_TIME_COUNT = 0x1000002; private static final HiLogLabel LABEL_LOG = new HiLogLabel(3, 0xD001100, "TTSAbilitySlice"); + /** + * 是否正在进行TTS播报 + */ protected boolean isInitItsResult; + /** + * 显示信息 + */ protected String info = ""; private int time = 0; private Timer timer = null; @@ -53,20 +59,16 @@ public abstract class TtsBaseAbilitySlice extends AbilitySlice implements TtsSho @Override protected void processEvent(InnerEvent event) { super.processEvent(event); - switch (event.eventId) { - case EVENT_MSG_TIME_COUNT: - getUITaskDispatcher().delayDispatch(new Runnable() { - @Override - public void run() { - time = time + 1; - HiLog.info(LABEL_LOG, "播报耗时:" + Integer.toString(time) + " s"); - info = "播报耗时:" + Integer.toString(time) + " s"; - showInfo(info); - } - }, 0); - break; - default: - break; + if (event.eventId == EVENT_MSG_TIME_COUNT) { + getUITaskDispatcher().delayDispatch(new Runnable() { + @Override + public void run() { + time = time + 1; + HiLog.info(LABEL_LOG, "playTime:" + Integer.toString(time) + " s"); + info = "playTime:" + Integer.toString(time) + " s"; + showInfo(info); + } + }, 0); } } }; @@ -100,7 +102,7 @@ public abstract class TtsBaseAbilitySlice extends AbilitySlice implements TtsSho } @Override - public void onError(String s, String s1) { + public void onError(String errorMsg, String s1) { HiLog.info(LABEL_LOG, "onError..."); } diff --git a/speechutils/src/main/java/ee/ioc/phon/ohos/speechutils/abilityslice/TtsShowInfoInterface.java b/speechutils/src/main/java/ee/ioc/phon/ohos/speechutils/abilityslice/TtsShowInfoInterface.java index 1f1c4840d3297c81536ba28e8fd1105d0eb8e8a5..f567b0c396051e3a068ab8c59e90720de500e079 100644 --- a/speechutils/src/main/java/ee/ioc/phon/ohos/speechutils/abilityslice/TtsShowInfoInterface.java +++ b/speechutils/src/main/java/ee/ioc/phon/ohos/speechutils/abilityslice/TtsShowInfoInterface.java @@ -24,7 +24,7 @@ public interface TtsShowInfoInterface { /** * 显示时间 * - * @param info + * @param info 耗时时间 */ void showInfo(String info); } diff --git a/speechutils/src/main/java/ee/ioc/phon/ohos/speechutils/utils/DialogUtils.java b/speechutils/src/main/java/ee/ioc/phon/ohos/speechutils/utils/DialogUtils.java index a2094ea6d2c4bed9d65104a907851e5c6b2c5db9..7182f1bc6d6e5c0855f7880f4da95bad78780d74 100644 --- a/speechutils/src/main/java/ee/ioc/phon/ohos/speechutils/utils/DialogUtils.java +++ b/speechutils/src/main/java/ee/ioc/phon/ohos/speechutils/utils/DialogUtils.java @@ -42,8 +42,8 @@ public class DialogUtils { /** * 显示Toast * - * @param msg - * @param ability + * @param msg 显示信息 + * @param ability Ability */ public static void showToast(String msg, Ability ability) { DirectionalLayout layout = (DirectionalLayout) LayoutScatter.getInstance(ability) 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 1f749544f38fd6252f987466c84809a3230c9b5a..60ffab0198d301b9e44c11c06de3f7e967423b18 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 @@ -135,9 +135,9 @@ public class MicButton extends Component implements Component.EstimateSizeListen /** * 测量方法onMeasure相似 * - * @param widthMeasureSpec - * @param heightMeasureSpec - * @return boolean + * @param widthMeasureSpec widthMeasureSpec + * @param heightMeasureSpec heightMeasureSpec + * @return boolean isOnEstimateSize */ @Override public boolean onEstimateSize(int widthMeasureSpec, int heightMeasureSpec) { @@ -169,7 +169,7 @@ public class MicButton extends Component implements Component.EstimateSizeListen /** * 1-30 * - * @param level + * @param level 能量波大小 */ public void setRmsdbLevel(float level) { rmsdbLevel = level; @@ -179,7 +179,7 @@ public class MicButton extends Component implements Component.EstimateSizeListen /** * 设置颜色 * - * @param color + * @param color 颜色值 */ public void setIndicatorColor(int color) { wavePaint.setColor(new Color(color)); @@ -219,7 +219,7 @@ public class MicButton extends Component implements Component.EstimateSizeListen /** * 通过资源ID获取位图对象 * - * @param resId + * @param resId 资源id * @return PixelMap */ private PixelMap getPixelMap(int resId) {