diff --git a/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/MainAbility.java b/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/MainAbility.java index c0253994a34192c3c6f646e8f94364ad5a79152d..62cd7f7db85bc00fe608d00759d4bbef962d48be 100644 --- a/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/MainAbility.java +++ b/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/MainAbility.java @@ -132,7 +132,7 @@ public class MainAbility extends LibreAbility implements SelectListener, Languag /** * If you are building a single instance app, then you can set the launchType to - * have this activity launch the bot, forum, or channel. + * have this ability launch the bot, forum, or channel. */ private static LaunchType launchType = LaunchType.Bot; @@ -645,12 +645,12 @@ public class MainAbility extends LibreAbility implements SelectListener, Languag } /** - * getActivity + * getAbility * * @param config * @return ff */ - public static Class getActivity(WebMediumConfig config) { + public static Class getAbility(WebMediumConfig config) { return null; } @@ -679,9 +679,9 @@ public class MainAbility extends LibreAbility implements SelectListener, Languag * * @param message * @param exception - * @param activity + * @param ability */ - public static void error(String message, Exception exception, Ability activity) { + public static void error(String message, Exception exception, Ability ability) { try { if (DEBUG) { System.out.println(String.valueOf(message)); @@ -695,7 +695,7 @@ public class MainAbility extends LibreAbility implements SelectListener, Languag if (message.contains("")) { message = "Server Error, ensure you are connected to the Internet"; } - MainAbility.showMessage(null, message, activity); + MainAbility.showMessage(null, message, ability); } catch (Throwable error) { error.printStackTrace(); } @@ -707,9 +707,9 @@ public class MainAbility extends LibreAbility implements SelectListener, Languag * @param type * @param message * @param exception - * @param activity + * @param ability */ - public static void errorInfo(int type, String message, Exception exception, Ability activity) { + public static void errorInfo(int type, String message, Exception exception, Ability ability) { try { if (DEBUG) { System.out.println(String.valueOf(message)); @@ -723,7 +723,7 @@ public class MainAbility extends LibreAbility implements SelectListener, Languag if (message.contains("")) { message = "Server Error, ensure you are connected to the Internet"; } - MainAbility.showMessageInfo(type, null, message, activity); + MainAbility.showMessageInfo(type, null, message, ability); } catch (Throwable error) { error.printStackTrace(); } @@ -742,14 +742,14 @@ public class MainAbility extends LibreAbility implements SelectListener, Languag * * @param title * @param message - * @param activity + * @param ability */ - public static void showMessage(String title, String message, Ability activity) { - CommonDialog mCommonDialog = new CommonDialog(activity); + public static void showMessage(String title, String message, Ability ability) { + CommonDialog mCommonDialog = new CommonDialog(ability); Optional - display = DisplayManager.getInstance().getDefaultDisplay(activity); + display = DisplayManager.getInstance().getDefaultDisplay(ability); DisplayAttributes displayAttributes = display.get().getAttributes(); - DirectionalLayout layout = (DirectionalLayout) LayoutScatter.getInstance(activity). + DirectionalLayout layout = (DirectionalLayout) LayoutScatter.getInstance(ability). parse(ResourceTable.Layout_content_dialog, null, false); mCommonDialog.setContentCustomComponent(layout) @@ -777,14 +777,14 @@ public class MainAbility extends LibreAbility implements SelectListener, Languag * * @param title * @param message - * @param activity + * @param ability */ - public void showLogin(String title, String message, Ability activity) { - CommonDialog mCommonDialog = new CommonDialog(activity); + public void showLogin(String title, String message, Ability ability) { + CommonDialog mCommonDialog = new CommonDialog(ability); Optional - display = DisplayManager.getInstance().getDefaultDisplay(activity); + display = DisplayManager.getInstance().getDefaultDisplay(ability); DisplayAttributes displayAttributes = display.get().getAttributes(); - DirectionalLayout layout = (DirectionalLayout) LayoutScatter.getInstance(activity). + DirectionalLayout layout = (DirectionalLayout) LayoutScatter.getInstance(ability). parse(ResourceTable.Layout_content_dialog, null, false); mCommonDialog.setContentCustomComponent(layout) @@ -816,14 +816,14 @@ public class MainAbility extends LibreAbility implements SelectListener, Languag * @param type * @param title * @param message - * @param activity + * @param ability */ - public static void showMessageInfo(int type, String title, String message, Ability activity) { - CommonDialog mCommonDialog = new CommonDialog(activity); + public static void showMessageInfo(int type, String title, String message, Ability ability) { + CommonDialog mCommonDialog = new CommonDialog(ability); Optional - display = DisplayManager.getInstance().getDefaultDisplay(activity); + display = DisplayManager.getInstance().getDefaultDisplay(ability); DisplayAttributes displayAttributes = display.get().getAttributes(); - DirectionalLayout layout = (DirectionalLayout) LayoutScatter.getInstance(activity). + DirectionalLayout layout = (DirectionalLayout) LayoutScatter.getInstance(ability). parse(ResourceTable.Layout_exception_dialog, null, false); mCommonDialog.setContentCustomComponent(layout) @@ -857,22 +857,22 @@ public class MainAbility extends LibreAbility implements SelectListener, Languag * showMessage * * @param message - * @param activity + * @param ability */ - public static void showMessage(String message, Ability activity) { - showMessage(null, message, activity); + public static void showMessage(String message, Ability ability) { + showMessage(null, message, ability); } /** * confirm * * @param message - * @param activity + * @param ability * @param cancelable * @param listener */ - public static void confirm(String message, Ability activity, Boolean cancelable, IDialog.ClickedListener listener) { - CommonDialog dialog = new CommonDialog(activity); + public static void confirm(String message, Ability ability, Boolean cancelable, IDialog.ClickedListener listener) { + CommonDialog dialog = new CommonDialog(ability); dialog.setTitleText("Bot Libre!"); dialog.setContentText(message); dialog.setButton(0, "Yes", listener); @@ -1606,10 +1606,10 @@ public class MainAbility extends LibreAbility implements SelectListener, Languag /** * readZipAvatars * - * @param activity + * @param ability * @param fileName */ - public static void readZipAvatars(Ability activity, String fileName) { + public static void readZipAvatars(Ability ability, String fileName) { } public static void setLearning(LearningConfig learnings) { diff --git a/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/ability/ChatAbility.java b/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/ability/ChatAbility.java index 250c50c52f7c3cccdff65d38dee73150b137b79a..04b64f09df8e4c26b210f1754ae593a4c1a81272 100644 --- a/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/ability/ChatAbility.java +++ b/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/ability/ChatAbility.java @@ -440,7 +440,7 @@ public class ChatAbility extends LibreAbility { */ @Override public void onError(int error) { - LogUtils.sop("ChatActivity on error executes here!"); + LogUtils.sop("ChatAbility on error executes here!"); try { if (error == AsrError.ERROR_AUDIO) { LogUtils.sop("Error: Audio Recording Error"); @@ -525,7 +525,7 @@ public class ChatAbility extends LibreAbility { @Override protected void onStart(Intent intent) { super.onStart(intent); - super.setUIContent(ResourceTable.Layout_activity_chat); + super.setUIContent(ResourceTable.Layout_ability_chat); ability = this; messages.clear(); audioManager = new AudioManager(this); diff --git a/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/ability/ChatAbility2.java b/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/ability/ChatAbility2.java index 9d8ae86cd9137ae247fcc991c91dd04af8baa952..7ffeda698030d77816be1827e243ba3620e8e98a 100644 --- a/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/ability/ChatAbility2.java +++ b/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/ability/ChatAbility2.java @@ -673,7 +673,7 @@ public class ChatAbility2 extends LibreAbility { */ @Override public void onError(int error) { - LogUtils.sop("ChatActivity on error executes here!"); + LogUtils.sop("ChatAbility on error executes here!"); try { isRecording = false; @@ -760,7 +760,7 @@ public class ChatAbility2 extends LibreAbility { @Override protected void onStart(Intent intent) { super.onStart(intent); - super.setUIContent(ResourceTable.Layout_activity_chat2); + super.setUIContent(ResourceTable.Layout_ability_chat2); setAbility(this); messages.clear(); audioManager = new AudioManager(this); diff --git a/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/ability/ListTemplateView.java b/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/ability/ListTemplateView.java index 8be9620572852480f6e3f95eb8e1bc93ed0a8764..5665b7765f560882507d48fa2fab39bed1da95e0 100644 --- a/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/ability/ListTemplateView.java +++ b/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/ability/ListTemplateView.java @@ -140,12 +140,12 @@ public class ListTemplateView extends LibreAbility { static class ListAdapter extends BaseItemProvider { - private final Ability mActivity; + private final Ability mAbility; private final LayoutScatter mInflater; private final List items; public ListAdapter(Ability ability, List items) { - mActivity = ability; + mAbility = ability; this.items = items; mInflater = LayoutScatter.getInstance(ability); } 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 49a9f3faff33a2e9fd26fc9249bd614249bdceda..be08f49582c67657ca185c05bb86b4b77ac0230b 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 @@ -165,9 +165,7 @@ public class MicConfigAbility extends LibreAbility implements AsrListener { }); micButton.setClickedListener(component -> { if (txt.getText().equals("Status: Timeout!")) { - //Intent intent = getIntent(); terminateAbility(); - // startActivity(intent); return; } if (clicked) { @@ -185,17 +183,6 @@ public class MicConfigAbility extends LibreAbility implements AsrListener { micButton2.setClickedListener(component -> { txt.setText("Status: ON"); setMicIcon(true, false); -// Intent intent = new Intent(RecognizerIntent.ACTION_RECOGNIZE_SPEECH); -// intent.putExtra(RecognizerIntent.EXTRA_LANGUAGE_MODEL, MainActivity.voice.language); -// try { -// startActivityForResult(intent, 1); -// editTextForGoogle.setText(""); -// } catch (ActivityNotFoundException a) { -// Toast t = Toast.makeText(getApplicationContext(), -// "Your device doesn't support Speech to Text", -// Toast.LENGTH_SHORT); -// t.show(); -// } }); playButton.setClickedListener(component -> { try { @@ -429,7 +416,7 @@ public class MicConfigAbility extends LibreAbility implements AsrListener { e.printStackTrace(); } if (volume != 0) { - LogUtils.error("ChatActivity", "The volume changed and saved to : " + volume); + LogUtils.error("ChatAbility", "The volume changed and saved to : " + volume); MainAbility.setVolume(volume); } } @@ -586,39 +573,7 @@ public class MicConfigAbility extends LibreAbility implements AsrListener { lastReply = System.currentTimeMillis(); muteMicBeep(true); -// Intent intent = new Intent(RecognizerIntent.ACTION_RECOGNIZE_SPEECH); -// if (MainActivity.offlineSpeech) { -// intent.putExtra(RecognizerIntent.EXTRA_LANGUAGE_MODEL, MainActivity.voice.language); // -// if (!this.failedOfflineLanguage) { -// //en-US will use the English in offline. -// intent.putExtra(RecognizerIntent.EXTRA_LANGUAGE, "en-US"); -// // intent.putExtra(RecognizerIntent.EXTRA_PREFER_OFFLINE, true); -// } -// intent.putExtra(RecognizerIntent.EXTRA_PREFER_OFFLINE, true); -// } else { -// if (MainActivity.voice.language != null && !MainActivity.voice.language.isEmpty()) { -// intent.putExtra(RecognizerIntent.EXTRA_LANGUAGE_MODEL, MainActivity.voice.language); -// if (!this.failedOfflineLanguage) { -// intent.putExtra(RecognizerIntent.EXTRA_LANGUAGE, MainActivity.voice.language); -// } -// } else { -// intent.putExtra(RecognizerIntent.EXTRA_LANGUAGE_MODEL, "en"); -// if (!this.failedOfflineLanguage) { -// intent.putExtra(RecognizerIntent.EXTRA_LANGUAGE, "en"); -// } -// } -// } -// -// try { -// LogUtils.e("BeginListening", "StartListening"); -// this.asrClient.startListening(intent); -// setMicIcon(true, false); -// } catch (ActivityNotFoundException a) { -// LogUtils.e("BeginListening", "CatchError: " + a.getMessage()); -// ToastUtils.show(this,"Your device doesn't support Speech to Text"); -// txt.setText("Status: Your device doesn't support Speech to text."); -// } } @Override diff --git a/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/ability/actions/HttpFetchAction.java b/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/ability/actions/HttpFetchAction.java index 7b14d268a7a7401cc99ae22199ff5027db9401ff..8016ed70a3ce6a3c6925c14525ba64f259be3ec2 100644 --- a/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/ability/actions/HttpFetchAction.java +++ b/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/ability/actions/HttpFetchAction.java @@ -87,7 +87,7 @@ public class HttpFetchAction extends HttpUIResultAction { cookies.putString(this.config.getType(), this.config.name); cookies.flushSync(); - Class childAbility = getActivity(this.config); + Class childAbility = getABility(this.config); if (this.launch && !this.config.isExternal) { if (this.config instanceof ChannelConfig) { // childAbility = LiveChatAbility.class; diff --git a/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/ability/actions/HttpResultAction.java b/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/ability/actions/HttpResultAction.java index f2c524cb49ec2371b4b238de5d7f9363175c458f..17f5e179af1eadb767b8d39cd6c0bd56e9cbe571 100644 --- a/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/ability/actions/HttpResultAction.java +++ b/BotLibreOffline/entry/src/main/java/org/botlibre/sdk/ability/actions/HttpResultAction.java @@ -39,7 +39,7 @@ public abstract class HttpResultAction { } /** - * 启动activity + * 启动ability * * @param ability * @param name @@ -56,7 +56,7 @@ public abstract class HttpResultAction { } /** - * 启动activity + * 启动ability * * @param ability * @param name diff --git a/BotLibreOffline/entry/src/main/resources/base/layout/activity_chat.xml b/BotLibreOffline/entry/src/main/resources/base/layout/ability_chat.xml similarity index 100% rename from BotLibreOffline/entry/src/main/resources/base/layout/activity_chat.xml rename to BotLibreOffline/entry/src/main/resources/base/layout/ability_chat.xml diff --git a/BotLibreOffline/entry/src/main/resources/base/layout/activity_chat2.xml b/BotLibreOffline/entry/src/main/resources/base/layout/ability_chat2.xml similarity index 100% rename from BotLibreOffline/entry/src/main/resources/base/layout/activity_chat2.xml rename to BotLibreOffline/entry/src/main/resources/base/layout/ability_chat2.xml