diff --git a/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/LiveChatListener.java b/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/LiveChatListener.java deleted file mode 100644 index 6aa89ba4728d6f2fe1633b378ff34c2066846eed..0000000000000000000000000000000000000000 --- a/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/LiveChatListener.java +++ /dev/null @@ -1,59 +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; - -/** - * Listener interface for a LiveChatConnection. - * This gives asynchronous notification when a channel receives a message, or notice. - */ -public interface LiveChatListener { - /** - * A user message was received from the channel. - * - * @param message - */ - void message(String message); - - /** - * An informational message was received from the channel. - * Such as a new user joined, private request, etc. - * - * @param message - */ - void info(String message); - - /** - * An error message was received from the channel. - * This could be an access error, or message failure. - * - * @param message - */ - void error(String message); - - /** - * Notification that the connection was closed. - */ - void closed(); - - /** - * The channels users changed (user joined, left, etc.) - * This contains a comma separated values (CSV) list of the current channel users. - * It can be passed to the SDKConnection.getUsers() API to obtain the UserConfig info for the users. - * - * @param usersCSV - */ - void updateUsers(String usersCSV); -} \ No newline at end of file diff --git a/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/SDKConnection.java b/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/SDKConnection.java index ddd8b1e8cd7c1f41c9ebd1aa8f19494c8590cfa6..2e026ee394d4492dbb483d1fdeaafcfc8fd34312 100644 --- a/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/SDKConnection.java +++ b/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/SDKConnection.java @@ -15,6 +15,10 @@ package org.botlibre.sdk; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; + import com.franmontiel.persistentcookiejar.ClearableCookieJar; import com.franmontiel.persistentcookiejar.PersistentCookieJar; import com.franmontiel.persistentcookiejar.cache.SetCookieCache; @@ -49,10 +53,6 @@ import org.botlibre.sdk.config.WebMediumConfig; import org.w3c.dom.Document; import org.w3c.dom.Element; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; - /** * SDKConnection * diff --git a/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/ability/CreateUserAbility.java b/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/ability/CreateUserAbility.java index 493caccf7714e688899ec24daec5a0af9842591b..16c4bbae7f9d80bce10f9a2b71f09cf1128a7f52 100644 --- a/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/ability/CreateUserAbility.java +++ b/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/ability/CreateUserAbility.java @@ -15,14 +15,14 @@ package org.botlibre.sdk.ability; -import org.botlibre.sdk.ResourceTable; -import org.botlibre.sdk.ability.actions.HttpCreateUserAction; -import org.botlibre.sdk.config.UserConfig; import ohos.aafwk.content.Intent; import ohos.agp.components.Button; import ohos.agp.components.Checkbox; import ohos.agp.components.Component; import ohos.agp.components.TextField; +import org.botlibre.sdk.ResourceTable; +import org.botlibre.sdk.ability.actions.HttpCreateUserAction; +import org.botlibre.sdk.config.UserConfig; /** * HttpConnectAction diff --git a/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/ability/ListTemplateView.java b/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/ability/ListTemplateView.java index 3e4f208a3cbc10421a1870325b153b511842870e..0d7e00f05a2c398096a5831426bbe418297dc320 100644 --- a/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/ability/ListTemplateView.java +++ b/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/ability/ListTemplateView.java @@ -14,103 +14,42 @@ */ package org.botlibre.sdk.ability; +import ohos.aafwk.ability.Ability; +import ohos.aafwk.content.Intent; +import org.botlibre.sdk.ResourceTable; +import org.botlibre.sdk.config.OfflineTemplateConfig; + import java.util.ArrayList; import java.util.List; -import org.botlibre.sdk.config.OfflineTemplateConfig; -import org.botlibre.sdk.ResourceTable; -import ohos.aafwk.ability.Ability; -import ohos.aafwk.content.Intent; +public class ListTemplateView extends Ability { + // public static boolean offlineTemplate = false; + // List items; + final static String listOfBots[] = {"Empty", "Basic", "Personal Assistance"}; + final static int imagesId[] = {ResourceTable.Media_bot, ResourceTable.Media_bot, ResourceTable.Media_bot}; + final static String listOfDec[] = {"A completely empty template loaded with no knowledge or scripts.", + "A basic bot template with only responses to common greetings and farewells (hello, goodbye, etc.), and the default bootstrap Self language scripts that understand basic language, 'what is' and 'where is' questions, names, dates, math, and topical questions.", + "Template for a Virtual Assistant. This template has command scripts for performing common tasks on such as opening apps, scheduling appointments, and send email."}; -public class ListTemplateView extends /*CreateWebMediumAbility*/Ability { - // public static boolean offlineTemplate = false; - // List items; - final static String listOfBots [] = {"Empty" , "Basic", "Personal Assistance"}; - final static int imagesId [] = {ResourceTable.Media_bot, ResourceTable.Media_bot , ResourceTable.Media_bot}; - final static String listOfDec [] = {"A completely empty template loaded with no knowledge or scripts.", - "A basic bot template with only responses to common greetings and farewells (hello, goodbye, etc.), and the default bootstrap Self language scripts that understand basic language, 'what is' and 'where is' questions, names, dates, math, and topical questions.", - "Template for a Virtual Assistant. This template has command scripts for performing common tasks on such as opening apps, scheduling appointments, and send email."}; - -// ArrayAdapter adapter; -// ListView llview; -// Intent data = new Intent(); -// String temp; -// TextView txt; -// @Override -// public String getType() { -// return "Bot"; -// } - @SuppressWarnings("unchecked") - @Override - public void onStart(Intent intent) { - super.onStart(intent); - super.setUIContent(ResourceTable.Layout_ability_list_view); -// llview = (ListView) findViewById(R.id.theListView); -// txt=(TextView) findViewById(R.id.theTitle); -// txt.setText("Select Template"); -// -// if(offlineTemplate){ -// items = retriveTemplates(); -// -// adapter = new CustomListViewAdapter(this, R.layout.list_item_imager, items); -// llview.setAdapter(adapter); -// -// llview.setOnItemClickListener(new OnItemClickListener() { -// @Override -// public void onItemClick(AdapterView arg0, View arg1, int arg2, long arg3) { -// WebMediumConfig config = new InstanceConfig(); -// OfflineTemplateConfig templates = (OfflineTemplateConfig) (llview.getItemAtPosition(arg2)); -// //saving a template number for getting the icons and pictures of the bot -// saveAllData(MainAbility.launchInstanceName = templates.getTitle(), MainAbility.launchInstanceId = templates.getId(), MainAbility.templateID = arg2); -// config.id = MainAbility.launchInstanceId; -// config.name = MainAbility.launchInstanceName; -// AvatarSelection.saveSelectedAvatar(templates.getTitle()); -// MainAbility.readZipAvatars(ListTemplateView.this, templates.getTitle()); -// MainAbility.offlineSelectedImage = templates.getImageId(); -// HttpAction action = new HttpFetchActionOffline(ListTemplateView.this, config, true); -// action.execute(); -// } -// }); -// offlineTemplate = false; -// return; -// } -// -// -// -// adapter = new ImageListAdapter(this, R.layout.image_list, (List) MainAbility.getAllTemplates(this)); -// llview.setAdapter(adapter); -// -// llview.setOnItemClickListener(new OnItemClickListener() { -// @Override -// public void onItemClick(AdapterView arg0, View arg1, int arg2, long arg3) { -// InstanceConfig templates = (InstanceConfig) (llview.getItemAtPosition(arg2)); -// Toast.makeText(ListTemplateView.this, templates.name + " Selected", Toast.LENGTH_SHORT).show(); -// data.putExtra("template", templates.name); -// setResult(RESULT_OK,data); -// finish(); -// } -// }); -// -// HttpAction action = new HttpGetTemplatesAction(this); -// action.execute(); - - } - - public void saveAllData(String instanceId, String instanceName, int id){ -// SharedPreferences.Editor cookies = MainAbility.current.getPreferences(Context.MODE_PRIVATE).edit(); -// cookies.putString("instanceID", instanceId); -// cookies.putString("instanceName", instanceName); -// cookies.putInt("tempId", id); -// cookies.commit(); - } + @SuppressWarnings("unchecked") + @Override + public void onStart(Intent intent) { + super.onStart(intent); + super.setUIContent(ResourceTable.Layout_ability_list_view); + } - public static List retriveTemplates(){ - List items = new ArrayList(); - for (int i = 0; i < listOfBots.length; i++) { - OfflineTemplateConfig item = new OfflineTemplateConfig(imagesId[i],listOfBots[i],listOfDec[i],""+i,i); - items.add(item); - } - return items; - } + /** + * retriveTemplates + * + * @return dd + */ + public static List retriveTemplates() { + List items = new ArrayList(); + for (int i = 0; i < listOfBots.length; i++) { + OfflineTemplateConfig item = new OfflineTemplateConfig(imagesId[i], listOfBots[i], listOfDec[i], "" + i, i); + items.add(item); + } + return items; + } } diff --git a/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/ability/LoginAbility.java b/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/ability/LoginAbility.java index c8f478ccb522e7e5237e56011f4b0a80e2135d66..29003b22ca5de0a400b2bd7bb0154162343e5454 100644 --- a/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/ability/LoginAbility.java +++ b/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/ability/LoginAbility.java @@ -15,13 +15,13 @@ package org.botlibre.sdk.ability; -import org.botlibre.sdk.ability.actions.HttpConnectAction; -import org.botlibre.sdk.config.UserConfig; -import org.botlibre.sdk.ResourceTable; import ohos.aafwk.content.Intent; import ohos.agp.components.Button; import ohos.agp.components.Component; import ohos.agp.components.TextField; +import org.botlibre.sdk.ResourceTable; +import org.botlibre.sdk.ability.actions.HttpConnectAction; +import org.botlibre.sdk.config.UserConfig; /** * Ability for user login. 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 242dbd82aca5822c9aedbe44f3abc93f50341f0f..ed9e90a3f15cb2f877ec90d369d9af610589288e 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 @@ -16,11 +16,6 @@ package org.botlibre.sdk.ability; import com.czt.mp3recorder.MP3Recorder; -import org.botlibre.sdk.ResourceTable; -import org.botlibre.sdk.MainAbility; -import org.botlibre.sdk.util.LogUtils; -import org.botlibre.sdk.util.PreferencesUtils; -import org.botlibre.sdk.util.ResUtils; import ohos.aafwk.content.Intent; import ohos.agp.components.Button; import ohos.agp.components.Checkbox; @@ -41,6 +36,11 @@ import ohos.media.common.Source; import ohos.media.player.Player; import ohos.security.SystemPermission; import ohos.utils.PacMap; +import org.botlibre.sdk.MainAbility; +import org.botlibre.sdk.ResourceTable; +import org.botlibre.sdk.util.LogUtils; +import org.botlibre.sdk.util.PreferencesUtils; +import org.botlibre.sdk.util.ResUtils; import java.io.File; import java.io.FileDescriptor; diff --git a/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/ability/actions/HttpAction.java b/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/ability/actions/HttpAction.java index f24d8dd5bddd623cc7f5ffeb1ec5e0c2cbb3d776..f3eab37267580bbf3a017a26a3fed6c22d37d510 100644 --- a/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/ability/actions/HttpAction.java +++ b/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/ability/actions/HttpAction.java @@ -15,10 +15,10 @@ package org.botlibre.sdk.ability.actions; -import org.botlibre.sdk.util.AsyncTask; import ohos.aafwk.ability.Ability; import ohos.aafwk.content.Intent; import ohos.aafwk.content.Operation; +import org.botlibre.sdk.util.AsyncTask; /** * HttpConnectAction diff --git a/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/ability/actions/HttpConnectAction.java b/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/ability/actions/HttpConnectAction.java index 36a2e53863bda9f45cb1b78caeafa055257bacd4..e0147b7b259370ce2a80e65ba2058ca3b797eab0 100644 --- a/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/ability/actions/HttpConnectAction.java +++ b/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/ability/actions/HttpConnectAction.java @@ -15,11 +15,11 @@ package org.botlibre.sdk.ability.actions; +import ohos.aafwk.ability.Ability; +import ohos.data.preferences.Preferences; import org.botlibre.sdk.MainAbility; import org.botlibre.sdk.config.UserConfig; import org.botlibre.sdk.util.PreferencesUtils; -import ohos.aafwk.ability.Ability; -import ohos.data.preferences.Preferences; /** * HttpConnectAction diff --git a/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/ability/actions/HttpCreateUserAction.java b/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/ability/actions/HttpCreateUserAction.java index 233e4d4adb852fa839dccd615b22d20f283d3ed6..8322d344b317f88901ab3604f1b83cf2a175309b 100644 --- a/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/ability/actions/HttpCreateUserAction.java +++ b/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/ability/actions/HttpCreateUserAction.java @@ -27,6 +27,7 @@ import ohos.app.Context; */ public class HttpCreateUserAction extends HttpUIAction { UserConfig config; + /** * HttpCreateUserAction * 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 b5db4b8adb3fa784558e684a7377cc2a8af6c50d..d9c4cbfaeed93ae9aa55e2f82c6d8eac7f80c2ca 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 @@ -15,9 +15,6 @@ package org.botlibre.sdk.ability.actions; -import org.botlibre.sdk.MainAbility; -import org.botlibre.sdk.ResourceTable; -import org.botlibre.sdk.util.LogUtils; import ohos.aafwk.ability.Ability; import ohos.agp.components.DirectionalLayout; import ohos.agp.components.LayoutScatter; @@ -25,6 +22,9 @@ 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.util.LogUtils; import java.util.Optional; 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 86caf4cf033458b07f61eee6d8ab6b93381b9f83..f2e3270f6b4065cf80dc98bca3e5aa8f328645fd 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 @@ -37,7 +37,7 @@ public class SpinnerAdapter extends BaseItemProvider { * 构造函数 * * @param ability ability - * @param types types + * @param types types */ public SpinnerAdapter(Ability ability, String[] types) { mAbility = ability; @@ -83,8 +83,8 @@ public class SpinnerAdapter extends BaseItemProvider { /** * getComponent * - * @param position position - * @param component1 component1 + * @param position position + * @param component1 component1 * @param componentContainer componentContainer * @return getComponent */ diff --git a/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/ability/avatar/AvatarSelection.java b/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/ability/avatar/AvatarSelection.java index 39c7038caec47b8fcd23fc1ea1c51cb5355e1524..371fee62e4a4106d3d7f27b93a95f538e20cc072 100644 --- a/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/ability/avatar/AvatarSelection.java +++ b/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/ability/avatar/AvatarSelection.java @@ -15,15 +15,14 @@ package org.botlibre.sdk.ability.avatar; -import org.botlibre.sdk.MainAbility; -import org.botlibre.sdk.config.OfflineTemplateConfig; -import org.botlibre.sdk.util.PreferencesUtils; -import org.botlibre.sdk.ResourceTable; import ohos.aafwk.ability.Ability; import ohos.aafwk.content.Intent; -import ohos.agp.components.ListContainer; import ohos.agp.components.Text; import ohos.data.preferences.Preferences; +import org.botlibre.sdk.MainAbility; +import org.botlibre.sdk.ResourceTable; +import org.botlibre.sdk.config.OfflineTemplateConfig; +import org.botlibre.sdk.util.PreferencesUtils; import java.util.ArrayList; 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 d6f8e32480d3058ecc69b4b4628d983964a72c04..1888d9ca4c4b9eaae6cd468b0dabc8c3f0857184 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 @@ -15,11 +15,6 @@ package org.botlibre.sdk.ability.dialog; -import org.botlibre.sdk.MainAbility; -import org.botlibre.sdk.ability.adapter.SpinnerAdapter; -import org.botlibre.sdk.ability.listener.LanguageListener; -import org.botlibre.sdk.util.Constant; -import org.botlibre.sdk.ResourceTable; 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; 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 d866d1adf72151749c24b9add79840d106bcd13e..90e2d5d6536cc6427aaa9fbcd8876c4cec679f2b 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 @@ -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; diff --git a/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/config/AvatarConfig.java b/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/config/AvatarConfig.java index 3d63ee6c5e27ccf369456a5232e3f88804521ddd..5d84dc9af8cf75ce6eed16a962a90647c711461c 100644 --- a/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/config/AvatarConfig.java +++ b/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/config/AvatarConfig.java @@ -15,16 +15,16 @@ package org.botlibre.sdk.config; +import org.botlibre.sdk.micro.MicroConnection; +import org.botlibre.util.Utils; +import org.w3c.dom.Element; + import java.io.StringWriter; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.botlibre.sdk.micro.MicroConnection; -import org.botlibre.util.Utils; -import org.w3c.dom.Element; - /** * DTO for XML avatar config. */ diff --git a/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/config/AvatarMedia.java b/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/config/AvatarMedia.java index 79574a2067aaecb0dd8c7f8faf695f38f6e338ac..b63e9e5abbdf8280d6cfd59686d96bfccede7065 100644 --- a/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/config/AvatarMedia.java +++ b/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/config/AvatarMedia.java @@ -15,10 +15,10 @@ package org.botlibre.sdk.config; -import java.io.StringWriter; - import org.w3c.dom.Element; +import java.io.StringWriter; + /** * Represents a media file for an avatar (image, video, audio). * An avatar can have many media files that are tagged with emotions, actions, and poses. diff --git a/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/config/ChannelConfig.java b/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/config/ChannelConfig.java index 47e441e5834c0302b5f257f165ff9bf336bdfb63..48c4e824779bcd05a1ded485c3126a5af57368e7 100644 --- a/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/config/ChannelConfig.java +++ b/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/config/ChannelConfig.java @@ -15,10 +15,10 @@ package org.botlibre.sdk.config; -import java.io.StringWriter; - import org.w3c.dom.Element; +import java.io.StringWriter; + /** * DTO for XML channel config. */ diff --git a/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/config/Config.java b/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/config/Config.java index 2af877d57205f15606b6c3f689bfde2388e7b828..0d761c6ac5a3cf7dbb75b855990ee11dd0e014a6 100644 --- a/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/config/Config.java +++ b/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/config/Config.java @@ -15,11 +15,11 @@ package org.botlibre.sdk.config; -import java.io.StringWriter; - import org.botlibre.sdk.SDKConnection; import org.w3c.dom.Element; +import java.io.StringWriter; + /** * DTO for XML config. */ diff --git a/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/config/DomainConfig.java b/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/config/DomainConfig.java index 69ae2d88e11a6cc5a8bcdfb9b8c210cb356e375d..46bb0266beabacbb48039a11b26852f9609bd19a 100644 --- a/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/config/DomainConfig.java +++ b/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/config/DomainConfig.java @@ -15,39 +15,44 @@ package org.botlibre.sdk.config; -import java.io.StringWriter; - import org.w3c.dom.Element; +import java.io.StringWriter; + /** * DTO for XML domain config. */ public class DomainConfig extends WebMediumConfig { - public String creationMode; - - public String getType() { - return "domain"; - } - - public WebMediumConfig credentials() { - DomainConfig config = new DomainConfig(); - config.id = this.id; - return config; - } - - public String toXML() { - StringWriter writer = new StringWriter(); - writer.write(""); - return writer.toString(); - } - - public void parseXML(Element element) { - super.parseXML(element); - this.creationMode = element.getAttribute("creationMode"); - } + public String creationMode; + + public String getType() { + return "domain"; + } + + public WebMediumConfig credentials() { + DomainConfig config = new DomainConfig(); + config.id = this.id; + return config; + } + + /** + * toXML + * + * @return dd + */ + public String toXML() { + StringWriter writer = new StringWriter(); + writer.write(""); + return writer.toString(); + } + + public void parseXML(Element element) { + super.parseXML(element); + this.creationMode = element.getAttribute("creationMode"); + } } \ No newline at end of file diff --git a/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/config/ForumConfig.java b/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/config/ForumConfig.java index 4520aca4b4b5d6e8c2186c11f3f90a1e3ee287d5..72ab06a91b4df75bce1c7e2524eb9d9c3f4a7338 100644 --- a/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/config/ForumConfig.java +++ b/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/config/ForumConfig.java @@ -15,10 +15,10 @@ package org.botlibre.sdk.config; -import java.io.StringWriter; - import org.w3c.dom.Element; +import java.io.StringWriter; + /** * DTO for XML forum config. */ diff --git a/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/config/GraphicConfig.java b/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/config/GraphicConfig.java index 7e9187181dd685466288e0d1d6f368cc2cd2db80..de1f166acacddbfb72e3cbffff6dcce14d80cc37 100644 --- a/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/config/GraphicConfig.java +++ b/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/config/GraphicConfig.java @@ -15,10 +15,10 @@ package org.botlibre.sdk.config; -import java.io.StringWriter; - import org.w3c.dom.Element; +import java.io.StringWriter; + /** * DTO for XML graphic config. */ diff --git a/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/config/InstanceConfig.java b/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/config/InstanceConfig.java index b87b4de405693645eda4bdc4ce9e6a5f07d0e683..a7249926880420a7b8e127230251b601dd1581f2 100644 --- a/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/config/InstanceConfig.java +++ b/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/config/InstanceConfig.java @@ -15,11 +15,11 @@ package org.botlibre.sdk.config; -import java.io.StringWriter; - import org.w3c.dom.Element; import org.w3c.dom.Node; +import java.io.StringWriter; + /** * DTO for XML bot instance config. */ diff --git a/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/config/LearningConfig.java b/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/config/LearningConfig.java index d7e32757434d3ff19a41880fbd8456f1cc0a67e4..9490aca5de334d5319b93aca33afcc8df3aa8951 100644 --- a/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/config/LearningConfig.java +++ b/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/config/LearningConfig.java @@ -15,10 +15,10 @@ package org.botlibre.sdk.config; -import java.io.StringWriter; - import org.w3c.dom.Element; +import java.io.StringWriter; + /** * DTO for XML voice config. diff --git a/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/config/MediaConfig.java b/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/config/MediaConfig.java deleted file mode 100644 index 2c25573b7444eaa141bdb4eb5eb1045209219437..0000000000000000000000000000000000000000 --- a/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/config/MediaConfig.java +++ /dev/null @@ -1,68 +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.config; - -import java.io.StringWriter; - -import org.w3c.dom.Element; - - -/** - * DTO for XML media config. - */ -public class MediaConfig extends Config { - public long id; - public String name; - public String type; - public String file; - public String key; - - public void parseXML(Element element) { - super.parseXML(element); - - this.id = Long.valueOf(element.getAttribute("id")); - this.name = element.getAttribute("name"); - this.type = element.getAttribute("type"); - this.file = element.getAttribute("file"); - this.key = element.getAttribute("key"); - } - - - public String toXML() { - StringWriter writer = new StringWriter(); - writer.write(""); - return writer.toString(); - } -} \ No newline at end of file diff --git a/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/config/ResponseConfig.java b/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/config/ResponseConfig.java index 1938727380831fce9c03bc15f4572a658782bde5..dda7ac31e77db10537e27233c7c9306d47037944 100644 --- a/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/config/ResponseConfig.java +++ b/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/config/ResponseConfig.java @@ -15,15 +15,15 @@ package org.botlibre.sdk.config; -import java.io.StringWriter; -import java.util.Objects; - import ohos.utils.zson.ZSONException; import ohos.utils.zson.ZSONObject; import org.botlibre.util.Utils; import org.w3c.dom.Element; import org.w3c.dom.Node; +import java.io.StringWriter; +import java.util.Objects; + /** * DTO for XML response config. diff --git a/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/config/ScriptConfig.java b/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/config/ScriptConfig.java index cfff0cd452092d19aff0e4612b3787f10f84b089..36e43c057a1478594beed82fd7376652dcb5ff61 100644 --- a/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/config/ScriptConfig.java +++ b/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/config/ScriptConfig.java @@ -15,10 +15,10 @@ package org.botlibre.sdk.config; -import java.io.StringWriter; - import org.w3c.dom.Element; +import java.io.StringWriter; + public class ScriptConfig extends WebMediumConfig { public String language; public String version; diff --git a/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/config/ScriptSourceConfig.java b/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/config/ScriptSourceConfig.java index 70c88c907b03f6205b6bf02dc778588208006e26..d44891cdf2c5186b61186349078ef634d9d6dc31 100644 --- a/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/config/ScriptSourceConfig.java +++ b/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/config/ScriptSourceConfig.java @@ -15,31 +15,12 @@ package org.botlibre.sdk.config; -import java.io.StringWriter; - - -/* - * ok, the API will be, "get-script-source" (ScriptConfig) and "save-script-source" (ScriptSourceConfig) -Paphus: 10:11:03 -You will need to add a ScriptSourceConfig class -AshBrandyne: 10:11:15 -ok -Paphus: 10:11:21 -public class ScriptSourceConfig extends Config { @XmlAttribute public String creationDate; @XmlAttribute public String updateDate; @XmlAttribute public boolean version; @XmlAttribute public String versionName; @XmlAttribute public String creator; public String source; } -Paphus: 10:11:55 -with parseXML and toXML methods -Paphus: 10:12:07 -I will update the server with the API next week - -so when they save a script, they have the option of versioning it, and can give a version name (which you can auto increment by default) - -public String getNextVersion() { if (this.source == null) { return "0.1"; } String version = this.source.getVersion(); int index = version.lastIndexOf('.'); if (index != -1) { String major = version.substring(0, index); String minor = version.substring(index + 1, version.length()); try { int value = Integer.valueOf(minor); version = major + "." + (value + 1); } catch (NumberFormatException ignore) {} } return version; } - */ - import org.botlibre.util.Utils; import org.w3c.dom.Element; import org.w3c.dom.Node; +import java.io.StringWriter; + public class ScriptSourceConfig extends Config{ public String id; diff --git a/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/config/UserMessageConfig.java b/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/config/UserMessageConfig.java deleted file mode 100644 index 4416c707dd16a248735e27314ecaad56330dfd26..0000000000000000000000000000000000000000 --- a/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/config/UserMessageConfig.java +++ /dev/null @@ -1,97 +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.config; - -import java.io.StringWriter; - -import org.botlibre.util.Utils; -import org.w3c.dom.Element; -import org.w3c.dom.Node; - - -/** - * DTO for XML content config. - */ -public class UserMessageConfig extends Config { - public String id; - public String creationDate; - public String owner; - public String creator; - public String target; - public String parent; - public String subject; - public String message; - - public void parseXML(Element element) { - super.parseXML(element); - - this.id = element.getAttribute("id"); - this.creationDate = element.getAttribute("creationDate"); - this.owner = element.getAttribute("owner"); - this.creator = element.getAttribute("creator"); - this.target = element.getAttribute("target"); - this.parent = element.getAttribute("parent"); - - Node node = element.getElementsByTagName("subject").item(0); - if (node != null) { - this.subject = node.getTextContent(); - } - node = element.getElementsByTagName("message").item(0); - if (node != null) { - this.message = node.getTextContent(); - } - } - - public String toXML() { - StringWriter writer = new StringWriter(); - writer.write(""); - - if (this.subject != null) { - writer.write(""); - writer.write(Utils.escapeHTML(this.subject)); - writer.write(""); - } - if (this.message != null) { - writer.write(""); - writer.write(Utils.escapeHTML(this.message)); - writer.write(""); - } - writer.write(""); - return writer.toString(); - } -} \ No newline at end of file diff --git a/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/config/VoiceConfig.java b/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/config/VoiceConfig.java index 90b54b0de78c6b0db19bb112d07f29c5a4468fca..01ee7fa8a04a266c3b3ef0591b8fcd1316a1c4d8 100644 --- a/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/config/VoiceConfig.java +++ b/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/config/VoiceConfig.java @@ -15,10 +15,10 @@ package org.botlibre.sdk.config; -import java.io.StringWriter; - import org.w3c.dom.Element; +import java.io.StringWriter; + /** * DTO for XML voice config. diff --git a/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/config/WebMediumConfig.java b/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/config/WebMediumConfig.java index 7dbee70ab3f8766ceb88d2dafa5a2f207f8e048d..8de5fe4bb9bd10c0e75167699a9d9a750de0608b 100644 --- a/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/config/WebMediumConfig.java +++ b/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/config/WebMediumConfig.java @@ -15,15 +15,15 @@ package org.botlibre.sdk.config; +import org.botlibre.util.Utils; +import org.w3c.dom.Element; +import org.w3c.dom.Node; + import java.io.StringWriter; import java.text.SimpleDateFormat; import java.util.Date; import java.util.Locale; -import org.botlibre.util.Utils; -import org.w3c.dom.Element; -import org.w3c.dom.Node; - /** * DTO for XML web medium config. diff --git a/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/micro/MicroConnection.java b/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/micro/MicroConnection.java index 94fbe9fcaeb38f2ff93ea2a7b9f54c4928aded1a..75977df9e17570a944ec40b9c2633a03dbdcee6d 100644 --- a/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/micro/MicroConnection.java +++ b/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/micro/MicroConnection.java @@ -16,7 +16,6 @@ package org.botlibre.sdk.micro; import org.botlibre.Bot; -import org.botlibre.knowledge.micro.MicroMemory; import org.botlibre.sdk.Credentials; import org.botlibre.sdk.SDKConnection; import org.botlibre.sdk.config.InstanceConfig; diff --git a/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/provider/ChatListProvicer.java b/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/provider/ChatListProvicer.java index 911db879f8bbfc850c60b48e3a00896e6e63cad1..ea8de774b5ca7758e73693f46b171ce3201c77ba 100644 --- a/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/provider/ChatListProvicer.java +++ b/PizzaBotOffline/entry/src/main/java/org/botlibre/sdk/provider/ChatListProvicer.java @@ -15,11 +15,16 @@ package org.botlibre.sdk.provider; +import ohos.aafwk.ability.Ability; +import ohos.agp.components.BaseItemProvider; +import ohos.agp.components.Component; +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.config.ChatConfig; import org.botlibre.sdk.config.ChatResponse; -import org.botlibre.sdk.ResourceTable; -import ohos.aafwk.ability.Ability; -import ohos.agp.components.*; import java.util.List; 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 c76d825b480d9abe667ad98918248f15455e395d..58ed38d83d62f0fd3663ae128818f044bfcd189b 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,9 +15,6 @@ 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; @@ -34,6 +31,9 @@ import ohos.media.image.ImageSource; import ohos.media.image.PixelMap; import org.botlibre.sdk.ResourceTable; +import java.io.IOException; +import java.util.Optional; + /** * 资源工具类