From 2ca33ff2801e47974815fd655868dcb5e6146055 Mon Sep 17 00:00:00 2001 From: 258767-shengyu <1qaz2wsx> Date: Thu, 22 Jul 2021 14:49:31 +0800 Subject: [PATCH 1/2] checkstyle --- .../java/org/botlibre/sdk/MyApplication.java | 8 ++++ .../sdk/util/ApplicationJumpUtil.java | 45 ++++++++----------- .../java/org/botlibre/sdk/util/FileUtils.java | 44 +++++++++--------- .../java/org/botlibre/sdk/MyApplication.java | 8 ++++ .../ability/dialog/LanguageDialogBuilder.java | 4 +- .../ability/dialog/SpinnerDialogBuilder.java | 4 +- .../java/org/botlibre/sdk/MyApplication.java | 8 ++++ .../ability/dialog/LanguageDialogBuilder.java | 4 +- .../ability/dialog/SearchDialogBuilder.java | 4 +- .../ability/dialog/SpinnerDialogBuilder.java | 4 +- 10 files changed, 75 insertions(+), 58 deletions(-) diff --git a/BotLibre/entry/src/main/java/org/botlibre/sdk/MyApplication.java b/BotLibre/entry/src/main/java/org/botlibre/sdk/MyApplication.java index 55e4b2b..d9a92f7 100644 --- a/BotLibre/entry/src/main/java/org/botlibre/sdk/MyApplication.java +++ b/BotLibre/entry/src/main/java/org/botlibre/sdk/MyApplication.java @@ -2,7 +2,15 @@ package org.botlibre.sdk; import ohos.aafwk.ability.AbilityPackage; +/** + * MyApplication + * + * @since 2021-05-10 + */ public class MyApplication extends AbilityPackage { + /** + * onInitialize + */ @Override public void onInitialize() { super.onInitialize(); diff --git a/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/util/ApplicationJumpUtil.java b/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/util/ApplicationJumpUtil.java index bce0b35..2307ffb 100644 --- a/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/util/ApplicationJumpUtil.java +++ b/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/util/ApplicationJumpUtil.java @@ -45,8 +45,8 @@ public class ApplicationJumpUtil { /** * 电话:IntentConstants.ACTION_DIAL * - * @param context - * @param action + * @param context 上下文 + * @param action action */ public static void setSystemOption(Ability context, String action) { Intent mIntent = new Intent(); @@ -60,7 +60,7 @@ public class ApplicationJumpUtil { /** * 打开相机 * - * @param context + * @param context 上下文 */ public static void openCamera(Ability context) { Intent intent = new Intent(); @@ -71,9 +71,9 @@ public class ApplicationJumpUtil { /** * 手机短信功能调用 action属性：IntentConstants.ACTION_SEND_SMS * - * @param context - * @param smsContent - * @param action + * @param context 上下文 + * @param smsContent smscontent + * @param action action */ public static void setSystemOptionSms(Ability context, String smsContent, String action) { Intent mIntent = new Intent(); @@ -88,7 +88,7 @@ public class ApplicationJumpUtil { * 打开日历记事本 * * @param context ability 上下文 - * @param action + * @param action action */ public static void setSystemOptionAction(Ability context, String action) { Intent intent = new Intent(); @@ -99,19 +99,11 @@ public class ApplicationJumpUtil { } /** - * 判断是否是邮箱 + * findEmail * - * @param email 邮箱地址 "email to dffdfdf@163.com" - * @return 返回状态 + * @param content 目标字符串 + * @return 邮箱 */ - public static boolean isEmail(String email) { - Pattern regex = Pattern.compile(check); - String cancelNull = email.toString().trim().replace(" ", ""); - Matcher matcher = regex.matcher(cancelNull); - boolean isMatched = matcher.matches(); - return isMatched; - } - public static String findEmail(String content) { Pattern pattern = Pattern.compile(regex); Matcher matcher = pattern.matcher(content); @@ -135,8 +127,8 @@ public class ApplicationJumpUtil { /** * 跳转浏览器 * - * @param ability - * @param urlString + * @param ability 上下文 + * @param urlString url */ public static void startWebsite(Ability ability, String urlString) { if (urlString.isEmpty()) { @@ -154,8 +146,8 @@ public class ApplicationJumpUtil { /** * 通过传参数 包名 ，获取信息 进行跳转 * - * @param context - * @param packageNa + * @param context 上下文 + * @param packageNa 包名 */ public static void startAppFromPackageName(Ability context, String packageNa) { // 通过包名获取此APP详细信息，包括Activities、services、versioncode、name等等 @@ -179,8 +171,11 @@ public class ApplicationJumpUtil { try { resolveinfoList = context.getBundleManager() .queryAbilityByIntent(resolveIntent, 0, 0); + } catch (RemoteException e) { + e.printStackTrace(); + } - if(resolveinfoList != null && resolveinfoList.size()>0) { + if (resolveinfoList != null && resolveinfoList.size() > 0) { String bundleName = null; String className = null; for (int ii = 0; ii < resolveinfoList.size(); ii++) { @@ -199,8 +194,6 @@ public class ApplicationJumpUtil { mIntent.setOperation(operation); context.startAbility(mIntent); } - } catch (RemoteException e) { - e.getMessage(); - } + } } diff --git a/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/util/FileUtils.java b/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/util/FileUtils.java index 2543508..57728a1 100644 --- a/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/util/FileUtils.java +++ b/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/util/FileUtils.java @@ -1,8 +1,21 @@ +/* + * 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 org.botlibre.sdk.util; import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; @@ -12,39 +25,26 @@ import java.io.InputStream; * @since 2021-06-10 */ public class FileUtils { + private static final int CONST1 = -1; + private static final int CONST1024 = 1024; - /** - * 读取File工具类，返回String - * - * @param filePath 文件路径 - * @return txt - */ - public static String readFile(String filePath) { - try { - File file = new File(filePath); - FileInputStream fis = new FileInputStream(file); - String txt = convertStreamToString(fis); - return txt; - } catch (Exception e) { - System.out.println(e.getMessage()); - } - return null; + private FileUtils() { } /** * InputStream转String工具类，返回String * - * @param inputStream + * @param inputStream 输入流 * @return dd * @throws IOException */ public static String convertStreamToString(InputStream inputStream) throws IOException { ByteArrayOutputStream result = new ByteArrayOutputStream(); - byte[] buffer = new byte[1024]; + byte[] buffer = new byte[CONST1024]; int length; - while ((length = inputStream.read(buffer)) != -1) { + while ((length = inputStream.read(buffer)) != CONST1) { result.write(buffer, 0, length); - }// StandardCharsets.UTF_8.name() > JDK 7 + } return result.toString("UTF-8"); } } diff --git a/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/MyApplication.java b/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/MyApplication.java index bcbf79d..efefafa 100644 --- a/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/MyApplication.java +++ b/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/MyApplication.java @@ -17,7 +17,15 @@ package org.botlibre.sdk; import ohos.aafwk.ability.AbilityPackage; +/** + * 语言对话框 + * + * @since 2021-05-10 + */ public class MyApplication extends AbilityPackage { + /** + * onInitialize + */ @Override public void onInitialize() { super.onInitialize(); diff --git a/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/ability/dialog/LanguageDialogBuilder.java b/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/ability/dialog/LanguageDialogBuilder.java index 1931e09..d6f8e32 100644 --- a/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/ability/dialog/LanguageDialogBuilder.java +++ b/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/ability/dialog/LanguageDialogBuilder.java @@ -62,8 +62,8 @@ public class LanguageDialogBuilder { Optional display = DisplayManager.getInstance().getDefaultDisplay(context); DisplayAttributes displayAttributes = display.get().getAttributes(); - DirectionalLayout layout = (DirectionalLayout) LayoutScatter.getInstance(context). - parse(ResourceTable.Layout_spinner_dialog, + DirectionalLayout layout = (DirectionalLayout) LayoutScatter.getInstance(context) + .parse(ResourceTable.Layout_spinner_dialog, null, false); mCommonDialog.setContentCustomComponent(layout) .setAlignment(LayoutAlignment.CENTER) diff --git a/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/ability/dialog/SpinnerDialogBuilder.java b/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/ability/dialog/SpinnerDialogBuilder.java index e4aaa06..d866d1a 100644 --- a/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/ability/dialog/SpinnerDialogBuilder.java +++ b/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/ability/dialog/SpinnerDialogBuilder.java @@ -62,8 +62,8 @@ public class SpinnerDialogBuilder { Optional display = DisplayManager.getInstance().getDefaultDisplay(context); DisplayAttributes displayAttributes = display.get().getAttributes(); - DirectionalLayout layout = (DirectionalLayout) LayoutScatter.getInstance(context). - parse(ResourceTable.Layout_spinner_dialog, + DirectionalLayout layout = (DirectionalLayout) LayoutScatter.getInstance(context) + .parse(ResourceTable.Layout_spinner_dialog, null, false); mCommonDialog.setContentCustomComponent(layout) .setAlignment(LayoutAlignment.CENTER) diff --git a/SantaBot/entry/src/main/java/org/botlibre/sdk/MyApplication.java b/SantaBot/entry/src/main/java/org/botlibre/sdk/MyApplication.java index 55e4b2b..d9a92f7 100644 --- a/SantaBot/entry/src/main/java/org/botlibre/sdk/MyApplication.java +++ b/SantaBot/entry/src/main/java/org/botlibre/sdk/MyApplication.java @@ -2,7 +2,15 @@ package org.botlibre.sdk; import ohos.aafwk.ability.AbilityPackage; +/** + * MyApplication + * + * @since 2021-05-10 + */ public class MyApplication extends AbilityPackage { + /** + * onInitialize + */ @Override public void onInitialize() { super.onInitialize(); diff --git a/SantaBot/entry/src/main/java/org/botlibre/sdk/ability/dialog/LanguageDialogBuilder.java b/SantaBot/entry/src/main/java/org/botlibre/sdk/ability/dialog/LanguageDialogBuilder.java index 6614d99..ff6a640 100644 --- a/SantaBot/entry/src/main/java/org/botlibre/sdk/ability/dialog/LanguageDialogBuilder.java +++ b/SantaBot/entry/src/main/java/org/botlibre/sdk/ability/dialog/LanguageDialogBuilder.java @@ -62,8 +62,8 @@ public class LanguageDialogBuilder { Optional display = DisplayManager.getInstance().getDefaultDisplay(context); DisplayAttributes displayAttributes = display.get().getAttributes(); - DirectionalLayout layout = (DirectionalLayout) LayoutScatter.getInstance(context). - parse(ResourceTable.Layout_spinner_dialog, + DirectionalLayout layout = (DirectionalLayout) LayoutScatter.getInstance(context) + .parse(ResourceTable.Layout_spinner_dialog, null, false); mCommonDialog.setContentCustomComponent(layout) .setAlignment(LayoutAlignment.CENTER) diff --git a/SantaBot/entry/src/main/java/org/botlibre/sdk/ability/dialog/SearchDialogBuilder.java b/SantaBot/entry/src/main/java/org/botlibre/sdk/ability/dialog/SearchDialogBuilder.java index 4c4ce57..d5e99dd 100644 --- a/SantaBot/entry/src/main/java/org/botlibre/sdk/ability/dialog/SearchDialogBuilder.java +++ b/SantaBot/entry/src/main/java/org/botlibre/sdk/ability/dialog/SearchDialogBuilder.java @@ -64,8 +64,8 @@ public class SearchDialogBuilder { Optional display = DisplayManager.getInstance().getDefaultDisplay(context); DisplayAttributes displayAttributes = display.get().getAttributes(); - DirectionalLayout layout = (DirectionalLayout) LayoutScatter.getInstance(context). - parse(ResourceTable.Layout_spinner_dialog, + DirectionalLayout layout = (DirectionalLayout) LayoutScatter.getInstance(context) + .parse(ResourceTable.Layout_spinner_dialog, null, false); mCommonDialog.setContentCustomComponent(layout) .setAlignment(LayoutAlignment.CENTER) diff --git a/SantaBot/entry/src/main/java/org/botlibre/sdk/ability/dialog/SpinnerDialogBuilder.java b/SantaBot/entry/src/main/java/org/botlibre/sdk/ability/dialog/SpinnerDialogBuilder.java index e4aaa06..d866d1a 100644 --- a/SantaBot/entry/src/main/java/org/botlibre/sdk/ability/dialog/SpinnerDialogBuilder.java +++ b/SantaBot/entry/src/main/java/org/botlibre/sdk/ability/dialog/SpinnerDialogBuilder.java @@ -62,8 +62,8 @@ public class SpinnerDialogBuilder { Optional display = DisplayManager.getInstance().getDefaultDisplay(context); DisplayAttributes displayAttributes = display.get().getAttributes(); - DirectionalLayout layout = (DirectionalLayout) LayoutScatter.getInstance(context). - parse(ResourceTable.Layout_spinner_dialog, + DirectionalLayout layout = (DirectionalLayout) LayoutScatter.getInstance(context) + .parse(ResourceTable.Layout_spinner_dialog, null, false); mCommonDialog.setContentCustomComponent(layout) .setAlignment(LayoutAlignment.CENTER) -- Gitee From 7a868b976a3b9549b57ca8c4c58ca4db758aecde Mon Sep 17 00:00:00 2001 From: 258767-shengyu <1qaz2wsx> Date: Thu, 22 Jul 2021 14:50:28 +0800 Subject: [PATCH 2/2] checkstyle --- .../org/botlibre/sdk/ability/BaseAbility.java | 12 -- .../actions/HttpFetchActionOffline.java | 2 +- .../sdk/ability/actions/HttpUIAction.java | 4 +- .../ability/actions/HttpUIResultAction.java | 4 +- .../sdk/ability/adapter/SpinnerAdapter.java | 9 +- .../ability/dialog/LanguageDialogBuilder.java | 20 +-- .../ability/dialog/SearchDialogBuilder.java | 22 ++-- .../ability/dialog/SpinnerDialogBuilder.java | 14 +- .../java/org/botlibre/sdk/util/AsyncTask.java | 46 ++++--- .../java/org/botlibre/sdk/util/LogUtils.java | 54 ++++---- .../botlibre/sdk/util/PreferencesUtils.java | 24 ++-- .../java/org/botlibre/sdk/util/ResUtils.java | 17 +-- .../org/botlibre/sdk/util/ToastUtils.java | 21 ++- .../org/botlibre/sdk/MainAbilityTest.java | 46 ------- .../java/org/botlibre/sdk/MyApplication.java | 20 ++- .../org/botlibre/sdk/ability/BaseAbility.java | 12 -- .../sdk/ability/MicConfigAbility.java | 40 +----- .../sdk/ability/actions/HttpUIAction.java | 4 +- .../ability/actions/HttpUIResultAction.java | 4 +- .../sdk/ability/adapter/CommandAdapter.java | 5 +- .../sdk/ability/adapter/EmoteAdapter.java | 8 +- .../sdk/ability/adapter/SpinnerAdapter.java | 5 +- .../ability/dialog/LanguageDialogBuilder.java | 14 +- .../ability/dialog/SearchDialogBuilder.java | 22 ++-- .../ability/dialog/SpinnerDialogBuilder.java | 18 +-- .../botlibre/sdk/micro/MicroConnection.java | 2 +- .../java/org/botlibre/sdk/util/AsyncTask.java | 124 ++++++++++-------- .../java/org/botlibre/sdk/util/LogUtils.java | 54 ++++---- .../botlibre/sdk/util/PreferencesUtils.java | 24 ++-- .../java/org/botlibre/sdk/util/ResUtils.java | 27 ++-- .../org/botlibre/sdk/util/ToastUtils.java | 21 ++- .../sdk/ability/MicConfigAbility.java | 10 +- .../sdk/ability/actions/HttpUIAction.java | 6 +- .../sdk/ability/adapter/SpinnerAdapter.java | 7 +- .../java/org/botlibre/sdk/util/AsyncTask.java | 46 ++++--- .../java/org/botlibre/sdk/util/LogUtils.java | 54 ++++---- .../botlibre/sdk/util/PreferencesUtils.java | 24 ++-- .../java/org/botlibre/sdk/util/ResUtils.java | 19 +-- .../org/botlibre/sdk/util/ToastUtils.java | 21 ++- .../botlibre/sdk/util/ResUtilsOhosTest.java | 51 ------- .../java/org/botlibre/sdk/ExampleTest.java | 8 ++ .../sdk/ability/actions/HttpUIAction.java | 4 +- .../ability/actions/HttpUIResultAction.java | 4 +- .../sdk/ability/adapter/SpinnerAdapter.java | 7 +- .../java/org/botlibre/sdk/util/AsyncTask.java | 46 ++++--- .../java/org/botlibre/sdk/util/LogUtils.java | 54 ++++---- .../botlibre/sdk/util/PreferencesUtils.java | 24 ++-- .../java/org/botlibre/sdk/util/ResUtils.java | 25 ++-- .../org/botlibre/sdk/util/ToastUtils.java | 21 ++- 49 files changed, 527 insertions(+), 603 deletions(-) delete mode 100644 BotLibre/entry/src/main/java/org/botlibre/sdk/ability/BaseAbility.java delete mode 100644 BotLibre/entry/src/ohosTest/java/org/botlibre/sdk/MainAbilityTest.java delete mode 100644 BotLibreOffline/entry/src/main/java/org/botlibre/sdk/ability/BaseAbility.java delete mode 100644 PizzaBotOffline/entry/src/ohosTest/java/org/botlibre/sdk/util/ResUtilsOhosTest.java diff --git a/BotLibre/entry/src/main/java/org/botlibre/sdk/ability/BaseAbility.java b/BotLibre/entry/src/main/java/org/botlibre/sdk/ability/BaseAbility.java deleted file mode 100644 index c659c6a..0000000 --- a/BotLibre/entry/src/main/java/org/botlibre/sdk/ability/BaseAbility.java +++ /dev/null @@ -1,12 +0,0 @@ -package org.botlibre.sdk.ability; - -import ohos.aafwk.ability.Ability; -import ohos.aafwk.content.Intent; - -public class BaseAbility extends Ability { - @Override - public void onStart(Intent intent) { - super.onStart(intent); - } - -} diff --git a/BotLibre/entry/src/main/java/org/botlibre/sdk/ability/actions/HttpFetchActionOffline.java b/BotLibre/entry/src/main/java/org/botlibre/sdk/ability/actions/HttpFetchActionOffline.java index 1519aa8..95ab96c 100644 --- a/BotLibre/entry/src/main/java/org/botlibre/sdk/ability/actions/HttpFetchActionOffline.java +++ b/BotLibre/entry/src/main/java/org/botlibre/sdk/ability/actions/HttpFetchActionOffline.java @@ -81,7 +81,7 @@ public class HttpFetchActionOffline extends HttpUIAction { this.config = microConnection.fetch(this.config); } catch (Exception exception) { this.exception = exception; - LogUtils.e("HttpFetchAction", exception.toString()); + LogUtils.error("HttpFetchAction", exception.toString()); return ""; } diff --git a/BotLibre/entry/src/main/java/org/botlibre/sdk/ability/actions/HttpUIAction.java b/BotLibre/entry/src/main/java/org/botlibre/sdk/ability/actions/HttpUIAction.java index f0093ab..a8a52bb 100644 --- a/BotLibre/entry/src/main/java/org/botlibre/sdk/ability/actions/HttpUIAction.java +++ b/BotLibre/entry/src/main/java/org/botlibre/sdk/ability/actions/HttpUIAction.java @@ -53,7 +53,7 @@ public abstract class HttpUIAction extends HttpAction { this.dialog.setSize(displayAttributes.width - 100,150); this.dialog.show(); } catch (Exception exception) { - LogUtils.e("HttpUIAction.onPreExecute", exception.toString()); + LogUtils.error("HttpUIAction.onPreExecute", exception.toString()); } } @@ -66,7 +66,7 @@ public abstract class HttpUIAction extends HttpAction { MainAbility.errorInfo(1,this.exception.getMessage(), this.exception, this.ability); } } catch (Exception exception) { - LogUtils.e("HttpUIAction.onPostExecute", exception.toString()); + LogUtils.error("HttpUIAction.onPostExecute", exception.toString()); } } } \ No newline at end of file diff --git a/BotLibre/entry/src/main/java/org/botlibre/sdk/ability/actions/HttpUIResultAction.java b/BotLibre/entry/src/main/java/org/botlibre/sdk/ability/actions/HttpUIResultAction.java index db20c90..c952ff7 100644 --- a/BotLibre/entry/src/main/java/org/botlibre/sdk/ability/actions/HttpUIResultAction.java +++ b/BotLibre/entry/src/main/java/org/botlibre/sdk/ability/actions/HttpUIResultAction.java @@ -54,7 +54,7 @@ public abstract class HttpUIResultAction extends HttpResultAction { this.dialog.setSize(displayAttributes.width - 100,150); this.dialog.show(); } catch (Exception exception) { - LogUtils.e("HttpUIAction.onPreExecute", exception.toString()); + LogUtils.error("HttpUIAction.onPreExecute", exception.toString()); } } @@ -71,7 +71,7 @@ public abstract class HttpUIResultAction extends HttpResultAction { // } } } catch (Exception exception) { - LogUtils.e("HttpUIAction.onPostExecute", exception.toString()); + LogUtils.error("HttpUIAction.onPostExecute", exception.toString()); } } } \ No newline at end of file diff --git a/BotLibre/entry/src/main/java/org/botlibre/sdk/ability/adapter/SpinnerAdapter.java b/BotLibre/entry/src/main/java/org/botlibre/sdk/ability/adapter/SpinnerAdapter.java index 5af9565..8a14895 100644 --- a/BotLibre/entry/src/main/java/org/botlibre/sdk/ability/adapter/SpinnerAdapter.java +++ b/BotLibre/entry/src/main/java/org/botlibre/sdk/ability/adapter/SpinnerAdapter.java @@ -15,13 +15,13 @@ package org.botlibre.sdk.ability.adapter; -import org.botlibre.sdk.ResourceTable; import ohos.aafwk.ability.Ability; 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 org.botlibre.sdk.ResourceTable; /** * 适配器 @@ -84,13 +84,14 @@ public class SpinnerAdapter extends BaseItemProvider { * getComponent * * @param position position - * @param component component1 + * @param component1 component1 * @param componentContainer componentContainer * @return getComponent */ @Override - public Component getComponent(int position, Component component, ComponentContainer componentContainer) { + public Component getComponent(int position, Component component1, ComponentContainer componentContainer) { ViewHolder holder; + Component component = component1; if (component == null) { component = mInflater.parse(ResourceTable.Layout_simple_spinner_dropdown_item, componentContainer, false); @@ -98,9 +99,7 @@ public class SpinnerAdapter extends BaseItemProvider { } else { holder = (ViewHolder) component.getTag(); } - holder.title.setText(types[position] + ""); - return component; } diff --git a/BotLibre/entry/src/main/java/org/botlibre/sdk/ability/dialog/LanguageDialogBuilder.java b/BotLibre/entry/src/main/java/org/botlibre/sdk/ability/dialog/LanguageDialogBuilder.java index 6614d99..aa65364 100644 --- a/BotLibre/entry/src/main/java/org/botlibre/sdk/ability/dialog/LanguageDialogBuilder.java +++ b/BotLibre/entry/src/main/java/org/botlibre/sdk/ability/dialog/LanguageDialogBuilder.java @@ -15,11 +15,6 @@ package org.botlibre.sdk.ability.dialog; -import org.botlibre.sdk.MainAbility; -import org.botlibre.sdk.ResourceTable; -import org.botlibre.sdk.ability.adapter.SpinnerAdapter; -import org.botlibre.sdk.ability.listener.LanguageListener; -import org.botlibre.sdk.util.Constant; import ohos.aafwk.ability.Ability; import ohos.agp.components.Component; import ohos.agp.components.DirectionalLayout; @@ -30,6 +25,11 @@ import ohos.agp.window.dialog.CommonDialog; import ohos.agp.window.service.Display; import ohos.agp.window.service.DisplayAttributes; import ohos.agp.window.service.DisplayManager; +import org.botlibre.sdk.MainAbility; +import org.botlibre.sdk.ResourceTable; +import org.botlibre.sdk.ability.adapter.SpinnerAdapter; +import org.botlibre.sdk.ability.listener.LanguageListener; +import org.botlibre.sdk.util.Constant; import java.util.Optional; @@ -62,17 +62,17 @@ public class LanguageDialogBuilder { Optional display = DisplayManager.getInstance().getDefaultDisplay(context); DisplayAttributes displayAttributes = display.get().getAttributes(); - DirectionalLayout layout = (DirectionalLayout) LayoutScatter.getInstance(context). - parse(ResourceTable.Layout_spinner_dialog, + DirectionalLayout layout = (DirectionalLayout) LayoutScatter.getInstance(context) + .parse(ResourceTable.Layout_spinner_dialog, null, false); mCommonDialog.setContentCustomComponent(layout) - .setAlignment(LayoutAlignment.CENTER) - .setSize(displayAttributes.width - Constant.FIVEZORE,displayAttributes.width) + .setAlignment(LayoutAlignment.CENTER). + setSize(displayAttributes.width - Constant.FIVEZORE, displayAttributes.width) .setAutoClosable(true) .setTransparent(false) .show(); - listContainer = (ListContainer)layout.findComponentById(ResourceTable.Id_typeSpin); + listContainer = (ListContainer) layout.findComponentById(ResourceTable.Id_typeSpin); SpinnerAdapter spinner = new SpinnerAdapter(context, MainAbility.getLanguages()); listContainer.setItemProvider(spinner); diff --git a/BotLibre/entry/src/main/java/org/botlibre/sdk/ability/dialog/SearchDialogBuilder.java b/BotLibre/entry/src/main/java/org/botlibre/sdk/ability/dialog/SearchDialogBuilder.java index 4c4ce57..a41f960 100644 --- a/BotLibre/entry/src/main/java/org/botlibre/sdk/ability/dialog/SearchDialogBuilder.java +++ b/BotLibre/entry/src/main/java/org/botlibre/sdk/ability/dialog/SearchDialogBuilder.java @@ -15,10 +15,6 @@ package org.botlibre.sdk.ability.dialog; -import org.botlibre.sdk.ResourceTable; -import org.botlibre.sdk.ability.adapter.SpinnerAdapter; -import org.botlibre.sdk.ability.listener.SelectListener; -import org.botlibre.sdk.util.Constant; import ohos.aafwk.ability.Ability; import ohos.agp.components.Component; import ohos.agp.components.DirectionalLayout; @@ -29,6 +25,10 @@ import ohos.agp.window.dialog.CommonDialog; import ohos.agp.window.service.Display; import ohos.agp.window.service.DisplayAttributes; import ohos.agp.window.service.DisplayManager; +import org.botlibre.sdk.ResourceTable; +import org.botlibre.sdk.ability.adapter.SpinnerAdapter; +import org.botlibre.sdk.ability.listener.SelectListener; +import org.botlibre.sdk.util.Constant; import java.util.Optional; @@ -49,7 +49,7 @@ public class SearchDialogBuilder { * @param context context * @param spinStr spinStr */ - public SearchDialogBuilder(Ability context,String[] spinStr) { + public SearchDialogBuilder(Ability context, String[] spinStr) { this.spinStr = spinStr.clone(); initLayout(context); } @@ -64,17 +64,17 @@ public class SearchDialogBuilder { Optional display = DisplayManager.getInstance().getDefaultDisplay(context); DisplayAttributes displayAttributes = display.get().getAttributes(); - DirectionalLayout layout = (DirectionalLayout) LayoutScatter.getInstance(context). - parse(ResourceTable.Layout_spinner_dialog, + DirectionalLayout layout = (DirectionalLayout) LayoutScatter.getInstance(context) + .parse(ResourceTable.Layout_spinner_dialog, null, false); mCommonDialog.setContentCustomComponent(layout) .setAlignment(LayoutAlignment.CENTER) - .setSize(displayAttributes.width - Constant.FIVEZORE,displayAttributes.width) + .setSize(displayAttributes.width - Constant.FIVEZORE, displayAttributes.width) .setAutoClosable(true) .setTransparent(false) .show(); - listContainer = (ListContainer)layout.findComponentById(ResourceTable.Id_typeSpin); + listContainer = (ListContainer) layout.findComponentById(ResourceTable.Id_typeSpin); SpinnerAdapter spinner = new SpinnerAdapter(context, spinStr); listContainer.setItemProvider(spinner); @@ -95,8 +95,8 @@ public class SearchDialogBuilder { * @param spinStr spinStr * @return 初始化函数 */ - public static SearchDialogBuilder with(Ability context,String[] spinStr) { - return new SearchDialogBuilder(context,spinStr); + public static SearchDialogBuilder with(Ability context, String[] spinStr) { + return new SearchDialogBuilder(context, spinStr); } /** diff --git a/BotLibre/entry/src/main/java/org/botlibre/sdk/ability/dialog/SpinnerDialogBuilder.java b/BotLibre/entry/src/main/java/org/botlibre/sdk/ability/dialog/SpinnerDialogBuilder.java index e4aaa06..90e2d5d 100644 --- a/BotLibre/entry/src/main/java/org/botlibre/sdk/ability/dialog/SpinnerDialogBuilder.java +++ b/BotLibre/entry/src/main/java/org/botlibre/sdk/ability/dialog/SpinnerDialogBuilder.java @@ -15,11 +15,6 @@ package org.botlibre.sdk.ability.dialog; -import org.botlibre.sdk.MainAbility; -import org.botlibre.sdk.ResourceTable; -import org.botlibre.sdk.ability.adapter.SpinnerAdapter; -import org.botlibre.sdk.ability.listener.SelectListener; -import org.botlibre.sdk.util.Constant; import ohos.aafwk.ability.Ability; import ohos.agp.components.Component; import ohos.agp.components.DirectionalLayout; @@ -30,6 +25,11 @@ import ohos.agp.window.dialog.CommonDialog; import ohos.agp.window.service.Display; import ohos.agp.window.service.DisplayAttributes; import ohos.agp.window.service.DisplayManager; +import org.botlibre.sdk.MainAbility; +import org.botlibre.sdk.ResourceTable; +import org.botlibre.sdk.ability.adapter.SpinnerAdapter; +import org.botlibre.sdk.ability.listener.SelectListener; +import org.botlibre.sdk.util.Constant; import java.util.Optional; @@ -62,8 +62,8 @@ public class SpinnerDialogBuilder { Optional display = DisplayManager.getInstance().getDefaultDisplay(context); DisplayAttributes displayAttributes = display.get().getAttributes(); - DirectionalLayout layout = (DirectionalLayout) LayoutScatter.getInstance(context). - parse(ResourceTable.Layout_spinner_dialog, + DirectionalLayout layout = (DirectionalLayout) LayoutScatter.getInstance(context) + .parse(ResourceTable.Layout_spinner_dialog, null, false); mCommonDialog.setContentCustomComponent(layout) .setAlignment(LayoutAlignment.CENTER) diff --git a/BotLibre/entry/src/main/java/org/botlibre/sdk/util/AsyncTask.java b/BotLibre/entry/src/main/java/org/botlibre/sdk/util/AsyncTask.java index 4df2b82..3b8c833 100644 --- a/BotLibre/entry/src/main/java/org/botlibre/sdk/util/AsyncTask.java +++ b/BotLibre/entry/src/main/java/org/botlibre/sdk/util/AsyncTask.java @@ -50,6 +50,12 @@ public abstract class AsyncTask { private static final ThreadFactory STHREADFACTORY = new ThreadFactory() { private final AtomicInteger mCount = new AtomicInteger(1); + /** + * newThread + * + * @param r runnable + * @return re + */ public Thread newThread(Runnable r) { return new Thread(r, "AsyncTask #" + mCount.getAndIncrement()); } @@ -70,12 +76,21 @@ public abstract class AsyncTask { * 构造函数中初始化 */ mWork = new WorkRunnable() { + /** + * call + * + * @return re + * @throws Exception + */ @Override public Result call() throws Exception { Result result = doInBackground(paramses); return result; } }; + /** + * 构造函数中初始化 + */ mFutureTask = new FutureTask(mWork) { @Override protected void done() { @@ -111,7 +126,7 @@ public abstract class AsyncTask { } private void postResult(Result result) { - getHandler().sendEvent(InnerEvent.get(POST_EXECUTE, new AsyncTaskResult(this, result))); + getHandler().sendEvent(InnerEvent.get(POST_EXECUTE)); } /** @@ -123,15 +138,15 @@ public abstract class AsyncTask { /** * doInBackground * - * @param params + * @param params params * @return result */ - protected abstract Result doInBackground(Params... params); + protected abstract Result doInBackground(Params[] params); /** * onPostExecute * - * @param result + * @param result result */ protected void onPostExecute(Result result) { } @@ -145,9 +160,9 @@ public abstract class AsyncTask { /** * onProgressUpdate * - * @param progress + * @param progress progress */ - protected void onProgressUpdate(Progress... progress) { + protected void onProgressUpdate(Progress[] progress) { } /** @@ -156,7 +171,6 @@ public abstract class AsyncTask { * @since 2021-04-25 */ private static class InnerUiHandler extends EventHandler { - InnerUiHandler() { super(EventRunner.getMainEventRunner()); } @@ -182,7 +196,7 @@ public abstract class AsyncTask { /** * publishProgress * - * @param progress + * @param progress progress */ public final void publishProgress(Progress... progress) { getHandler().sendEvent(InnerEvent.get(PUBLISH_PROGRSS, @@ -212,7 +226,7 @@ public abstract class AsyncTask { /** * execute * - * @param params + * @param params params * @return async */ public final AsyncTask execute(Params... params) { @@ -222,12 +236,12 @@ public abstract class AsyncTask { /** * executeOnExecutor * - * @param executor - * @param paramses + * @param executor executor + * @param paramses paramses * @return async * @throws IllegalStateException */ - public final AsyncTask executeOnExecutor(Executor executor, Params... paramses) { + public final AsyncTask executeOnExecutor(Executor executor, Params[] paramses) { if (mStatus != Status.PENDING) { switch (mStatus) { case RUNNING: @@ -253,8 +267,8 @@ public abstract class AsyncTask { /** * InnerUiHandler * - * @param - * @param + * @param paramses + * @param result * @since 2021-04-25 */ private abstract static class WorkRunnable implements Callable { @@ -267,14 +281,14 @@ public abstract class AsyncTask { /** * InnerUiHandler * - * @param + * @param data * @since 2021-04-25 */ private static class AsyncTaskResult { AsyncTask myAsyncTask; Data[] mData; - AsyncTaskResult(AsyncTask myAsyncTask, Data... data) { + AsyncTaskResult(AsyncTask myAsyncTask, Data[] data) { this.myAsyncTask = myAsyncTask; this.mData = data; } diff --git a/BotLibre/entry/src/main/java/org/botlibre/sdk/util/LogUtils.java b/BotLibre/entry/src/main/java/org/botlibre/sdk/util/LogUtils.java index 09c0c77..515f410 100644 --- a/BotLibre/entry/src/main/java/org/botlibre/sdk/util/LogUtils.java +++ b/BotLibre/entry/src/main/java/org/botlibre/sdk/util/LogUtils.java @@ -32,67 +32,67 @@ public final class LogUtils { } /** - * debug + * debug信息 * - * @param tag - * @param info + * @param tag 标记 + * @param info 信息 */ - public static void d(String tag, String info) { + public static void debug(String tag, String info) { HiLog.debug(LABEL_LOG, LOG_FORMAT, tag, info); } /** - * debug + * debug信息 * - * @param info + * @param info 信息 */ - public static void d(String info) { - d("SLog-aaaa", info); + public static void debug(String info) { + debug("SLog-aaaa", info); } /** - * debug + * debug信息 * - * @param info + * @param info 信息 */ - public static void d(int info) { - d("SLog-aaaa", info + ""); + public static void debug(int info) { + debug("SLog-aaaa", info + ""); } /** - * error + * error信息 * - * @param tag - * @param info + * @param tag 标记 + * @param info 信息 */ - public static void e(String tag, String info) { + public static void error(String tag, String info) { HiLog.error(LABEL_LOG, LOG_FORMAT, tag, info); } /** - * error + * error信息 * - * @param info + * @param info 信息 */ - public static void e(String info) { - e(TAG, info); + public static void error(String info) { + error(TAG, info); } /** - * error + * error信息 * - * @param info + * @param info 信息 */ - public static void e(int info) { - e(TAG, info + ""); + public static void error(int info) { + error(TAG, info + ""); } /** - * error + * error信息 * - * @param info + * @param info 信息 */ public static void sop(String info) { - e(TAG, info + ""); + error(TAG, info + ""); } } diff --git a/BotLibre/entry/src/main/java/org/botlibre/sdk/util/PreferencesUtils.java b/BotLibre/entry/src/main/java/org/botlibre/sdk/util/PreferencesUtils.java index c20f105..fea8fd3 100644 --- a/BotLibre/entry/src/main/java/org/botlibre/sdk/util/PreferencesUtils.java +++ b/BotLibre/entry/src/main/java/org/botlibre/sdk/util/PreferencesUtils.java @@ -36,7 +36,7 @@ public class PreferencesUtils { /** * getPreferences * - * @param ability + * @param ability 上下文 * @return Preferences */ public static Preferences getPreferences(Ability ability) { @@ -71,9 +71,9 @@ public class PreferencesUtils { /** * 存储string类型数据 * - * @param context - * @param key - * @param value + * @param context 上下文 + * @param key 键名 + * @param value 值名 */ public void putString(Context context, String key, String value) { preferences.putString(key, value); @@ -84,7 +84,7 @@ public class PreferencesUtils { * 获取string数据 * * @param context MyApplication中定义全局的context - * @param key + * @param key 键名 * @return 获取的String 默认值为:null */ public String getString(Context context, String key) { @@ -95,11 +95,10 @@ public class PreferencesUtils { /** * 设置布尔值 * - * @param context - * @param key - * @param isValue + * @param context 上下文 + * @param key 键名 + * @param isValue 值 */ - public void putBoolean(Context context, String key, boolean isValue) { preferences.putBoolean(key, isValue).flushSync(); } @@ -107,12 +106,11 @@ public class PreferencesUtils { /** * 获取 布尔值 * - * @param context - * @param key - * @param isDefValue + * @param context 上下文 + * @param key 键名 + * @param isDefValue 值 * @return false */ - public boolean getBoolean(Context context, String key, boolean isDefValue) { return preferences.getBoolean(key, isDefValue); } diff --git a/BotLibre/entry/src/main/java/org/botlibre/sdk/util/ResUtils.java b/BotLibre/entry/src/main/java/org/botlibre/sdk/util/ResUtils.java index 62df39f..81de12c 100644 --- a/BotLibre/entry/src/main/java/org/botlibre/sdk/util/ResUtils.java +++ b/BotLibre/entry/src/main/java/org/botlibre/sdk/util/ResUtils.java @@ -15,6 +15,9 @@ package org.botlibre.sdk.util; +import java.io.IOException; +import java.util.Optional; + import ohos.aafwk.ability.Ability; import ohos.agp.components.Button; import ohos.agp.components.Checkbox; @@ -31,8 +34,6 @@ import ohos.media.image.ImageSource; import ohos.media.image.PixelMap; import org.botlibre.sdk.ResourceTable; -import java.io.IOException; -import java.util.Optional; /** * 资源工具类 @@ -80,11 +81,11 @@ public final class ResUtils { try { result = manager.getElement(id).getString(); } catch (IOException e) { - LogUtils.e("getString ->IOException"); + LogUtils.error("getString ->IOException"); } catch (NotExistException e) { - LogUtils.e("getString -> NotExistException"); + LogUtils.error("getString -> NotExistException"); } catch (WrongTypeException e) { - LogUtils.e("getString -> WrongTypeException"); + LogUtils.error("getString -> WrongTypeException"); } return result; } @@ -126,7 +127,7 @@ public final class ResUtils { * get the Pixel Map Element * * @param context the context - * @param resId + * @param resId the path from id * @return the Pixel Map Element */ public static PixelMapElement getPixelMapDrawable(Context context, int resId) { @@ -138,7 +139,7 @@ public final class ResUtils { * get the pixel map * * @param context the context - * @param id + * @param id the path from id * @return the pixel map */ public static Optional getPixelMap(Context context, int id) { @@ -163,7 +164,7 @@ public final class ResUtils { * get the path from id * * @param context the context - * @param id + * @param id the path from id * @return the path from id */ public static String getPathById(Context context, int id) { diff --git a/BotLibre/entry/src/main/java/org/botlibre/sdk/util/ToastUtils.java b/BotLibre/entry/src/main/java/org/botlibre/sdk/util/ToastUtils.java index 99fcf28..0117f4c 100644 --- a/BotLibre/entry/src/main/java/org/botlibre/sdk/util/ToastUtils.java +++ b/BotLibre/entry/src/main/java/org/botlibre/sdk/util/ToastUtils.java @@ -15,7 +15,6 @@ package org.botlibre.sdk.util; -import org.botlibre.sdk.ResourceTable; import ohos.aafwk.ability.Ability; import ohos.agp.components.Component; import ohos.agp.components.LayoutScatter; @@ -23,6 +22,7 @@ import ohos.agp.components.Text; import ohos.agp.utils.LayoutAlignment; import ohos.agp.window.dialog.ToastDialog; import ohos.app.Context; +import org.botlibre.sdk.ResourceTable; /** * ToastUtils @@ -37,20 +37,20 @@ public class ToastUtils { } /** - * show + * show显示提示文字 * - * @param ability - * @param text + * @param ability 上下文 + * @param text 信息 */ public static void show(Ability ability, String text) { showToast(ability, text); } /** - * showToast + * showToast显示提示文字 * - * @param ability - * @param text + * @param ability 上下文 + * @param text 信息 */ public static void showToast(Ability ability, String text) { if (toast == null) { @@ -63,12 +63,11 @@ public class ToastUtils { } /** - * 自定义 + * 自定义 居中 * - * @param context - * @param val + * @param context 上下文 + * @param val 信息 */ - public static void showCenterToast(Context context, String val) { Component toastLayout = LayoutScatter.getInstance(context) .parse(ResourceTable.Layout_toast_layout, null, false); diff --git a/BotLibre/entry/src/ohosTest/java/org/botlibre/sdk/MainAbilityTest.java b/BotLibre/entry/src/ohosTest/java/org/botlibre/sdk/MainAbilityTest.java deleted file mode 100644 index 2be6a5e..0000000 --- a/BotLibre/entry/src/ohosTest/java/org/botlibre/sdk/MainAbilityTest.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * 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 org.botlibre.sdk; - -import ohos.aafwk.ability.Ability; -import ohos.aafwk.ability.delegation.AbilityDelegatorRegistry; -import ohos.hiviewdfx.HiLog; -import ohos.hiviewdfx.HiLogLabel; -import org.botlibre.sdk.util.LogUtils; -import org.botlibre.sdk.util.ResUtils; -import org.junit.Assert; -import org.junit.Test; - -/** - * 单元测试类 - * - * @since 2021-05-25 - */ -public class MainAbilityTest { - private static final HiLogLabel LABEL_LOG = new HiLogLabel(10043, 0xD000f00, "MainAbility"); - Ability ability = AbilityDelegatorRegistry.getAbilityDelegator().getCurrentTopAbility(); - - @Test - public void onStart() { - LogUtils.d("HiLog","单元测试"); - int height = ResUtils.getScreenHeight(ability.getApplicationContext()); - HiLog.info(LABEL_LOG,height + ""); - int width = ResUtils.getScreenWidth(ability.getApplicationContext()); - HiLog.info(LABEL_LOG,width + ""); - int color = ResUtils.getColor(ability.getApplicationContext(),-65536); - HiLog.info(LABEL_LOG,color + ""); - } -} \ No newline at end of file diff --git a/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/MyApplication.java b/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/MyApplication.java index 6a28862..ed61515 100644 --- a/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/MyApplication.java +++ b/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/MyApplication.java @@ -3,19 +3,37 @@ package org.botlibre.sdk; import ohos.aafwk.ability.AbilityPackage; import ohos.app.Context; +/** + * MyApplication + * + * @since 2021-04-16 + */ public class MyApplication extends AbilityPackage { private static Context mContext; + /** + * onInitialize + */ @Override public void onInitialize() { super.onInitialize(); setmContext(getApplicationContext()); } - public static Context getAppContext(){ + /** + * getAppContext + * + * @return mContext + */ + public static Context getAppContext() { return mContext; } + /** + * setmContext + * + * @param mContext + */ public static void setmContext(Context mContext) { MyApplication.mContext = mContext; } diff --git a/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/ability/BaseAbility.java b/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/ability/BaseAbility.java deleted file mode 100644 index c659c6a..0000000 --- a/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/ability/BaseAbility.java +++ /dev/null @@ -1,12 +0,0 @@ -package org.botlibre.sdk.ability; - -import ohos.aafwk.ability.Ability; -import ohos.aafwk.content.Intent; - -public class BaseAbility extends Ability { - @Override - public void onStart(Intent intent) { - super.onStart(intent); - } - -} diff --git a/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/ability/MicConfigAbility.java b/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/ability/MicConfigAbility.java index fed73ed..49a9f3f 100644 --- a/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/ability/MicConfigAbility.java +++ b/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/ability/MicConfigAbility.java @@ -310,9 +310,9 @@ public class MicConfigAbility extends LibreAbility implements AsrListener { file = new File(cont.getFilesDir(), "record.mp3"); try { boolean filesave = file.createNewFile(); - LogUtils.e(CLASSNAME, "" + filesave); + LogUtils.error(CLASSNAME, "" + filesave); } catch (IOException e) { - LogUtils.e(CLASSNAME, ""); + LogUtils.error(CLASSNAME, ""); } mRecorder = new MP3Recorder(file); mPlayer = new Player(cont); @@ -340,13 +340,13 @@ public class MicConfigAbility extends LibreAbility implements AsrListener { inputStream = new FileInputStream(file.getCanonicalFile()); startPlayVideo(inputStream.getFD()); } catch (IOException e) { - LogUtils.e(CLASSNAME, "error" + e.toString()); + LogUtils.error(CLASSNAME, "error" + e.toString()); } finally { if (inputStream != null) { try { inputStream.close(); } catch (IOException e) { - LogUtils.e(CLASSNAME, "error" + e.toString()); + LogUtils.error(CLASSNAME, "error" + e.toString()); } } } @@ -429,7 +429,7 @@ public class MicConfigAbility extends LibreAbility implements AsrListener { e.printStackTrace(); } if (volume != 0) { - LogUtils.e("ChatActivity", "The volume changed and saved to : " + volume); + LogUtils.error("ChatActivity", "The volume changed and saved to : " + volume); MainAbility.setVolume(volume); } } @@ -442,16 +442,6 @@ public class MicConfigAbility extends LibreAbility implements AsrListener { terminateAbility(); super.onBackPressed(); } - - private boolean deleteRecordedFile(String outputFile) { - boolean deleted = false; - File file = new File(outputFile); - if (file.exists()) { - deleted = file.delete(); - } - return deleted; - } - public boolean deleteRecordedFile(File outputFile) { boolean deleted = false; if (outputFile.exists()) { @@ -460,26 +450,6 @@ public class MicConfigAbility extends LibreAbility implements AsrListener { return deleted; } - -// @Override -// protected void onActivityResult(int requestCode, int resultCode, Intent data) { -// super.onActivityResult(requestCode, resultCode, data); -// -// switch (requestCode) { -// -// case 1: { -// if (resultCode == RESULT_OK && data != null) { -// setMicIcon(false, false); -// ArrayList text = data.getStringArrayListExtra(RecognizerIntent.EXTRA_RESULTS); -// editTextForGoogle.setText(text.get(0)); -// txt.setText("Status: Done!"); -// } -// break; -// } -// } -// } - - @Override public void onInit(PacMap pacMap) { diff --git a/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/ability/actions/HttpUIAction.java b/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/ability/actions/HttpUIAction.java index f0093ab..a8a52bb 100644 --- a/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/ability/actions/HttpUIAction.java +++ b/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/ability/actions/HttpUIAction.java @@ -53,7 +53,7 @@ public abstract class HttpUIAction extends HttpAction { this.dialog.setSize(displayAttributes.width - 100,150); this.dialog.show(); } catch (Exception exception) { - LogUtils.e("HttpUIAction.onPreExecute", exception.toString()); + LogUtils.error("HttpUIAction.onPreExecute", exception.toString()); } } @@ -66,7 +66,7 @@ public abstract class HttpUIAction extends HttpAction { MainAbility.errorInfo(1,this.exception.getMessage(), this.exception, this.ability); } } catch (Exception exception) { - LogUtils.e("HttpUIAction.onPostExecute", exception.toString()); + LogUtils.error("HttpUIAction.onPostExecute", exception.toString()); } } } \ No newline at end of file diff --git a/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/ability/actions/HttpUIResultAction.java b/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/ability/actions/HttpUIResultAction.java index db20c90..c952ff7 100644 --- a/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/ability/actions/HttpUIResultAction.java +++ b/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/ability/actions/HttpUIResultAction.java @@ -54,7 +54,7 @@ public abstract class HttpUIResultAction extends HttpResultAction { this.dialog.setSize(displayAttributes.width - 100,150); this.dialog.show(); } catch (Exception exception) { - LogUtils.e("HttpUIAction.onPreExecute", exception.toString()); + LogUtils.error("HttpUIAction.onPreExecute", exception.toString()); } } @@ -71,7 +71,7 @@ public abstract class HttpUIResultAction extends HttpResultAction { // } } } catch (Exception exception) { - LogUtils.e("HttpUIAction.onPostExecute", exception.toString()); + LogUtils.error("HttpUIAction.onPostExecute", exception.toString()); } } } \ No newline at end of file diff --git a/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/ability/adapter/CommandAdapter.java b/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/ability/adapter/CommandAdapter.java index b2fc355..33676c6 100644 --- a/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/ability/adapter/CommandAdapter.java +++ b/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/ability/adapter/CommandAdapter.java @@ -15,7 +15,6 @@ package org.botlibre.sdk.ability.adapter; -import org.botlibre.sdk.ResourceTable; import ohos.aafwk.ability.Ability; import ohos.agp.components.BaseItemProvider; import ohos.agp.components.Checkbox; @@ -23,6 +22,7 @@ import ohos.agp.components.Component; import ohos.agp.components.ComponentContainer; import ohos.agp.components.LayoutScatter; import ohos.agp.components.Text; +import org.botlibre.sdk.ResourceTable; import java.util.List; @@ -92,8 +92,9 @@ public class CommandAdapter extends BaseItemProvider { * @return getComponent */ @Override - public Component getComponent(int position, Component component, ComponentContainer componentContainer) { + public Component getComponent(int position, Component component1, ComponentContainer componentContainer) { ViewHolder holder; + Component component = component1; if (component == null) { component = mInflater.parse(ResourceTable.Layout_command_item, componentContainer, false); holder = new ViewHolder(component); diff --git a/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/ability/adapter/EmoteAdapter.java b/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/ability/adapter/EmoteAdapter.java index 79c9199..d31b0ca 100644 --- a/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/ability/adapter/EmoteAdapter.java +++ b/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/ability/adapter/EmoteAdapter.java @@ -15,8 +15,6 @@ package org.botlibre.sdk.ability.adapter; -import org.botlibre.sdk.ResourceTable; -import org.botlibre.sdk.ability.EmotionalState; import ohos.aafwk.ability.Ability; import ohos.agp.components.BaseItemProvider; import ohos.agp.components.Component; @@ -24,6 +22,8 @@ import ohos.agp.components.ComponentContainer; import ohos.agp.components.Image; import ohos.agp.components.LayoutScatter; import ohos.agp.components.Text; +import org.botlibre.sdk.ResourceTable; +import org.botlibre.sdk.ability.EmotionalState; import java.util.List; import java.util.Locale; @@ -94,9 +94,9 @@ public class EmoteAdapter extends BaseItemProvider { * @return getComponent */ @Override - public Component getComponent(int position, Component component, ComponentContainer componentContainer) { + public Component getComponent(int position, Component component1, ComponentContainer componentContainer) { ViewHolder holder; - + Component component = component1; if (component == null) { component = mInflater.parse(ResourceTable.Layout_emote_item, componentContainer, false); holder = new ViewHolder(component); diff --git a/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/ability/adapter/SpinnerAdapter.java b/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/ability/adapter/SpinnerAdapter.java index 8a3d483..86caf4c 100644 --- a/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/ability/adapter/SpinnerAdapter.java +++ b/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/ability/adapter/SpinnerAdapter.java @@ -15,13 +15,13 @@ package org.botlibre.sdk.ability.adapter; -import org.botlibre.sdk.ResourceTable; import ohos.aafwk.ability.Ability; 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 org.botlibre.sdk.ResourceTable; /** * 适配器 @@ -89,8 +89,9 @@ public class SpinnerAdapter extends BaseItemProvider { * @return getComponent */ @Override - public Component getComponent(int position, Component component, ComponentContainer componentContainer) { + public Component getComponent(int position, Component component1, ComponentContainer componentContainer) { ViewHolder holder; + Component component = component1; if (component == null) { component = mInflater.parse(ResourceTable.Layout_simple_spinner_dropdown_item, componentContainer, false); diff --git a/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/ability/dialog/LanguageDialogBuilder.java b/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/ability/dialog/LanguageDialogBuilder.java index 6614d99..1888d9c 100644 --- a/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/ability/dialog/LanguageDialogBuilder.java +++ b/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/ability/dialog/LanguageDialogBuilder.java @@ -15,11 +15,6 @@ package org.botlibre.sdk.ability.dialog; -import org.botlibre.sdk.MainAbility; -import org.botlibre.sdk.ResourceTable; -import org.botlibre.sdk.ability.adapter.SpinnerAdapter; -import org.botlibre.sdk.ability.listener.LanguageListener; -import org.botlibre.sdk.util.Constant; import ohos.aafwk.ability.Ability; import ohos.agp.components.Component; import ohos.agp.components.DirectionalLayout; @@ -30,6 +25,11 @@ import ohos.agp.window.dialog.CommonDialog; import ohos.agp.window.service.Display; import ohos.agp.window.service.DisplayAttributes; import ohos.agp.window.service.DisplayManager; +import org.botlibre.sdk.MainAbility; +import org.botlibre.sdk.ResourceTable; +import org.botlibre.sdk.ability.adapter.SpinnerAdapter; +import org.botlibre.sdk.ability.listener.LanguageListener; +import org.botlibre.sdk.util.Constant; import java.util.Optional; @@ -62,8 +62,8 @@ public class LanguageDialogBuilder { Optional display = DisplayManager.getInstance().getDefaultDisplay(context); DisplayAttributes displayAttributes = display.get().getAttributes(); - DirectionalLayout layout = (DirectionalLayout) LayoutScatter.getInstance(context). - parse(ResourceTable.Layout_spinner_dialog, + DirectionalLayout layout = (DirectionalLayout) LayoutScatter.getInstance(context) + .parse(ResourceTable.Layout_spinner_dialog, null, false); mCommonDialog.setContentCustomComponent(layout) .setAlignment(LayoutAlignment.CENTER) diff --git a/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/ability/dialog/SearchDialogBuilder.java b/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/ability/dialog/SearchDialogBuilder.java index 4c4ce57..a41f960 100644 --- a/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/ability/dialog/SearchDialogBuilder.java +++ b/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/ability/dialog/SearchDialogBuilder.java @@ -15,10 +15,6 @@ package org.botlibre.sdk.ability.dialog; -import org.botlibre.sdk.ResourceTable; -import org.botlibre.sdk.ability.adapter.SpinnerAdapter; -import org.botlibre.sdk.ability.listener.SelectListener; -import org.botlibre.sdk.util.Constant; import ohos.aafwk.ability.Ability; import ohos.agp.components.Component; import ohos.agp.components.DirectionalLayout; @@ -29,6 +25,10 @@ import ohos.agp.window.dialog.CommonDialog; import ohos.agp.window.service.Display; import ohos.agp.window.service.DisplayAttributes; import ohos.agp.window.service.DisplayManager; +import org.botlibre.sdk.ResourceTable; +import org.botlibre.sdk.ability.adapter.SpinnerAdapter; +import org.botlibre.sdk.ability.listener.SelectListener; +import org.botlibre.sdk.util.Constant; import java.util.Optional; @@ -49,7 +49,7 @@ public class SearchDialogBuilder { * @param context context * @param spinStr spinStr */ - public SearchDialogBuilder(Ability context,String[] spinStr) { + public SearchDialogBuilder(Ability context, String[] spinStr) { this.spinStr = spinStr.clone(); initLayout(context); } @@ -64,17 +64,17 @@ public class SearchDialogBuilder { Optional display = DisplayManager.getInstance().getDefaultDisplay(context); DisplayAttributes displayAttributes = display.get().getAttributes(); - DirectionalLayout layout = (DirectionalLayout) LayoutScatter.getInstance(context). - parse(ResourceTable.Layout_spinner_dialog, + DirectionalLayout layout = (DirectionalLayout) LayoutScatter.getInstance(context) + .parse(ResourceTable.Layout_spinner_dialog, null, false); mCommonDialog.setContentCustomComponent(layout) .setAlignment(LayoutAlignment.CENTER) - .setSize(displayAttributes.width - Constant.FIVEZORE,displayAttributes.width) + .setSize(displayAttributes.width - Constant.FIVEZORE, displayAttributes.width) .setAutoClosable(true) .setTransparent(false) .show(); - listContainer = (ListContainer)layout.findComponentById(ResourceTable.Id_typeSpin); + listContainer = (ListContainer) layout.findComponentById(ResourceTable.Id_typeSpin); SpinnerAdapter spinner = new SpinnerAdapter(context, spinStr); listContainer.setItemProvider(spinner); @@ -95,8 +95,8 @@ public class SearchDialogBuilder { * @param spinStr spinStr * @return 初始化函数 */ - public static SearchDialogBuilder with(Ability context,String[] spinStr) { - return new SearchDialogBuilder(context,spinStr); + public static SearchDialogBuilder with(Ability context, String[] spinStr) { + return new SearchDialogBuilder(context, spinStr); } /** diff --git a/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/ability/dialog/SpinnerDialogBuilder.java b/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/ability/dialog/SpinnerDialogBuilder.java index e4aaa06..812eb3a 100644 --- a/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/ability/dialog/SpinnerDialogBuilder.java +++ b/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/ability/dialog/SpinnerDialogBuilder.java @@ -15,11 +15,6 @@ package org.botlibre.sdk.ability.dialog; -import org.botlibre.sdk.MainAbility; -import org.botlibre.sdk.ResourceTable; -import org.botlibre.sdk.ability.adapter.SpinnerAdapter; -import org.botlibre.sdk.ability.listener.SelectListener; -import org.botlibre.sdk.util.Constant; import ohos.aafwk.ability.Ability; import ohos.agp.components.Component; import ohos.agp.components.DirectionalLayout; @@ -30,6 +25,11 @@ import ohos.agp.window.dialog.CommonDialog; import ohos.agp.window.service.Display; import ohos.agp.window.service.DisplayAttributes; import ohos.agp.window.service.DisplayManager; +import org.botlibre.sdk.MainAbility; +import org.botlibre.sdk.ResourceTable; +import org.botlibre.sdk.ability.adapter.SpinnerAdapter; +import org.botlibre.sdk.ability.listener.SelectListener; +import org.botlibre.sdk.util.Constant; import java.util.Optional; @@ -62,17 +62,17 @@ public class SpinnerDialogBuilder { Optional display = DisplayManager.getInstance().getDefaultDisplay(context); DisplayAttributes displayAttributes = display.get().getAttributes(); - DirectionalLayout layout = (DirectionalLayout) LayoutScatter.getInstance(context). - parse(ResourceTable.Layout_spinner_dialog, + DirectionalLayout layout = (DirectionalLayout) LayoutScatter.getInstance(context) + .parse(ResourceTable.Layout_spinner_dialog, null, false); mCommonDialog.setContentCustomComponent(layout) .setAlignment(LayoutAlignment.CENTER) - .setSize(displayAttributes.width - Constant.FIVEZORE,displayAttributes.width) + .setSize(displayAttributes.width - Constant.FIVEZORE, displayAttributes.width) .setAutoClosable(true) .setTransparent(false) .show(); - listContainer = (ListContainer)layout.findComponentById(ResourceTable.Id_typeSpin); + listContainer = (ListContainer) layout.findComponentById(ResourceTable.Id_typeSpin); SpinnerAdapter spinner = new SpinnerAdapter(context, MainAbility.getTypes()); listContainer.setItemProvider(spinner); diff --git a/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/micro/MicroConnection.java b/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/micro/MicroConnection.java index 60fffa0..5911040 100644 --- a/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/micro/MicroConnection.java +++ b/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/micro/MicroConnection.java @@ -180,7 +180,7 @@ public class MicroConnection extends SDKConnection implements TextListener { * @param message */ public void sendMessage(TextOutput message) { - LogUtils.e("[MicroConnection]---->output-sendMessage", message.getMessage()); + LogUtils.error("[MicroConnection]---->output-sendMessage", message.getMessage()); this.message = message; } diff --git a/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/util/AsyncTask.java b/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/util/AsyncTask.java index 1d74681..3b8c833 100644 --- a/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/util/AsyncTask.java +++ b/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/util/AsyncTask.java @@ -39,9 +39,6 @@ import java.util.concurrent.atomic.AtomicInteger; * @since 2021-05-08 */ public abstract class AsyncTask { - /** - * 含有的成员变量 - */ private static final int CPU_COUNT = Runtime.getRuntime().availableProcessors(); private static final int CORE_COUNT = CPU_COUNT + 1; private static final int MAX_COUNT = CPU_COUNT * 2 + 1; @@ -50,17 +47,23 @@ public abstract class AsyncTask { private static final int KEEP_ALIVE = 1; private static final BlockingQueue POOLWORKQUEUE = new LinkedBlockingQueue(128); - private static final ThreadFactory THREADFACTORY = new ThreadFactory() { + private static final ThreadFactory STHREADFACTORY = new ThreadFactory() { private final AtomicInteger mCount = new AtomicInteger(1); + /** + * newThread + * + * @param r runnable + * @return re + */ public Thread newThread(Runnable r) { return new Thread(r, "AsyncTask #" + mCount.getAndIncrement()); } }; - private static final Executor EXECUTOR = new ThreadPoolExecutor(CORE_COUNT, MAX_COUNT, KEEP_ALIVE, - TimeUnit.SECONDS, POOLWORKQUEUE, THREADFACTORY); + private static final Executor MEXECUTOR = new ThreadPoolExecutor(CORE_COUNT, MAX_COUNT, KEEP_ALIVE, + TimeUnit.SECONDS, POOLWORKQUEUE, STHREADFACTORY); - private InnerUiHandler mUiHandler; + private static InnerUiHandler mUIHandler; private final WorkRunnable mWork; private final FutureTask mFutureTask; private volatile Status mStatus = Status.PENDING; @@ -73,12 +76,21 @@ public abstract class AsyncTask { * 构造函数中初始化 */ mWork = new WorkRunnable() { + /** + * call + * + * @return re + * @throws Exception + */ @Override public Result call() throws Exception { Result result = doInBackground(paramses); return result; } }; + /** + * 构造函数中初始化 + */ mFutureTask = new FutureTask(mWork) { @Override protected void done() { @@ -92,15 +104,16 @@ public abstract class AsyncTask { }; } - private EventHandler getHandler() { + private static EventHandler getHandler() { synchronized (AsyncTask.class) { - if (mUiHandler == null) { - mUiHandler = new InnerUiHandler(); + if (mUIHandler == null) { + mUIHandler = new InnerUiHandler(); } - return mUiHandler; + return mUIHandler; } } + /** * 用来获取futuretask执行完成的结果 * @@ -112,21 +125,8 @@ public abstract class AsyncTask { return mFutureTask.get(); } - /** - * publishProgress - * - * @param progress - */ - public final void publishProgress(Progress... progress) { - getHandler().sendEvent(InnerEvent.get(PUBLISH_PROGRSS, - new AsyncTaskResult(this, progress))); - } - - private void postResult(Result result) { - InnerEvent inner = InnerEvent.get(POST_EXECUTE); - inner.object = new AsyncTaskResult(this, result); - getHandler().sendEvent(inner); + getHandler().sendEvent(InnerEvent.get(POST_EXECUTE)); } /** @@ -136,20 +136,19 @@ public abstract class AsyncTask { } /** - * publishProgress + * doInBackground * - * @param params + * @param params params * @return result */ - protected abstract Result doInBackground(Params... params); + protected abstract Result doInBackground(Params[] params); /** * onPostExecute * - * @param result + * @param result result */ protected void onPostExecute(Result result) { - LogUtils.sop("onPostExecute"); } /** @@ -159,21 +158,20 @@ public abstract class AsyncTask { } /** - * onPostExecute + * onProgressUpdate * - * @param progress + * @param progress progress */ - protected void onProgressUpdate(Progress... progress) { + protected void onProgressUpdate(Progress[] progress) { } /** - * InnerUIHandler + * InnerUiHandler * - * @since 2021-05-25 + * @since 2021-04-25 */ - private class InnerUiHandler extends EventHandler { - - private InnerUiHandler() { + private static class InnerUiHandler extends EventHandler { + InnerUiHandler() { super(EventRunner.getMainEventRunner()); } @@ -183,7 +181,7 @@ public abstract class AsyncTask { switch (event.eventId) { case POST_EXECUTE: AsyncTaskResult result = (AsyncTaskResult) event.object; - result.myAsyncTask.onPostExecute(""); + result.myAsyncTask.postResult(result.mData); break; case PUBLISH_PROGRSS: AsyncTaskResult result2 = (AsyncTaskResult) event.object; @@ -196,9 +194,19 @@ public abstract class AsyncTask { } /** - * InnerUIHandler + * publishProgress + * + * @param progress progress + */ + public final void publishProgress(Progress... progress) { + getHandler().sendEvent(InnerEvent.get(PUBLISH_PROGRSS, + new AsyncTaskResult(this, progress))); + } + + /** + * InnerUiHandler * - * @since 2021-05-25 + * @since 2021-04-25 */ public enum Status { /** @@ -218,25 +226,26 @@ public abstract class AsyncTask { /** * execute * - * @param params - * @return ask + * @param params params + * @return async */ public final AsyncTask execute(Params... params) { - return executeOnExecutor(EXECUTOR, params); + return executeOnExecutor(MEXECUTOR, params); } /** * executeOnExecutor * - * @param executor - * @param paramses - * @return ask + * @param executor executor + * @param paramses paramses + * @return async * @throws IllegalStateException */ - public final AsyncTask executeOnExecutor(Executor executor, Params... paramses) { + public final AsyncTask executeOnExecutor(Executor executor, Params[] paramses) { if (mStatus != Status.PENDING) { switch (mStatus) { case RUNNING: + throw new IllegalStateException("Cannot execute task:" + " the task is already running."); case FINISHED: @@ -256,27 +265,30 @@ public abstract class AsyncTask { } /** - * WorkRunnable + * InnerUiHandler * - * @param - * @param - * @since 2021-05-25 + * @param paramses + * @param result + * @since 2021-04-25 */ private abstract static class WorkRunnable implements Callable { + /** + * execute + */ Params[] paramses; } /** - * InnerUIHandler + * InnerUiHandler * - * @param - * @since 2021-05-25 + * @param data + * @since 2021-04-25 */ private static class AsyncTaskResult { AsyncTask myAsyncTask; Data[] mData; - private AsyncTaskResult(AsyncTask myAsyncTask, Data... data) { + AsyncTaskResult(AsyncTask myAsyncTask, Data[] data) { this.myAsyncTask = myAsyncTask; this.mData = data; } diff --git a/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/util/LogUtils.java b/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/util/LogUtils.java index 09c0c77..515f410 100644 --- a/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/util/LogUtils.java +++ b/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/util/LogUtils.java @@ -32,67 +32,67 @@ public final class LogUtils { } /** - * debug + * debug信息 * - * @param tag - * @param info + * @param tag 标记 + * @param info 信息 */ - public static void d(String tag, String info) { + public static void debug(String tag, String info) { HiLog.debug(LABEL_LOG, LOG_FORMAT, tag, info); } /** - * debug + * debug信息 * - * @param info + * @param info 信息 */ - public static void d(String info) { - d("SLog-aaaa", info); + public static void debug(String info) { + debug("SLog-aaaa", info); } /** - * debug + * debug信息 * - * @param info + * @param info 信息 */ - public static void d(int info) { - d("SLog-aaaa", info + ""); + public static void debug(int info) { + debug("SLog-aaaa", info + ""); } /** - * error + * error信息 * - * @param tag - * @param info + * @param tag 标记 + * @param info 信息 */ - public static void e(String tag, String info) { + public static void error(String tag, String info) { HiLog.error(LABEL_LOG, LOG_FORMAT, tag, info); } /** - * error + * error信息 * - * @param info + * @param info 信息 */ - public static void e(String info) { - e(TAG, info); + public static void error(String info) { + error(TAG, info); } /** - * error + * error信息 * - * @param info + * @param info 信息 */ - public static void e(int info) { - e(TAG, info + ""); + public static void error(int info) { + error(TAG, info + ""); } /** - * error + * error信息 * - * @param info + * @param info 信息 */ public static void sop(String info) { - e(TAG, info + ""); + error(TAG, info + ""); } } diff --git a/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/util/PreferencesUtils.java b/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/util/PreferencesUtils.java index c20f105..fea8fd3 100644 --- a/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/util/PreferencesUtils.java +++ b/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/util/PreferencesUtils.java @@ -36,7 +36,7 @@ public class PreferencesUtils { /** * getPreferences * - * @param ability + * @param ability 上下文 * @return Preferences */ public static Preferences getPreferences(Ability ability) { @@ -71,9 +71,9 @@ public class PreferencesUtils { /** * 存储string类型数据 * - * @param context - * @param key - * @param value + * @param context 上下文 + * @param key 键名 + * @param value 值名 */ public void putString(Context context, String key, String value) { preferences.putString(key, value); @@ -84,7 +84,7 @@ public class PreferencesUtils { * 获取string数据 * * @param context MyApplication中定义全局的context - * @param key + * @param key 键名 * @return 获取的String 默认值为:null */ public String getString(Context context, String key) { @@ -95,11 +95,10 @@ public class PreferencesUtils { /** * 设置布尔值 * - * @param context - * @param key - * @param isValue + * @param context 上下文 + * @param key 键名 + * @param isValue 值 */ - public void putBoolean(Context context, String key, boolean isValue) { preferences.putBoolean(key, isValue).flushSync(); } @@ -107,12 +106,11 @@ public class PreferencesUtils { /** * 获取 布尔值 * - * @param context - * @param key - * @param isDefValue + * @param context 上下文 + * @param key 键名 + * @param isDefValue 值 * @return false */ - public boolean getBoolean(Context context, String key, boolean isDefValue) { return preferences.getBoolean(key, isDefValue); } diff --git a/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/util/ResUtils.java b/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/util/ResUtils.java index 6ac5a78..688b893 100644 --- a/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/util/ResUtils.java +++ b/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/util/ResUtils.java @@ -15,6 +15,9 @@ package org.botlibre.sdk.util; +import java.io.IOException; +import java.util.Optional; + import ohos.aafwk.ability.Ability; import ohos.agp.components.Button; import ohos.agp.components.Checkbox; @@ -31,8 +34,6 @@ import ohos.media.image.ImageSource; import ohos.media.image.PixelMap; import org.botlibre.sdk.ResourceTable; -import java.io.IOException; -import java.util.Optional; /** * 资源工具类 @@ -80,11 +81,11 @@ public final class ResUtils { try { result = manager.getElement(id).getString(); } catch (IOException e) { - LogUtils.e("getString ->IOException"); + LogUtils.error("getString ->IOException"); } catch (NotExistException e) { - LogUtils.e("getString -> NotExistException"); + LogUtils.error("getString -> NotExistException"); } catch (WrongTypeException e) { - LogUtils.e("getString -> WrongTypeException"); + LogUtils.error("getString -> WrongTypeException"); } return result; } @@ -92,7 +93,7 @@ public final class ResUtils { /** * 每个单词第一个字母大写 * - * @param str + * @param str 目标str * @return str */ public static String toUpperFirstCode(String str) { @@ -112,8 +113,8 @@ public final class ResUtils { /** * 设置button背景 * - * @param button - * @param resId + * @param button button + * @param resId 资源id */ public static void setBackground(Button button, int resId) { Resource bgResource = null; @@ -130,8 +131,8 @@ public final class ResUtils { /** * 设置button背景 * - * @param ability - * @param checkbox + * @param ability 上下文 + * @param checkbox checkbox */ public static void setCheckboxBg(Ability ability, Checkbox checkbox) { StateElement stateElement = new StateElement(); @@ -146,7 +147,7 @@ public final class ResUtils { * get the Pixel Map Element * * @param context the context - * @param resId + * @param resId 资源id * @return the Pixel Map Element */ public static PixelMapElement getPixelMapDrawable(Context context, int resId) { @@ -158,7 +159,7 @@ public final class ResUtils { * get the pixel map * * @param context the context - * @param id + * @param id 资源id * @return the pixel map */ public static Optional getPixelMap(Context context, int id) { @@ -183,7 +184,7 @@ public final class ResUtils { * get the path from id * * @param context the context - * @param id + * @param id 资源id * @return the path from id */ public static String getPathById(Context context, int id) { diff --git a/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/util/ToastUtils.java b/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/util/ToastUtils.java index 99fcf28..0117f4c 100644 --- a/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/util/ToastUtils.java +++ b/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/util/ToastUtils.java @@ -15,7 +15,6 @@ package org.botlibre.sdk.util; -import org.botlibre.sdk.ResourceTable; import ohos.aafwk.ability.Ability; import ohos.agp.components.Component; import ohos.agp.components.LayoutScatter; @@ -23,6 +22,7 @@ import ohos.agp.components.Text; import ohos.agp.utils.LayoutAlignment; import ohos.agp.window.dialog.ToastDialog; import ohos.app.Context; +import org.botlibre.sdk.ResourceTable; /** * ToastUtils @@ -37,20 +37,20 @@ public class ToastUtils { } /** - * show + * show显示提示文字 * - * @param ability - * @param text + * @param ability 上下文 + * @param text 信息 */ public static void show(Ability ability, String text) { showToast(ability, text); } /** - * showToast + * showToast显示提示文字 * - * @param ability - * @param text + * @param ability 上下文 + * @param text 信息 */ public static void showToast(Ability ability, String text) { if (toast == null) { @@ -63,12 +63,11 @@ public class ToastUtils { } /** - * 自定义 + * 自定义 居中 * - * @param context - * @param val + * @param context 上下文 + * @param val 信息 */ - public static void showCenterToast(Context context, String val) { Component toastLayout = LayoutScatter.getInstance(context) .parse(ResourceTable.Layout_toast_layout, null, false); diff --git a/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/ability/MicConfigAbility.java b/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/ability/MicConfigAbility.java index a94ca81..242dbd8 100644 --- a/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/ability/MicConfigAbility.java +++ b/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/ability/MicConfigAbility.java @@ -287,9 +287,9 @@ public class MicConfigAbility extends LibreAbility implements AsrListener { file = new File(cont.getFilesDir(), "record.mp3"); try { boolean filesave = file.createNewFile(); - LogUtils.e(CLASSNAME, "" + filesave); + LogUtils.error(CLASSNAME, "" + filesave); } catch (IOException e) { - LogUtils.e(CLASSNAME, ""); + LogUtils.error(CLASSNAME, ""); } mRecorder = new MP3Recorder(file); mPlayer = new Player(cont); @@ -317,13 +317,13 @@ public class MicConfigAbility extends LibreAbility implements AsrListener { inputStream = new FileInputStream(file.getCanonicalFile()); startPlayVideo(inputStream.getFD()); } catch (IOException e) { - LogUtils.e(CLASSNAME, "error" + e.toString()); + LogUtils.error(CLASSNAME, "error" + e.toString()); } finally { if (inputStream != null) { try { inputStream.close(); } catch (IOException e) { - LogUtils.e(CLASSNAME, "error" + e.toString()); + LogUtils.error(CLASSNAME, "error" + e.toString()); } } } @@ -406,7 +406,7 @@ public class MicConfigAbility extends LibreAbility implements AsrListener { e.printStackTrace(); } if (volume != 0) { - LogUtils.e("ChatAbility", "The volume changed and saved to : " + volume); + LogUtils.error("ChatAbility", "The volume changed and saved to : " + volume); MainAbility.setVolume(volume); } } diff --git a/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/ability/actions/HttpUIAction.java b/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/ability/actions/HttpUIAction.java index 5ffee4e..b5db4b8 100644 --- a/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/ability/actions/HttpUIAction.java +++ b/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/ability/actions/HttpUIAction.java @@ -55,7 +55,7 @@ public abstract class HttpUIAction extends HttpAction { this.dialog.setSize(displayAttributes.width - 100, 150); this.dialog.show(); } catch (Exception exception) { - LogUtils.e("HttpUIAction.onPreExecute", exception.toString()); + LogUtils.error("HttpUIAction.onPreExecute", exception.toString()); } } @@ -69,7 +69,7 @@ public abstract class HttpUIAction extends HttpAction { MainAbility.error(this.exception.getMessage(), this.exception, this.ability); } } catch (Exception exception) { - LogUtils.e("HttpUIAction.onPostExecute", exception.toString()); + LogUtils.error("HttpUIAction.onPostExecute", exception.toString()); } } @@ -82,7 +82,7 @@ public abstract class HttpUIAction extends HttpAction { MainAbility.error(this.exception.getMessage(), this.exception, this.ability); } } catch (Exception exception) { - LogUtils.e("HttpUIAction.onPostExecute", exception.toString()); + LogUtils.error("HttpUIAction.onPostExecute", exception.toString()); } } } \ No newline at end of file diff --git a/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/ability/adapter/SpinnerAdapter.java b/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/ability/adapter/SpinnerAdapter.java index 4cff2a5..86caf4c 100644 --- a/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/ability/adapter/SpinnerAdapter.java +++ b/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/ability/adapter/SpinnerAdapter.java @@ -15,13 +15,13 @@ package org.botlibre.sdk.ability.adapter; -import org.botlibre.sdk.ResourceTable; import ohos.aafwk.ability.Ability; 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 org.botlibre.sdk.ResourceTable; /** * 适配器 @@ -84,13 +84,14 @@ public class SpinnerAdapter extends BaseItemProvider { * getComponent * * @param position position - * @param component component1 + * @param component1 component1 * @param componentContainer componentContainer * @return getComponent */ @Override - public Component getComponent(int position, Component component, ComponentContainer componentContainer) { + public Component getComponent(int position, Component component1, ComponentContainer componentContainer) { ViewHolder holder; + Component component = component1; if (component == null) { component = mInflater.parse(ResourceTable.Layout_simple_spinner_dropdown_item, componentContainer, false); diff --git a/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/util/AsyncTask.java b/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/util/AsyncTask.java index 4df2b82..3b8c833 100644 --- a/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/util/AsyncTask.java +++ b/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/util/AsyncTask.java @@ -50,6 +50,12 @@ public abstract class AsyncTask { private static final ThreadFactory STHREADFACTORY = new ThreadFactory() { private final AtomicInteger mCount = new AtomicInteger(1); + /** + * newThread + * + * @param r runnable + * @return re + */ public Thread newThread(Runnable r) { return new Thread(r, "AsyncTask #" + mCount.getAndIncrement()); } @@ -70,12 +76,21 @@ public abstract class AsyncTask { * 构造函数中初始化 */ mWork = new WorkRunnable() { + /** + * call + * + * @return re + * @throws Exception + */ @Override public Result call() throws Exception { Result result = doInBackground(paramses); return result; } }; + /** + * 构造函数中初始化 + */ mFutureTask = new FutureTask(mWork) { @Override protected void done() { @@ -111,7 +126,7 @@ public abstract class AsyncTask { } private void postResult(Result result) { - getHandler().sendEvent(InnerEvent.get(POST_EXECUTE, new AsyncTaskResult(this, result))); + getHandler().sendEvent(InnerEvent.get(POST_EXECUTE)); } /** @@ -123,15 +138,15 @@ public abstract class AsyncTask { /** * doInBackground * - * @param params + * @param params params * @return result */ - protected abstract Result doInBackground(Params... params); + protected abstract Result doInBackground(Params[] params); /** * onPostExecute * - * @param result + * @param result result */ protected void onPostExecute(Result result) { } @@ -145,9 +160,9 @@ public abstract class AsyncTask { /** * onProgressUpdate * - * @param progress + * @param progress progress */ - protected void onProgressUpdate(Progress... progress) { + protected void onProgressUpdate(Progress[] progress) { } /** @@ -156,7 +171,6 @@ public abstract class AsyncTask { * @since 2021-04-25 */ private static class InnerUiHandler extends EventHandler { - InnerUiHandler() { super(EventRunner.getMainEventRunner()); } @@ -182,7 +196,7 @@ public abstract class AsyncTask { /** * publishProgress * - * @param progress + * @param progress progress */ public final void publishProgress(Progress... progress) { getHandler().sendEvent(InnerEvent.get(PUBLISH_PROGRSS, @@ -212,7 +226,7 @@ public abstract class AsyncTask { /** * execute * - * @param params + * @param params params * @return async */ public final AsyncTask execute(Params... params) { @@ -222,12 +236,12 @@ public abstract class AsyncTask { /** * executeOnExecutor * - * @param executor - * @param paramses + * @param executor executor + * @param paramses paramses * @return async * @throws IllegalStateException */ - public final AsyncTask executeOnExecutor(Executor executor, Params... paramses) { + public final AsyncTask executeOnExecutor(Executor executor, Params[] paramses) { if (mStatus != Status.PENDING) { switch (mStatus) { case RUNNING: @@ -253,8 +267,8 @@ public abstract class AsyncTask { /** * InnerUiHandler * - * @param - * @param + * @param paramses + * @param result * @since 2021-04-25 */ private abstract static class WorkRunnable implements Callable { @@ -267,14 +281,14 @@ public abstract class AsyncTask { /** * InnerUiHandler * - * @param + * @param data * @since 2021-04-25 */ private static class AsyncTaskResult { AsyncTask myAsyncTask; Data[] mData; - AsyncTaskResult(AsyncTask myAsyncTask, Data... data) { + AsyncTaskResult(AsyncTask myAsyncTask, Data[] data) { this.myAsyncTask = myAsyncTask; this.mData = data; } diff --git a/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/util/LogUtils.java b/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/util/LogUtils.java index 09c0c77..515f410 100644 --- a/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/util/LogUtils.java +++ b/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/util/LogUtils.java @@ -32,67 +32,67 @@ public final class LogUtils { } /** - * debug + * debug信息 * - * @param tag - * @param info + * @param tag 标记 + * @param info 信息 */ - public static void d(String tag, String info) { + public static void debug(String tag, String info) { HiLog.debug(LABEL_LOG, LOG_FORMAT, tag, info); } /** - * debug + * debug信息 * - * @param info + * @param info 信息 */ - public static void d(String info) { - d("SLog-aaaa", info); + public static void debug(String info) { + debug("SLog-aaaa", info); } /** - * debug + * debug信息 * - * @param info + * @param info 信息 */ - public static void d(int info) { - d("SLog-aaaa", info + ""); + public static void debug(int info) { + debug("SLog-aaaa", info + ""); } /** - * error + * error信息 * - * @param tag - * @param info + * @param tag 标记 + * @param info 信息 */ - public static void e(String tag, String info) { + public static void error(String tag, String info) { HiLog.error(LABEL_LOG, LOG_FORMAT, tag, info); } /** - * error + * error信息 * - * @param info + * @param info 信息 */ - public static void e(String info) { - e(TAG, info); + public static void error(String info) { + error(TAG, info); } /** - * error + * error信息 * - * @param info + * @param info 信息 */ - public static void e(int info) { - e(TAG, info + ""); + public static void error(int info) { + error(TAG, info + ""); } /** - * error + * error信息 * - * @param info + * @param info 信息 */ public static void sop(String info) { - e(TAG, info + ""); + error(TAG, info + ""); } } diff --git a/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/util/PreferencesUtils.java b/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/util/PreferencesUtils.java index c20f105..fea8fd3 100644 --- a/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/util/PreferencesUtils.java +++ b/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/util/PreferencesUtils.java @@ -36,7 +36,7 @@ public class PreferencesUtils { /** * getPreferences * - * @param ability + * @param ability 上下文 * @return Preferences */ public static Preferences getPreferences(Ability ability) { @@ -71,9 +71,9 @@ public class PreferencesUtils { /** * 存储string类型数据 * - * @param context - * @param key - * @param value + * @param context 上下文 + * @param key 键名 + * @param value 值名 */ public void putString(Context context, String key, String value) { preferences.putString(key, value); @@ -84,7 +84,7 @@ public class PreferencesUtils { * 获取string数据 * * @param context MyApplication中定义全局的context - * @param key + * @param key 键名 * @return 获取的String 默认值为:null */ public String getString(Context context, String key) { @@ -95,11 +95,10 @@ public class PreferencesUtils { /** * 设置布尔值 * - * @param context - * @param key - * @param isValue + * @param context 上下文 + * @param key 键名 + * @param isValue 值 */ - public void putBoolean(Context context, String key, boolean isValue) { preferences.putBoolean(key, isValue).flushSync(); } @@ -107,12 +106,11 @@ public class PreferencesUtils { /** * 获取 布尔值 * - * @param context - * @param key - * @param isDefValue + * @param context 上下文 + * @param key 键名 + * @param isDefValue 值 * @return false */ - public boolean getBoolean(Context context, String key, boolean isDefValue) { return preferences.getBoolean(key, isDefValue); } diff --git a/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/util/ResUtils.java b/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/util/ResUtils.java index c27e6cf..c76d825 100644 --- a/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/util/ResUtils.java +++ b/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/util/ResUtils.java @@ -15,6 +15,9 @@ package org.botlibre.sdk.util; +import java.io.IOException; +import java.util.Optional; + import ohos.aafwk.ability.Ability; import ohos.agp.components.Button; import ohos.agp.components.Checkbox; @@ -31,8 +34,6 @@ import ohos.media.image.ImageSource; import ohos.media.image.PixelMap; import org.botlibre.sdk.ResourceTable; -import java.io.IOException; -import java.util.Optional; /** * 资源工具类 @@ -70,8 +71,8 @@ public final class ResUtils { /** * 设置button背景 * - * @param button - * @param resId + * @param button button + * @param resId 资源id */ public static void setBackground(Button button, int resId) { Resource bgResource = null; @@ -88,8 +89,8 @@ public final class ResUtils { /** * 设置button背景 * - * @param ability - * @param checkbox + * @param ability 上下文 + * @param checkbox checkbox */ public static void setCheckboxBg(Ability ability, Checkbox checkbox) { StateElement stateElement = new StateElement(); @@ -104,7 +105,7 @@ public final class ResUtils { * get the Pixel Map Element * * @param context the context - * @param resId + * @param resId 资源id * @return the Pixel Map Element */ public static PixelMapElement getPixelMapDrawable(Context context, int resId) { @@ -116,7 +117,7 @@ public final class ResUtils { * get the pixel map * * @param context the context - * @param id + * @param id 资源id * @return the pixel map */ public static Optional getPixelMap(Context context, int id) { @@ -141,7 +142,7 @@ public final class ResUtils { * get the path from id * * @param context the context - * @param id + * @param id 资源id * @return the path from id */ public static String getPathById(Context context, int id) { diff --git a/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/util/ToastUtils.java b/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/util/ToastUtils.java index 99fcf28..0117f4c 100644 --- a/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/util/ToastUtils.java +++ b/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/util/ToastUtils.java @@ -15,7 +15,6 @@ package org.botlibre.sdk.util; -import org.botlibre.sdk.ResourceTable; import ohos.aafwk.ability.Ability; import ohos.agp.components.Component; import ohos.agp.components.LayoutScatter; @@ -23,6 +22,7 @@ import ohos.agp.components.Text; import ohos.agp.utils.LayoutAlignment; import ohos.agp.window.dialog.ToastDialog; import ohos.app.Context; +import org.botlibre.sdk.ResourceTable; /** * ToastUtils @@ -37,20 +37,20 @@ public class ToastUtils { } /** - * show + * show显示提示文字 * - * @param ability - * @param text + * @param ability 上下文 + * @param text 信息 */ public static void show(Ability ability, String text) { showToast(ability, text); } /** - * showToast + * showToast显示提示文字 * - * @param ability - * @param text + * @param ability 上下文 + * @param text 信息 */ public static void showToast(Ability ability, String text) { if (toast == null) { @@ -63,12 +63,11 @@ public class ToastUtils { } /** - * 自定义 + * 自定义 居中 * - * @param context - * @param val + * @param context 上下文 + * @param val 信息 */ - public static void showCenterToast(Context context, String val) { Component toastLayout = LayoutScatter.getInstance(context) .parse(ResourceTable.Layout_toast_layout, null, false); diff --git a/PizzaBotOffline/entry/src/ohosTest/java/org/botlibre/sdk/util/ResUtilsOhosTest.java b/PizzaBotOffline/entry/src/ohosTest/java/org/botlibre/sdk/util/ResUtilsOhosTest.java deleted file mode 100644 index 9394905..0000000 --- a/PizzaBotOffline/entry/src/ohosTest/java/org/botlibre/sdk/util/ResUtilsOhosTest.java +++ /dev/null @@ -1,51 +0,0 @@ -package org.botlibre.sdk.util; - -import org.junit.Test; - -/** - * ResUtilsOhosTest - * - * @since 2021-06-17 - */ -public class ResUtilsOhosTest { - - @Test - public void vpToPx() { - } - - @Test - public void pxTovp() { - } - - @Test - public void getScreenWidth() { - } - - @Test - public void getScreenHeight() { - } - - @Test - public void getColor() { - } - - @Test - public void getDimen() { - } - - @Test - public void getPixelMap() { - } - - @Test - public void getPixelMapDrawable() { - } - - @Test - public void buildDrawableByColor() { - } - - @Test - public void buildDrawableByColorRadius() { - } -} \ No newline at end of file diff --git a/PizzaBotOffline/entry/src/test/java/org/botlibre/sdk/ExampleTest.java b/PizzaBotOffline/entry/src/test/java/org/botlibre/sdk/ExampleTest.java index 7a3b92d..b862efa 100644 --- a/PizzaBotOffline/entry/src/test/java/org/botlibre/sdk/ExampleTest.java +++ b/PizzaBotOffline/entry/src/test/java/org/botlibre/sdk/ExampleTest.java @@ -2,7 +2,15 @@ package org.botlibre.sdk; import org.junit.Test; +/** + * ExampleTest + * + * @since 2021-04-16 + */ public class ExampleTest { + /** + * onStart + */ @Test public void onStart() { } diff --git a/SantaBot/entry/src/main/java/org/botlibre/sdk/ability/actions/HttpUIAction.java b/SantaBot/entry/src/main/java/org/botlibre/sdk/ability/actions/HttpUIAction.java index f0093ab..a8a52bb 100644 --- a/SantaBot/entry/src/main/java/org/botlibre/sdk/ability/actions/HttpUIAction.java +++ b/SantaBot/entry/src/main/java/org/botlibre/sdk/ability/actions/HttpUIAction.java @@ -53,7 +53,7 @@ public abstract class HttpUIAction extends HttpAction { this.dialog.setSize(displayAttributes.width - 100,150); this.dialog.show(); } catch (Exception exception) { - LogUtils.e("HttpUIAction.onPreExecute", exception.toString()); + LogUtils.error("HttpUIAction.onPreExecute", exception.toString()); } } @@ -66,7 +66,7 @@ public abstract class HttpUIAction extends HttpAction { MainAbility.errorInfo(1,this.exception.getMessage(), this.exception, this.ability); } } catch (Exception exception) { - LogUtils.e("HttpUIAction.onPostExecute", exception.toString()); + LogUtils.error("HttpUIAction.onPostExecute", exception.toString()); } } } \ No newline at end of file diff --git a/SantaBot/entry/src/main/java/org/botlibre/sdk/ability/actions/HttpUIResultAction.java b/SantaBot/entry/src/main/java/org/botlibre/sdk/ability/actions/HttpUIResultAction.java index db20c90..c952ff7 100644 --- a/SantaBot/entry/src/main/java/org/botlibre/sdk/ability/actions/HttpUIResultAction.java +++ b/SantaBot/entry/src/main/java/org/botlibre/sdk/ability/actions/HttpUIResultAction.java @@ -54,7 +54,7 @@ public abstract class HttpUIResultAction extends HttpResultAction { this.dialog.setSize(displayAttributes.width - 100,150); this.dialog.show(); } catch (Exception exception) { - LogUtils.e("HttpUIAction.onPreExecute", exception.toString()); + LogUtils.error("HttpUIAction.onPreExecute", exception.toString()); } } @@ -71,7 +71,7 @@ public abstract class HttpUIResultAction extends HttpResultAction { // } } } catch (Exception exception) { - LogUtils.e("HttpUIAction.onPostExecute", exception.toString()); + LogUtils.error("HttpUIAction.onPostExecute", exception.toString()); } } } \ No newline at end of file diff --git a/SantaBot/entry/src/main/java/org/botlibre/sdk/ability/adapter/SpinnerAdapter.java b/SantaBot/entry/src/main/java/org/botlibre/sdk/ability/adapter/SpinnerAdapter.java index 4cff2a5..86caf4c 100644 --- a/SantaBot/entry/src/main/java/org/botlibre/sdk/ability/adapter/SpinnerAdapter.java +++ b/SantaBot/entry/src/main/java/org/botlibre/sdk/ability/adapter/SpinnerAdapter.java @@ -15,13 +15,13 @@ package org.botlibre.sdk.ability.adapter; -import org.botlibre.sdk.ResourceTable; import ohos.aafwk.ability.Ability; 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 org.botlibre.sdk.ResourceTable; /** * 适配器 @@ -84,13 +84,14 @@ public class SpinnerAdapter extends BaseItemProvider { * getComponent * * @param position position - * @param component component1 + * @param component1 component1 * @param componentContainer componentContainer * @return getComponent */ @Override - public Component getComponent(int position, Component component, ComponentContainer componentContainer) { + public Component getComponent(int position, Component component1, ComponentContainer componentContainer) { ViewHolder holder; + Component component = component1; if (component == null) { component = mInflater.parse(ResourceTable.Layout_simple_spinner_dropdown_item, componentContainer, false); diff --git a/SantaBot/entry/src/main/java/org/botlibre/sdk/util/AsyncTask.java b/SantaBot/entry/src/main/java/org/botlibre/sdk/util/AsyncTask.java index 4df2b82..3b8c833 100644 --- a/SantaBot/entry/src/main/java/org/botlibre/sdk/util/AsyncTask.java +++ b/SantaBot/entry/src/main/java/org/botlibre/sdk/util/AsyncTask.java @@ -50,6 +50,12 @@ public abstract class AsyncTask { private static final ThreadFactory STHREADFACTORY = new ThreadFactory() { private final AtomicInteger mCount = new AtomicInteger(1); + /** + * newThread + * + * @param r runnable + * @return re + */ public Thread newThread(Runnable r) { return new Thread(r, "AsyncTask #" + mCount.getAndIncrement()); } @@ -70,12 +76,21 @@ public abstract class AsyncTask { * 构造函数中初始化 */ mWork = new WorkRunnable() { + /** + * call + * + * @return re + * @throws Exception + */ @Override public Result call() throws Exception { Result result = doInBackground(paramses); return result; } }; + /** + * 构造函数中初始化 + */ mFutureTask = new FutureTask(mWork) { @Override protected void done() { @@ -111,7 +126,7 @@ public abstract class AsyncTask { } private void postResult(Result result) { - getHandler().sendEvent(InnerEvent.get(POST_EXECUTE, new AsyncTaskResult(this, result))); + getHandler().sendEvent(InnerEvent.get(POST_EXECUTE)); } /** @@ -123,15 +138,15 @@ public abstract class AsyncTask { /** * doInBackground * - * @param params + * @param params params * @return result */ - protected abstract Result doInBackground(Params... params); + protected abstract Result doInBackground(Params[] params); /** * onPostExecute * - * @param result + * @param result result */ protected void onPostExecute(Result result) { } @@ -145,9 +160,9 @@ public abstract class AsyncTask { /** * onProgressUpdate * - * @param progress + * @param progress progress */ - protected void onProgressUpdate(Progress... progress) { + protected void onProgressUpdate(Progress[] progress) { } /** @@ -156,7 +171,6 @@ public abstract class AsyncTask { * @since 2021-04-25 */ private static class InnerUiHandler extends EventHandler { - InnerUiHandler() { super(EventRunner.getMainEventRunner()); } @@ -182,7 +196,7 @@ public abstract class AsyncTask { /** * publishProgress * - * @param progress + * @param progress progress */ public final void publishProgress(Progress... progress) { getHandler().sendEvent(InnerEvent.get(PUBLISH_PROGRSS, @@ -212,7 +226,7 @@ public abstract class AsyncTask { /** * execute * - * @param params + * @param params params * @return async */ public final AsyncTask execute(Params... params) { @@ -222,12 +236,12 @@ public abstract class AsyncTask { /** * executeOnExecutor * - * @param executor - * @param paramses + * @param executor executor + * @param paramses paramses * @return async * @throws IllegalStateException */ - public final AsyncTask executeOnExecutor(Executor executor, Params... paramses) { + public final AsyncTask executeOnExecutor(Executor executor, Params[] paramses) { if (mStatus != Status.PENDING) { switch (mStatus) { case RUNNING: @@ -253,8 +267,8 @@ public abstract class AsyncTask { /** * InnerUiHandler * - * @param - * @param + * @param paramses + * @param result * @since 2021-04-25 */ private abstract static class WorkRunnable implements Callable { @@ -267,14 +281,14 @@ public abstract class AsyncTask { /** * InnerUiHandler * - * @param + * @param data * @since 2021-04-25 */ private static class AsyncTaskResult { AsyncTask myAsyncTask; Data[] mData; - AsyncTaskResult(AsyncTask myAsyncTask, Data... data) { + AsyncTaskResult(AsyncTask myAsyncTask, Data[] data) { this.myAsyncTask = myAsyncTask; this.mData = data; } diff --git a/SantaBot/entry/src/main/java/org/botlibre/sdk/util/LogUtils.java b/SantaBot/entry/src/main/java/org/botlibre/sdk/util/LogUtils.java index 09c0c77..515f410 100644 --- a/SantaBot/entry/src/main/java/org/botlibre/sdk/util/LogUtils.java +++ b/SantaBot/entry/src/main/java/org/botlibre/sdk/util/LogUtils.java @@ -32,67 +32,67 @@ public final class LogUtils { } /** - * debug + * debug信息 * - * @param tag - * @param info + * @param tag 标记 + * @param info 信息 */ - public static void d(String tag, String info) { + public static void debug(String tag, String info) { HiLog.debug(LABEL_LOG, LOG_FORMAT, tag, info); } /** - * debug + * debug信息 * - * @param info + * @param info 信息 */ - public static void d(String info) { - d("SLog-aaaa", info); + public static void debug(String info) { + debug("SLog-aaaa", info); } /** - * debug + * debug信息 * - * @param info + * @param info 信息 */ - public static void d(int info) { - d("SLog-aaaa", info + ""); + public static void debug(int info) { + debug("SLog-aaaa", info + ""); } /** - * error + * error信息 * - * @param tag - * @param info + * @param tag 标记 + * @param info 信息 */ - public static void e(String tag, String info) { + public static void error(String tag, String info) { HiLog.error(LABEL_LOG, LOG_FORMAT, tag, info); } /** - * error + * error信息 * - * @param info + * @param info 信息 */ - public static void e(String info) { - e(TAG, info); + public static void error(String info) { + error(TAG, info); } /** - * error + * error信息 * - * @param info + * @param info 信息 */ - public static void e(int info) { - e(TAG, info + ""); + public static void error(int info) { + error(TAG, info + ""); } /** - * error + * error信息 * - * @param info + * @param info 信息 */ public static void sop(String info) { - e(TAG, info + ""); + error(TAG, info + ""); } } diff --git a/SantaBot/entry/src/main/java/org/botlibre/sdk/util/PreferencesUtils.java b/SantaBot/entry/src/main/java/org/botlibre/sdk/util/PreferencesUtils.java index c20f105..fea8fd3 100644 --- a/SantaBot/entry/src/main/java/org/botlibre/sdk/util/PreferencesUtils.java +++ b/SantaBot/entry/src/main/java/org/botlibre/sdk/util/PreferencesUtils.java @@ -36,7 +36,7 @@ public class PreferencesUtils { /** * getPreferences * - * @param ability + * @param ability 上下文 * @return Preferences */ public static Preferences getPreferences(Ability ability) { @@ -71,9 +71,9 @@ public class PreferencesUtils { /** * 存储string类型数据 * - * @param context - * @param key - * @param value + * @param context 上下文 + * @param key 键名 + * @param value 值名 */ public void putString(Context context, String key, String value) { preferences.putString(key, value); @@ -84,7 +84,7 @@ public class PreferencesUtils { * 获取string数据 * * @param context MyApplication中定义全局的context - * @param key + * @param key 键名 * @return 获取的String 默认值为:null */ public String getString(Context context, String key) { @@ -95,11 +95,10 @@ public class PreferencesUtils { /** * 设置布尔值 * - * @param context - * @param key - * @param isValue + * @param context 上下文 + * @param key 键名 + * @param isValue 值 */ - public void putBoolean(Context context, String key, boolean isValue) { preferences.putBoolean(key, isValue).flushSync(); } @@ -107,12 +106,11 @@ public class PreferencesUtils { /** * 获取 布尔值 * - * @param context - * @param key - * @param isDefValue + * @param context 上下文 + * @param key 键名 + * @param isDefValue 值 * @return false */ - public boolean getBoolean(Context context, String key, boolean isDefValue) { return preferences.getBoolean(key, isDefValue); } diff --git a/SantaBot/entry/src/main/java/org/botlibre/sdk/util/ResUtils.java b/SantaBot/entry/src/main/java/org/botlibre/sdk/util/ResUtils.java index 62df39f..0fa1fff 100644 --- a/SantaBot/entry/src/main/java/org/botlibre/sdk/util/ResUtils.java +++ b/SantaBot/entry/src/main/java/org/botlibre/sdk/util/ResUtils.java @@ -15,6 +15,9 @@ package org.botlibre.sdk.util; +import java.io.IOException; +import java.util.Optional; + import ohos.aafwk.ability.Ability; import ohos.agp.components.Button; import ohos.agp.components.Checkbox; @@ -31,8 +34,6 @@ import ohos.media.image.ImageSource; import ohos.media.image.PixelMap; import org.botlibre.sdk.ResourceTable; -import java.io.IOException; -import java.util.Optional; /** * 资源工具类 @@ -80,11 +81,11 @@ public final class ResUtils { try { result = manager.getElement(id).getString(); } catch (IOException e) { - LogUtils.e("getString ->IOException"); + LogUtils.error("getString ->IOException"); } catch (NotExistException e) { - LogUtils.e("getString -> NotExistException"); + LogUtils.error("getString -> NotExistException"); } catch (WrongTypeException e) { - LogUtils.e("getString -> WrongTypeException"); + LogUtils.error("getString -> WrongTypeException"); } return result; } @@ -92,8 +93,8 @@ public final class ResUtils { /** * 设置button背景 * - * @param button - * @param resId + * @param button button + * @param resId 资源id */ public static void setBackground(Button button, int resId) { Resource bgResource = null; @@ -110,8 +111,8 @@ public final class ResUtils { /** * 设置button背景 * - * @param ability - * @param checkbox + * @param ability 上下文 + * @param checkbox checkbox */ public static void setCheckboxBg(Ability ability, Checkbox checkbox) { StateElement stateElement = new StateElement(); @@ -126,7 +127,7 @@ public final class ResUtils { * get the Pixel Map Element * * @param context the context - * @param resId + * @param resId 资源id * @return the Pixel Map Element */ public static PixelMapElement getPixelMapDrawable(Context context, int resId) { @@ -138,7 +139,7 @@ public final class ResUtils { * get the pixel map * * @param context the context - * @param id + * @param id 资源id * @return the pixel map */ public static Optional getPixelMap(Context context, int id) { @@ -163,7 +164,7 @@ public final class ResUtils { * get the path from id * * @param context the context - * @param id + * @param id 资源id * @return the path from id */ public static String getPathById(Context context, int id) { diff --git a/SantaBot/entry/src/main/java/org/botlibre/sdk/util/ToastUtils.java b/SantaBot/entry/src/main/java/org/botlibre/sdk/util/ToastUtils.java index 99fcf28..0117f4c 100644 --- a/SantaBot/entry/src/main/java/org/botlibre/sdk/util/ToastUtils.java +++ b/SantaBot/entry/src/main/java/org/botlibre/sdk/util/ToastUtils.java @@ -15,7 +15,6 @@ package org.botlibre.sdk.util; -import org.botlibre.sdk.ResourceTable; import ohos.aafwk.ability.Ability; import ohos.agp.components.Component; import ohos.agp.components.LayoutScatter; @@ -23,6 +22,7 @@ import ohos.agp.components.Text; import ohos.agp.utils.LayoutAlignment; import ohos.agp.window.dialog.ToastDialog; import ohos.app.Context; +import org.botlibre.sdk.ResourceTable; /** * ToastUtils @@ -37,20 +37,20 @@ public class ToastUtils { } /** - * show + * show显示提示文字 * - * @param ability - * @param text + * @param ability 上下文 + * @param text 信息 */ public static void show(Ability ability, String text) { showToast(ability, text); } /** - * showToast + * showToast显示提示文字 * - * @param ability - * @param text + * @param ability 上下文 + * @param text 信息 */ public static void showToast(Ability ability, String text) { if (toast == null) { @@ -63,12 +63,11 @@ public class ToastUtils { } /** - * 自定义 + * 自定义 居中 * - * @param context - * @param val + * @param context 上下文 + * @param val 信息 */ - public static void showCenterToast(Context context, String val) { Component toastLayout = LayoutScatter.getInstance(context) .parse(ResourceTable.Layout_toast_layout, null, false); -- Gitee