diff --git a/aafwk/aafwk_standard/formmanager/BUILD.gn b/aafwk/aafwk_standard/formmanager/BUILD.gn index b1f83cc8f197dadd99917edac6ee40cbdee3bb26..55074a49c81eeb9393d99d9c839ff90284c81594 100644 --- a/aafwk/aafwk_standard/formmanager/BUILD.gn +++ b/aafwk/aafwk_standard/formmanager/BUILD.gn @@ -16,42 +16,6 @@ import("//test/xts/tools/build/suite.gni") group("formmanager") { testonly = true if (is_standard_system) { - deps = [ - "formhostst_ets/formsystemhostc:FormSystemHostC", - "formhostst_ets/formsystemhostf:FormSystemHostF", - "formhostst_ets/formsystemhostg:FormSystemHostG", - "formhostst_ets/formsystemhostk:FormSystemHostK", - "formhostst_ets/formsystemhostl:FormSystemHostL", - "formhostst_ets/formsystemhostn:FormSystemHostN", - "formhostst_ets/formsystemhostnoperm:FormSystemHostNoPerm", - "formhostst_ets/formsystemhosto:FormSystemHostO", - "formhostst_ets/formsystemhostp:FormSystemHostP", - "formproviderst_ets/formsupplyapplicationA:FormSupplyAppA", - "formproviderst_ets/formsupplyapplicationB:FormSupplyAppB", - "formproviderst_ets/formsupplyapplicationD:FormSupplyAppD", - "formproviderst_ets/formsupplyapplicationE:FormSupplyAppE", - "formproviderst_ets/formsupplyapplicationF:FormSupplyAppF", - "formproviderst_ets/formsupplyapplicationG:FormSupplyAppG", - "formproviderst_ets/formsupplyapplicationH:FormSupplyAppH", - "formproviderst_ets/formsupplyapplicationNotSysApp:FormSupplyAppNS", - "formproviderst_ets/formsystemprovidera:FormSystemProviderA", - "formproviderst_ets/formsystemproviderb:FormSystemProviderB", - "formproviderst_ets/formsystemproviderc:FormSystemProviderC", - "formproviderst_ets/formsystemproviderd:FormSystemProviderD", - "formsystemtest_ets/formfuzztest:ActsFormFuzzTest", - "formsystemtest_ets/formgetformsinfotest/formsoneandonetest:FormsOneAndOneTest", - "formsystemtest_ets/formgetformsinfotest/formsoneandtwotest:FormsOneAndTwoTest", - "formsystemtest_ets/formgetformsinfotest/formsoneandzerotest:FormsOneAndZeroTest", - "formsystemtest_ets/formgetformsinfotest/formswithoutpermtest:FormsWithoutPermTest", - "formsystemtest_ets/formgetformsinfotest/formszerotest:FormsZeroTest", - "formsystemtest_ets/formhostdeathrecipienttest:FormHostDeathRecipientTest", - "formsystemtest_ets/formperformancetest:FormPerformanceTest", - "formsystemtest_ets/formstatetest_disable:FormStateDisableTest", - "formsystemtest_ets/formstatetest_enable:FormStateEnableTest", - "formsystemtest_ets/formstatetest_notifyinvisible:FormStateNotifyInvisibleTest", - "formsystemtest_ets/formstatetest_notifyinvisible2:FormStateNotifyInvisibleTest2", - "formsystemtest_ets/formstatetest_notifyvisible:FormStateNotifyVisibleTest", - "formsystemtest_ets/formstresstest:FormStressTest", - ] + deps = [ "fa:formmanager" ] } } diff --git a/aafwk/aafwk_standard/formmanager/fa/BUILD.gn b/aafwk/aafwk_standard/formmanager/fa/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..c42393d261b248ca7dab5f03c95249a53d21298b --- /dev/null +++ b/aafwk/aafwk_standard/formmanager/fa/BUILD.gn @@ -0,0 +1,63 @@ +# 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. + +import("//test/xts/tools/build/suite.gni") + +group("formmanager") { + testonly = true + if (is_standard_system) { + deps = [ + "formhostst_ets/formsystemhost:FormSystemHost", + "formhostst_ets/formsystemhostb:FormSystemHostB", + "formhostst_ets/formsystemhostc:FormSystemHostC", + "formhostst_ets/formsystemhostf:FormSystemHostF", + "formhostst_ets/formsystemhostg:FormSystemHostG", + "formhostst_ets/formsystemhosti:FormSystemHostI", + "formhostst_ets/formsystemhostj:FormSystemHostJ", + "formhostst_ets/formsystemhostk:FormSystemHostK", + "formhostst_ets/formsystemhostl:FormSystemHostL", + "formhostst_ets/formsystemhostn:FormSystemHostN", + "formhostst_ets/formsystemhostnoperm:FormSystemHostNoPerm", + "formhostst_ets/formsystemhosto:FormSystemHostO", + "formhostst_ets/formsystemhostp:FormSystemHostP", + "formproviderst_ets/formsupplyapplicationA:FormSupplyAppA", + "formproviderst_ets/formsupplyapplicationB:FormSupplyAppB", + "formproviderst_ets/formsupplyapplicationD:FormSupplyAppD", + "formproviderst_ets/formsupplyapplicationE:FormSupplyAppE", + "formproviderst_ets/formsupplyapplicationF:FormSupplyAppF", + "formproviderst_ets/formsupplyapplicationG:FormSupplyAppG", + "formproviderst_ets/formsupplyapplicationH:FormSupplyAppH", + "formproviderst_ets/formsupplyapplicationNotSysApp:FormSupplyAppNS", + "formproviderst_ets/formsystemprovidera:FormSystemProviderA", + "formproviderst_ets/formsystemproviderb:FormSystemProviderB", + "formproviderst_ets/formsystemproviderc:FormSystemProviderC", + "formproviderst_ets/formsystemproviderd:FormSystemProviderD", + "formsystemtest_ets/formacquiretest:FormAcquireTest", + "formsystemtest_ets/formacquiretest2:FormAcquireTest2", + "formsystemtest_ets/formfuzztest:ActsFormFuzzTest", + "formsystemtest_ets/formgetformsinfotest/formsoneandonetest:FormsOneAndOneTest", + "formsystemtest_ets/formgetformsinfotest/formsoneandtwotest:FormsOneAndTwoTest", + "formsystemtest_ets/formgetformsinfotest/formsoneandzerotest:FormsOneAndZeroTest", + "formsystemtest_ets/formgetformsinfotest/formswithoutpermtest:FormsWithoutPermTest", + "formsystemtest_ets/formgetformsinfotest/formszerotest:FormsZeroTest", + "formsystemtest_ets/formhostdeathrecipienttest:FormHostDeathRecipientTest", + "formsystemtest_ets/formperformancetest:FormPerformanceTest", + "formsystemtest_ets/formstatetest_disable:FormStateDisableTest", + "formsystemtest_ets/formstatetest_enable:FormStateEnableTest", + "formsystemtest_ets/formstatetest_notifyinvisible:FormStateNotifyInvisibleTest", + "formsystemtest_ets/formstatetest_notifyinvisible2:FormStateNotifyInvisibleTest2", + "formsystemtest_ets/formstatetest_notifyvisible:FormStateNotifyVisibleTest", + "formsystemtest_ets/formstresstest:FormStressTest", + ] + } +} diff --git a/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhost/BUILD.gn b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhost/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..953593fd6264503b8ee0e4cbe311235ac4710d0f --- /dev/null +++ b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhost/BUILD.gn @@ -0,0 +1,32 @@ +# 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. + +import("//test/xts/tools/build/suite.gni") + +ohos_js_hap_suite("FormSystemHost") { + hap_profile = "./entry/src/main/config.json" + deps = [ + ":hjs_demo_js_assets", + ":hjs_demo_resources", + ] + ets2abc = true + certificate_profile = "./signature/openharmony_sx.p7b" + hap_name = "FormSystemHost" +} +ohos_js_assets("hjs_demo_js_assets") { + source_dir = "./entry/src/main/ets/MainAbility" +} +ohos_resources("hjs_demo_resources") { + sources = [ "./entry/src/main/resources" ] + hap_profile = "./entry/src/main/config.json" +} diff --git a/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhost/Test.json b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhost/Test.json new file mode 100644 index 0000000000000000000000000000000000000000..4300a64be9af93e37a31f6b5c6fc734e8f1b4563 --- /dev/null +++ b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhost/Test.json @@ -0,0 +1,3 @@ +{ + "description": "Configuration for hjunit demo Tests" +} diff --git a/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhost/entry/src/main/config.json b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhost/entry/src/main/config.json new file mode 100644 index 0000000000000000000000000000000000000000..c8690b4bb2ca91777e273bed44741e75fef71a74 --- /dev/null +++ b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhost/entry/src/main/config.json @@ -0,0 +1,124 @@ +{ + "app": { + "bundleName": "com.ohos.st.formsystemhost", + "vendor": "ohos", + "version": { + "code": 1000000, + "name": "1.0.0" + }, + "apiVersion": { + "compatible": 7, + "releaseType": "Release", + "target": 7 + } + }, + "deviceConfig": {}, + "module": { + "package": "com.ohos.st.formsystemhost", + "name": ".FormStHostApp", + "mainAbility": ".MainAbility", + "deviceType": [ + "phone" + ], + "distro": { + "deliveryWithInstall": true, + "moduleName": "entry", + "moduleType": "entry", + "installationFree": false + }, + "abilities": [ + { + "skills": [ + { + "entities": [ + "entity.system.home" + ], + "actions": [ + "action.system.home" + ] + } + ], + "visible": true, + "name": ".MainAbility", + "srcLanguage": "ets", + "icon": "$media:icon", + "description": "$string:description_mainability", + "label": "$string:entry_MainAbility", + "type": "page", + "launchType": "standard" + } + ], + "js": [ + { + "mode": { + "syntax": "ets", + "type": "pageAbility" + }, + "pages": [ + "pages/index" + ], + "name": ".MainAbility", + "window": { + "designWidth": 720, + "autoDesignWidth": false + } + } + ], + "defPermissions": [ + { + "availableScope": [], + "grantMode": "system_grant", + "name": "FMS_FormDelete_commonEvent" + }, + { + "availableScope": [], + "grantMode": "system_grant", + "name": "FMS_FormOnAcquired_commonEvent" + }, + { + "availableScope": [], + "grantMode": "system_grant", + "name": "FMS_FormOnError_commonEvent" + }, + { + "availableScope": [], + "grantMode": "system_grant", + "name": "FMS_FormCast_commonEvent" + }, + { + "availableScope": [], + "grantMode": "system_grant", + "name": "FMS_FormOnUninstall_commonEvent" + } + ], + "reqPermissions": [ + { + "name": "FMS_FormOnAcquired_commonEvent" + }, + { + "name": "FMS_FormDelete_commonEvent" + }, + { + "name": "FMS_FormOnError_commonEvent" + }, + { + "name": "FMS_FormCast_commonEvent" + }, + { + "name": "FMS_FormOnUninstall_commonEvent" + }, + { + "name": "ohos.permission.GET_BUNDLE_INFO_PRIVILEGED" + }, + { + "name": "ohos.permission.INSTALL_BUNDLE" + }, + { + "name": "ohos.permission.LISTEN_BUNDLE_CHANGE" + }, + { + "name": "ohos.permission.REQUIRE_FORM" + } + ] + } +} \ No newline at end of file diff --git a/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhost/entry/src/main/ets/MainAbility/app.ets b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhost/entry/src/main/ets/MainAbility/app.ets new file mode 100644 index 0000000000000000000000000000000000000000..e88deae73252f64f101cbb565ec7d7a983ed2e5b --- /dev/null +++ b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhost/entry/src/main/ets/MainAbility/app.ets @@ -0,0 +1,23 @@ +/* + * 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. + */ + +export default { + onCreate() { + console.info('[FormComponent.host] Application onCreate') + }, + onDestroy() { + console.info('[FormComponent.host] Application onDestroy') + }, +} \ No newline at end of file diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostl/entry/src/main/ets/MainAbility/pages/FormViewModel.ets b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhost/entry/src/main/ets/MainAbility/pages/FormViewModel.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostl/entry/src/main/ets/MainAbility/pages/FormViewModel.ets rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhost/entry/src/main/ets/MainAbility/pages/FormViewModel.ets diff --git a/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhost/entry/src/main/ets/MainAbility/pages/index.ets b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhost/entry/src/main/ets/MainAbility/pages/index.ets new file mode 100644 index 0000000000000000000000000000000000000000..ac0ed6c4e0970dd39cb8cba27bd829274ec70bc9 --- /dev/null +++ b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhost/entry/src/main/ets/MainAbility/pages/index.ets @@ -0,0 +1,325 @@ +/* + * 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. + */ + +import FormViewModel from './FormViewModel.ets'; +import router from '@system.router'; +import featureAbility from "@ohos.ability.featureAbility"; +import formManager from '@ohos.application.formHost' +import commonEvent from '@ohos.commonEvent'; +@Entry +@Component +struct Index { + @State formId: number = 0; + @State bundle: string = "com.form.formsystemtestservicea.hmservice"; + @State ability: string = "com.form.formsystemtestservicea.hmservice.MainAbility"; + @State moduleName: string = "entry"; + @State name: string = "Form_Js001"; + @State width: number = 300; + @State height: number = 200; + @State allowUpate: boolean = true; + @State onAcquireResult: string = ""; + @State isShowing: boolean = true; + @State canCreateForm: boolean = false; + private dimension: FormDimension = FormDimension.Dimension_1_2; + + private deleteForm = false; + private deleteId = "-1"; + private temporaryId = "-1"; + private temporary = false; + private mFormViewModel: FormViewModel; + private isVisible = false; + private mMargin = 15; + private BTN_BG_COLOR: string = '#0D9FFB'; + private castForm = false; + private tempFormId: number = 0; + + private formOnAcquiredEvent = "FMS_FormOnAcquired_commonEvent"; + private formCastEvent = "FMS_FormCast_commonEvent"; + private formOnErrorEvent = "FMS_FormOnError_commonEvent"; + private formOnUninstallEvent = "FMS_FormOnUninstall_commonEvent"; + + private subscriberDel; + private subscriberFormDeleteEvent = { + events: ["FMS_FormDelete_commonEvent"], + }; + + private publishOnErrorCallBack() { + this.canCreateForm = false; + console.debug("====>formOnErrorEvent Publish CallBack ====>"); + } + private publishOnAcquiredCallBack() { + console.debug("====>formOnAcquiredEvent Publish CallBack ====>"); + } + private publishCastCallBack() { + console.debug("====>formCastEvent Publish CallBack ====>"); + } + + private publishOnUninstallCallBack() { + console.debug("====>formOnUninstallEvent Publish CallBack ====>"); + } + + private deleteCallBack(err, data) { + console.info("!!!====>formsystemhost deleteCallBack start:====>" + JSON.stringify(data)); + if (data.bundleName && data.bundleName != "com.ohos.st.formsystemhost") { + return; + } + formManager.deleteForm(data.data) + .then((data2) => { + console.info('[FormComponent] deleteForm result:' + data2); + }); + + this.canCreateForm = false; + console.info("!!!====>formsystemhost deleteCallBack end ====>"); + } + + private unSubscribeDeleteCallback() { + console.debug("====>formsystemhost unSubscribeDeleteCallback_1100 CallBack====>"); + } + + private aboutToAppear() { + + const TAG = "[FormComponent.host]" + + this.mFormViewModel = FormViewModel.getInstance(); + + commonEvent.createSubscriber(this.subscriberFormDeleteEvent).then(async (data) => { + console.info("====>formsystemhost Subscriber FormDelete data:====>", JSON.stringify(data)); + this.subscriberDel = data; + await commonEvent.subscribe(this.subscriberDel, this.deleteCallBack); + }) + + console.error('[FormComponent] getWant'); + featureAbility.getWant() + .then((want: any) => { + this.formId = parseInt(want.parameters.formId); + this.name = want.parameters.name; + this.bundle = want.parameters.bundle; + this.ability = want.parameters.ability; + if (want.parameters.moduleName) { + this.moduleName = want.parameters.moduleName; + } + if (want.parameters.temporary) { + this.temporary = want.parameters.temporary; + } + console.log("formsystemhost dimension1:" + this.dimension); + if (want.parameters.dimension) { + this.dimension = want.parameters.dimension; + } + console.log("formsystemhost dimension2:" + this.dimension); + if (want.parameters.castForm) { + this.castForm = want.parameters.castForm; + } + if (want.parameters.temporaryId) { + this.temporaryId = want.parameters.temporaryId; + } + if (want.parameters.deleteForm) { + this.deleteForm = want.parameters.deleteForm; + } + if (want.parameters.deleteId) { + this.deleteId = want.parameters.deleteId; + } + setTimeout(() => { + this.canCreateForm = want.parameters.isCreate ? true : false; + console.error('[FormComponent] getWant canCreateForm:' + this.canCreateForm); + }, 10); + console.error('[FormComponent] getWant end' + JSON.stringify(want)); + + if (!want.parameters.isCreate && this.deleteForm) { + console.log("formsystemhost deleteForm start"); + formManager.deleteForm(this.deleteId) + .then((data) => { + console.info('formsystemhost deleteForm result:' + data); + let commonEventPublishData = { + data: data || `0`, + parameters: { + "formId": this.deleteId.toString() + } + }; + commonEvent.publish(this.formOnErrorEvent, commonEventPublishData, this.publishOnErrorCallBack); + }) + .catch((error) => { + console.info('[FormComponent] deleteForm error:' + error); + let commonEventPublishData = { + data: error.code.toString(), + parameters: { + "formId": this.deleteId.toString() + } + }; + commonEvent.publish(this.formOnErrorEvent, commonEventPublishData, this.publishOnErrorCallBack); + }); + console.log("formsystemhost deleteForm end"); + } + if (!want.parameters.isCreate && this.castForm) { + console.log("[FormComponent.host] castTempForm start"); + formManager.castTempForm(this.temporaryId) + .then((data) => { + console.info('[FormComponent] castTempForm result:' + data); + setTimeout(() => { + let commonEventPublishData = { + data: data || `0`, + parameters: { + "formId": this.temporaryId.toString() + } + }; + commonEvent.publish(this.formCastEvent, commonEventPublishData, this.publishCastCallBack); + }, 5); + }) + .catch((error) => { + console.info('[FormComponent] castTempForm error:' + error); + setTimeout(() => { + let commonEventPublishData = { + data: error.code.toString(), + parameters: { + "formId": this.temporaryId.toString() + } + }; + commonEvent.publish(this.formCastEvent, commonEventPublishData, this.publishCastCallBack); + }, 5); + }); + console.log("[FormComponent.host] castTempForm end"); + } + }) + .catch((error: any) => { + console.error('[FormComponent] Operation failed. Cause: ' + JSON.stringify(error)); + }) + console.log(`[FormComponent.host] aboutToAppear end`); + } + + build() { + Column() { + Text('form component test begin') + Column() { + if (this.canCreateForm) { + FormComponent({ + id: this.formId, + name: this.name, + bundle: this.bundle, + ability: this.ability, + module: this.moduleName, + dimension: this.dimension, + temporary: this.temporary, + }) + .allowUpdate(this.allowUpate) + .visibility(this.isShowing ? Visibility.Visible : Visibility.Hidden) + .onAcquired((form) => { + console.log("[FormComponent.host] get form, form id:" + form.id); + this.formId = form.id; + if (this.castForm) { + console.log("[FormComponent.host] castTempForm start"); + formManager.castTempForm(this.temporaryId) + .then((data) => { + console.info('[FormComponent] castTempForm result:' + data); + setTimeout(() => { + let commonEventPublishData = { + data: data || `0`, + parameters: { + "formId": this.formId.toString() + } + }; + commonEvent.publish(this.formCastEvent, commonEventPublishData, this.publishCastCallBack); + }, 5); + }) + .catch((error) => { + console.info('[FormComponent] castTempForm error:' + error); + setTimeout(() => { + let commonEventPublishData = { + data: error.code.toString(), + parameters: { + "formId": this.temporaryId.toString() + } + }; + commonEvent.publish(this.formCastEvent, commonEventPublishData, this.publishCastCallBack); + }, 5); + }); + console.log("[FormComponent.host] castTempForm end"); + } else if (this.deleteForm) { + console.log("[FormComponent.host] deleteForm start"); + if (this.deleteId == "self") { + this.deleteId = this.formId.toString(); + } + setTimeout(() => { + formManager.deleteForm(this.deleteId) + .then((data) => { + console.info('[FormComponent] deleteForm result:' + data); + let commonEventPublishData = { + data: data || `0`, + parameters: { + "formId": this.deleteId.toString() + } + }; + commonEvent.publish(this.formOnErrorEvent, commonEventPublishData, this.publishOnErrorCallBack); + }) + .catch((error) => { + console.info('[FormComponent] deleteForm error:' + error); + let commonEventPublishData = { + data: error.code.toString(), + parameters: { + "formId": this.deleteId.toString() + } + }; + commonEvent.publish(this.formOnErrorEvent, commonEventPublishData, this.publishOnErrorCallBack); + }); + + console.log("[FormComponent.host] deleteForm end"); + }, 1000); + } else { + let commonEventPublishData = { + data: this.formId.toString(), + parameters: { + "formId": this.deleteId.toString() + } + }; + commonEvent.publish(this.formOnAcquiredEvent, commonEventPublishData, this.publishOnAcquiredCallBack); + } + }) + .onUninstall((info) => { + console.log("[FormComponent] onUninstall:" + JSON.stringify(info)); + let commonEventPublishData = { + data: this.formId.toString(), + parameters: { + "formId": info.id.toString() + } + }; + commonEvent.publish(this.formOnUninstallEvent, commonEventPublishData, this.publishOnUninstallCallBack); + }) + .onError((error) => { + console.log("[FormComponent.host] error code:" + error.errcode); + console.log("[FormComponent.host] error msg:" + error.msg); + this.onAcquireResult += error.errcode; + this.onAcquireResult += " "; + this.onAcquireResult += error.msg; + if (this.deleteForm && this.deleteId) { + let commonEventPublishData = { + data: error.msg, + parameters: { + "formId": this.formId.toString() + } + }; + commonEvent.publish(this.formOnErrorEvent, commonEventPublishData, this.publishOnErrorCallBack); + } else { + let commonEventPublishData = { + data: error.msg + }; + commonEvent.publish(this.formOnErrorEvent, commonEventPublishData, this.publishOnErrorCallBack); + } + }) + } + } + .backgroundColor(Color.White) + Text('form component test end') + } + .backgroundColor(Color.White) + } +} \ No newline at end of file diff --git a/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhost/entry/src/main/resources/base/element/string.json b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhost/entry/src/main/resources/base/element/string.json new file mode 100644 index 0000000000000000000000000000000000000000..755213f8c6b47a9077880f85861c96ca2a67a3e3 --- /dev/null +++ b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhost/entry/src/main/resources/base/element/string.json @@ -0,0 +1,12 @@ +{ + "string": [ + { + "name": "entry_MainAbility", + "value": "formhostA" + }, + { + "name": "description_mainability", + "value": "ETS_Empty Ability" + } + ] +} \ No newline at end of file diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostc/entry/src/main/resources/base/media/icon.png b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhost/entry/src/main/resources/base/media/icon.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostc/entry/src/main/resources/base/media/icon.png rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhost/entry/src/main/resources/base/media/icon.png diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostc/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhost/signature/openharmony_sx.p7b similarity index 100% rename from aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostc/signature/openharmony_sx.p7b rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhost/signature/openharmony_sx.p7b diff --git a/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostb/BUILD.gn b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostb/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..882910858877b87f38e79f759f603f18b920f1e5 --- /dev/null +++ b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostb/BUILD.gn @@ -0,0 +1,32 @@ +# 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. + +import("//test/xts/tools/build/suite.gni") + +ohos_js_hap_suite("FormSystemHostB") { + hap_profile = "./entry/src/main/config.json" + deps = [ + ":hjs_demo_js_assets", + ":hjs_demo_resources", + ] + ets2abc = true + certificate_profile = "./signature/openharmony_sx.p7b" + hap_name = "FormSystemHostB" +} +ohos_js_assets("hjs_demo_js_assets") { + source_dir = "./entry/src/main/ets/MainAbility" +} +ohos_resources("hjs_demo_resources") { + sources = [ "./entry/src/main/resources" ] + hap_profile = "./entry/src/main/config.json" +} diff --git a/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostb/Test.json b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostb/Test.json new file mode 100644 index 0000000000000000000000000000000000000000..4300a64be9af93e37a31f6b5c6fc734e8f1b4563 --- /dev/null +++ b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostb/Test.json @@ -0,0 +1,3 @@ +{ + "description": "Configuration for hjunit demo Tests" +} diff --git a/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostb/entry/src/main/config.json b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostb/entry/src/main/config.json new file mode 100644 index 0000000000000000000000000000000000000000..fc12ed37e598a5d27fb345bd23869c165dbf9426 --- /dev/null +++ b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostb/entry/src/main/config.json @@ -0,0 +1,110 @@ +{ + "app": { + "bundleName": "com.ohos.st.formsystemhostb", + "vendor": "ohos", + "version": { + "code": 1000000, + "name": "1.0.0" + }, + "apiVersion": { + "compatible": 7, + "releaseType": "Release", + "target": 7 + } + }, + "deviceConfig": {}, + "module": { + "package": "com.ohos.st.formsystemhostb", + "name": ".FormStHostAppB", + "mainAbility": ".MainAbility", + "deviceType": [ + "phone" + ], + "distro": { + "deliveryWithInstall": true, + "moduleName": "entry", + "moduleType": "entry", + "installationFree": false + }, + "abilities": [ + { + "skills": [ + { + "entities": [ + "entity.system.home" + ], + "actions": [ + "action.system.home" + ] + } + ], + "visible": true, + "name": ".MainAbility", + "srcLanguage": "ets", + "icon": "$media:icon", + "description": "$string:description_mainability", + "label": "$string:entry_MainAbility", + "type": "page", + "launchType": "standard" + } + ], + "js": [ + { + "mode": { + "syntax": "ets", + "type": "pageAbility" + }, + "pages": [ + "pages/index" + ], + "name": ".MainAbility", + "window": { + "designWidth": 720, + "autoDesignWidth": false + } + } + ], + "defPermissions": [ + { + "availableScope": [], + "grantMode": "system_grant", + "name": "FMS_FormDelete_commonEvent" + }, + { + "availableScope": [], + "grantMode": "system_grant", + "name": "FMS_FormOnAcquired_commonEvent" + }, + { + "availableScope": [], + "grantMode": "system_grant", + "name": "FMS_FormOnError_commonEvent" + } + ], + "reqPermissions": [ + { + "name": "FMS_FormOnAcquired_commonEvent" + }, + { + "name": "FMS_FormDelete_commonEvent", + "reason": "need use FMS_FormDelete_commonEvent" + }, + { + "name": "FMS_FormOnError_commonEvent", + "reason": "need use delete commonEvent" + }, + { + "name": "ohos.permission.GET_BUNDLE_INFO_PRIVILEGED" + }, + { + "name": "ohos.permission.INSTALL_BUNDLE" + }, + { + "name": "ohos.permission.LISTEN_BUNDLE_CHANGE" + }, + { + "name": "ohos.permission.REQUIRE_FORM" + } + ] + } +} \ No newline at end of file diff --git a/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostb/entry/src/main/ets/MainAbility/app.ets b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostb/entry/src/main/ets/MainAbility/app.ets new file mode 100644 index 0000000000000000000000000000000000000000..e88deae73252f64f101cbb565ec7d7a983ed2e5b --- /dev/null +++ b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostb/entry/src/main/ets/MainAbility/app.ets @@ -0,0 +1,23 @@ +/* + * 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. + */ + +export default { + onCreate() { + console.info('[FormComponent.host] Application onCreate') + }, + onDestroy() { + console.info('[FormComponent.host] Application onDestroy') + }, +} \ No newline at end of file diff --git a/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostb/entry/src/main/ets/MainAbility/pages/FormViewModel.ets b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostb/entry/src/main/ets/MainAbility/pages/FormViewModel.ets new file mode 100644 index 0000000000000000000000000000000000000000..cb25732d908c6cc580d69de1ae9984cde6230774 --- /dev/null +++ b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostb/entry/src/main/ets/MainAbility/pages/FormViewModel.ets @@ -0,0 +1,127 @@ +/* + * 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. + */ + +import formManager from '@ohos.ability.formmanager'; +import bundleManager from '@ohos.bundle'; +import abilityManager from '@ohos.app.abilityManager'; + +export default class FormViewModel { + private static sFormViewModel: FormViewModel = null; + + public static getInstance(): FormViewModel { + if (FormViewModel.sFormViewModel == null) { + FormViewModel.sFormViewModel = new FormViewModel(); + } + return FormViewModel.sFormViewModel; + } + + public async castTempFormToNormal(formId: string) { + formManager.castTempForm(formId) + .then((data) => { + console.info('[FormComponent] castTempForm result:' + data); + }); + } + + public async requestForm(formId: string) { + formManager.requestForm(formId) + .then((data) => { + console.info('[FormComponent] requestForm result:' + data); + }); + } + + public async deleteCard(formId: string) { + formManager.deleteForm(formId) + .then((data) => { + console.info('[FormComponent] deleteForm result:' + data); + }); + } + + public async releaseCard(formId: string) { + formManager.releaseForm(formId) + .then((data) => { + console.info('[FormComponent] releaseForm result:' + data); + }); + } + + public async enableCard(formId: string) { + formManager.enableFormsUpdate([formId]) + .then((data) => { + console.info('[FormComponent] enableFormsUpdate result:' + data); + }); + } + + public async disableCard(formId: string) { + formManager.disableFormsUpdate([formId]) + .then((data) => { + console.info('[FormComponent] disableCard result:' + data); + }); + } + + public async changeCardVisible(formId: string, isVisible: boolean) { + if (isVisible) { + formManager.notifyVisibleForms([formId]) + .then((data) => { + console.info('[FormComponent] changeCardVisible result:' + data + ', isVisible:' + isVisible); + }); + } else { + formManager.notifyInvisibleForms([formId]) + .then((data) => { + console.info('[FormComponent] changeCardVisible result:' + data + ', isVisible:' + isVisible); + }); + } + } + + public async isFmsReady() { + formManager.isSystemReady() + .then((data) => { + console.info('[FormComponent] isFmsReady result:' + data); + }); + } + + public async getAllFormsInfo() { + formManager.getAllFormsInfo() + .then((data) => { + console.info('[FormComponent] getAllFormsInfo result:' + JSON.stringify(data)); + }); + } + + public async getFormsInfoByApp(bundle: string) { + formManager.getFormsInfo(bundle) + .then((data) => { + console.info('[FormComponent] getFormsInfoByApp result:' + JSON.stringify(data)); + }); + } + + public async getFormsInfoByModule(bundle: string, moduleName: string) { + formManager.getFormsInfo(bundle, moduleName) + .then((data) => { + console.info('[FormComponent] getFormsInfoByModule result:' + JSON.stringify(data)); + }); + } + + public async clearFormUserCache() { + abilityManager.clearUpApplicationData('com.ohos.myapplicationform') + .then((data) => { + console.info('[FormComponent] cleanBundleCacheFiles result:' + JSON.stringify(data)); + }); + } + + public async clearFormProviderCache(bundle: string) { + abilityManager.clearUpApplicationData(bundle) + .then((data) => { + console.info('[FormComponent] cleanBundleCacheFiles result:' + JSON.stringify(data)); + }); + } +} \ No newline at end of file diff --git a/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostb/entry/src/main/ets/MainAbility/pages/index.ets b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostb/entry/src/main/ets/MainAbility/pages/index.ets new file mode 100644 index 0000000000000000000000000000000000000000..0c040626d267ffee0ad9c5e16b756a2cce64854c --- /dev/null +++ b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostb/entry/src/main/ets/MainAbility/pages/index.ets @@ -0,0 +1,283 @@ +/* + * 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. + */ + +import FormViewModel from './FormViewModel.ets'; +import router from '@system.router'; +import featureAbility from "@ohos.ability.featureAbility"; +import formManager from '@ohos.application.formHost' +import commonEvent from '@ohos.commonEvent'; + +@Entry +@Component +struct Index { + @State formId: number = 0; + @State bundle: string = "com.form.formsystemtestservicea.hmservice"; + @State ability: string = "com.form.formsystemtestservicea.hmservice.MainAbility"; + @State moduleName: string = "entry"; + @State name: string = "Form_Js001"; + @State width: number = 300; + @State height: number = 200; + @State allowUpate: boolean = true; + @State onAcquireResult: string = ""; + @State isShowing: boolean = true; + @State canCreateForm: boolean = false; + + private dimension: FormDimension = FormDimension.Dimension_1_2; + + private deleteForm = false; + private deleteId = "-1"; + private temporaryId="-1"; + private temporary = false; + private mFormViewModel: FormViewModel; + private isVisible = false; + private mMargin = 15; + private BTN_BG_COLOR: string = '#0D9FFB'; + private castForm = false; + private tempFormId: number = 0; + + private formOnAcquiredEvent = "FMS_FormOnAcquired_commonEvent"; + private formCastEvent = "FMS_FormCast_commonEvent"; + private formOnErrorEvent = "FMS_FormOnError_commonEvent"; + + private subscriberFormDeleteEvent = { + events: ["FMS_FormDelete_commonEvent"], + }; + private subscriberDle; + + private publishOnErrorCallBack() { + this.canCreateForm = false; + console.debug("====>formOnErrorEvent Publish CallBack ====>"); + } + private publishOnAcquiredCallBack() { + console.debug("====>formOnAcquiredEvent Publish CallBack ====>"); + } + private publishCastCallBack() { + console.debug("====>formCastEvent Publish CallBack ====>"); + } + private deleteCallBack(err, data) { + console.info("!!!====>formsystemhost deleteCallBack start:====>" + JSON.stringify(data)); + if(data.bundleName && data.bundleName != "com.ohos.st.formsystemhostb") { + return; + } + formManager.deleteForm(data.data) + .then((data2) => { + console.info('[FormComponent] deleteForm result:' + data2); + }); + + this.canCreateForm = false; + console.info("!!!====>formsystemhost deleteCallBack end ====>"); + } + + private unSubscribeDeleteCallback() { + console.debug("====>formsystemhost unSubscribeDeleteCallback_1100 CallBack====>"); + } + + private aboutToAppear() { + + const TAG = "[FormComponent.host]" + + this.mFormViewModel = FormViewModel.getInstance(); + + commonEvent.createSubscriber(this.subscriberFormDeleteEvent).then(async (data) => { + console.info("====>formsystemhost Subscriber FormDelete data:====>", JSON.stringify(data)); + this.subscriberDle = data; + await commonEvent.subscribe(this.subscriberDle, this.deleteCallBack); + }) + console.error('[FormComponent] getWant'); + featureAbility.getWant() + .then((want: any) => { + this.formId = parseInt(want.parameters.formId); + this.name = want.parameters.name; + this.bundle = want.parameters.bundle; + this.ability = want.parameters.ability; + if(want.parameters.moduleName) { + this.moduleName = want.parameters.moduleName; + } + if(want.parameters.temporary) { + this.temporary = want.parameters.temporary; + } + if(want.parameters.dimension) { + this.dimension = want.parameters.dimension; + } + if(!this.dimension) { + this.dimension = FormDimension.Dimension_1_2; + } + if(want.parameters.castForm) { + this.castForm = want.parameters.castForm; + } + if(want.parameters.temporaryId) { + this.temporaryId = want.parameters.temporaryId; + } + if(want.parameters.deleteForm) { + this.deleteForm = want.parameters.deleteForm; + } + if(want.parameters.deleteId) { + this.deleteId = want.parameters.deleteId; + } + setTimeout(() => { + this.canCreateForm = want.parameters.isCreate ? true : false; + console.error('[FormComponent] getWant canCreateForm:'+ this.canCreateForm); + }, 10); + console.error('[FormComponent] getWant end'+ JSON.stringify(want)); + + if(!want.parameters.isCreate && this.deleteForm) { + console.log("formsystemhostb deleteForm start"); + formManager.deleteForm(this.deleteId) + .then((data) => { + console.info('formsystemhostb deleteForm result:' + data); + let commonEventPublishData = { + data: data.toString(), + parameters: { + "formId" : this.deleteId.toString() + } + }; + commonEvent.publish(this.formOnErrorEvent, commonEventPublishData, this.publishOnErrorCallBack); + }) + .catch((error) => { + console.info('[FormComponent] deleteForm error:' + error); + let commonEventPublishData = { + data: error.code.toString(), + parameters: { + "formId" : this.deleteId.toString() + } + }; + commonEvent.publish(this.formOnErrorEvent, commonEventPublishData, this.publishOnErrorCallBack); + }); + + console.log("formsystemhostb deleteForm end"); + } + }) + .catch((error: any) => { + console.error('[FormComponent] Operation failed. Cause: ' + JSON.stringify(error)); + }) + console.log(`[FormComponent.host] aboutToAppear end`); + } + + build() { + Column() { + Text('form component test begin') + Column() { + if (this.canCreateForm) { + FormComponent({ + id: this.formId, + name: this.name, + bundle: this.bundle, + ability: this.ability, + module: this.moduleName, + dimension: this.dimension, + temporary: this.temporary, + }) + .allowUpdate(this.allowUpate) + .visibility(this.isShowing ? Visibility.Visible : Visibility.Hidden) + .onAcquired((form) => { + console.log("[FormComponent.host] get form, form id:" + form.id); + this.formId = form.id; + if(this.castForm) { + console.log("[FormComponent.host] castTempForm start"); + formManager.castTempForm(this.temporaryId) + .then((data) => { + console.info('[FormComponent] castTempForm result:' + data); + setTimeout(() => { + let commonEventPublishData = { + data: data.toString(), + parameters: { + "formId" : this.formId.toString() + } + }; + commonEvent.publish(this.formCastEvent, commonEventPublishData, this.publishCastCallBack); + }, 5); + }) + .catch((error) => { + console.info('[FormComponent] castTempForm error:' + error); + setTimeout(() => { + let commonEventPublishData = { + data: error.code.toString(), + parameters: { + "formId" : this.temporaryId.toString() + } + }; + commonEvent.publish(this.formCastEvent, commonEventPublishData, this.publishCastCallBack); + }, 5); + }); + + console.log("[FormComponent.host] castTempForm end"); + } else if(this.deleteForm) { + console.log("[FormComponent.host] deleteForm start"); + if(this.deleteId == "self") { + this.deleteId = this.formId.toString(); + } + setTimeout(() => { + formManager.deleteForm(this.deleteId) + .then((data) => { + console.info('[FormComponent] deleteForm result:' + data); + let commonEventPublishData = { + data: data.toString(), + parameters: { + "formId" : this.deleteId.toString() + } + }; + commonEvent.publish(this.formOnErrorEvent, commonEventPublishData, this.publishOnErrorCallBack); + }) + .catch((error) => { + console.info('[FormComponent] deleteForm error:' + error); + let commonEventPublishData = { + data: error.code.toString(), + parameters: { + "formId" : this.deleteId.toString() + } + }; + commonEvent.publish(this.formOnErrorEvent, commonEventPublishData, this.publishOnErrorCallBack); + }); + console.log("[FormComponent.host] deleteForm end"); + }, 1000); + } else { + let commonEventPublishData = { + data: this.formId.toString() + }; + commonEvent.publish(this.formOnAcquiredEvent, commonEventPublishData, this.publishOnAcquiredCallBack); + } + }) + // .onUninstall((info) => { + // console.log("[FormComponent] onUninstall:" + JSON.stringify(info)); + // }) + .onError((error) => { + console.log("[FormComponent.host] error code:" + error.errcode); + console.log("[FormComponent.host] error msg:" + error.msg); + this.onAcquireResult += error.errcode; + this.onAcquireResult += " "; + this.onAcquireResult += error.msg; + if(this.deleteForm && this.deleteId) { + let commonEventPublishData = { + data: error.msg, + parameters: { + "formId" : this.deleteId.toString() + } + }; + commonEvent.publish(this.formOnErrorEvent, commonEventPublishData, this.publishOnErrorCallBack); + } else { + let commonEventPublishData = { + data: error.msg + }; + commonEvent.publish(this.formOnErrorEvent, commonEventPublishData, this.publishOnErrorCallBack); + } + }) + } + } + .backgroundColor(Color.White) + Text('form component test end') + } + .backgroundColor(Color.White) + } +} \ No newline at end of file diff --git a/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostb/entry/src/main/resources/base/element/string.json b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostb/entry/src/main/resources/base/element/string.json new file mode 100644 index 0000000000000000000000000000000000000000..2ebd44b3961b0bfe3778b4a4e4f947061ea15cb2 --- /dev/null +++ b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostb/entry/src/main/resources/base/element/string.json @@ -0,0 +1,12 @@ +{ + "string": [ + { + "name": "entry_MainAbility", + "value": "formhostB" + }, + { + "name": "description_mainability", + "value": "ETS_Empty Ability" + } + ] +} \ No newline at end of file diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostf/entry/src/main/resources/base/media/icon.png b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostb/entry/src/main/resources/base/media/icon.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostf/entry/src/main/resources/base/media/icon.png rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostb/entry/src/main/resources/base/media/icon.png diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostf/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostb/signature/openharmony_sx.p7b similarity index 100% rename from aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostf/signature/openharmony_sx.p7b rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostb/signature/openharmony_sx.p7b diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostc/BUILD.gn b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostc/BUILD.gn similarity index 100% rename from aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostc/BUILD.gn rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostc/BUILD.gn diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostc/Test.json b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostc/Test.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostc/Test.json rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostc/Test.json diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostc/entry/src/main/config.json b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostc/entry/src/main/config.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostc/entry/src/main/config.json rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostc/entry/src/main/config.json diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostc/entry/src/main/ets/MainAbility/app.ets b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostc/entry/src/main/ets/MainAbility/app.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostc/entry/src/main/ets/MainAbility/app.ets rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostc/entry/src/main/ets/MainAbility/app.ets diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostc/entry/src/main/ets/MainAbility/pages/FormViewModel.ets b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostc/entry/src/main/ets/MainAbility/pages/FormViewModel.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostc/entry/src/main/ets/MainAbility/pages/FormViewModel.ets rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostc/entry/src/main/ets/MainAbility/pages/FormViewModel.ets diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostc/entry/src/main/ets/MainAbility/pages/index.ets b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostc/entry/src/main/ets/MainAbility/pages/index.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostc/entry/src/main/ets/MainAbility/pages/index.ets rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostc/entry/src/main/ets/MainAbility/pages/index.ets diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostc/entry/src/main/resources/base/element/string.json b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostc/entry/src/main/resources/base/element/string.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostc/entry/src/main/resources/base/element/string.json rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostc/entry/src/main/resources/base/element/string.json diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostg/entry/src/main/resources/base/media/icon.png b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostc/entry/src/main/resources/base/media/icon.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostg/entry/src/main/resources/base/media/icon.png rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostc/entry/src/main/resources/base/media/icon.png diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostg/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostc/signature/openharmony_sx.p7b similarity index 100% rename from aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostg/signature/openharmony_sx.p7b rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostc/signature/openharmony_sx.p7b diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostf/BUILD.gn b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostf/BUILD.gn similarity index 100% rename from aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostf/BUILD.gn rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostf/BUILD.gn diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostf/Test.json b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostf/Test.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostf/Test.json rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostf/Test.json diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostf/entry/src/main/config.json b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostf/entry/src/main/config.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostf/entry/src/main/config.json rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostf/entry/src/main/config.json diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostf/entry/src/main/ets/MainAbility/app.ets b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostf/entry/src/main/ets/MainAbility/app.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostf/entry/src/main/ets/MainAbility/app.ets rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostf/entry/src/main/ets/MainAbility/app.ets diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostf/entry/src/main/ets/MainAbility/pages/FormViewModel.ets b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostf/entry/src/main/ets/MainAbility/pages/FormViewModel.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostf/entry/src/main/ets/MainAbility/pages/FormViewModel.ets rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostf/entry/src/main/ets/MainAbility/pages/FormViewModel.ets diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostf/entry/src/main/ets/MainAbility/pages/index.ets b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostf/entry/src/main/ets/MainAbility/pages/index.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostf/entry/src/main/ets/MainAbility/pages/index.ets rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostf/entry/src/main/ets/MainAbility/pages/index.ets diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostf/entry/src/main/resources/base/element/string.json b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostf/entry/src/main/resources/base/element/string.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostf/entry/src/main/resources/base/element/string.json rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostf/entry/src/main/resources/base/element/string.json diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostk/entry/src/main/resources/base/media/icon.png b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostf/entry/src/main/resources/base/media/icon.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostk/entry/src/main/resources/base/media/icon.png rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostf/entry/src/main/resources/base/media/icon.png diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostk/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostf/signature/openharmony_sx.p7b similarity index 100% rename from aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostk/signature/openharmony_sx.p7b rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostf/signature/openharmony_sx.p7b diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostg/BUILD.gn b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostg/BUILD.gn similarity index 100% rename from aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostg/BUILD.gn rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostg/BUILD.gn diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostg/Test.json b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostg/Test.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostg/Test.json rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostg/Test.json diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostg/entry/src/main/config.json b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostg/entry/src/main/config.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostg/entry/src/main/config.json rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostg/entry/src/main/config.json diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostg/entry/src/main/ets/MainAbility/app.ets b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostg/entry/src/main/ets/MainAbility/app.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostg/entry/src/main/ets/MainAbility/app.ets rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostg/entry/src/main/ets/MainAbility/app.ets diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostg/entry/src/main/ets/MainAbility/pages/FormViewModel.ets b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostg/entry/src/main/ets/MainAbility/pages/FormViewModel.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostg/entry/src/main/ets/MainAbility/pages/FormViewModel.ets rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostg/entry/src/main/ets/MainAbility/pages/FormViewModel.ets diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostg/entry/src/main/ets/MainAbility/pages/index.ets b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostg/entry/src/main/ets/MainAbility/pages/index.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostg/entry/src/main/ets/MainAbility/pages/index.ets rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostg/entry/src/main/ets/MainAbility/pages/index.ets diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostg/entry/src/main/resources/base/element/string.json b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostg/entry/src/main/resources/base/element/string.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostg/entry/src/main/resources/base/element/string.json rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostg/entry/src/main/resources/base/element/string.json diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostl/entry/src/main/resources/base/media/icon.png b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostg/entry/src/main/resources/base/media/icon.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostl/entry/src/main/resources/base/media/icon.png rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostg/entry/src/main/resources/base/media/icon.png diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostl/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostg/signature/openharmony_sx.p7b similarity index 100% rename from aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostl/signature/openharmony_sx.p7b rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostg/signature/openharmony_sx.p7b diff --git a/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhosti/BUILD.gn b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhosti/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..4ac1113eed7d31f499af5ac8a6219a5791acf5c9 --- /dev/null +++ b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhosti/BUILD.gn @@ -0,0 +1,32 @@ +# 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. + +import("//test/xts/tools/build/suite.gni") + +ohos_js_hap_suite("FormSystemHostI") { + hap_profile = "./entry/src/main/config.json" + deps = [ + ":hjs_demo_js_assets", + ":hjs_demo_resources", + ] + ets2abc = true + certificate_profile = "./signature/openharmony_sx.p7b" + hap_name = "FormSystemHostI" +} +ohos_js_assets("hjs_demo_js_assets") { + source_dir = "./entry/src/main/ets/MainAbility" +} +ohos_resources("hjs_demo_resources") { + sources = [ "./entry/src/main/resources" ] + hap_profile = "./entry/src/main/config.json" +} diff --git a/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhosti/Test.json b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhosti/Test.json new file mode 100644 index 0000000000000000000000000000000000000000..4300a64be9af93e37a31f6b5c6fc734e8f1b4563 --- /dev/null +++ b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhosti/Test.json @@ -0,0 +1,3 @@ +{ + "description": "Configuration for hjunit demo Tests" +} diff --git a/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhosti/entry/src/main/config.json b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhosti/entry/src/main/config.json new file mode 100644 index 0000000000000000000000000000000000000000..ff59a977b1677c584508c4a3b96d51512e6361b9 --- /dev/null +++ b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhosti/entry/src/main/config.json @@ -0,0 +1,124 @@ +{ + "app": { + "bundleName": "com.ohos.st.formsystemhosti", + "vendor": "ohos", + "version": { + "code": 1000000, + "name": "1.0.0" + }, + "apiVersion": { + "compatible": 7, + "releaseType": "Release", + "target": 7 + } + }, + "deviceConfig": {}, + "module": { + "package": "com.ohos.st.formsystemhosti", + "name": ".FormStHostAppI", + "mainAbility": ".MainAbility", + "deviceType": [ + "phone" + ], + "distro": { + "deliveryWithInstall": true, + "moduleName": "entry", + "moduleType": "entry", + "installationFree": false + }, + "abilities": [ + { + "skills": [ + { + "entities": [ + "entity.system.home" + ], + "actions": [ + "action.system.home" + ] + } + ], + "visible": true, + "name": ".MainAbility", + "srcLanguage": "ets", + "icon": "$media:icon", + "description": "$string:description_mainability", + "label": "$string:entry_MainAbility", + "type": "page", + "launchType": "standard" + } + ], + "js": [ + { + "mode": { + "syntax": "ets", + "type": "pageAbility" + }, + "pages": [ + "pages/index" + ], + "name": ".MainAbility", + "window": { + "designWidth": 720, + "autoDesignWidth": false + } + } + ], + "defPermissions": [ + { + "availableScope": [], + "grantMode": "system_grant", + "name": "FMS_FormDelete_commonEvent" + }, + { + "availableScope": [], + "grantMode": "system_grant", + "name": "FMS_FormOnAcquired_commonEvent" + }, + { + "availableScope": [], + "grantMode": "system_grant", + "name": "FMS_FormOnError_commonEvent" + }, + { + "availableScope": [], + "grantMode": "system_grant", + "name": "FMS_FormOnDeleted_commonEvent" + }, + { + "availableScope": [], + "grantMode": "system_grant", + "name": "FMS_FormOnState_commonEvent" + } + ], + "reqPermissions": [ + { + "name": "FMS_FormOnAcquired_commonEvent" + }, + { + "name": "FMS_FormDelete_commonEvent" + }, + { + "name": "FMS_FormOnError_commonEvent" + }, + { + "name": "FMS_FormOnDeleted_commonEvent" + }, + { + "name": "FMS_FormOnState_commonEvent" + }, + { + "name": "ohos.permission.GET_BUNDLE_INFO_PRIVILEGED" + }, + { + "name": "ohos.permission.INSTALL_BUNDLE" + }, + { + "name": "ohos.permission.LISTEN_BUNDLE_CHANGE" + }, + { + "name": "ohos.permission.REQUIRE_FORM" + } + ] + } +} \ No newline at end of file diff --git a/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhosti/entry/src/main/ets/MainAbility/app.ets b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhosti/entry/src/main/ets/MainAbility/app.ets new file mode 100644 index 0000000000000000000000000000000000000000..e88deae73252f64f101cbb565ec7d7a983ed2e5b --- /dev/null +++ b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhosti/entry/src/main/ets/MainAbility/app.ets @@ -0,0 +1,23 @@ +/* + * 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. + */ + +export default { + onCreate() { + console.info('[FormComponent.host] Application onCreate') + }, + onDestroy() { + console.info('[FormComponent.host] Application onDestroy') + }, +} \ No newline at end of file diff --git a/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhosti/entry/src/main/ets/MainAbility/pages/FormViewModel.ets b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhosti/entry/src/main/ets/MainAbility/pages/FormViewModel.ets new file mode 100644 index 0000000000000000000000000000000000000000..dc72a2fb08469f1728b24fd8257a522d602af27c --- /dev/null +++ b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhosti/entry/src/main/ets/MainAbility/pages/FormViewModel.ets @@ -0,0 +1,127 @@ +/* + * 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. + */ + +import formManager from '@ohos.application.formHost'; +import bundleManager from '@ohos.bundle'; +import abilityManager from '@ohos.app.abilityManager'; + +export default class FormViewModel { + private static sFormViewModel: FormViewModel = null; + + public static getInstance(): FormViewModel { + if (FormViewModel.sFormViewModel == null) { + FormViewModel.sFormViewModel = new FormViewModel(); + } + return FormViewModel.sFormViewModel; + } + + public async castTempFormToNormal(formId: string) { + formManager.castTempForm(formId) + .then((data) => { + console.info('[FormComponent] castTempForm result:' + data); + }); + } + + public async requestForm(formId: string) { + formManager.requestForm(formId) + .then((data) => { + console.info('[FormComponent] requestForm result:' + data); + }); + } + + public async deleteCard(formId: string) { + formManager.deleteForm(formId) + .then((data) => { + console.info('[FormComponent] deleteForm result:' + data); + }); + } + + public async releaseCard(formId: string) { + formManager.releaseForm(formId) + .then((data) => { + console.info('[FormComponent] releaseForm result:' + data); + }); + } + + public async enableCard(formId: string) { + formManager.enableFormsUpdate([formId]) + .then((data) => { + console.info('[FormComponent] enableFormsUpdate result:' + data); + }); + } + + public async disableCard(formId: string) { + formManager.disableFormsUpdate([formId]) + .then((data) => { + console.info('[FormComponent] disableCard result:' + data); + }); + } + + public async changeCardVisible(formId: string, isVisible: boolean) { + if (isVisible) { + formManager.notifyVisibleForms([formId]) + .then((data) => { + console.info('[FormComponent] changeCardVisible result:' + data + ', isVisible:' + isVisible); + }); + } else { + formManager.notifyInvisibleForms([formId]) + .then((data) => { + console.info('[FormComponent] changeCardVisible result:' + data + ', isVisible:' + isVisible); + }); + } + } + + public async isFmsReady() { + formManager.isSystemReady() + .then((data) => { + console.info('[FormComponent] isFmsReady result:' + data); + }); + } + + public async getAllFormsInfo() { + formManager.getAllFormsInfo() + .then((data) => { + console.info('[FormComponent] getAllFormsInfo result:' + JSON.stringify(data)); + }); + } + + public async getFormsInfoByApp(bundle: string) { + formManager.getFormsInfo(bundle) + .then((data) => { + console.info('[FormComponent] getFormsInfoByApp result:' + JSON.stringify(data)); + }); + } + + public async getFormsInfoByModule(bundle: string, moduleName: string) { + formManager.getFormsInfo(bundle, moduleName) + .then((data) => { + console.info('[FormComponent] getFormsInfoByModule result:' + JSON.stringify(data)); + }); + } + + public async clearFormUserCache() { + abilityManager.clearUpApplicationData('com.ohos.myapplicationform') + .then((data) => { + console.info('[FormComponent] cleanBundleCacheFiles result:' + JSON.stringify(data)); + }); + } + + public async clearFormProviderCache(bundle: string) { + abilityManager.clearUpApplicationData(bundle) + .then((data) => { + console.info('[FormComponent] cleanBundleCacheFiles result:' + JSON.stringify(data)); + }); + } +} \ No newline at end of file diff --git a/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhosti/entry/src/main/ets/MainAbility/pages/index.ets b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhosti/entry/src/main/ets/MainAbility/pages/index.ets new file mode 100644 index 0000000000000000000000000000000000000000..0d7d51e9567e3ab0de3e49f5a71be21f6e592595 --- /dev/null +++ b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhosti/entry/src/main/ets/MainAbility/pages/index.ets @@ -0,0 +1,310 @@ +/* + * 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. + */ + +import featureAbility from "@ohos.ability.featureAbility"; +import formManager from '@ohos.application.formHost'; +import commonEvent from '@ohos.commonEvent'; +import FormViewModel from './FormViewModel.ets'; +@Entry +@Component +struct Index { + @State formId: number = 0; + @State bundle: string = "com.form.formsystemtestservicea.hmservice"; + @State ability: string = "com.form.formsystemtestservicea.hmservice.MainAbility"; + @State moduleName: string = "entry"; + @State name: string = "Form_Js001"; + @State width: number = 300; + @State height: number = 200; + @State allowUpate: boolean = true; + @State onAcquireResult: string = ""; + @State isShowing: boolean = true; + @State canCreateForm: boolean = false; + + private dimension: FormDimension = FormDimension.Dimension_1_2; + private deleteForm = false; + private deleteId = "-1"; + private temporaryId = "-1"; + private temporary = false; + private mFormViewModel: FormViewModel; + private isVisible = false; + private mMargin = 15; + private BTN_BG_COLOR: string = '#0D9FFB'; + private castForm = false; + private tempFormId: number = 0; + + private formOnAcquiredEvent = "FMS_FormOnAcquired_commonEvent"; + private formCastEvent = "FMS_FormCast_commonEvent"; + private formOnErrorEvent = "FMS_FormOnError_commonEvent"; + + private subscriberDel; + private subscriberFormDeleteEvent = { + events: ["FMS_FormDelete_commonEvent"], + }; + + private publishOnErrorCallBack() { + this.canCreateForm = false; + console.info("====>formOnErrorEvent Publish CallBack ====>"); + } + private publishOnAcquiredCallBack() { + console.info("====>formOnAcquiredEvent Publish CallBack ====>"); + } + private publishCastCallBack() { + console.info("====>formCastEvent Publish CallBack ====>"); + } + + private deleteCallBack(err, data) { + console.info("!!!====>formsystemhost deleteCallBack start:====>" + JSON.stringify(data)); + if (data.bundleName && data.bundleName != "com.ohos.st.formsystemhost") { + return; + } + formManager.deleteForm(data.data) + .then((data2) => { + console.info('[FormComponent] deleteForm result:' + data2); + }); + + this.canCreateForm = false; + console.info("!!!====>formsystemhost deleteCallBack end ====>"); + } + + private unSubscribeDeleteCallback() { + console.info("====>formsystemhost unSubscribeDeleteCallback_1100 CallBack====>"); + } + + private aboutToAppear() { + + const TAG = "[FormComponent.host]" + + this.mFormViewModel = FormViewModel.getInstance(); + + commonEvent.createSubscriber(this.subscriberFormDeleteEvent).then(async (data) => { + console.info("====>formsystemhost Subscriber FormDelete data:====>", JSON.stringify(data)); + this.subscriberDel = data; + await commonEvent.subscribe(this.subscriberDel, this.deleteCallBack); + }) + + console.error('[FormComponent] getWant'); + featureAbility.getWant() + .then((want: any) => { + this.formId = parseInt(want.parameters.formId); + this.name = want.parameters.name; + this.bundle = want.parameters.bundle; + this.ability = want.parameters.ability; + if (want.parameters.moduleName) { + this.moduleName = want.parameters.moduleName; + } + if (want.parameters.temporary) { + this.temporary = want.parameters.temporary; + } + if (want.parameters.castForm) { + this.castForm = want.parameters.castForm; + } + if (want.parameters.dimension) { + this.dimension = want.parameters.dimension; + } + if (want.parameters.temporaryId) { + this.temporaryId = want.parameters.temporaryId; + } + if (want.parameters.deleteForm) { + this.deleteForm = want.parameters.deleteForm; + } + if (want.parameters.deleteId) { + this.deleteId = want.parameters.deleteId; + } + setTimeout(() => { + this.canCreateForm = want.parameters.isCreate ? true : false; + console.error('[FormComponent] getWant canCreateForm:' + this.canCreateForm); + }, 10); + console.error('[FormComponent] getWant end' + JSON.stringify(want)); + + if (!want.parameters.isCreate && this.deleteForm) { + console.info("formsystemhost deleteForm start"); + formManager.deleteForm(this.deleteId) + .then((data) => { + console.info('formsystemhost deleteForm result:' + data); + let commonEventPublishData = { + data: data.toString(), + parameters: { + "formId": this.deleteId.toString() + } + }; + commonEvent.publish(this.formOnErrorEvent, commonEventPublishData, this.publishOnErrorCallBack); + }) + .catch((error) => { + console.info('[FormComponent] deleteForm error:' + error); + let commonEventPublishData = { + data: error.code.toString(), + parameters: { + "formId": this.deleteId.toString() + } + }; + commonEvent.publish(this.formOnErrorEvent, commonEventPublishData, this.publishOnErrorCallBack); + }); + console.info("formsystemhost deleteForm end"); + } + if (!want.parameters.isCreate && this.castForm) { + console.info("[FormComponent.host] castTempForm start"); + formManager.castTempForm(this.temporaryId) + .then((data) => { + console.info('[FormComponent] castTempForm result:' + data); + setTimeout(() => { + let commonEventPublishData = { + data: data.toString(), + parameters: { + "formId": this.temporaryId.toString() + } + }; + commonEvent.publish(this.formCastEvent, commonEventPublishData, this.publishCastCallBack); + }, 5); + }) + .catch((error) => { + console.info('[FormComponent] castTempForm error:' + error); + setTimeout(() => { + let commonEventPublishData = { + data: error.code.toString(), + parameters: { + "formId": this.temporaryId.toString() + } + }; + commonEvent.publish(this.formCastEvent, commonEventPublishData, this.publishCastCallBack); + }, 5); + }); + console.info("[FormComponent.host] castTempForm end"); + } + }) + .catch((error: any) => { + console.error('[FormComponent] Operation failed. Cause: ' + JSON.stringify(error)); + }) + console.info(`[FormComponent.host] aboutToAppear end`); + } + + build() { + Column() { + Text('form component test begin') + Column() { + if (this.canCreateForm) { + FormComponent({ + id: this.formId, + name: this.name, + bundle: this.bundle, + ability: this.ability, + module: this.moduleName, + dimension: this.dimension, + temporary: this.temporary + }) + .allowUpdate(this.allowUpate) + .visibility(this.isShowing ? Visibility.Visible : Visibility.Hidden) + .onAcquired((form) => { + console.info("[FormComponent.host] get form, form id:" + form.id); + this.formId = form.id; + if (this.castForm) { + console.info("[FormComponent.host] castTempForm start"); + formManager.castTempForm(this.temporaryId) + .then((data) => { + console.info('[FormComponent] castTempForm result:' + data); + setTimeout(() => { + let commonEventPublishData = { + data: data.toString(), + parameters: { + "formId": this.formId.toString() + } + }; + commonEvent.publish(this.formCastEvent, commonEventPublishData, this.publishCastCallBack); + }, 5); + }) + .catch((error) => { + console.info('[FormComponent] castTempForm error:' + error); + setTimeout(() => { + let commonEventPublishData = { + data: error.code.toString(), + parameters: { + "formId": this.temporaryId.toString() + } + }; + commonEvent.publish(this.formCastEvent, commonEventPublishData, this.publishCastCallBack); + }, 5); + }); + console.info("[FormComponent.host] castTempForm end"); + } else if (this.deleteForm) { + console.info("[FormComponent.host] deleteForm start"); + if (this.deleteId == "self") { + this.deleteId = this.formId.toString(); + } + setTimeout(() => { + formManager.deleteForm(this.deleteId) + .then((data) => { + console.info('[FormComponent] deleteForm result:' + data); + let commonEventPublishData = { + data: data.toString(), + parameters: { + "formId": this.deleteId.toString() + } + }; + commonEvent.publish(this.formOnErrorEvent, commonEventPublishData, this.publishOnErrorCallBack); + }) + .catch((error) => { + console.info('[FormComponent] deleteForm error:' + error); + let commonEventPublishData = { + data: error.code.toString(), + parameters: { + "formId": this.deleteId.toString() + } + }; + commonEvent.publish(this.formOnErrorEvent, commonEventPublishData, this.publishOnErrorCallBack); + }); + + console.info("[FormComponent.host] deleteForm end"); + }, 1000); + } else { + let commonEventPublishData = { + data: this.formId.toString(), + parameters: { + "formId": this.deleteId.toString() + } + }; + commonEvent.publish(this.formOnAcquiredEvent, commonEventPublishData, this.publishOnAcquiredCallBack); + } + }) + .onUninstall((info) => { + console.info("[FormComponent] onUninstall:" + JSON.stringify(info)); + }) + .onError((error) => { + console.info("[FormComponent.host] error code:" + error.errcode); + console.info("[FormComponent.host] error msg:" + error.msg); + this.onAcquireResult += error.errcode; + this.onAcquireResult += " "; + this.onAcquireResult += error.msg; + if (this.deleteForm && this.deleteId) { + let commonEventPublishData = { + data: error.msg, + parameters: { + "formId": this.formId.toString() + } + }; + commonEvent.publish(this.formOnErrorEvent, commonEventPublishData, this.publishOnErrorCallBack); + } else { + let commonEventPublishData = { + data: error.msg + }; + commonEvent.publish(this.formOnErrorEvent, commonEventPublishData, this.publishOnErrorCallBack); + } + }) + } + } + .backgroundColor(Color.White) + Text('form component test end') + } + .backgroundColor(Color.White) + } +} \ No newline at end of file diff --git a/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhosti/entry/src/main/resources/base/element/string.json b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhosti/entry/src/main/resources/base/element/string.json new file mode 100644 index 0000000000000000000000000000000000000000..bebec3022f0ff1342e2be9e9520674d430507d4f --- /dev/null +++ b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhosti/entry/src/main/resources/base/element/string.json @@ -0,0 +1,12 @@ +{ + "string": [ + { + "name": "entry_MainAbility", + "value": "formhostI" + }, + { + "name": "description_mainability", + "value": "ETS_Empty Ability" + } + ] +} \ No newline at end of file diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostn/entry/src/main/resources/base/media/icon.png b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhosti/entry/src/main/resources/base/media/icon.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostn/entry/src/main/resources/base/media/icon.png rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhosti/entry/src/main/resources/base/media/icon.png diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostn/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhosti/signature/openharmony_sx.p7b similarity index 100% rename from aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostn/signature/openharmony_sx.p7b rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhosti/signature/openharmony_sx.p7b diff --git a/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostj/BUILD.gn b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostj/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..be156b6d07ea799a3ff32b321fe805346a2238c1 --- /dev/null +++ b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostj/BUILD.gn @@ -0,0 +1,32 @@ +# 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. + +import("//test/xts/tools/build/suite.gni") + +ohos_js_hap_suite("FormSystemHostJ") { + hap_profile = "./entry/src/main/config.json" + deps = [ + ":hjs_demo_js_assets", + ":hjs_demo_resources", + ] + ets2abc = true + certificate_profile = "./signature/openharmony_sx.p7b" + hap_name = "FormSystemHostJ" +} +ohos_js_assets("hjs_demo_js_assets") { + source_dir = "./entry/src/main/ets/MainAbility" +} +ohos_resources("hjs_demo_resources") { + sources = [ "./entry/src/main/resources" ] + hap_profile = "./entry/src/main/config.json" +} diff --git a/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostj/Test.json b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostj/Test.json new file mode 100644 index 0000000000000000000000000000000000000000..4300a64be9af93e37a31f6b5c6fc734e8f1b4563 --- /dev/null +++ b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostj/Test.json @@ -0,0 +1,3 @@ +{ + "description": "Configuration for hjunit demo Tests" +} diff --git a/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostj/entry/src/main/config.json b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostj/entry/src/main/config.json new file mode 100644 index 0000000000000000000000000000000000000000..2248ed3dcd62c3e02c74dd5e30e83a6afc9c596b --- /dev/null +++ b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostj/entry/src/main/config.json @@ -0,0 +1,116 @@ +{ + "app": { + "bundleName": "com.ohos.st.formsystemhostj", + "vendor": "ohos", + "version": { + "code": 1000000, + "name": "1.0.0" + }, + "apiVersion": { + "compatible": 7, + "releaseType": "Release", + "target": 7 + } + }, + "deviceConfig": {}, + "module": { + "package": "com.ohos.st.formsystemhostj", + "name": ".FormStHostApp", + "mainAbility": ".MainAbility", + "deviceType": [ + "phone" + ], + "distro": { + "deliveryWithInstall": true, + "moduleName": "entry", + "moduleType": "entry", + "installationFree": false + }, + "abilities": [ + { + "skills": [ + { + "entities": [ + "entity.system.home" + ], + "actions": [ + "action.system.home" + ] + } + ], + "visible": true, + "name": ".MainAbility", + "srcLanguage": "ets", + "icon": "$media:icon", + "description": "$string:description_mainability", + "label": "$string:entry_MainAbility", + "type": "page", + "launchType": "standard" + } + ], + "js": [ + { + "mode": { + "syntax": "ets", + "type": "pageAbility" + }, + "pages": [ + "pages/index" + ], + "name": ".MainAbility", + "window": { + "designWidth": 720, + "autoDesignWidth": false + } + } + ], + "defPermissions": [ + { + "availableScope": [], + "grantMode": "system_grant", + "name": "FMS_FormDelete_commonEvent" + }, + { + "availableScope": [], + "grantMode": "system_grant", + "name": "FMS_FormOnAcquired_commonEvent" + }, + { + "availableScope": [], + "grantMode": "system_grant", + "name": "FMS_FormOnError_commonEvent" + }, + { + "availableScope": [], + "grantMode": "system_grant", + "name": "FMS_FormCast_commonEvent" + } + ], + "reqPermissions": [ + { + "name": "FMS_FormOnAcquired_commonEvent" + }, + { + "name": "FMS_FormDelete_commonEvent" + }, + { + "name": "FMS_FormOnError_commonEvent" + }, + { + "name": "FMS_FormCast_commonEvent" + }, + { + "name": "ohos.permission.GET_BUNDLE_INFO_PRIVILEGED" + }, + { + "name": "ohos.permission.INSTALL_BUNDLE" + }, + { + "name": "ohos.permission.LISTEN_BUNDLE_CHANGE" + }, + { + "name": "ohos.permission.REQUIRE_FORM" + } + ] + } +} \ No newline at end of file diff --git a/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostj/entry/src/main/ets/MainAbility/app.ets b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostj/entry/src/main/ets/MainAbility/app.ets new file mode 100644 index 0000000000000000000000000000000000000000..e88deae73252f64f101cbb565ec7d7a983ed2e5b --- /dev/null +++ b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostj/entry/src/main/ets/MainAbility/app.ets @@ -0,0 +1,23 @@ +/* + * 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. + */ + +export default { + onCreate() { + console.info('[FormComponent.host] Application onCreate') + }, + onDestroy() { + console.info('[FormComponent.host] Application onDestroy') + }, +} \ No newline at end of file diff --git a/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostj/entry/src/main/ets/MainAbility/pages/FormViewModel.ets b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostj/entry/src/main/ets/MainAbility/pages/FormViewModel.ets new file mode 100644 index 0000000000000000000000000000000000000000..cb25732d908c6cc580d69de1ae9984cde6230774 --- /dev/null +++ b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostj/entry/src/main/ets/MainAbility/pages/FormViewModel.ets @@ -0,0 +1,127 @@ +/* + * 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. + */ + +import formManager from '@ohos.ability.formmanager'; +import bundleManager from '@ohos.bundle'; +import abilityManager from '@ohos.app.abilityManager'; + +export default class FormViewModel { + private static sFormViewModel: FormViewModel = null; + + public static getInstance(): FormViewModel { + if (FormViewModel.sFormViewModel == null) { + FormViewModel.sFormViewModel = new FormViewModel(); + } + return FormViewModel.sFormViewModel; + } + + public async castTempFormToNormal(formId: string) { + formManager.castTempForm(formId) + .then((data) => { + console.info('[FormComponent] castTempForm result:' + data); + }); + } + + public async requestForm(formId: string) { + formManager.requestForm(formId) + .then((data) => { + console.info('[FormComponent] requestForm result:' + data); + }); + } + + public async deleteCard(formId: string) { + formManager.deleteForm(formId) + .then((data) => { + console.info('[FormComponent] deleteForm result:' + data); + }); + } + + public async releaseCard(formId: string) { + formManager.releaseForm(formId) + .then((data) => { + console.info('[FormComponent] releaseForm result:' + data); + }); + } + + public async enableCard(formId: string) { + formManager.enableFormsUpdate([formId]) + .then((data) => { + console.info('[FormComponent] enableFormsUpdate result:' + data); + }); + } + + public async disableCard(formId: string) { + formManager.disableFormsUpdate([formId]) + .then((data) => { + console.info('[FormComponent] disableCard result:' + data); + }); + } + + public async changeCardVisible(formId: string, isVisible: boolean) { + if (isVisible) { + formManager.notifyVisibleForms([formId]) + .then((data) => { + console.info('[FormComponent] changeCardVisible result:' + data + ', isVisible:' + isVisible); + }); + } else { + formManager.notifyInvisibleForms([formId]) + .then((data) => { + console.info('[FormComponent] changeCardVisible result:' + data + ', isVisible:' + isVisible); + }); + } + } + + public async isFmsReady() { + formManager.isSystemReady() + .then((data) => { + console.info('[FormComponent] isFmsReady result:' + data); + }); + } + + public async getAllFormsInfo() { + formManager.getAllFormsInfo() + .then((data) => { + console.info('[FormComponent] getAllFormsInfo result:' + JSON.stringify(data)); + }); + } + + public async getFormsInfoByApp(bundle: string) { + formManager.getFormsInfo(bundle) + .then((data) => { + console.info('[FormComponent] getFormsInfoByApp result:' + JSON.stringify(data)); + }); + } + + public async getFormsInfoByModule(bundle: string, moduleName: string) { + formManager.getFormsInfo(bundle, moduleName) + .then((data) => { + console.info('[FormComponent] getFormsInfoByModule result:' + JSON.stringify(data)); + }); + } + + public async clearFormUserCache() { + abilityManager.clearUpApplicationData('com.ohos.myapplicationform') + .then((data) => { + console.info('[FormComponent] cleanBundleCacheFiles result:' + JSON.stringify(data)); + }); + } + + public async clearFormProviderCache(bundle: string) { + abilityManager.clearUpApplicationData(bundle) + .then((data) => { + console.info('[FormComponent] cleanBundleCacheFiles result:' + JSON.stringify(data)); + }); + } +} \ No newline at end of file diff --git a/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostj/entry/src/main/ets/MainAbility/pages/index.ets b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostj/entry/src/main/ets/MainAbility/pages/index.ets new file mode 100644 index 0000000000000000000000000000000000000000..3148e1e9d7e1e0672ce2ff9a34fdf1c02c423b72 --- /dev/null +++ b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostj/entry/src/main/ets/MainAbility/pages/index.ets @@ -0,0 +1,311 @@ +/* + * 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. + */ + +import FormViewModel from './FormViewModel.ets'; +import router from '@system.router'; +import featureAbility from "@ohos.ability.featureAbility"; +import formManager from '@ohos.application.formHost' +import commonEvent from '@ohos.commonEvent'; +@Entry +@Component +struct Index { + @State formId: number = 0; + @State bundle: string = "com.form.formsystemtestservicea.hmservice"; + @State ability: string = "com.form.formsystemtestservicea.hmservice.MainAbility"; + @State moduleName: string = "entry"; + @State name: string = "Form_Js001"; + @State width: number = 300; + @State height: number = 200; + @State allowUpate: boolean = true; + @State onAcquireResult: string = ""; + @State isShowing: boolean = true; + @State canCreateForm: boolean = false; + private dimension: FormDimension = FormDimension.Dimension_1_2; + + private deleteForm = false; + private deleteId = "-1"; + private temporaryId="-1"; + private temporary = false; + private mFormViewModel: FormViewModel; + private isVisible = false; + private mMargin = 15; + private BTN_BG_COLOR: string = '#0D9FFB'; + private castForm = false; + private tempFormId: number = 0; + + private formOnAcquiredEvent = "FMS_FormOnAcquired_commonEvent"; + private formCastEvent = "FMS_FormCast_commonEvent"; + private formOnErrorEvent = "FMS_FormOnError_commonEvent"; + + private subscriberDel; + private subscriberFormDeleteEvent = { + events: ["FMS_FormDelete_commonEvent"], + }; + + private publishOnErrorCallBack() { + this.canCreateForm = false; + console.debug("====>formOnErrorEvent Publish CallBack ====>"); + } + private publishOnAcquiredCallBack() { + console.debug("====>formOnAcquiredEvent Publish CallBack ====>"); + } + private publishCastCallBack() { + console.debug("====>formCastEvent Publish CallBack ====>"); + } + + private deleteCallBack(err, data) { + console.info("!!!====>formsystemhostj deleteCallBack start:====>" + JSON.stringify(data)); + if(data.bundleName && data.bundleName != "com.ohos.st.formsystemhostj") { + return; + } + formManager.deleteForm(data.data) + .then((data2) => { + console.info('[FormComponent] deleteForm result:' + data2); + }); + + this.canCreateForm = false; + console.info("!!!====>formsystemhostj deleteCallBack end ====>"); + } + + private unSubscribeDeleteCallback() { + console.debug("====>formsystemhostj unSubscribeDeleteCallback_1100 CallBack====>"); + } + + private aboutToAppear() { + + const TAG = "[FormComponent.host]" + + this.mFormViewModel = FormViewModel.getInstance(); + + commonEvent.createSubscriber(this.subscriberFormDeleteEvent).then(async (data) => { + console.info("====>formsystemhostj Subscriber FormDelete data:====>", JSON.stringify(data)); + this.subscriberDel = data; + await commonEvent.subscribe(this.subscriberDel, this.deleteCallBack); + }) + + console.error('[FormComponent] getWant'); + featureAbility.getWant() + .then((want: any) => { + this.formId = parseInt(want.parameters.formId); + this.name = want.parameters.name; + this.bundle = want.parameters.bundle; + this.ability = want.parameters.ability; + this.moduleName = want.parameters.moduleName; + if(want.parameters.temporary) { + this.temporary = want.parameters.temporary; + } + console.log("formsystemhostj dimension1:" + this.dimension); + if(want.parameters.dimension) { + this.dimension = want.parameters.dimension; + } + console.log("formsystemhostj dimension2:" + this.dimension); + if(want.parameters.castForm) { + this.castForm = want.parameters.castForm; + } + if(want.parameters.temporaryId) { + this.temporaryId = want.parameters.temporaryId; + } + if(want.parameters.deleteForm) { + this.deleteForm = want.parameters.deleteForm; + } + if(want.parameters.deleteId) { + this.deleteId = want.parameters.deleteId; + } + setTimeout(() => { + this.canCreateForm = want.parameters.isCreate ? true : false; + console.error('[FormComponent] getWant canCreateForm:'+ this.canCreateForm); + }, 10); + console.error('[FormComponent] getWant end'+ JSON.stringify(want)); + + if(!want.parameters.isCreate && this.deleteForm) { + console.log("formsystemhostj deleteForm start"); + formManager.deleteForm(this.deleteId) + .then((data) => { + console.info('formsystemhostj deleteForm result:' + data); + let commonEventPublishData = { + data: data.toString(), + parameters: { + "formId" : this.deleteId.toString() + } + }; + commonEvent.publish(this.formOnErrorEvent, commonEventPublishData, this.publishOnErrorCallBack); + }) + .catch((error) => { + console.info('[FormComponent] deleteForm error:' + error); + let commonEventPublishData = { + data: error.code.toString(), + parameters: { + "formId" : this.deleteId.toString() + } + }; + commonEvent.publish(this.formOnErrorEvent, commonEventPublishData, this.publishOnErrorCallBack); + }); + console.log("formsystemhostj deleteForm end"); + } + if(!want.parameters.isCreate && this.castForm) { + console.log("[FormComponent.host] castTempForm start"); + formManager.castTempForm(this.temporaryId) + .then((data) => { + console.info('[FormComponent] castTempForm result:' + data); + setTimeout(() => { + let commonEventPublishData = { + data: data.toString(), + parameters: { + "formId" : this.temporaryId.toString() + } + }; + commonEvent.publish(this.formCastEvent, commonEventPublishData, this.publishCastCallBack); + }, 5); + }) + .catch((error) => { + console.info('[FormComponent] castTempForm error:' + error); + setTimeout(() => { + let commonEventPublishData = { + data: error.code.toString(), + parameters: { + "formId" : this.temporaryId.toString() + } + }; + commonEvent.publish(this.formCastEvent, commonEventPublishData, this.publishCastCallBack); + }, 5); + }); + console.log("[FormComponent.host] castTempForm end"); + } + }) + .catch((error: any) => { + console.error('[FormComponent] Operation failed. Cause: ' + JSON.stringify(error)); + }) + console.log(`[FormComponent.host] aboutToAppear end`); + } + + build() { + Column() { + Text('form component test begin') + Column() { + if (this.canCreateForm) { + FormComponent({ + id: this.formId, + name: this.name, + bundle: this.bundle, + ability: this.ability, + module: this.moduleName, + dimension: this.dimension, + temporary: this.temporary, + }) + .allowUpdate(this.allowUpate) + .visibility(this.isShowing ? Visibility.Visible : Visibility.Hidden) + .onAcquired((form) => { + console.log("[FormComponent.host] get form, form id:" + form.id); + this.formId = form.id; + if(this.castForm) { + console.log("[FormComponent.host] castTempForm start"); + formManager.castTempForm(this.temporaryId) + .then((data) => { + console.info('[FormComponent] castTempForm result:' + data); + setTimeout(() => { + let commonEventPublishData = { + data: data.toString(), + parameters: { + "formId" : this.formId.toString() + } + }; + commonEvent.publish(this.formCastEvent, commonEventPublishData, this.publishCastCallBack); + }, 5); + }) + .catch((error) => { + console.info('[FormComponent] castTempForm error:' + error); + setTimeout(() => { + let commonEventPublishData = { + data: error.code.toString(), + parameters: { + "formId" : this.temporaryId.toString() + } + }; + commonEvent.publish(this.formCastEvent, commonEventPublishData, this.publishCastCallBack); + }, 5); + }); + console.log("[FormComponent.host] castTempForm end"); + } else if(this.deleteForm) { + console.log("[FormComponent.host] deleteForm start"); + if(this.deleteId == "self") { + this.deleteId = this.formId.toString(); + } + setTimeout(() => { + formManager.deleteForm(this.deleteId) + .then((data) => { + console.info('[FormComponent] deleteForm result:' + data); + let commonEventPublishData = { + data: data.toString(), + parameters: { + "formId" : this.deleteId.toString() + } + }; + commonEvent.publish(this.formOnErrorEvent, commonEventPublishData, this.publishOnErrorCallBack); + }) + .catch((error) => { + console.info('[FormComponent] deleteForm error:' + error); + let commonEventPublishData = { + data: error.code.toString(), + parameters: { + "formId" : this.deleteId.toString() + } + }; + commonEvent.publish(this.formOnErrorEvent, commonEventPublishData, this.publishOnErrorCallBack); + }); + + console.log("[FormComponent.host] deleteForm end"); + }, 1000); + } else { + let commonEventPublishData = { + data: this.formId.toString(), + parameters: { + "formId" : this.deleteId.toString() + } + }; + commonEvent.publish(this.formOnAcquiredEvent, commonEventPublishData, this.publishOnAcquiredCallBack); + } + }) + // .onUninstall((info) => { + // console.log("[FormComponent] onUninstall:" + JSON.stringify(info)); + // }) + .onError((error) => { + console.log("[FormComponent.host] error code:" + error.errcode); + console.log("[FormComponent.host] error msg:" + error.msg); + this.onAcquireResult += error.errcode; + this.onAcquireResult += " "; + this.onAcquireResult += error.msg; + if(this.deleteForm && this.deleteId) { + let commonEventPublishData = { + data: error.msg, + parameters: { + "formId" : this.formId.toString() + } + }; + commonEvent.publish(this.formOnErrorEvent, commonEventPublishData, this.publishOnErrorCallBack); + } else { + let commonEventPublishData = { + data: error.msg + }; + commonEvent.publish(this.formOnErrorEvent, commonEventPublishData, this.publishOnErrorCallBack); + } + }) + } + } + .backgroundColor(Color.White) + Text('form component test end') + } + .backgroundColor(Color.White) + } +} \ No newline at end of file diff --git a/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostj/entry/src/main/resources/base/element/string.json b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostj/entry/src/main/resources/base/element/string.json new file mode 100644 index 0000000000000000000000000000000000000000..fcba7b2154f0a2b4c9dffdab2bbaab0278141209 --- /dev/null +++ b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostj/entry/src/main/resources/base/element/string.json @@ -0,0 +1,12 @@ +{ + "string": [ + { + "name": "entry_MainAbility", + "value": "formhostJ" + }, + { + "name": "description_mainability", + "value": "ETS_Empty Ability" + } + ] +} \ No newline at end of file diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostnoperm/entry/src/main/resources/base/media/icon.png b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostj/entry/src/main/resources/base/media/icon.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostnoperm/entry/src/main/resources/base/media/icon.png rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostj/entry/src/main/resources/base/media/icon.png diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostnoperm/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostj/signature/openharmony_sx.p7b similarity index 100% rename from aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostnoperm/signature/openharmony_sx.p7b rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostj/signature/openharmony_sx.p7b diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostk/BUILD.gn b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostk/BUILD.gn similarity index 100% rename from aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostk/BUILD.gn rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostk/BUILD.gn diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostk/Test.json b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostk/Test.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostk/Test.json rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostk/Test.json diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostk/entry/src/main/config.json b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostk/entry/src/main/config.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostk/entry/src/main/config.json rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostk/entry/src/main/config.json diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostk/entry/src/main/ets/MainAbility/app.ets b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostk/entry/src/main/ets/MainAbility/app.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostk/entry/src/main/ets/MainAbility/app.ets rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostk/entry/src/main/ets/MainAbility/app.ets diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostk/entry/src/main/ets/MainAbility/pages/FormViewModel.ets b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostk/entry/src/main/ets/MainAbility/pages/FormViewModel.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostk/entry/src/main/ets/MainAbility/pages/FormViewModel.ets rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostk/entry/src/main/ets/MainAbility/pages/FormViewModel.ets diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostk/entry/src/main/ets/MainAbility/pages/index.ets b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostk/entry/src/main/ets/MainAbility/pages/index.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostk/entry/src/main/ets/MainAbility/pages/index.ets rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostk/entry/src/main/ets/MainAbility/pages/index.ets diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostk/entry/src/main/resources/base/element/string.json b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostk/entry/src/main/resources/base/element/string.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostk/entry/src/main/resources/base/element/string.json rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostk/entry/src/main/resources/base/element/string.json diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhosto/entry/src/main/resources/base/media/icon.png b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostk/entry/src/main/resources/base/media/icon.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhosto/entry/src/main/resources/base/media/icon.png rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostk/entry/src/main/resources/base/media/icon.png diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhosto/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostk/signature/openharmony_sx.p7b similarity index 100% rename from aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhosto/signature/openharmony_sx.p7b rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostk/signature/openharmony_sx.p7b diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostl/BUILD.gn b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostl/BUILD.gn similarity index 100% rename from aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostl/BUILD.gn rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostl/BUILD.gn diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostl/Test.json b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostl/Test.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostl/Test.json rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostl/Test.json diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostl/entry/src/main/config.json b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostl/entry/src/main/config.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostl/entry/src/main/config.json rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostl/entry/src/main/config.json diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostl/entry/src/main/ets/MainAbility/app.ets b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostl/entry/src/main/ets/MainAbility/app.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostl/entry/src/main/ets/MainAbility/app.ets rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostl/entry/src/main/ets/MainAbility/app.ets diff --git a/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostl/entry/src/main/ets/MainAbility/pages/FormViewModel.ets b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostl/entry/src/main/ets/MainAbility/pages/FormViewModel.ets new file mode 100644 index 0000000000000000000000000000000000000000..cb25732d908c6cc580d69de1ae9984cde6230774 --- /dev/null +++ b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostl/entry/src/main/ets/MainAbility/pages/FormViewModel.ets @@ -0,0 +1,127 @@ +/* + * 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. + */ + +import formManager from '@ohos.ability.formmanager'; +import bundleManager from '@ohos.bundle'; +import abilityManager from '@ohos.app.abilityManager'; + +export default class FormViewModel { + private static sFormViewModel: FormViewModel = null; + + public static getInstance(): FormViewModel { + if (FormViewModel.sFormViewModel == null) { + FormViewModel.sFormViewModel = new FormViewModel(); + } + return FormViewModel.sFormViewModel; + } + + public async castTempFormToNormal(formId: string) { + formManager.castTempForm(formId) + .then((data) => { + console.info('[FormComponent] castTempForm result:' + data); + }); + } + + public async requestForm(formId: string) { + formManager.requestForm(formId) + .then((data) => { + console.info('[FormComponent] requestForm result:' + data); + }); + } + + public async deleteCard(formId: string) { + formManager.deleteForm(formId) + .then((data) => { + console.info('[FormComponent] deleteForm result:' + data); + }); + } + + public async releaseCard(formId: string) { + formManager.releaseForm(formId) + .then((data) => { + console.info('[FormComponent] releaseForm result:' + data); + }); + } + + public async enableCard(formId: string) { + formManager.enableFormsUpdate([formId]) + .then((data) => { + console.info('[FormComponent] enableFormsUpdate result:' + data); + }); + } + + public async disableCard(formId: string) { + formManager.disableFormsUpdate([formId]) + .then((data) => { + console.info('[FormComponent] disableCard result:' + data); + }); + } + + public async changeCardVisible(formId: string, isVisible: boolean) { + if (isVisible) { + formManager.notifyVisibleForms([formId]) + .then((data) => { + console.info('[FormComponent] changeCardVisible result:' + data + ', isVisible:' + isVisible); + }); + } else { + formManager.notifyInvisibleForms([formId]) + .then((data) => { + console.info('[FormComponent] changeCardVisible result:' + data + ', isVisible:' + isVisible); + }); + } + } + + public async isFmsReady() { + formManager.isSystemReady() + .then((data) => { + console.info('[FormComponent] isFmsReady result:' + data); + }); + } + + public async getAllFormsInfo() { + formManager.getAllFormsInfo() + .then((data) => { + console.info('[FormComponent] getAllFormsInfo result:' + JSON.stringify(data)); + }); + } + + public async getFormsInfoByApp(bundle: string) { + formManager.getFormsInfo(bundle) + .then((data) => { + console.info('[FormComponent] getFormsInfoByApp result:' + JSON.stringify(data)); + }); + } + + public async getFormsInfoByModule(bundle: string, moduleName: string) { + formManager.getFormsInfo(bundle, moduleName) + .then((data) => { + console.info('[FormComponent] getFormsInfoByModule result:' + JSON.stringify(data)); + }); + } + + public async clearFormUserCache() { + abilityManager.clearUpApplicationData('com.ohos.myapplicationform') + .then((data) => { + console.info('[FormComponent] cleanBundleCacheFiles result:' + JSON.stringify(data)); + }); + } + + public async clearFormProviderCache(bundle: string) { + abilityManager.clearUpApplicationData(bundle) + .then((data) => { + console.info('[FormComponent] cleanBundleCacheFiles result:' + JSON.stringify(data)); + }); + } +} \ No newline at end of file diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostl/entry/src/main/ets/MainAbility/pages/index.ets b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostl/entry/src/main/ets/MainAbility/pages/index.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostl/entry/src/main/ets/MainAbility/pages/index.ets rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostl/entry/src/main/ets/MainAbility/pages/index.ets diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostl/entry/src/main/resources/base/element/string.json b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostl/entry/src/main/resources/base/element/string.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostl/entry/src/main/resources/base/element/string.json rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostl/entry/src/main/resources/base/element/string.json diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostp/entry/src/main/resources/base/media/icon.png b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostl/entry/src/main/resources/base/media/icon.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostp/entry/src/main/resources/base/media/icon.png rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostl/entry/src/main/resources/base/media/icon.png diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostp/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostl/signature/openharmony_sx.p7b similarity index 100% rename from aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostp/signature/openharmony_sx.p7b rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostl/signature/openharmony_sx.p7b diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostn/BUILD.gn b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostn/BUILD.gn similarity index 100% rename from aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostn/BUILD.gn rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostn/BUILD.gn diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostn/Test.json b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostn/Test.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostn/Test.json rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostn/Test.json diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostn/entry/src/main/config.json b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostn/entry/src/main/config.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostn/entry/src/main/config.json rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostn/entry/src/main/config.json diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostn/entry/src/main/ets/MainAbility/app.ets b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostn/entry/src/main/ets/MainAbility/app.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostn/entry/src/main/ets/MainAbility/app.ets rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostn/entry/src/main/ets/MainAbility/app.ets diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostn/entry/src/main/ets/MainAbility/pages/index.ets b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostn/entry/src/main/ets/MainAbility/pages/index.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostn/entry/src/main/ets/MainAbility/pages/index.ets rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostn/entry/src/main/ets/MainAbility/pages/index.ets diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostn/entry/src/main/resources/base/element/string.json b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostn/entry/src/main/resources/base/element/string.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostn/entry/src/main/resources/base/element/string.json rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostn/entry/src/main/resources/base/element/string.json diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationA/entry/src/main/resources/base/media/icon.png b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostn/entry/src/main/resources/base/media/icon.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationA/entry/src/main/resources/base/media/icon.png rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostn/entry/src/main/resources/base/media/icon.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationA/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostn/signature/openharmony_sx.p7b similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationA/signature/openharmony_sx.p7b rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostn/signature/openharmony_sx.p7b diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostnoperm/BUILD.gn b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostnoperm/BUILD.gn similarity index 100% rename from aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostnoperm/BUILD.gn rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostnoperm/BUILD.gn diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostnoperm/Test.json b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostnoperm/Test.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostnoperm/Test.json rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostnoperm/Test.json diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostnoperm/entry/src/main/config.json b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostnoperm/entry/src/main/config.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostnoperm/entry/src/main/config.json rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostnoperm/entry/src/main/config.json diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostnoperm/entry/src/main/ets/MainAbility/app.ets b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostnoperm/entry/src/main/ets/MainAbility/app.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostnoperm/entry/src/main/ets/MainAbility/app.ets rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostnoperm/entry/src/main/ets/MainAbility/app.ets diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostnoperm/entry/src/main/ets/MainAbility/pages/FormViewModel.ets b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostnoperm/entry/src/main/ets/MainAbility/pages/FormViewModel.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostnoperm/entry/src/main/ets/MainAbility/pages/FormViewModel.ets rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostnoperm/entry/src/main/ets/MainAbility/pages/FormViewModel.ets diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostnoperm/entry/src/main/ets/MainAbility/pages/index.ets b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostnoperm/entry/src/main/ets/MainAbility/pages/index.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostnoperm/entry/src/main/ets/MainAbility/pages/index.ets rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostnoperm/entry/src/main/ets/MainAbility/pages/index.ets diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostnoperm/entry/src/main/resources/base/element/string.json b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostnoperm/entry/src/main/resources/base/element/string.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostnoperm/entry/src/main/resources/base/element/string.json rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostnoperm/entry/src/main/resources/base/element/string.json diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationB/entry/src/main/resources/base/media/icon.png b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostnoperm/entry/src/main/resources/base/media/icon.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationB/entry/src/main/resources/base/media/icon.png rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostnoperm/entry/src/main/resources/base/media/icon.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationB/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostnoperm/signature/openharmony_sx.p7b similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationB/signature/openharmony_sx.p7b rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostnoperm/signature/openharmony_sx.p7b diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhosto/BUILD.gn b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhosto/BUILD.gn similarity index 100% rename from aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhosto/BUILD.gn rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhosto/BUILD.gn diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhosto/Test.json b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhosto/Test.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhosto/Test.json rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhosto/Test.json diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhosto/entry/src/main/config.json b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhosto/entry/src/main/config.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhosto/entry/src/main/config.json rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhosto/entry/src/main/config.json diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhosto/entry/src/main/ets/MainAbility/app.ets b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhosto/entry/src/main/ets/MainAbility/app.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhosto/entry/src/main/ets/MainAbility/app.ets rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhosto/entry/src/main/ets/MainAbility/app.ets diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhosto/entry/src/main/ets/MainAbility/pages/index.ets b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhosto/entry/src/main/ets/MainAbility/pages/index.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhosto/entry/src/main/ets/MainAbility/pages/index.ets rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhosto/entry/src/main/ets/MainAbility/pages/index.ets diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhosto/entry/src/main/resources/base/element/string.json b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhosto/entry/src/main/resources/base/element/string.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhosto/entry/src/main/resources/base/element/string.json rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhosto/entry/src/main/resources/base/element/string.json diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationD/entry/src/main/resources/base/media/icon.png b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhosto/entry/src/main/resources/base/media/icon.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationD/entry/src/main/resources/base/media/icon.png rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhosto/entry/src/main/resources/base/media/icon.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationD/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhosto/signature/openharmony_sx.p7b similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationD/signature/openharmony_sx.p7b rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhosto/signature/openharmony_sx.p7b diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostp/BUILD.gn b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostp/BUILD.gn similarity index 100% rename from aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostp/BUILD.gn rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostp/BUILD.gn diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostp/Test.json b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostp/Test.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostp/Test.json rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostp/Test.json diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostp/entry/src/main/config.json b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostp/entry/src/main/config.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostp/entry/src/main/config.json rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostp/entry/src/main/config.json diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostp/entry/src/main/ets/MainAbility/app.ets b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostp/entry/src/main/ets/MainAbility/app.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostp/entry/src/main/ets/MainAbility/app.ets rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostp/entry/src/main/ets/MainAbility/app.ets diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostp/entry/src/main/ets/MainAbility/pages/index.ets b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostp/entry/src/main/ets/MainAbility/pages/index.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostp/entry/src/main/ets/MainAbility/pages/index.ets rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostp/entry/src/main/ets/MainAbility/pages/index.ets diff --git a/aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostp/entry/src/main/resources/base/element/string.json b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostp/entry/src/main/resources/base/element/string.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formhostst_ets/formsystemhostp/entry/src/main/resources/base/element/string.json rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostp/entry/src/main/resources/base/element/string.json diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationE/entry/src/main/resources/base/media/icon.png b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostp/entry/src/main/resources/base/media/icon.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationE/entry/src/main/resources/base/media/icon.png rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostp/entry/src/main/resources/base/media/icon.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationE/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostp/signature/openharmony_sx.p7b similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationE/signature/openharmony_sx.p7b rename to aafwk/aafwk_standard/formmanager/fa/formhostst_ets/formsystemhostp/signature/openharmony_sx.p7b diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationA/BUILD.gn b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationA/BUILD.gn similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationA/BUILD.gn rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationA/BUILD.gn diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationA/Test.json b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationA/Test.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationA/Test.json rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationA/Test.json diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationA/entry/src/main/config.json b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationA/entry/src/main/config.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationA/entry/src/main/config.json rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationA/entry/src/main/config.json diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationA/entry/src/main/ets/FormAbility/form.ts b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationA/entry/src/main/ets/FormAbility/form.ts similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationA/entry/src/main/ets/FormAbility/form.ts rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationA/entry/src/main/ets/FormAbility/form.ts diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationA/entry/src/main/ets/MainAbility/app.ets b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationA/entry/src/main/ets/MainAbility/app.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationA/entry/src/main/ets/MainAbility/app.ets rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationA/entry/src/main/ets/MainAbility/app.ets diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationA/entry/src/main/ets/MainAbility/pages/index.ets b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationA/entry/src/main/ets/MainAbility/pages/index.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationA/entry/src/main/ets/MainAbility/pages/index.ets rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationA/entry/src/main/ets/MainAbility/pages/index.ets diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationA/entry/src/main/ets/MainAbility/pages/second.ets b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationA/entry/src/main/ets/MainAbility/pages/second.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationA/entry/src/main/ets/MainAbility/pages/second.ets rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationA/entry/src/main/ets/MainAbility/pages/second.ets diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationA/entry/src/main/js/Form_Js001/pages/index/index.css b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationA/entry/src/main/js/Form_Js001/pages/index/index.css similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationA/entry/src/main/js/Form_Js001/pages/index/index.css rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationA/entry/src/main/js/Form_Js001/pages/index/index.css diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationA/entry/src/main/js/Form_Js001/pages/index/index.hml b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationA/entry/src/main/js/Form_Js001/pages/index/index.hml similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationA/entry/src/main/js/Form_Js001/pages/index/index.hml rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationA/entry/src/main/js/Form_Js001/pages/index/index.hml diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationA/entry/src/main/js/Form_Js001/pages/index/index.json b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationA/entry/src/main/js/Form_Js001/pages/index/index.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationA/entry/src/main/js/Form_Js001/pages/index/index.json rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationA/entry/src/main/js/Form_Js001/pages/index/index.json diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationA/entry/src/main/resources/base/element/string.json b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationA/entry/src/main/resources/base/element/string.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationA/entry/src/main/resources/base/element/string.json rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationA/entry/src/main/resources/base/element/string.json diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationF/entry/src/main/resources/base/media/icon.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationA/entry/src/main/resources/base/media/icon.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationF/entry/src/main/resources/base/media/icon.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationA/entry/src/main/resources/base/media/icon.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationF/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationA/signature/openharmony_sx.p7b similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationF/signature/openharmony_sx.p7b rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationA/signature/openharmony_sx.p7b diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationB/BUILD.gn b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationB/BUILD.gn similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationB/BUILD.gn rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationB/BUILD.gn diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationB/Test.json b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationB/Test.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationB/Test.json rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationB/Test.json diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationB/entry/src/main/config.json b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationB/entry/src/main/config.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationB/entry/src/main/config.json rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationB/entry/src/main/config.json diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationB/entry/src/main/ets/FormAbility/form.ts b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationB/entry/src/main/ets/FormAbility/form.ts similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationB/entry/src/main/ets/FormAbility/form.ts rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationB/entry/src/main/ets/FormAbility/form.ts diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationB/entry/src/main/ets/MainAbility/app.ets b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationB/entry/src/main/ets/MainAbility/app.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationB/entry/src/main/ets/MainAbility/app.ets rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationB/entry/src/main/ets/MainAbility/app.ets diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationB/entry/src/main/ets/MainAbility/pages/index.ets b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationB/entry/src/main/ets/MainAbility/pages/index.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationB/entry/src/main/ets/MainAbility/pages/index.ets rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationB/entry/src/main/ets/MainAbility/pages/index.ets diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/image_1.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/image_1.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/image_1.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/image_1.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/image_2.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/image_2.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/image_2.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/image_2.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/close.svg b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/close.svg similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/close.svg rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/close.svg diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/ic_HD1.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/ic_HD1.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/ic_HD1.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/ic_HD1.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/ic_box.svg b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/ic_box.svg similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/ic_box.svg rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/ic_box.svg diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/ic_box1.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/ic_box1.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/ic_box1.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/ic_box1.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/ic_default_image.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/ic_default_image.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/ic_default_image.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/ic_default_image.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/ic_default_image@3x.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/ic_default_image@3x.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/ic_default_image@3x.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/ic_default_image@3x.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/ic_default_white.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/ic_default_white.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/ic_default_white.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/ic_default_white.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/ic_device_earphone_hero_filled.svg b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/ic_device_earphone_hero_filled.svg similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/ic_device_earphone_hero_filled.svg rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/ic_device_earphone_hero_filled.svg diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/ic_device_earphone_hero_filled1.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/ic_device_earphone_hero_filled1.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/ic_device_earphone_hero_filled1.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/ic_device_earphone_hero_filled1.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/ic_list.svg b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/ic_list.svg similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/ic_list.svg rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/ic_list.svg diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/ic_pad.svg b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/ic_pad.svg similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/ic_pad.svg rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/ic_pad.svg diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/ic_pad1.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/ic_pad1.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/ic_pad1.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/ic_pad1.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/ic_pc.svg b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/ic_pc.svg similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/ic_pc.svg rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/ic_pc.svg diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/ic_pc1.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/ic_pc1.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/ic_pc1.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/ic_pc1.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/ic_public_search.svg b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/ic_public_search.svg similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/ic_public_search.svg rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/ic_public_search.svg diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/ic_selfie.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/ic_selfie.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/ic_selfie.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/ic_selfie.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/ic_tv.svg b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/ic_tv.svg similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/ic_tv.svg rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/ic_tv.svg diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/ic_vision.svg b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/ic_vision.svg similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/ic_vision.svg rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/ic_vision.svg diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/search.svg b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/search.svg similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/search.svg rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/search.svg diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/superdevice.svg b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/superdevice.svg similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/superdevice.svg rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/superdevice.svg diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/template.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/template.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/template.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/common/img/template.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/manifest.json b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/manifest.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/manifest.json rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/manifest.json diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/pages/index/index.json b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/pages/index/index.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/pages/index/index.json rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationB/entry/src/main/js/widget/pages/index/index.json diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationB/entry/src/main/resources/base/element/string.json b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationB/entry/src/main/resources/base/element/string.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationB/entry/src/main/resources/base/element/string.json rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationB/entry/src/main/resources/base/element/string.json diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationG/entry/src/main/resources/base/media/icon.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationB/entry/src/main/resources/base/media/icon.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationG/entry/src/main/resources/base/media/icon.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationB/entry/src/main/resources/base/media/icon.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationG/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationB/signature/openharmony_sx.p7b similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationG/signature/openharmony_sx.p7b rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationB/signature/openharmony_sx.p7b diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationD/BUILD.gn b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationD/BUILD.gn similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationD/BUILD.gn rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationD/BUILD.gn diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationD/Test.json b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationD/Test.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationD/Test.json rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationD/Test.json diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationD/entry/src/main/config.json b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationD/entry/src/main/config.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationD/entry/src/main/config.json rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationD/entry/src/main/config.json diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationD/entry/src/main/ets/FormAbility/form.ts b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationD/entry/src/main/ets/FormAbility/form.ts similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationD/entry/src/main/ets/FormAbility/form.ts rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationD/entry/src/main/ets/FormAbility/form.ts diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationD/entry/src/main/ets/MainAbility/app.ets b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationD/entry/src/main/ets/MainAbility/app.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationD/entry/src/main/ets/MainAbility/app.ets rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationD/entry/src/main/ets/MainAbility/app.ets diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationD/entry/src/main/ets/MainAbility/pages/index.ets b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationD/entry/src/main/ets/MainAbility/pages/index.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationD/entry/src/main/ets/MainAbility/pages/index.ets rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationD/entry/src/main/ets/MainAbility/pages/index.ets diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/image_1.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/image_1.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/image_1.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/image_1.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/image_2.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/image_2.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/image_2.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/image_2.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/close.svg b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/close.svg similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/close.svg rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/close.svg diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/ic_HD1.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/ic_HD1.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/ic_HD1.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/ic_HD1.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/ic_box.svg b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/ic_box.svg similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/ic_box.svg rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/ic_box.svg diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/ic_box1.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/ic_box1.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/ic_box1.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/ic_box1.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/ic_default_image.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/ic_default_image.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/ic_default_image.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/ic_default_image.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/ic_default_image@3x.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/ic_default_image@3x.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/ic_default_image@3x.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/ic_default_image@3x.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/ic_default_white.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/ic_default_white.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/ic_default_white.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/ic_default_white.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/ic_device_earphone_hero_filled.svg b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/ic_device_earphone_hero_filled.svg similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/ic_device_earphone_hero_filled.svg rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/ic_device_earphone_hero_filled.svg diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/ic_device_earphone_hero_filled1.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/ic_device_earphone_hero_filled1.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/ic_device_earphone_hero_filled1.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/ic_device_earphone_hero_filled1.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/ic_list.svg b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/ic_list.svg similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/ic_list.svg rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/ic_list.svg diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/ic_pad.svg b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/ic_pad.svg similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/ic_pad.svg rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/ic_pad.svg diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/ic_pad1.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/ic_pad1.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/ic_pad1.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/ic_pad1.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/ic_pc.svg b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/ic_pc.svg similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/ic_pc.svg rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/ic_pc.svg diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/ic_pc1.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/ic_pc1.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/ic_pc1.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/ic_pc1.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/ic_public_search.svg b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/ic_public_search.svg similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/ic_public_search.svg rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/ic_public_search.svg diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/ic_selfie.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/ic_selfie.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/ic_selfie.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/ic_selfie.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/ic_tv.svg b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/ic_tv.svg similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/ic_tv.svg rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/ic_tv.svg diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/ic_vision.svg b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/ic_vision.svg similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/ic_vision.svg rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/ic_vision.svg diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/search.svg b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/search.svg similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/search.svg rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/search.svg diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/superdevice.svg b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/superdevice.svg similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/superdevice.svg rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/superdevice.svg diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/template.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/template.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/template.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/common/img/template.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/manifest.json b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/manifest.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/manifest.json rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/manifest.json diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/pages/index/index.json b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/pages/index/index.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/pages/index/index.json rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationD/entry/src/main/js/widget/pages/index/index.json diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationD/entry/src/main/resources/base/element/string.json b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationD/entry/src/main/resources/base/element/string.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationD/entry/src/main/resources/base/element/string.json rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationD/entry/src/main/resources/base/element/string.json diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationH/entry/src/main/resources/base/media/icon.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationD/entry/src/main/resources/base/media/icon.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationH/entry/src/main/resources/base/media/icon.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationD/entry/src/main/resources/base/media/icon.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationH/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationD/signature/openharmony_sx.p7b similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationH/signature/openharmony_sx.p7b rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationD/signature/openharmony_sx.p7b diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationE/BUILD.gn b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationE/BUILD.gn similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationE/BUILD.gn rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationE/BUILD.gn diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationE/Test.json b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationE/Test.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationE/Test.json rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationE/Test.json diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationE/entry/src/main/config.json b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationE/entry/src/main/config.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationE/entry/src/main/config.json rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationE/entry/src/main/config.json diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationE/entry/src/main/ets/FormAbility/form.ts b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationE/entry/src/main/ets/FormAbility/form.ts similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationE/entry/src/main/ets/FormAbility/form.ts rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationE/entry/src/main/ets/FormAbility/form.ts diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationE/entry/src/main/ets/MainAbility/app.ets b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationE/entry/src/main/ets/MainAbility/app.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationE/entry/src/main/ets/MainAbility/app.ets rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationE/entry/src/main/ets/MainAbility/app.ets diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationE/entry/src/main/ets/MainAbility/pages/index.ets b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationE/entry/src/main/ets/MainAbility/pages/index.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationE/entry/src/main/ets/MainAbility/pages/index.ets rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationE/entry/src/main/ets/MainAbility/pages/index.ets diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationE/entry/src/main/ets/MainAbility/pages/second.ets b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationE/entry/src/main/ets/MainAbility/pages/second.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationE/entry/src/main/ets/MainAbility/pages/second.ets rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationE/entry/src/main/ets/MainAbility/pages/second.ets diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/image_1.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/image_1.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/image_1.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/image_1.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/image_2.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/image_2.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/image_2.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/image_2.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/close.svg b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/close.svg similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/close.svg rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/close.svg diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/ic_HD1.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/ic_HD1.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/ic_HD1.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/ic_HD1.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/ic_box.svg b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/ic_box.svg similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/ic_box.svg rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/ic_box.svg diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/ic_box1.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/ic_box1.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/ic_box1.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/ic_box1.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/ic_default_image.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/ic_default_image.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/ic_default_image.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/ic_default_image.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/ic_default_image@3x.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/ic_default_image@3x.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/ic_default_image@3x.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/ic_default_image@3x.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/ic_default_white.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/ic_default_white.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/ic_default_white.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/ic_default_white.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/ic_device_earphone_hero_filled.svg b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/ic_device_earphone_hero_filled.svg similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/ic_device_earphone_hero_filled.svg rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/ic_device_earphone_hero_filled.svg diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/ic_device_earphone_hero_filled1.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/ic_device_earphone_hero_filled1.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/ic_device_earphone_hero_filled1.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/ic_device_earphone_hero_filled1.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/ic_list.svg b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/ic_list.svg similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/ic_list.svg rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/ic_list.svg diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/ic_pad.svg b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/ic_pad.svg similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/ic_pad.svg rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/ic_pad.svg diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/ic_pad1.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/ic_pad1.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/ic_pad1.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/ic_pad1.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/ic_pc.svg b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/ic_pc.svg similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/ic_pc.svg rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/ic_pc.svg diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/ic_pc1.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/ic_pc1.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/ic_pc1.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/ic_pc1.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/ic_public_search.svg b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/ic_public_search.svg similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/ic_public_search.svg rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/ic_public_search.svg diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/ic_selfie.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/ic_selfie.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/ic_selfie.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/ic_selfie.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/ic_tv.svg b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/ic_tv.svg similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/ic_tv.svg rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/ic_tv.svg diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/ic_vision.svg b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/ic_vision.svg similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/ic_vision.svg rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/ic_vision.svg diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/search.svg b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/search.svg similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/search.svg rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/search.svg diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/superdevice.svg b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/superdevice.svg similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/superdevice.svg rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/superdevice.svg diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/template.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/template.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/template.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/common/img/template.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/manifest.json b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/manifest.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/manifest.json rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/manifest.json diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/pages/index/index.json b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/pages/index/index.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/pages/index/index.json rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationE/entry/src/main/js/widget/pages/index/index.json diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationE/entry/src/main/resources/base/element/string.json b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationE/entry/src/main/resources/base/element/string.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationE/entry/src/main/resources/base/element/string.json rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationE/entry/src/main/resources/base/element/string.json diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationNotSysApp/entry/src/main/resources/base/media/icon.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationE/entry/src/main/resources/base/media/icon.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationNotSysApp/entry/src/main/resources/base/media/icon.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationE/entry/src/main/resources/base/media/icon.png diff --git a/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationE/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationE/signature/openharmony_sx.p7b new file mode 100644 index 0000000000000000000000000000000000000000..6084de2e92d6f254a93a654b02701870bef66d31 Binary files /dev/null and b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationE/signature/openharmony_sx.p7b differ diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationF/BUILD.gn b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationF/BUILD.gn similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationF/BUILD.gn rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationF/BUILD.gn diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationF/Test.json b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationF/Test.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationF/Test.json rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationF/Test.json diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationF/entry/src/main/config.json b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationF/entry/src/main/config.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationF/entry/src/main/config.json rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationF/entry/src/main/config.json diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationF/entry/src/main/ets/FormAbility/form.ts b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationF/entry/src/main/ets/FormAbility/form.ts similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationF/entry/src/main/ets/FormAbility/form.ts rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationF/entry/src/main/ets/FormAbility/form.ts diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationF/entry/src/main/ets/MainAbility/app.ets b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationF/entry/src/main/ets/MainAbility/app.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationF/entry/src/main/ets/MainAbility/app.ets rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationF/entry/src/main/ets/MainAbility/app.ets diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationF/entry/src/main/ets/MainAbility/pages/index.ets b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationF/entry/src/main/ets/MainAbility/pages/index.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationF/entry/src/main/ets/MainAbility/pages/index.ets rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationF/entry/src/main/ets/MainAbility/pages/index.ets diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationF/entry/src/main/ets/MainAbility/pages/second.ets b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationF/entry/src/main/ets/MainAbility/pages/second.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationF/entry/src/main/ets/MainAbility/pages/second.ets rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationF/entry/src/main/ets/MainAbility/pages/second.ets diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/image_1.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/image_1.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/image_1.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/image_1.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/image_2.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/image_2.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/image_2.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/image_2.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/close.svg b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/close.svg similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/close.svg rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/close.svg diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/ic_HD1.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/ic_HD1.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/ic_HD1.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/ic_HD1.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/ic_box.svg b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/ic_box.svg similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/ic_box.svg rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/ic_box.svg diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/ic_box1.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/ic_box1.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/ic_box1.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/ic_box1.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/ic_default_image.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/ic_default_image.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/ic_default_image.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/ic_default_image.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/ic_default_image@3x.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/ic_default_image@3x.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/ic_default_image@3x.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/ic_default_image@3x.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/ic_default_white.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/ic_default_white.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/ic_default_white.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/ic_default_white.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/ic_device_earphone_hero_filled.svg b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/ic_device_earphone_hero_filled.svg similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/ic_device_earphone_hero_filled.svg rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/ic_device_earphone_hero_filled.svg diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/ic_device_earphone_hero_filled1.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/ic_device_earphone_hero_filled1.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/ic_device_earphone_hero_filled1.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/ic_device_earphone_hero_filled1.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/ic_list.svg b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/ic_list.svg similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/ic_list.svg rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/ic_list.svg diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/ic_pad.svg b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/ic_pad.svg similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/ic_pad.svg rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/ic_pad.svg diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/ic_pad1.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/ic_pad1.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/ic_pad1.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/ic_pad1.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/ic_pc.svg b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/ic_pc.svg similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/ic_pc.svg rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/ic_pc.svg diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/ic_pc1.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/ic_pc1.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/ic_pc1.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/ic_pc1.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/ic_public_search.svg b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/ic_public_search.svg similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/ic_public_search.svg rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/ic_public_search.svg diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/ic_selfie.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/ic_selfie.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/ic_selfie.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/ic_selfie.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/ic_tv.svg b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/ic_tv.svg similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/ic_tv.svg rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/ic_tv.svg diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/ic_vision.svg b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/ic_vision.svg similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/ic_vision.svg rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/ic_vision.svg diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/search.svg b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/search.svg similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/search.svg rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/search.svg diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/superdevice.svg b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/superdevice.svg similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/superdevice.svg rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/superdevice.svg diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/template.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/template.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/template.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/common/img/template.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/manifest.json b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/manifest.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/manifest.json rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/manifest.json diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/pages/index/index.json b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/pages/index/index.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/pages/index/index.json rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationF/entry/src/main/js/Form_Js001/pages/index/index.json diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationF/entry/src/main/resources/base/element/string.json b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationF/entry/src/main/resources/base/element/string.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationF/entry/src/main/resources/base/element/string.json rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationF/entry/src/main/resources/base/element/string.json diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsystemprovidera/entry/src/main/resources/base/media/icon.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationF/entry/src/main/resources/base/media/icon.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsystemprovidera/entry/src/main/resources/base/media/icon.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationF/entry/src/main/resources/base/media/icon.png diff --git a/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationF/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationF/signature/openharmony_sx.p7b new file mode 100644 index 0000000000000000000000000000000000000000..6084de2e92d6f254a93a654b02701870bef66d31 Binary files /dev/null and b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationF/signature/openharmony_sx.p7b differ diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationG/BUILD.gn b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationG/BUILD.gn similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationG/BUILD.gn rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationG/BUILD.gn diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationG/Test.json b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationG/Test.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationG/Test.json rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationG/Test.json diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationG/entry/src/main/config.json b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationG/entry/src/main/config.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationG/entry/src/main/config.json rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationG/entry/src/main/config.json diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationG/entry/src/main/ets/FormAbility/form.ts b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationG/entry/src/main/ets/FormAbility/form.ts similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationG/entry/src/main/ets/FormAbility/form.ts rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationG/entry/src/main/ets/FormAbility/form.ts diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationG/entry/src/main/ets/MainAbility/app.ets b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationG/entry/src/main/ets/MainAbility/app.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationG/entry/src/main/ets/MainAbility/app.ets rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationG/entry/src/main/ets/MainAbility/app.ets diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationG/entry/src/main/ets/MainAbility/pages/index.ets b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationG/entry/src/main/ets/MainAbility/pages/index.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationG/entry/src/main/ets/MainAbility/pages/index.ets rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationG/entry/src/main/ets/MainAbility/pages/index.ets diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationG/entry/src/main/ets/MainAbility/pages/second.ets b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationG/entry/src/main/ets/MainAbility/pages/second.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationG/entry/src/main/ets/MainAbility/pages/second.ets rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationG/entry/src/main/ets/MainAbility/pages/second.ets diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/image_1.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/image_1.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/image_1.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/image_1.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/image_2.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/image_2.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/image_2.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/image_2.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/close.svg b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/close.svg similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/close.svg rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/close.svg diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/ic_HD1.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/ic_HD1.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/ic_HD1.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/ic_HD1.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/ic_box.svg b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/ic_box.svg similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/ic_box.svg rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/ic_box.svg diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/ic_box1.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/ic_box1.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/ic_box1.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/ic_box1.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/ic_default_image.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/ic_default_image.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/ic_default_image.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/ic_default_image.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/ic_default_image@3x.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/ic_default_image@3x.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/ic_default_image@3x.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/ic_default_image@3x.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/ic_default_white.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/ic_default_white.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/ic_default_white.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/ic_default_white.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/ic_device_earphone_hero_filled.svg b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/ic_device_earphone_hero_filled.svg similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/ic_device_earphone_hero_filled.svg rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/ic_device_earphone_hero_filled.svg diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/ic_device_earphone_hero_filled1.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/ic_device_earphone_hero_filled1.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/ic_device_earphone_hero_filled1.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/ic_device_earphone_hero_filled1.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/ic_list.svg b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/ic_list.svg similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/ic_list.svg rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/ic_list.svg diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/ic_pad.svg b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/ic_pad.svg similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/ic_pad.svg rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/ic_pad.svg diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/ic_pad1.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/ic_pad1.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/ic_pad1.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/ic_pad1.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/ic_pc.svg b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/ic_pc.svg similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/ic_pc.svg rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/ic_pc.svg diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/ic_pc1.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/ic_pc1.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/ic_pc1.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/ic_pc1.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/ic_public_search.svg b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/ic_public_search.svg similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/ic_public_search.svg rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/ic_public_search.svg diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/ic_selfie.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/ic_selfie.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/ic_selfie.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/ic_selfie.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/ic_tv.svg b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/ic_tv.svg similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/ic_tv.svg rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/ic_tv.svg diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/ic_vision.svg b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/ic_vision.svg similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/ic_vision.svg rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/ic_vision.svg diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/search.svg b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/search.svg similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/search.svg rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/search.svg diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/superdevice.svg b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/superdevice.svg similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/superdevice.svg rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/superdevice.svg diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/template.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/template.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/template.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/common/img/template.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/manifest.json b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/manifest.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/manifest.json rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/manifest.json diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/pages/index/index.json b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/pages/index/index.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/pages/index/index.json rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationG/entry/src/main/js/Form_Js001/pages/index/index.json diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationG/entry/src/main/resources/base/element/string.json b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationG/entry/src/main/resources/base/element/string.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationG/entry/src/main/resources/base/element/string.json rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationG/entry/src/main/resources/base/element/string.json diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsystemproviderb/entry/src/main/resources/base/media/icon.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationG/entry/src/main/resources/base/media/icon.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsystemproviderb/entry/src/main/resources/base/media/icon.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationG/entry/src/main/resources/base/media/icon.png diff --git a/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationG/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationG/signature/openharmony_sx.p7b new file mode 100644 index 0000000000000000000000000000000000000000..6084de2e92d6f254a93a654b02701870bef66d31 Binary files /dev/null and b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationG/signature/openharmony_sx.p7b differ diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationH/BUILD.gn b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationH/BUILD.gn similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationH/BUILD.gn rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationH/BUILD.gn diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationH/Test.json b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationH/Test.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationH/Test.json rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationH/Test.json diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationH/entry/src/main/config.json b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationH/entry/src/main/config.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationH/entry/src/main/config.json rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationH/entry/src/main/config.json diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationH/entry/src/main/ets/FormAbility/form.ts b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationH/entry/src/main/ets/FormAbility/form.ts similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationH/entry/src/main/ets/FormAbility/form.ts rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationH/entry/src/main/ets/FormAbility/form.ts diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationH/entry/src/main/ets/MainAbility/app.ets b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationH/entry/src/main/ets/MainAbility/app.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationH/entry/src/main/ets/MainAbility/app.ets rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationH/entry/src/main/ets/MainAbility/app.ets diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationH/entry/src/main/ets/MainAbility/pages/index.ets b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationH/entry/src/main/ets/MainAbility/pages/index.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationH/entry/src/main/ets/MainAbility/pages/index.ets rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationH/entry/src/main/ets/MainAbility/pages/index.ets diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationH/entry/src/main/ets/MainAbility/pages/second.ets b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationH/entry/src/main/ets/MainAbility/pages/second.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationH/entry/src/main/ets/MainAbility/pages/second.ets rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationH/entry/src/main/ets/MainAbility/pages/second.ets diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/image_1.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/image_1.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/image_1.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/image_1.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/image_2.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/image_2.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/image_2.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/image_2.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/close.svg b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/close.svg similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/close.svg rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/close.svg diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/ic_HD1.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/ic_HD1.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/ic_HD1.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/ic_HD1.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/ic_box.svg b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/ic_box.svg similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/ic_box.svg rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/ic_box.svg diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/ic_box1.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/ic_box1.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/ic_box1.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/ic_box1.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/ic_default_image.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/ic_default_image.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/ic_default_image.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/ic_default_image.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/ic_default_image@3x.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/ic_default_image@3x.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/ic_default_image@3x.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/ic_default_image@3x.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/ic_default_white.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/ic_default_white.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/ic_default_white.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/ic_default_white.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/ic_device_earphone_hero_filled.svg b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/ic_device_earphone_hero_filled.svg similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/ic_device_earphone_hero_filled.svg rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/ic_device_earphone_hero_filled.svg diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/ic_device_earphone_hero_filled1.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/ic_device_earphone_hero_filled1.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/ic_device_earphone_hero_filled1.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/ic_device_earphone_hero_filled1.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/ic_list.svg b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/ic_list.svg similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/ic_list.svg rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/ic_list.svg diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/ic_pad.svg b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/ic_pad.svg similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/ic_pad.svg rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/ic_pad.svg diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/ic_pad1.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/ic_pad1.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/ic_pad1.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/ic_pad1.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/ic_pc.svg b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/ic_pc.svg similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/ic_pc.svg rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/ic_pc.svg diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/ic_pc1.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/ic_pc1.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/ic_pc1.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/ic_pc1.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/ic_public_search.svg b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/ic_public_search.svg similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/ic_public_search.svg rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/ic_public_search.svg diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/ic_selfie.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/ic_selfie.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/ic_selfie.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/ic_selfie.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/ic_tv.svg b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/ic_tv.svg similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/ic_tv.svg rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/ic_tv.svg diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/ic_vision.svg b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/ic_vision.svg similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/ic_vision.svg rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/ic_vision.svg diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/search.svg b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/search.svg similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/search.svg rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/search.svg diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/superdevice.svg b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/superdevice.svg similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/superdevice.svg rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/superdevice.svg diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/template.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/template.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/template.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/common/img/template.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/manifest.json b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/manifest.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/manifest.json rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/manifest.json diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/pages/index/index.json b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/pages/index/index.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/pages/index/index.json rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationH/entry/src/main/js/widget/pages/index/index.json diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationH/entry/src/main/resources/base/element/string.json b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationH/entry/src/main/resources/base/element/string.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationH/entry/src/main/resources/base/element/string.json rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationH/entry/src/main/resources/base/element/string.json diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsystemproviderc/entry/src/main/resources/base/media/icon.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationH/entry/src/main/resources/base/media/icon.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsystemproviderc/entry/src/main/resources/base/media/icon.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationH/entry/src/main/resources/base/media/icon.png diff --git a/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationH/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationH/signature/openharmony_sx.p7b new file mode 100644 index 0000000000000000000000000000000000000000..6084de2e92d6f254a93a654b02701870bef66d31 Binary files /dev/null and b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationH/signature/openharmony_sx.p7b differ diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationNotSysApp/BUILD.gn b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationNotSysApp/BUILD.gn similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationNotSysApp/BUILD.gn rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationNotSysApp/BUILD.gn diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationNotSysApp/Test.json b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationNotSysApp/Test.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationNotSysApp/Test.json rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationNotSysApp/Test.json diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationNotSysApp/entry/src/main/config.json b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationNotSysApp/entry/src/main/config.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationNotSysApp/entry/src/main/config.json rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationNotSysApp/entry/src/main/config.json diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationNotSysApp/entry/src/main/ets/FormAbility/form.ts b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationNotSysApp/entry/src/main/ets/FormAbility/form.ts similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationNotSysApp/entry/src/main/ets/FormAbility/form.ts rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationNotSysApp/entry/src/main/ets/FormAbility/form.ts diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationNotSysApp/entry/src/main/ets/MainAbility/app.ets b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationNotSysApp/entry/src/main/ets/MainAbility/app.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationNotSysApp/entry/src/main/ets/MainAbility/app.ets rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationNotSysApp/entry/src/main/ets/MainAbility/app.ets diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationNotSysApp/entry/src/main/ets/MainAbility/pages/index.ets b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationNotSysApp/entry/src/main/ets/MainAbility/pages/index.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationNotSysApp/entry/src/main/ets/MainAbility/pages/index.ets rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationNotSysApp/entry/src/main/ets/MainAbility/pages/index.ets diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationNotSysApp/entry/src/main/ets/MainAbility/pages/second.ets b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationNotSysApp/entry/src/main/ets/MainAbility/pages/second.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationNotSysApp/entry/src/main/ets/MainAbility/pages/second.ets rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationNotSysApp/entry/src/main/ets/MainAbility/pages/second.ets diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationNotSysApp/entry/src/main/js/Form_Js001/pages/index/index.css b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationNotSysApp/entry/src/main/js/Form_Js001/pages/index/index.css similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationNotSysApp/entry/src/main/js/Form_Js001/pages/index/index.css rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationNotSysApp/entry/src/main/js/Form_Js001/pages/index/index.css diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationNotSysApp/entry/src/main/js/Form_Js001/pages/index/index.hml b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationNotSysApp/entry/src/main/js/Form_Js001/pages/index/index.hml similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationNotSysApp/entry/src/main/js/Form_Js001/pages/index/index.hml rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationNotSysApp/entry/src/main/js/Form_Js001/pages/index/index.hml diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationNotSysApp/entry/src/main/js/Form_Js001/pages/index/index.json b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationNotSysApp/entry/src/main/js/Form_Js001/pages/index/index.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationNotSysApp/entry/src/main/js/Form_Js001/pages/index/index.json rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationNotSysApp/entry/src/main/js/Form_Js001/pages/index/index.json diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationNotSysApp/entry/src/main/resources/base/element/string.json b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationNotSysApp/entry/src/main/resources/base/element/string.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationNotSysApp/entry/src/main/resources/base/element/string.json rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationNotSysApp/entry/src/main/resources/base/element/string.json diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsystemproviderd/entry/src/main/resources/base/media/icon.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationNotSysApp/entry/src/main/resources/base/media/icon.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsystemproviderd/entry/src/main/resources/base/media/icon.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationNotSysApp/entry/src/main/resources/base/media/icon.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationNotSysApp/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationNotSysApp/signature/openharmony_sx.p7b similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsupplyapplicationNotSysApp/signature/openharmony_sx.p7b rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsupplyapplicationNotSysApp/signature/openharmony_sx.p7b diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsystemprovidera/BUILD.gn b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsystemprovidera/BUILD.gn similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsystemprovidera/BUILD.gn rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsystemprovidera/BUILD.gn diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsystemprovidera/Test.json b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsystemprovidera/Test.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsystemprovidera/Test.json rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsystemprovidera/Test.json diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsystemprovidera/entry/src/main/config.json b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsystemprovidera/entry/src/main/config.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsystemprovidera/entry/src/main/config.json rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsystemprovidera/entry/src/main/config.json diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsystemprovidera/entry/src/main/ets/MainAbility/app.ets b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsystemprovidera/entry/src/main/ets/MainAbility/app.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsystemprovidera/entry/src/main/ets/MainAbility/app.ets rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsystemprovidera/entry/src/main/ets/MainAbility/app.ets diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsystemprovidera/entry/src/main/ets/MainAbility/pages/index.ets b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsystemprovidera/entry/src/main/ets/MainAbility/pages/index.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsystemprovidera/entry/src/main/ets/MainAbility/pages/index.ets rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsystemprovidera/entry/src/main/ets/MainAbility/pages/index.ets diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsystemprovidera/entry/src/main/resources/base/element/string.json b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsystemprovidera/entry/src/main/resources/base/element/string.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsystemprovidera/entry/src/main/resources/base/element/string.json rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsystemprovidera/entry/src/main/resources/base/element/string.json diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formfuzztest/entry/src/main/resources/base/media/icon.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsystemprovidera/entry/src/main/resources/base/media/icon.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formfuzztest/entry/src/main/resources/base/media/icon.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsystemprovidera/entry/src/main/resources/base/media/icon.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsystemprovidera/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsystemprovidera/signature/openharmony_sx.p7b similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsystemprovidera/signature/openharmony_sx.p7b rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsystemprovidera/signature/openharmony_sx.p7b diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsystemproviderb/BUILD.gn b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsystemproviderb/BUILD.gn similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsystemproviderb/BUILD.gn rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsystemproviderb/BUILD.gn diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsystemproviderb/Test.json b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsystemproviderb/Test.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsystemproviderb/Test.json rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsystemproviderb/Test.json diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsystemproviderb/entry/src/main/config.json b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsystemproviderb/entry/src/main/config.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsystemproviderb/entry/src/main/config.json rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsystemproviderb/entry/src/main/config.json diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsystemproviderb/entry/src/main/ets/MainAbility/app.ets b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsystemproviderb/entry/src/main/ets/MainAbility/app.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsystemproviderb/entry/src/main/ets/MainAbility/app.ets rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsystemproviderb/entry/src/main/ets/MainAbility/app.ets diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsystemproviderb/entry/src/main/ets/MainAbility/pages/index.ets b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsystemproviderb/entry/src/main/ets/MainAbility/pages/index.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsystemproviderb/entry/src/main/ets/MainAbility/pages/index.ets rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsystemproviderb/entry/src/main/ets/MainAbility/pages/index.ets diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsystemproviderb/entry/src/main/resources/base/element/string.json b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsystemproviderb/entry/src/main/resources/base/element/string.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsystemproviderb/entry/src/main/resources/base/element/string.json rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsystemproviderb/entry/src/main/resources/base/element/string.json diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formsoneandonetest/entry/src/main/resources/base/media/icon.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsystemproviderb/entry/src/main/resources/base/media/icon.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formsoneandonetest/entry/src/main/resources/base/media/icon.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsystemproviderb/entry/src/main/resources/base/media/icon.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsystemproviderb/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsystemproviderb/signature/openharmony_sx.p7b similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsystemproviderb/signature/openharmony_sx.p7b rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsystemproviderb/signature/openharmony_sx.p7b diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsystemproviderc/BUILD.gn b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsystemproviderc/BUILD.gn similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsystemproviderc/BUILD.gn rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsystemproviderc/BUILD.gn diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsystemproviderc/Test.json b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsystemproviderc/Test.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsystemproviderc/Test.json rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsystemproviderc/Test.json diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsystemproviderc/entry/src/main/config.json b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsystemproviderc/entry/src/main/config.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsystemproviderc/entry/src/main/config.json rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsystemproviderc/entry/src/main/config.json diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsystemproviderc/entry/src/main/ets/MainAbility/app.ets b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsystemproviderc/entry/src/main/ets/MainAbility/app.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsystemproviderc/entry/src/main/ets/MainAbility/app.ets rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsystemproviderc/entry/src/main/ets/MainAbility/app.ets diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsystemproviderc/entry/src/main/ets/MainAbility/pages/index.ets b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsystemproviderc/entry/src/main/ets/MainAbility/pages/index.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsystemproviderc/entry/src/main/ets/MainAbility/pages/index.ets rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsystemproviderc/entry/src/main/ets/MainAbility/pages/index.ets diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsystemproviderc/entry/src/main/resources/base/element/string.json b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsystemproviderc/entry/src/main/resources/base/element/string.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsystemproviderc/entry/src/main/resources/base/element/string.json rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsystemproviderc/entry/src/main/resources/base/element/string.json diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formsoneandtwotest/entry/src/main/resources/base/media/icon.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsystemproviderc/entry/src/main/resources/base/media/icon.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formsoneandtwotest/entry/src/main/resources/base/media/icon.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsystemproviderc/entry/src/main/resources/base/media/icon.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsystemproviderc/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsystemproviderc/signature/openharmony_sx.p7b similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsystemproviderc/signature/openharmony_sx.p7b rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsystemproviderc/signature/openharmony_sx.p7b diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsystemproviderd/BUILD.gn b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsystemproviderd/BUILD.gn similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsystemproviderd/BUILD.gn rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsystemproviderd/BUILD.gn diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsystemproviderd/Test.json b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsystemproviderd/Test.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsystemproviderd/Test.json rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsystemproviderd/Test.json diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsystemproviderd/entry/src/main/config.json b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsystemproviderd/entry/src/main/config.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsystemproviderd/entry/src/main/config.json rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsystemproviderd/entry/src/main/config.json diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsystemproviderd/entry/src/main/ets/MainAbility/app.ets b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsystemproviderd/entry/src/main/ets/MainAbility/app.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsystemproviderd/entry/src/main/ets/MainAbility/app.ets rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsystemproviderd/entry/src/main/ets/MainAbility/app.ets diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsystemproviderd/entry/src/main/ets/MainAbility/pages/index.ets b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsystemproviderd/entry/src/main/ets/MainAbility/pages/index.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsystemproviderd/entry/src/main/ets/MainAbility/pages/index.ets rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsystemproviderd/entry/src/main/ets/MainAbility/pages/index.ets diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsystemproviderd/entry/src/main/resources/base/element/string.json b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsystemproviderd/entry/src/main/resources/base/element/string.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsystemproviderd/entry/src/main/resources/base/element/string.json rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsystemproviderd/entry/src/main/resources/base/element/string.json diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formsoneandzerotest/entry/src/main/resources/base/media/icon.png b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsystemproviderd/entry/src/main/resources/base/media/icon.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formsoneandzerotest/entry/src/main/resources/base/media/icon.png rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsystemproviderd/entry/src/main/resources/base/media/icon.png diff --git a/aafwk/aafwk_standard/formmanager/formproviderst_ets/formsystemproviderd/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsystemproviderd/signature/openharmony_sx.p7b similarity index 100% rename from aafwk/aafwk_standard/formmanager/formproviderst_ets/formsystemproviderd/signature/openharmony_sx.p7b rename to aafwk/aafwk_standard/formmanager/fa/formproviderst_ets/formsystemproviderd/signature/openharmony_sx.p7b diff --git a/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formacquiretest/BUILD.gn b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formacquiretest/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..c7564074f34966c611455769c83aebe1291ececc --- /dev/null +++ b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formacquiretest/BUILD.gn @@ -0,0 +1,32 @@ +# 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. + +import("//test/xts/tools/build/suite.gni") + +ohos_js_hap_suite("FormAcquireTest") { + hap_profile = "./entry/src/main/config.json" + deps = [ + ":hjs_demo_js_assets", + ":hjs_demo_resources", + ] + ets2abc = true + certificate_profile = "./signature/openharmony_sx.p7b" + hap_name = "FormAcquireTest" +} +ohos_js_assets("hjs_demo_js_assets") { + source_dir = "./entry/src/main/ets/MainAbility" +} +ohos_resources("hjs_demo_resources") { + sources = [ "./entry/src/main/resources" ] + hap_profile = "./entry/src/main/config.json" +} diff --git a/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formacquiretest/Test.json b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formacquiretest/Test.json new file mode 100644 index 0000000000000000000000000000000000000000..6acc04ea494f7a72e7eb635c970f61aeb859a024 --- /dev/null +++ b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formacquiretest/Test.json @@ -0,0 +1,23 @@ +{ + "description": "Configuration for hjunit demo Tests", + "driver": { + "type": "JSUnitTest", + "test-timeout": "300000", + "package": "com.ohos.st.formacquiretest", + "shell-timeout": "60000" + }, + "kits": [ + { + "test-file-name": [ + "FormAcquireTest.hap", + "FormSystemHost.hap", + "FormSystemHostB.hap", + "FormSystemHostNoPerm.hap", + "FormSupplyAppA.hap", + "FormSupplyAppE.hap" + ], + "type": "AppInstallKit", + "cleanup-apps": true + } + ] +} diff --git a/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formacquiretest/entry/src/main/config.json b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formacquiretest/entry/src/main/config.json new file mode 100644 index 0000000000000000000000000000000000000000..0ed03d198f22c595f73261f143dacdab72ff1ea6 --- /dev/null +++ b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formacquiretest/entry/src/main/config.json @@ -0,0 +1,141 @@ +{ + "app": { + "bundleName": "com.ohos.st.formacquiretest", + "vendor": "ohos", + "version": { + "code": 1000000, + "name": "1.0.0" + }, + "apiVersion": { + "compatible": 7, + "releaseType": "Release", + "target": 7 + } + }, + "deviceConfig": {}, + "module": { + "package": "com.ohos.st.formacquiretest", + "name": ".FormAcquireSTApp", + "mainAbility": ".MainAbility", + "deviceType": [ + "phone" + ], + "distro": { + "deliveryWithInstall": true, + "moduleName": "entry", + "moduleType": "entry", + "installationFree": false + }, + "abilities": [ + { + "skills": [ + { + "entities": [ + "entity.system.home" + ], + "actions": [ + "action.system.home" + ] + } + ], + "visible": true, + "name": ".MainAbility", + "srcLanguage": "ets", + "icon": "$media:icon", + "description": "$string:description_mainability", + "label": "$string:entry_MainAbility", + "type": "page", + "launchType": "standard" + } + ], + "defPermissions": [ + { + "availableScope": [], + "grantMode": "system_grant", + "name": "FMS_FormDelete_commonEvent" + }, + { + "availableScope": [], + "grantMode": "system_grant", + "name": "FMS_FormOnAcquired_commonEvent" + }, + { + "availableScope": [], + "grantMode": "system_grant", + "name": "FMS_FormOnError_commonEvent" + }, + { + "availableScope": [], + "grantMode": "system_grant", + "name": "FMS_FormCast_commonEvent" + }, + { + "availableScope": [], + "grantMode": "system_grant", + "name": "FMS_FormSupply_commonEvent" + } + ], + "reqPermissions": [ + { + "name": "FMS_FormOnAcquired_commonEvent", + "reason": "need use onAcquired commonEvent" + }, + { + "name": "FMS_FormDelete_commonEvent", + "reason": "need use delete commonEvent" + }, + { + "name": "FMS_FormOnError_commonEvent", + "reason": "need use OnError commonEvent" + }, + { + "name": "FMS_FormCast_commonEvent", + "reason": "need use castFrom commonEvent" + }, + { + "name": "FMS_FormSupply_commonEvent", + "reason": "need use FormSupply commonEvent" + }, + { + "name": "ohos.permission.INSTALL_BUNDLE", + "reason": "need use ohos.permission.INSTALL_BUNDLE" + }, + { + "name":"ohos.permission.GET_BUNDLE_INFO_PRIVILEGED", + "reason":"need use ohos.permission.GET_BUNDLE_INFO_PRIVILEGED" + }, + { + "name":"ohos.permission.CHANGE_ABILITY_ENABLED_STATE", + "reason":"need use ohos.permission.CHANGE_ABILITY_ENABLED_STATE" + }, + { + "name":"ohos.permission.REMOVE_CACHE_FILES", + "reason":"need use ohos.permission.REMOVE_CACHE_FILES" + }, + { + "name":"ohos.permission.LISTEN_BUNDLE_CHANGE", + "reason":"need use ohos.permission.LISTEN_BUNDLE_CHANGE" + }, + { + "name":"ohos.permission.CLEAN_BACKGROUND_PROCESSES", + "reason":"need use ohos.permission.CLEAN_BACKGROUND_PROCESSES" + } + ], + "js": [ + { + "mode": { + "syntax": "ets", + "type": "pageAbility" + }, + "pages": [ + "pages/index" + ], + "name": ".MainAbility", + "window": { + "designWidth": 720, + "autoDesignWidth": false + } + } + ] + } +} \ No newline at end of file diff --git a/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formacquiretest/entry/src/main/ets/MainAbility/app.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formacquiretest/entry/src/main/ets/MainAbility/app.ets new file mode 100644 index 0000000000000000000000000000000000000000..11c5d70c4f3b21c318de8032595862856e849485 --- /dev/null +++ b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formacquiretest/entry/src/main/ets/MainAbility/app.ets @@ -0,0 +1,23 @@ +/* + * 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. + */ + +export default { + onCreate() { + console.info('[FormComponent] Application onCreate') + }, + onDestroy() { + console.info('[FormComponent] Application onDestroy') + }, +} \ No newline at end of file diff --git a/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formacquiretest/entry/src/main/ets/MainAbility/model/FormViewModel.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formacquiretest/entry/src/main/ets/MainAbility/model/FormViewModel.ets new file mode 100644 index 0000000000000000000000000000000000000000..659108ce439cf2b927fdf1801539f3dddbd851d6 --- /dev/null +++ b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formacquiretest/entry/src/main/ets/MainAbility/model/FormViewModel.ets @@ -0,0 +1,131 @@ +/* + * 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. + */ + +import formManager from '@ohos.ability.formmanager'; +import bundleManager from '@ohos.bundle'; + +export default class FormViewModel { + private static sFormViewModel: FormViewModel = null; + + public static getInstance(): FormViewModel { + if (FormViewModel.sFormViewModel == null) { + FormViewModel.sFormViewModel = new FormViewModel(); + } + return FormViewModel.sFormViewModel; + } + + public async requestForm(formId: string) { + formManager.requestForm(formId) + .then((data) => { + console.info( '[FormComponent] requestForm result:' + data); + }); + } + + public async deleteCard(formId: string) { + formManager.deleteForm(formId) + .then((data) => { + console.info('[FormComponent] deleteForm result:' + data); + }); + } + + public async releaseCard(formId: string) { + formManager.releaseForm(formId) + .then((data) => { + console.info('[FormComponent] releaseForm result:' + data); + }); + } + + public async castTempToNormal(formId: string) { + formManager.castTempForm(formId) + .then((data) => { + console.info('[FormComponent] castTempToNormal result:' + data); + }); + } + + public async enableCard(formId: string) { + formManager.enableFormsUpdate([formId]) + .then((data) => { + console.info('[FormComponent] enableFormsUpdate result:' + data); + }); + } + + public async disableCard(formId: string) { + formManager.disableFormsUpdate([formId]) + .then((data) => { + console.info('[FormComponent] disableCard result:' + data); + }); + } + + public async changeCardVisible(formId: string, isVisible: boolean) { + if (isVisible) { + formManager.notifyVisibleForms([formId]) + .then((data) => { + console.info('[FormComponent] changeCardVisible result:' + data + ', isVisible:' + isVisible); + }); + } else { + formManager.notifyInvisibleForms([formId]) + .then((data) => { + console.info('[FormComponent] changeCardVisible result:' + data + ', isVisible:' + isVisible); + }); + } + } + + public async isFmsReady() { + formManager.isSystemReady() + .then((data) => { + console.info('[FormComponent] isFmsReady result:' + data); + }); + } + + public async getAllFormsInfo() { + console.info("[FormComponent] getAllFormsInfo start"); + formManager.getAllFormsInfo() + .then((data) => { + console.info('[FormComponent] getAllFormsInfo result:' + JSON.stringify(data)); + }) + .catch((err) => { + console.info('[FormComponent] getAllFormsInfo error:' + JSON.stringify(err)); + }); + console.info("[FormComponent] getAllFormsInfo end"); + } + + public async getFormsInfoByApp(bundle: string) { + formManager.getFormsInfo(bundle) + .then((data) => { + console.info('[FormComponent] getFormsInfoByApp result:' + JSON.stringify(data)); + }); + } + + public async getFormsInfoByModule(bundle: string, moduleName: string) { + formManager.getFormsInfo(bundle, moduleName) + .then((data) => { + console.info('[FormComponent] getFormsInfoByModule result:' + JSON.stringify(data)); + }); + } + + public async clearFormUserCache() { + bundleManager.cleanBundleCacheFiles('com.ohos.myapplicationform') + .then((data) => { + console.info('[FormComponent] cleanBundleCacheFiles result:' + JSON.stringify(data)); + }); + } + + public async clearFormProviderCache(bundle: string) { + bundleManager.cleanBundleCacheFiles(bundle) + .then((data) => { + console.info('[FormComponent] cleanBundleCacheFiles result:' + JSON.stringify(data)); + }); + } +} \ No newline at end of file diff --git a/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formacquiretest/entry/src/main/ets/MainAbility/pages/index.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formacquiretest/entry/src/main/ets/MainAbility/pages/index.ets new file mode 100644 index 0000000000000000000000000000000000000000..2d7dedf235ac93bb26e6694eb65700ad939725aa --- /dev/null +++ b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formacquiretest/entry/src/main/ets/MainAbility/pages/index.ets @@ -0,0 +1,68 @@ +/* + * 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. + */ + +// @ts-nocheck +import featureAbility from "@ohos.ability.featureAbility"; +import file from '@system.file'; +import { Core, ExpectExtend, ReportExtend } from "deccjsunit/index.ets"; +import testsuite from "../test/List.test.ets"; + +@Entry +@Component +struct Index { + + aboutToAppear() { + + console.info("[FormComponent] start run testcase!!!!"); + + featureAbility.getWant() + .then((want: any) => { + console.info('[FormComponent] Operation successful. Data: ' + JSON.stringify(want)); + const core = Core.getInstance(); + const expectExtend = new ExpectExtend({ + 'id': 'extend' + }); + core.addService('expect', expectExtend); + const reportExtend = new ReportExtend(file); + core.addService('report', reportExtend); + core.init(); + core.subscribeEvent('task', reportExtend); + const configService = core.getDefaultService('config'); + want.parameters['timeout'] = 40000; + console.info('[FormComponent] parameters---->' + JSON.stringify(want.parameters)); + configService.setConfig(want.parameters); + testsuite(); + core.execute(); + }) + .catch((error: any) => { + console.error('[FormComponent] Operation failed. Cause: ' + JSON.stringify(error)); + }) + } + + build() { + Flex({ + direction: FlexDirection.Column, + alignItems: ItemAlign.Center, + justifyContent: FlexAlign.Center + }) { + Text('Fms Main Ability Test') + .fontSize(50) + .fontWeight(FontWeight.Bold) + } + .width('100%') + .height('100%') + } +} + diff --git a/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formacquiretest/entry/src/main/ets/MainAbility/test/FmsAcquireForm.test.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formacquiretest/entry/src/main/ets/MainAbility/test/FmsAcquireForm.test.ets new file mode 100644 index 0000000000000000000000000000000000000000..a570231ae81e2fc1717403c59438f69673f35c8a --- /dev/null +++ b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formacquiretest/entry/src/main/ets/MainAbility/test/FmsAcquireForm.test.ets @@ -0,0 +1,1876 @@ +/* + * 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. + */ + +import featureAbility from "@ohos.ability.featureAbility"; +import commonEvent from '@ohos.commonEvent'; +import { describe, expect, it } from "deccjsunit/index.ets"; + +var onErrorForm_Event = { + events: ["FMS_FormOnError_commonEvent"], +}; +var onAcquiredForm_Event = { + events: ["FMS_FormOnAcquired_commonEvent"], +}; +var subscriberFormCastEvent = { + events: ["FMS_FormCast_commonEvent"], +}; +var onSupplyEvent = { + events: ["FMS_FormSupply_commonEvent"], +}; + +var deleteForm_Event = "FMS_FormDelete_commonEvent"; + +export default function test() { + describe(`FmsAcquiredFormTest`, () => { + + /** + * @tc.number: FMS_acquireForm_0200 + * @tc.name: The form host does not have permission to use the form + * @tc.desc: Failed to create a form when verifying that the form host does not have form permission. + */ + it(`FMS_acquireForm_0200`, 0, async (done) => { + console.info(`FMS_acquireForm_0200 start`); + var subscriberOnError; + function onErrorCallBack(err, data) { + console.info("!!!====>FMS_acquireForm_0200 onErrorCallBack data:====>" + JSON.stringify(data)); + expect(data.event).assertEqual("FMS_FormOnError_commonEvent"); + expect(data.data).assertEqual("check permission deny, need to request ohos.permission.REQUIRE_FORM."); + commonEvent.unsubscribe(subscriberOnError, unSubscribeOnErrorCallback); + console.info(`FMS_acquireForm_0200 end`); + done(); + } + function unSubscribeOnErrorCallback() { + console.info("====>FMS_acquireForm_0200 unSubscribeOnErrorCallback CallBack====>"); + } + commonEvent.createSubscriber(onErrorForm_Event).then(async (data) => { + console.info("====>FMS_acquireForm_0200 onErrorForm_Event Subscriber====>"); + subscriberOnError = data; + await commonEvent.subscribe(subscriberOnError, onErrorCallBack); + }); + console.info(`FMS_acquireForm_0200 featureAbility.startAbility start`); + await featureAbility.startAbility({ + want: { + bundleName: "com.ohos.st.formsystemhostnoperm", + abilityName: "com.ohos.st.formsystemhostnoperm.MainAbility", + parameters: { + "formId": "0", + "name": "Form_Js001", + "bundle": "com.form.formsystemtestservicea.hmservice", + "ability": "com.form.formsystemtestservicea.hmservice.FormAbility", + "moduleName": "entry", + "temporary": false, + "isCreate": true + } + } + }).then((res: any) => { + console.info(`FMS_acquireForm_0200 featureAbility.startAbilityhost res: ${JSON.stringify(res)}`); + }).catch((err: any) => { + console.info(`FMS_acquireForm_0200 featureAbility.startAbilityhost error: ${JSON.stringify(err)}`); + }); + console.info(`FMS_acquireForm_0200 featureAbility.startAbility end`); + }); + /** + * @tc.number: FMS_acquireForm_0300 + * @tc.name: Failed to add form when parameter formId is wrong. + * @tc.desc: Failed to create form when verifying that the parameter (formId) of creating form is wrong. + */ + it(`FMS_acquireForm_0300`, 0, async (done) => { + console.info(`FMS_acquireForm_0300 start`); + var subscriberOnError; + function onErrorCallBack(err, data) { + console.info("!!!====>FMS_acquireForm_0300 onErrorCallBack data:====>" + JSON.stringify(data)); + expect(data.event).assertEqual("FMS_FormOnError_commonEvent"); + expect(data.data).assertEqual("invalid params received on operating form."); + commonEvent.unsubscribe(subscriberOnError, unSubscribeOnErrorCallback); + console.info(`FMS_acquireForm_0300 end`); + done(); + } + function unSubscribeOnErrorCallback() { + console.info("====>FMS_acquireForm_0300 unSubscribeOnErrorCallback CallBack====>"); + } + commonEvent.createSubscriber(onErrorForm_Event).then(async (data) => { + console.info("====>FMS_acquireForm_0300 onErrorForm_Event Subscriber====>"); + subscriberOnError = data; + await commonEvent.subscribe(subscriberOnError, onErrorCallBack); + }); + console.info(`FMS_acquireForm_0300 featureAbility.startAbility start`); + await featureAbility.startAbility({ + want: { + bundleName: "com.ohos.st.formsystemhost", + abilityName: "com.ohos.st.formsystemhost.MainAbility", + parameters: { + "formId": "-1", + "name": "Form_Js001", + "bundle": "com.form.formsystemtestservicea.hmservice", + "ability": "com.form.formsystemtestservicea.hmservice.FormAbility", + "moduleName": "entry", + "temporary": false, + "isCreate": true + } + } + }).then((res: any) => { + console.info(`FMS_acquireForm_0300 featureAbility.startAbilityhost res: ${JSON.stringify(res)}`); + }).catch((err: any) => { + console.info(`FMS_acquireForm_0300 featureAbility.startAbilityhost error: ${JSON.stringify(err)}`); + }); + console.info(`FMS_acquireForm_0300 featureAbility.startAbility end`); + }); + /** + * @tc.number: FMS_acquireForm_0400 + * @tc.name: Failed to add form when parameter bundlename is wrong. + * @tc.desc: Form creation failed when verifying the wrong parameter (bundlename) of form creation. + */ + it(`FMS_acquireForm_0400`, 0, async (done) => { + console.info(`FMS_acquireForm_0400 start`); + var subscriberOnError; + function onErrorCallBack(err, data) { + console.info("!!!====>FMS_acquireForm_0400 onErrorCallBack data:====>" + JSON.stringify(data)); + expect(data.event).assertEqual("FMS_FormOnError_commonEvent"); + expect(data.data).assertEqual("invalid params received on operating form."); + commonEvent.unsubscribe(subscriberOnError, unSubscribeOnErrorCallback); + console.info(`FMS_acquireForm_0400 end`); + done(); + } + function unSubscribeOnErrorCallback() { + console.info("====>FMS_acquireForm_0400 unSubscribeOnErrorCallback CallBack====>"); + } + commonEvent.createSubscriber(onErrorForm_Event).then(async (data) => { + console.info("====>FMS_acquireForm_0400 onErrorForm_Event Subscriber====>"); + subscriberOnError = data; + await commonEvent.subscribe(subscriberOnError, onErrorCallBack); + }); + console.info(`FMS_acquireForm_0400 featureAbility.startAbility start`); + await featureAbility.startAbility({ + want: { + bundleName: "com.ohos.st.formsystemhost", + abilityName: "com.ohos.st.formsystemhost.MainAbility", + parameters: { + "formId": "-1", + "name": "Form_Js001", + "bundle": "com.form.formsystemtestservicea.hmservice123", + "ability": "com.form.formsystemtestservicea.hmservice.FormAbility", + "moduleName": "entry", + "temporary": false, + "isCreate": true + } + } + }).then((res: any) => { + console.info(`FMS_acquireForm_0400 featureAbility.startAbilityhost res: ${JSON.stringify(res)}`); + }).catch((err: any) => { + console.info(`FMS_acquireForm_0400 featureAbility.startAbilityhost error: ${JSON.stringify(err)}`); + }); + console.info(`FMS_acquireForm_0400 featureAbility.startAbility end`); + }); + /** + * @tc.number: FMS_acquireForm_0500 + * @tc.name: Failed to add form when parameter moduleName is wrong. + * @tc.desc: Form creation failed when verifying the wrong parameter (moduleName) of form creation. + */ + it(`FMS_acquireForm_0500`, 0, async (done) => { + console.info(`FMS_acquireForm_0500 start`); + var subscriberOnError; + function onErrorCallBack(err, data) { + console.info("!!!====>FMS_acquireForm_0500 onErrorCallBack data:====>" + JSON.stringify(data)); + expect(data.event).assertEqual("FMS_FormOnError_commonEvent"); + expect(data.data).assertEqual("invalid params received on operating form."); + commonEvent.unsubscribe(subscriberOnError, unSubscribeOnErrorCallback); + console.info(`FMS_acquireForm_0500 end`); + done(); + } + function unSubscribeOnErrorCallback() { + console.info("====>FMS_acquireForm_0500 unSubscribeOnErrorCallback CallBack====>"); + } + commonEvent.createSubscriber(onErrorForm_Event).then(async (data) => { + console.info("====>FMS_acquireForm_0500 onErrorForm_Event Subscriber====>"); + subscriberOnError = data; + await commonEvent.subscribe(subscriberOnError, onErrorCallBack); + }); + console.info(`FMS_acquireForm_0500 featureAbility.startAbility start`); + await featureAbility.startAbility({ + want: { + bundleName: "com.ohos.st.formsystemhost", + abilityName: "com.ohos.st.formsystemhost.MainAbility", + parameters: { + "formId": "-1", + "name": "Form_Js001", + "bundle": "com.form.formsystemtestservicea.hmservice", + "ability": "com.form.formsystemtestservicea.hmservice.FormAbility", + "moduleName": "entry123", + "temporary": false, + "isCreate": true + } + } + }).then((res: any) => { + console.info(`FMS_acquireForm_0500 featureAbility.startAbilityhost res: ${JSON.stringify(res)}`); + }).catch((err: any) => { + console.info(`FMS_acquireForm_0500 featureAbility.startAbilityhost error: ${JSON.stringify(err)}`); + }); + console.info(`FMS_acquireForm_0500 featureAbility.startAbility end`); + }); + /** + * @tc.number: FMS_acquireForm_0600 + * @tc.name: Failed to add form when parameter formName is wrong. + * @tc.desc: Form creation failed when verifying the wrong parameter (formName) of form creation. + */ + it(`FMS_acquireForm_0600`, 0, async (done) => { + console.info(`FMS_acquireForm_0600 start`); + var subscriberOnError; + function onErrorCallBack(err, data) { + console.info("!!!====>FMS_acquireForm_0600 onErrorCallBack data:====>" + JSON.stringify(data)); + expect(data.event).assertEqual("FMS_FormOnError_commonEvent"); + expect(data.data).assertEqual("invalid params received on operating form."); + commonEvent.unsubscribe(subscriberOnError, unSubscribeOnErrorCallback); + console.info(`FMS_acquireForm_0600 end`); + done(); + } + function unSubscribeOnErrorCallback() { + console.info("====>FMS_acquireForm_0600 unSubscribeOnErrorCallback CallBack====>"); + } + commonEvent.createSubscriber(onErrorForm_Event).then(async (data) => { + console.info("====>FMS_acquireForm_0600 onErrorForm_Event Subscriber====>"); + subscriberOnError = data; + await commonEvent.subscribe(subscriberOnError, onErrorCallBack); + }); + console.info(`FMS_acquireForm_0600 featureAbility.startAbility start`); + await featureAbility.startAbility({ + want: { + bundleName: "com.ohos.st.formsystemhost", + abilityName: "com.ohos.st.formsystemhost.MainAbility", + parameters: { + "formId": "-1", + "name": "Form_Js001987", + "bundle": "com.form.formsystemtestservicea.hmservice", + "ability": "com.form.formsystemtestservicea.hmservice.FormAbility", + "moduleName": "entry", + "temporary": false, + "isCreate": true + } + } + }).then((res: any) => { + console.info(`FMS_acquireForm_0600 featureAbility.startAbilityhost res: ${JSON.stringify(res)}`); + }).catch((err: any) => { + console.info(`FMS_acquireForm_0600 featureAbility.startAbilityhost error: ${JSON.stringify(err)}`); + }); + console.info(`FMS_acquireForm_0600 featureAbility.startAbility end`); + }); + /** + * @tc.number: FMS_acquireForm_0700 + * @tc.name: Failed to add form when parameter abilityName is wrong. + * @tc.desc: Form creation failed when verifying the wrong parameter (abilityName) of form creation. + */ + it(`FMS_acquireForm_0700`, 0, async (done) => { + console.info(`FMS_acquireForm_0700 start`); + var subscriberOnError; + function onErrorCallBack(err, data) { + console.info("!!!====>FMS_acquireForm_0700 onErrorCallBack data:====>" + JSON.stringify(data)); + expect(data.event).assertEqual("FMS_FormOnError_commonEvent"); + expect(data.data).assertEqual("invalid params received on operating form."); + commonEvent.unsubscribe(subscriberOnError, unSubscribeOnErrorCallback); + console.info(`FMS_acquireForm_0700 end`); + done(); + } + function unSubscribeOnErrorCallback() { + console.info("====>FMS_acquireForm_0700 unSubscribeOnErrorCallback CallBack====>"); + } + commonEvent.createSubscriber(onErrorForm_Event).then(async (data) => { + console.info("====>FMS_acquireForm_0700 onErrorForm_Event Subscriber====>"); + subscriberOnError = data; + await commonEvent.subscribe(subscriberOnError, onErrorCallBack); + }); + console.info(`FMS_acquireForm_0700 featureAbility.startAbility start`); + await featureAbility.startAbility({ + want: { + bundleName: "com.ohos.st.formsystemhost", + abilityName: "com.ohos.st.formsystemhost.MainAbility", + parameters: { + "formId": "-1", + "name": "Form_Js001", + "bundle": "com.form.formsystemtestservicea.hmservice", + "ability": "com.form.formsystemtestservicea.hmservice.FormAbility123", + "moduleName": "entry", + "temporary": false, + "isCreate": true + } + } + }).then((res: any) => { + console.info(`FMS_acquireForm_0700 featureAbility.startAbilityhost res: ${JSON.stringify(res)}`); + }).catch((err: any) => { + console.info(`FMS_acquireForm_0700 featureAbility.startAbilityhost error: ${JSON.stringify(err)}`); + }); + console.info(`FMS_acquireForm_0700 featureAbility.startAbility end`); + }); + /** + * @tc.number: FMS_acquireForm_1000 + * @tc.name: Failed to add form when parameter form dimension is wrong. + * @tc.desc: Form creation failed when verifying the wrong parameter (form dimension) of form creation. + */ + it(`FMS_acquireForm_1000`, 0, async (done) => { + console.info(`FMS_acquireForm_1000 start`); + var subscriberOnError; + function onErrorCallBack(err, data) { + console.info("!!!====>FMS_acquireForm_1000 onErrorCallBack data:====>" + JSON.stringify(data)); + expect(data.event).assertEqual("FMS_FormOnError_commonEvent"); + expect(data.data).assertEqual("invalid params received on operating form."); + commonEvent.unsubscribe(subscriberOnError, unSubscribeOnErrorCallback); + console.info(`FMS_acquireForm_1000 end`); + done(); + } + function unSubscribeOnErrorCallback() { + console.info("====>FMS_acquireForm_1000 unSubscribeOnErrorCallback CallBack====>"); + } + commonEvent.createSubscriber(onErrorForm_Event).then(async (data) => { + console.info("====>FMS_acquireForm_1000 onErrorForm_Event Subscriber====>"); + subscriberOnError = data; + await commonEvent.subscribe(subscriberOnError, onErrorCallBack); + }); + console.info(`FMS_acquireForm_1000 featureAbility.startAbility start`); + await featureAbility.startAbility({ + want: { + bundleName: "com.ohos.st.formsystemhost", + abilityName: "com.ohos.st.formsystemhost.MainAbility", + parameters: { + "formId": "-1", + "name": "Form_Js001", + "bundle": "com.form.formsystemtestservicea.hmservice", + "ability": "com.form.formsystemtestservicea.hmservice.FormAbility", + "moduleName": "entry", + "dimension": 4, + "temporary": false, + "isCreate": true + } + } + }).then((res: any) => { + console.info(`FMS_acquireForm_1000 featureAbility.startAbilityhost res: ${JSON.stringify(res)}`); + }).catch((err: any) => { + console.info(`FMS_acquireForm_1000 featureAbility.startAbilityhost error: ${JSON.stringify(err)}`); + }); + console.info(`FMS_acquireForm_1000 featureAbility.startAbility end`); + }); + + /** + * @tc.number: FMS_acquireForm_1100 + * @tc.name: When the formId is set to 0, a non cached form is added. + * @tc.desc: Verify that the non cache form can be successfully created. + */ + it(`FMS_acquireForm_1100`, 0, async (done) => { + console.info(`FMS_acquireForm_1100 start`); + let subscriberOnAcquired; + let subscriberSupply; + let formId1; + let formId2; + + function delPublishCallBack() { + console.info("!!!====>FMS_acquireForm_1100 delPublishCallBack====>"); + setTimeout(function () { + console.info('FMS_acquireForm_1100 delPublishCallBack end'); + console.info(`FMS_acquireForm_1100 end`); + done(); + }, 1000); + } + function onAcquiredCallBack(err, data) { + console.info("!!!====>FMS_acquireForm_1100 onAcquiredCallBack data:====>" + JSON.stringify(data)); + expect(data.event).assertEqual("FMS_FormOnAcquired_commonEvent"); + commonEvent.unsubscribe(subscriberOnAcquired, unSubscribeOnAcquiredCallback); + formId1 = data.data; + + if (formId1 && formId2) { + expect(formId1).assertEqual(formId2); + let commonEventPublishData = { + data: formId1 + }; + commonEvent.publish(deleteForm_Event, commonEventPublishData, delPublishCallBack); + } + } + function unSubscribeOnAcquiredCallback() { + console.info("====>FMS_acquireForm_1100 unSubscribeOnAcquiredCallback CallBack====>"); + } + commonEvent.createSubscriber(onAcquiredForm_Event).then(async (data) => { + console.info("====>FMS_acquireForm_1100 onAcquiredForm_Event Subscriber====>"); + subscriberOnAcquired = data; + await commonEvent.subscribe(subscriberOnAcquired, onAcquiredCallBack); + }); + function onSupplyCallBack(err, data) { + if (data.parameters.kind == "onCreate") { + console.info("====>FMS_acquireForm_1100 onSupplyCallBack====>" + JSON.stringify(data)); + commonEvent.unsubscribe(subscriberSupply, unSubscribeSupplyCallback); + let retData = JSON.parse(data.parameters.parameters); + + let bundleName = retData.bundleName; + expect(bundleName).assertEqual("com.form.formsystemtestservicea.hmservice"); + let abilityName = retData.abilityName; + expect(abilityName).assertEqual("com.form.formsystemtestservicea.hmservice.FormAbility"); + let moduleName = retData.parameters['ohos.extra.param.key.module_name']; + expect(moduleName).assertEqual("entry"); + let formName = retData.parameters['ohos.extra.param.key.form_name']; + expect(formName).assertEqual("Form_Js001"); + let formDimension = retData.parameters['ohos.extra.param.key.form_dimension']; + expect(formDimension).assertEqual(1); + let tempFormFlag = retData.parameters['ohos.extra.param.key.form_temporary']; + expect(tempFormFlag).assertEqual(false); + + formId2 = retData.parameters['ohos.extra.param.key.form_identity']; + + if (formId1 && formId2) { + expect(formId1).assertEqual(formId2); + let commonEventPublishData = { + data: formId1 + }; + commonEvent.publish(deleteForm_Event, commonEventPublishData, delPublishCallBack); + } + } + } + function unSubscribeSupplyCallback() { + console.info("====>FMS_acquireForm_1100 unSubscribeSupplyCallback====>"); + } + commonEvent.createSubscriber(onSupplyEvent).then(async (data) => { + console.info("====>FMS_acquireForm_1100 onSupplyEvent Subscriber====>"); + subscriberSupply = data; + await commonEvent.subscribe(subscriberSupply, onSupplyCallBack); + }); + console.info(`FMS_acquireForm_1100 featureAbility.startAbility start`); + await featureAbility.startAbility({ + want: { + bundleName: "com.ohos.st.formsystemhost", + abilityName: "com.ohos.st.formsystemhost.MainAbility", + parameters: { + "formId": "0", + "name": "Form_Js001", + "bundle": "com.form.formsystemtestservicea.hmservice", + "ability": "com.form.formsystemtestservicea.hmservice.FormAbility", + "moduleName": "entry", + "temporary": false, + "isCreate": true + } + } + }).then((res: any) => { + console.info(`FMS_acquireForm_1100 featureAbility.startAbilityhost res: ${JSON.stringify(res)}`); + }).catch((err: any) => { + console.info(`FMS_acquireForm_1100 featureAbility.startAbilityhost error: ${JSON.stringify(err)}`); + }); + console.info(`FMS_acquireForm_1100 featureAbility.startAbility end`); + }); + + /** + * @tc.number: FMS_acquireForm_1200 + * @tc.name: When the formId is set to 0, a non cached form is added. + * @tc.desc: Verify that the non cache form can be successfully created. + */ + it(`FMS_acquireForm_1200`, 0, async (done) => { + console.info(`FMS_acquireForm_1200 start`); + let subscriberOnAcquired; + let subscriberSupply; + let formId1; + let formId2; + + function delPublishCallBack() { + console.info("!!!====>FMS_acquireForm_1200 delPublishCallBack====>"); + setTimeout(function () { + console.info('FMS_acquireForm_1200 delPublishCallBack end'); + console.info(`FMS_acquireForm_1200 end`); + done(); + }, 1000); + } + function onAcquiredCallBack(err, data) { + console.info("!!!====>FMS_acquireForm_1200 onAcquiredCallBack data:====>" + JSON.stringify(data)); + expect(data.event).assertEqual("FMS_FormOnAcquired_commonEvent"); + commonEvent.unsubscribe(subscriberOnAcquired, unSubscribeOnAcquiredCallback) + formId1 = data.data; + console.info("!!!====>FMS_acquireForm_1200 onAcquiredCallBack formId1:====>" + formId1); + if (formId1 && formId2) { + expect(formId1).assertEqual(formId2); + let commonEventPublishData = { + data: formId1 + }; + commonEvent.publish(deleteForm_Event, commonEventPublishData, delPublishCallBack); + } + } + function unSubscribeOnAcquiredCallback() { + console.info("====>FMS_acquireForm_1200 OnAcquired UnSubscribe CallBack====>"); + } + commonEvent.createSubscriber(onAcquiredForm_Event).then(async (data) => { + console.info("====>FMS_acquireForm_1200 Create OnAcquired Subscriber====>"); + subscriberOnAcquired = data; + await commonEvent.subscribe(subscriberOnAcquired, onAcquiredCallBack); + }); + + function onSupplyCallBack(err, data) { + if (data.parameters.kind == "onCreate") { + console.info("====>FMS_acquireForm_1200 onSupplyCallBack====>" + JSON.stringify(data)); + commonEvent.unsubscribe(subscriberSupply, unSubscribeSupplyCallback); + let retData = JSON.parse(data.parameters.parameters); + + let bundleName = retData.bundleName; + expect(bundleName).assertEqual("com.form.formsystemtestservicee.hmservice"); + let abilityName = retData.abilityName; + expect(abilityName).assertEqual("com.form.formsystemtestservicee.hmservice.FormAbility"); + let moduleName = retData.parameters['ohos.extra.param.key.module_name']; + expect(moduleName).assertEqual("entry"); + let formName = retData.parameters['ohos.extra.param.key.form_name']; + expect(formName).assertEqual("Form_Js001"); + let formDimension = retData.parameters['ohos.extra.param.key.form_dimension']; + expect(formDimension).assertEqual(1); + let tempFormFlag = retData.parameters['ohos.extra.param.key.form_temporary']; + expect(tempFormFlag).assertEqual(false); + + formId2 = retData.parameters['ohos.extra.param.key.form_identity']; + console.info("!!!====>FMS_acquireForm_1200 onAcquiredCallBack formId2:====>" + formId2); + if (formId1 && formId2) { + expect(formId1).assertEqual(formId2); + let commonEventPublishData = { + data: formId1 + }; + commonEvent.publish(deleteForm_Event, commonEventPublishData, delPublishCallBack); + } + } + } + function unSubscribeSupplyCallback() { + console.info("====>FMS_acquireForm_1200 unSubscribeSupplyCallback====>"); + } + commonEvent.createSubscriber(onSupplyEvent).then(async (data) => { + console.info("====>FMS_acquireForm_1200 onSupplyEvent Subscriber====>"); + subscriberSupply = data; + commonEvent.subscribe(subscriberSupply, onSupplyCallBack); + }); + console.info(`FMS_acquireForm_1200 featureAbility.startAbility start`); + await featureAbility.startAbility({ + want: { + bundleName: "com.ohos.st.formsystemhostb", + abilityName: "com.ohos.st.formsystemhostb.MainAbility", + parameters: { + "formId": "0", + "name": "Form_Js001", + "bundle": "com.form.formsystemtestservicee.hmservice", + "ability": "com.form.formsystemtestservicee.hmservice.FormAbility", + "moduleName": "entry", + "temporary": false, + "isCreate": true + } + } + }).then((res: any) => { + console.info(`FMS_acquireForm_1200 featureAbility.startAbilityhost res: ${JSON.stringify(res)}`); + }).catch((err: any) => { + console.info(`FMS_acquireForm_1200 featureAbility.startAbilityhost error: ${JSON.stringify(err)}`); + }); + console.info(`FMS_acquireForm_1200 featureAbility.startAbility end`); + }); + /** + * @tc.number: FMS_acquireForm_1400 + * @tc.name: FormId does not match other parameters when adding a cached form. + * @tc.desc: Failed to create a cached form when verifying that FormId does not match other parameters. + */ + it(`FMS_acquireForm_1400`, 0, async (done) => { + console.info(`FMS_acquireForm_1400 start`); + var subscriberOnAcquired; + var subscriberOnError; + var formId; + + function delPublishCallBack() { + console.info("!!!====>FMS_acquireForm_1400 delPublishCallBack====>"); + setTimeout(function () { + console.info('FMS_acquireForm_1400 delPublishCallBack end'); + console.info(`FMS_acquireForm_1400 end`); + done(); + }, 1000) + } + function onErrorCallBack(err, data) { + console.info("!!!====>FMS_acquireForm_1400 onErrorCallBack data:====>" + JSON.stringify(data)); + expect(data.event).assertEqual("FMS_FormOnError_commonEvent"); + expect(data.data).assertEqual("the requested form id is not existed on fms."); + commonEvent.unsubscribe(subscriberOnError, unSubscribeOnErrorCallBackCache); + var commonEventPublishData = { + data: formId + }; + commonEvent.publish(deleteForm_Event, commonEventPublishData, delPublishCallBack); + } + function unSubscribeOnErrorCallBackCache() { + console.info("====>FMS_acquireForm_1400 unSubscribeOnErrorCallBackCache CallBack====>"); + } + function onAcquiredCallBack(err, data) { + console.info("!!!====>FMS_acquireForm_1400 onAcquiredCallBack data:====>" + JSON.stringify(data)); + expect(data.event).assertEqual("FMS_FormOnAcquired_commonEvent"); + commonEvent.unsubscribe(subscriberOnAcquired, unSubscribeOnAcquiredCallback) + formId = data.data; + // add cache form + commonEvent.createSubscriber(onErrorForm_Event).then(async (data1) => { + console.info("====>FMS_acquireForm_1400 onErrorForm_Event Subscriber====>"); + subscriberOnError = data1; + await commonEvent.subscribe(subscriberOnError, onErrorCallBack); + }); + console.info(`FMS_acquireForm_1400 featureAbility.startAbility again start`); + featureAbility.startAbility({ + want: { + bundleName: "com.ohos.st.formsystemhost", + abilityName: "com.ohos.st.formsystemhost.MainAbility", + parameters: { + "formId": "1", + "name": "Form_Js001", + "bundle": "com.form.formsystemtestservicea.hmservice", + "ability": "com.form.formsystemtestservicea.hmservice.FormAbility", + "moduleName": "entry", + "temporary": false, + "isCreate": true + } + } + }).then((res: any) => { + console.info(`FMS_acquireForm_1400 featureAbility.startAbilityhost res: ${JSON.stringify(res)}`); + }).catch((err: any) => { + console.info(`FMS_acquireForm_1400 featureAbility.startAbilityhost error: ${JSON.stringify(err)}`); + }); + console.info(`FMS_acquireForm_1400 featureAbility.startAbility again end`); + } + function unSubscribeOnAcquiredCallback() { + console.info("====>FMS_acquireForm_1400 unSubscribeOnAcquiredCallback====>"); + } + + commonEvent.createSubscriber(onAcquiredForm_Event).then(async (data) => { + console.info("====>FMS_acquireForm_1400 onAcquiredForm_Event Subscriber====>"); + subscriberOnAcquired = data; + await commonEvent.subscribe(subscriberOnAcquired, onAcquiredCallBack); + }); + + console.info(`FMS_acquireForm_1400 featureAbility.startAbility start`); + await featureAbility.startAbility({ + want: { + bundleName: "com.ohos.st.formsystemhost", + abilityName: "com.ohos.st.formsystemhost.MainAbility", + parameters: { + "formId": "0", + "name": "Form_Js001", + "bundle": "com.form.formsystemtestservicea.hmservice", + "ability": "com.form.formsystemtestservicea.hmservice.FormAbility", + "moduleName": "entry", + "temporary": false, + "isCreate": true + } + } + }).then((res: any) => { + console.info(`FMS_acquireForm_1400 featureAbility.startAbilityhost res: ${JSON.stringify(res)}`); + }).catch((err: any) => { + console.info(`FMS_acquireForm_1400 featureAbility.startAbilityhost error: ${JSON.stringify(err)}`); + }); + console.info(`FMS_acquireForm_1400 featureAbility.startAbility end`); + }); + /** + * @tc.number: FMS_acquireForm_1500 + * @tc.name: Add a cached form. + * @tc.desc: Verify that the cached form can be successfully created. + */ + it(`FMS_acquireForm_1500`, 0, async (done) => { + console.info(`FMS_acquireForm_1500 start`); + let subscriberOnAcquired; + let subscriberSupply; + let formId1; + let formId2; + let onCreateCount = 0; + + function delPublishCallBack() { + console.info("!!!====>FMS_acquireForm_1500 delPublishCallBack====>"); + setTimeout(function () { + console.info('FMS_acquireForm_1500 delPublishCallBack end'); + console.info(`FMS_acquireForm_1500 end`); + done(); + }, 1000) + } + function onAcquiredCallBackCache(err, data) { + console.info("!!!====>FMS_acquireForm_1500 onAcquiredCallBackCache data:====>" + JSON.stringify(data)); + commonEvent.unsubscribe(subscriberOnAcquired, unSubscribeOnAcquiredCallBackCache); + expect(data.event).assertEqual("FMS_FormOnAcquired_commonEvent"); + formId2 = data.data; + if (formId1 && formId2) { + expect(formId1).assertEqual(formId2); + let commonEventPublishData = { + data: formId1 + }; + commonEvent.publish(deleteForm_Event, commonEventPublishData, delPublishCallBack); + } + } + function unSubscribeOnAcquiredCallBackCache() { + console.info("====>FMS_acquireForm_1500 OnAcquired Cache UnSubscribe CallBack====>"); + } + function onAcquiredCallBack(err, data) { + console.info("!!!====>FMS_acquireForm_1500 onAcquiredCallBack data:====>" + JSON.stringify(data)); + expect(data.event).assertEqual("FMS_FormOnAcquired_commonEvent"); + commonEvent.unsubscribe(subscriberOnAcquired, unSubscribeOnAcquiredCallback) + formId1 = data.data; + // add cache form + commonEvent.createSubscriber(onAcquiredForm_Event).then(async (data1) => { + console.info("====>FMS_acquireForm_1500 Create OnAcquired Subscriber====>"); + subscriberOnAcquired = data1; + await commonEvent.subscribe(subscriberOnAcquired, onAcquiredCallBackCache); + }); + console.info(`FMS_acquireForm_1500 featureAbility.startAbility again start`); + featureAbility.startAbility({ + want: { + bundleName: "com.ohos.st.formsystemhostb", + abilityName: "com.ohos.st.formsystemhostb.MainAbility", + parameters: { + "formId": formId1, + "name": "Form_Js001", + "bundle": "com.form.formsystemtestservicea.hmservice", + "ability": "com.form.formsystemtestservicea.hmservice.FormAbility", + "moduleName": "entry", + "temporary": false, + "isCreate": true + } + } + }).then((res: any) => { + console.info(`FMS_acquireForm_1500 featureAbility.startAbilityhost res: ${JSON.stringify(res)}`); + }).catch((err: any) => { + console.info(`FMS_acquireForm_1500 featureAbility.startAbilityhost error: ${JSON.stringify(err)}`); + }); + console.info(`FMS_acquireForm_1500 featureAbility.startAbility again end`); + } + function unSubscribeOnAcquiredCallback() { + console.info("====>FMS_acquireForm_1500 OnAcquired UnSubscribe CallBack====>"); + } + + commonEvent.createSubscriber(onAcquiredForm_Event).then(async (data) => { + console.info("====>FMS_acquireForm_1500 Create OnAcquired Subscriber====>"); + subscriberOnAcquired = data; + await commonEvent.subscribe(subscriberOnAcquired, onAcquiredCallBack); + }); + function onSupplyCallBack(err, data) { + if (data.parameters.kind == "onCreate") { + console.info("====>FMS_acquireForm_1500 onSupplyCallBack====>" + JSON.stringify(data)); + onCreateCount++; + if (onCreateCount == 2) { + commonEvent.unsubscribe(subscriberSupply, unSubscribeSupplyCallback) + } + if (formId1 && formId2) { + expect(formId1).assertEqual(formId2); + let commonEventPublishData = { + data: formId1 + }; + commonEvent.publish(deleteForm_Event, commonEventPublishData, delPublishCallBack); + } + } + } + function unSubscribeSupplyCallback() { + console.info("====>FMS_acquireForm_1500 unSubscribeSupplyCallback====>"); + } + + commonEvent.createSubscriber(onSupplyEvent).then(async (data) => { + console.info("====>FMS_acquireForm_1500 onSupplyEvent Subscriber====>"); + subscriberSupply = data; + await commonEvent.subscribe(subscriberSupply, onSupplyCallBack); + }); + console.info(`FMS_acquireForm_1500 featureAbility.startAbility start`); + await featureAbility.startAbility({ + want: { + bundleName: "com.ohos.st.formsystemhost", + abilityName: "com.ohos.st.formsystemhost.MainAbility", + parameters: { + "formId": "0", + "name": "Form_Js001", + "bundle": "com.form.formsystemtestservicea.hmservice", + "ability": "com.form.formsystemtestservicea.hmservice.FormAbility", + "moduleName": "entry", + "temporary": false, + "isCreate": true + } + } + }).then((res: any) => { + console.info(`FMS_acquireForm_1500 featureAbility.startAbilityhost res: ${JSON.stringify(res)}`); + }).catch((err: any) => { + console.info(`FMS_acquireForm_1500 featureAbility.startAbilityhost error: ${JSON.stringify(err)}`); + }); + console.info(`FMS_acquireForm_1500 featureAbility.startAbility end`); + }); + + /** + * @tc.number: FMS_acquireForm_1600 + * @tc.name: A single form host (using a single thread) continuously creates 2 normal and 2 temporary forms. + * @tc.desc: Verify that a single host (using a single thread) can successfully create multiple normal + * and temporary forms continuously. + */ + it(`FMS_acquireForm_1600`, 0, async (done) => { + console.info(`FMS_acquireForm_1600 start`); + + var subscriberOnAcquired; + + function delPublishCallBack_Normal1() { + console.info("!!!====>FMS_acquireForm_1600 delPublishCallBack_Normal1====>"); + setTimeout(function () { + console.info('FMS_acquireForm_1600 delPublishCallBack_Normal1 end'); + FMS_acquireForm_1600_normal2(); + }, 50); + } + function onAcquiredCallBack_Normal1(err, data) { + console.info("!!!====>FMS_acquireForm_1600 onAcquiredCallBack_Normal1 data:====>" + JSON.stringify(data)); + expect(data.event).assertEqual("FMS_FormOnAcquired_commonEvent"); + commonEvent.unsubscribe(subscriberOnAcquired, unSubscribeOnAcquiredCallBack_Normal1) + var commonEventPublishData = { + bundleName: "com.ohos.st.formsystemhost", + data: data.data + }; + commonEvent.publish(deleteForm_Event, commonEventPublishData, delPublishCallBack_Normal1); + } + function unSubscribeOnAcquiredCallBack_Normal1() { + console.info("====>FMS_acquireForm_1600 unSubscribeOnAcquiredCallBack_Normal1 CallBack====>"); + } + + function FMS_acquireForm_1600_normal1() { + console.info(`FMS_acquireForm_1600_normal1 start`); + commonEvent.createSubscriber(onAcquiredForm_Event).then(async (data) => { + console.info("====>FMS_acquireForm_1600_normal1 Create OnAcquired Subscriber====>"); + subscriberOnAcquired = data; + await commonEvent.subscribe(subscriberOnAcquired, onAcquiredCallBack_Normal1); + }); + + console.info(`FMS_acquireForm_1600_normal1 featureAbility.startAbility start`); + featureAbility.startAbility({ + want: { + bundleName: "com.ohos.st.formsystemhost", + abilityName: "com.ohos.st.formsystemhost.MainAbility", + parameters: { + "formId": "0", + "name": "Form_Js001", + "bundle": "com.form.formsystemtestservicea.hmservice", + "ability": "com.form.formsystemtestservicea.hmservice.FormAbility", + "moduleName": "entry", + "temporary": false, + "isCreate": true + } + } + }).then((res: any) => { + console.info(`FMS_acquireForm_1600_normal1 featureAbility.startAbilityhost res: ${JSON.stringify(res)}`); + }).catch((err: any) => { + console.info(`FMS_acquireForm_1600_normal1 featureAbility.startAbilityhost error: ${JSON.stringify(err)}`); + }); + + console.info(`FMS_acquireForm_1600_normal1 featureAbility.startAbility end`); + console.info(`FMS_acquireForm_1600_normal1 end`); + } + + function delPublishCallBack_Normal2() { + console.info("!!!====>FMS_acquireForm_1600 delPublishCallBack_Normal2====>"); + setTimeout(function () { + console.info('FMS_acquireForm_1600 delPublishCallBack_Normal2 end'); + FMS_acquireForm_1600_Temp1(); + }, 50); + } + function onAcquiredCallBack_Normal2(err, data) { + console.info("!!!====>FMS_acquireForm_1600 onAcquiredCallBack_Normal2 data:====>" + JSON.stringify(data)); + expect(data.event).assertEqual("FMS_FormOnAcquired_commonEvent"); + commonEvent.unsubscribe(subscriberOnAcquired, unSubscribeOnAcquiredCallBack_Normal2) + var commonEventPublishData = { + bundleName: "com.ohos.st.formsystemhost", + data: data.data + }; + commonEvent.publish(deleteForm_Event, commonEventPublishData, delPublishCallBack_Normal2); + } + function unSubscribeOnAcquiredCallBack_Normal2() { + console.info("====>FMS_acquireForm_1600 unSubscribeOnAcquiredCallBack_Normal2====>"); + } + function FMS_acquireForm_1600_normal2() { + console.info(`FMS_acquireForm_1600_normal2 start`); + commonEvent.createSubscriber(onAcquiredForm_Event).then(async (data) => { + console.info("====>FMS_acquireForm_1600_normal2 Create OnAcquired Subscriber====>"); + subscriberOnAcquired = data; + await commonEvent.subscribe(subscriberOnAcquired, onAcquiredCallBack_Normal2); + }); + + console.info(`FMS_acquireForm_1600_normal2 featureAbility.startAbility start`); + featureAbility.startAbility({ + want: { + bundleName: "com.ohos.st.formsystemhost", + abilityName: "com.ohos.st.formsystemhost.MainAbility", + parameters: { + "formId": "0", + "name": "Form_Js001", + "bundle": "com.form.formsystemtestservicea.hmservice", + "ability": "com.form.formsystemtestservicea.hmservice.FormAbility", + "moduleName": "entry", + "temporary": false, + "isCreate": true + } + } + }).then((res: any) => { + console.info(`FMS_acquireForm_1600_normal2 featureAbility.startAbilityhost res: ${JSON.stringify(res)}`); + }).catch((err: any) => { + console.info(`FMS_acquireForm_1600_normal2 featureAbility.startAbilityhost error: ${JSON.stringify(err)}`); + }); + + console.info(`FMS_acquireForm_1600_normal2 featureAbility.startAbility end`); + console.info(`FMS_acquireForm_1600_normal2 end`); + } + + function delPublishCallBack_Temp1() { + console.info("!!!====>FMS_acquireForm_1600 delPublishCallBack_Temp1====>"); + setTimeout(function () { + console.info('FMS_acquireForm_1600 delPublishCallBack_Temp1 end'); + FMS_acquireForm_1600_Temp2(); + }, 50); + } + function onAcquiredCallBack_Temp1(err, data) { + console.info("!!!====>FMS_acquireForm_1600 onAcquiredCallBack_Temp1 data:====>" + JSON.stringify(data)); + expect(data.event).assertEqual("FMS_FormOnAcquired_commonEvent"); + commonEvent.unsubscribe(subscriberOnAcquired, unSubscribeOnAcquiredCallBack_Temp1) + var commonEventPublishData = { + bundleName: "com.ohos.st.formsystemhost", + data: data.data + }; + commonEvent.publish(deleteForm_Event, commonEventPublishData, delPublishCallBack_Temp1); + } + function unSubscribeOnAcquiredCallBack_Temp1() { + console.info("====>FMS_acquireForm_1600 unSubscribeOnAcquiredCallBack_Temp1====>"); + } + + function FMS_acquireForm_1600_Temp1() { + console.info(`FMS_acquireForm_1600_Temp1 start`); + commonEvent.createSubscriber(onAcquiredForm_Event).then(async (data) => { + console.info("====>FMS_acquireForm_1600_Temp1 Create OnAcquired Subscriber====>"); + subscriberOnAcquired = data; + await commonEvent.subscribe(subscriberOnAcquired, onAcquiredCallBack_Temp1); + }); + + console.info(`FMS_acquireForm_1600_Temp1 featureAbility.startAbility start`); + featureAbility.startAbility({ + want: { + bundleName: "com.ohos.st.formsystemhost", + abilityName: "com.ohos.st.formsystemhost.MainAbility", + + parameters: { + "formId": "0", + "name": "Form_Js001", + "bundle": "com.form.formsystemtestservicea.hmservice", + "ability": "com.form.formsystemtestservicea.hmservice.FormAbility", + "moduleName": "entry", + "temporary": true, + "isCreate": true + } + } + }).then((res: any) => { + console.info(`FMS_acquireForm_1600_Temp1 featureAbility.startAbilityhost res: ${JSON.stringify(res)}`); + }).catch((err: any) => { + console.info(`FMS_acquireForm_1600_Temp1 featureAbility.startAbilityhost error: ${JSON.stringify(err)}`); + }); + + console.info(`FMS_acquireForm_1600_Temp1 featureAbility.startAbility end`); + console.info(`FMS_acquireForm_1600_Temp1 end`); + } + + function delPublishCallBack_Temp2() { + console.info("!!!====>FMS_acquireForm_1600 delPublishCallBack_Temp2====>"); + setTimeout(function () { + console.info('FMS_acquireForm_1600 delPublishCallBack_Temp2 end'); + console.info(`FMS_acquireForm_1600 end`); + done(); + }, 500); + } + function onAcquiredCallBack_Temp2(err, data) { + console.info("!!!====>FMS_acquireForm_1600 onAcquiredCallBack_Temp2 data:====>" + JSON.stringify(data)); + expect(data.event).assertEqual("FMS_FormOnAcquired_commonEvent"); + commonEvent.unsubscribe(subscriberOnAcquired, unSubscribeOnAcquiredCallBack_Temp2) + var commonEventPublishData = { + bundleName: "com.ohos.st.formsystemhost", + data: data.data + }; + commonEvent.publish(deleteForm_Event, commonEventPublishData, delPublishCallBack_Temp2); + } + function unSubscribeOnAcquiredCallBack_Temp2() { + console.info("====>FMS_acquireForm_1600 unSubscribeOnAcquiredCallBack_Temp2====>"); + } + + function FMS_acquireForm_1600_Temp2() { + console.info(`FMS_acquireForm_1600_Temp2 start`); + commonEvent.createSubscriber(onAcquiredForm_Event).then(async (data) => { + console.info("====>FMS_acquireForm_1600_Temp2 Create OnAcquired Subscriber====>"); + subscriberOnAcquired = data; + await commonEvent.subscribe(subscriberOnAcquired, onAcquiredCallBack_Temp2); + }); + + console.info(`FMS_acquireForm_1600_Temp2 featureAbility.startAbility start`); + featureAbility.startAbility({ + want: { + bundleName: "com.ohos.st.formsystemhost", + abilityName: "com.ohos.st.formsystemhost.MainAbility", + + parameters: { + "formId": "0", + "name": "Form_Js001", + "bundle": "com.form.formsystemtestservicea.hmservice", + "ability": "com.form.formsystemtestservicea.hmservice.FormAbility", + "moduleName": "entry", + "temporary": true, + "isCreate": true + } + } + }).then((res: any) => { + console.info(`FMS_acquireForm_1600_Temp2 featureAbility.startAbilityhost res: ${JSON.stringify(res)}`); + }).catch((err: any) => { + console.info(`FMS_acquireForm_1600_Temp2 featureAbility.startAbilityhost error: ${JSON.stringify(err)}`); + }); + + console.info(`FMS_acquireForm_1600_Temp2 featureAbility.startAbility end`); + console.info(`FMS_acquireForm_1600_Temp2 end`); + } + + FMS_acquireForm_1600_normal1(); + }); + /** + * @tc.number: FMS_acquireForm_1800 + * @tc.name: Multiple form hosts create one normal form and one temporary form respectively. + * @tc.desc: Verify that multiple hosts can successfully create multiple normal and temporary forms respectively. + */ + it(`FMS_acquireForm_1800`, 0, async (done) => { + console.info(`FMS_acquireForm_1800 start`); + + var subscriberOnAcquired; + + function delPublishCallBack_Normal1() { + console.info("!!!====>FMS_acquireForm_1800 delPublishCallBack_Normal1====>"); + setTimeout(function () { + console.info('FMS_acquireForm_1800 delPublishCallBack_Normal1 end'); + FMS_acquireForm_1800_normal2(); + }, 50); + } + function onAcquiredCallBack_Normal1(err, data) { + console.info("!!!====>FMS_acquireForm_1800 onAcquiredCallBack_Normal1 data:====>" + JSON.stringify(data)); + expect(data.event).assertEqual("FMS_FormOnAcquired_commonEvent"); + commonEvent.unsubscribe(subscriberOnAcquired, unSubscribeOnAcquiredCallBack_Normal1) + var commonEventPublishData = { + bundleName: "com.ohos.st.formsystemhost", + data: data.data + }; + commonEvent.publish(deleteForm_Event, commonEventPublishData, delPublishCallBack_Normal1); + } + function unSubscribeOnAcquiredCallBack_Normal1() { + console.info("====>FMS_acquireForm_1800 unSubscribeOnAcquiredCallBack_Normal1 CallBack====>"); + } + + function FMS_acquireForm_1800_normal1() { + console.info(`FMS_acquireForm_1800_normal1 start`); + commonEvent.createSubscriber(onAcquiredForm_Event).then(async (data) => { + console.info("====>FMS_acquireForm_1800_normal1 Create OnAcquired Subscriber====>"); + subscriberOnAcquired = data; + await commonEvent.subscribe(subscriberOnAcquired, onAcquiredCallBack_Normal1); + }); + + console.info(`FMS_acquireForm_1800_normal1 featureAbility.startAbility start`); + featureAbility.startAbility({ + want: { + bundleName: "com.ohos.st.formsystemhost", + abilityName: "com.ohos.st.formsystemhost.MainAbility", + parameters: { + "formId": "0", + "name": "Form_Js001", + "bundle": "com.form.formsystemtestservicea.hmservice", + "ability": "com.form.formsystemtestservicea.hmservice.FormAbility", + "moduleName": "entry", + "temporary": false, + "isCreate": true + } + } + }).then((res: any) => { + console.info(`FMS_acquireForm_1800_normal1 featureAbility.startAbilityhost res: ${JSON.stringify(res)}`); + }).catch((err: any) => { + console.info(`FMS_acquireForm_1800_normal1 featureAbility.startAbilityhost error: ${JSON.stringify(err)}`); + }); + + console.info(`FMS_acquireForm_1800_normal1 featureAbility.startAbility end`); + console.info(`FMS_acquireForm_1800_normal1 end`); + } + + function delPublishCallBack_Normal2() { + console.info("!!!====>FMS_acquireForm_1800 delPublishCallBack_Normal2====>"); + setTimeout(function () { + console.info('FMS_acquireForm_1800 delPublishCallBack_Normal2 end'); + FMS_acquireForm_1800_Temp1(); + }, 50); + } + function onAcquiredCallBack_Normal2(err, data) { + console.info("!!!====>FMS_acquireForm_1800 onAcquiredCallBack_Normal2 data:====>" + JSON.stringify(data)); + expect(data.event).assertEqual("FMS_FormOnAcquired_commonEvent"); + commonEvent.unsubscribe(subscriberOnAcquired, unSubscribeOnAcquiredCallBack_Normal2) + var commonEventPublishData = { + bundleName: "com.ohos.st.formsystemhostb", + data: data.data + }; + commonEvent.publish(deleteForm_Event, commonEventPublishData, delPublishCallBack_Normal2); + } + function unSubscribeOnAcquiredCallBack_Normal2() { + console.info("====>FMS_acquireForm_1800 unSubscribeOnAcquiredCallBack_Normal2====>"); + } + function FMS_acquireForm_1800_normal2() { + console.info(`FMS_acquireForm_1800_normal2 start`); + commonEvent.createSubscriber(onAcquiredForm_Event).then(async (data) => { + console.info("====>FMS_acquireForm_1800_normal2 Create OnAcquired Subscriber====>"); + subscriberOnAcquired = data; + await commonEvent.subscribe(subscriberOnAcquired, onAcquiredCallBack_Normal2); + }); + + console.info(`FMS_acquireForm_1800_normal2 featureAbility.startAbility start`); + featureAbility.startAbility({ + want: { + bundleName: "com.ohos.st.formsystemhostb", + abilityName: "com.ohos.st.formsystemhostb.MainAbility", + parameters: { + "formId": "0", + "name": "Form_Js001", + "bundle": "com.form.formsystemtestservicea.hmservice", + "ability": "com.form.formsystemtestservicea.hmservice.FormAbility", + "moduleName": "entry", + "temporary": false, + "isCreate": true + } + } + }).then((res: any) => { + console.info(`FMS_acquireForm_1800_normal2 featureAbility.startAbilityhost res: ${JSON.stringify(res)}`); + }).catch((err: any) => { + console.info(`FMS_acquireForm_1800_normal2 featureAbility.startAbilityhost error: ${JSON.stringify(err)}`); + }); + + console.info(`FMS_acquireForm_1800_normal2 featureAbility.startAbility end`); + console.info(`FMS_acquireForm_1800_normal2 end`); + } + + function delPublishCallBack_Temp1() { + console.info("!!!====>FMS_acquireForm_1800 delPublishCallBack_Temp1====>"); + setTimeout(function () { + console.info('FMS_acquireForm_1800 delPublishCallBack_Temp1 end'); + FMS_acquireForm_1800_Temp2(); + }, 50); + } + function onAcquiredCallBack_Temp1(err, data) { + console.info("!!!====>FMS_acquireForm_1800 onAcquiredCallBack_Temp1 data:====>" + JSON.stringify(data)); + expect(data.event).assertEqual("FMS_FormOnAcquired_commonEvent"); + commonEvent.unsubscribe(subscriberOnAcquired, unSubscribeOnAcquiredCallBack_Temp1) + var commonEventPublishData = { + bundleName: "com.ohos.st.formsystemhost", + data: data.data + }; + commonEvent.publish(deleteForm_Event, commonEventPublishData, delPublishCallBack_Temp1); + } + function unSubscribeOnAcquiredCallBack_Temp1() { + console.info("====>FMS_acquireForm_1800 unSubscribeOnAcquiredCallBack_Temp1====>"); + } + + function FMS_acquireForm_1800_Temp1() { + console.info(`FMS_acquireForm_1800_Temp1 start`); + commonEvent.createSubscriber(onAcquiredForm_Event).then(async (data) => { + console.info("====>FMS_acquireForm_1800_Temp1 Create OnAcquired Subscriber====>"); + subscriberOnAcquired = data; + await commonEvent.subscribe(subscriberOnAcquired, onAcquiredCallBack_Temp1); + }); + + console.info(`FMS_acquireForm_1800_Temp1 featureAbility.startAbility start`); + featureAbility.startAbility({ + want: { + bundleName: "com.ohos.st.formsystemhost", + abilityName: "com.ohos.st.formsystemhost.MainAbility", + parameters: { + "formId": "0", + "name": "Form_Js001", + "bundle": "com.form.formsystemtestservicea.hmservice", + "ability": "com.form.formsystemtestservicea.hmservice.FormAbility", + "moduleName": "entry", + "temporary": true, + "isCreate": true + } + } + }).then((res: any) => { + console.info(`FMS_acquireForm_1800_Temp1 featureAbility.startAbilityhost res: ${JSON.stringify(res)}`); + }).catch((err: any) => { + console.info(`FMS_acquireForm_1800_Temp1 featureAbility.startAbilityhost error: ${JSON.stringify(err)}`); + }); + + console.info(`FMS_acquireForm_1800_Temp1 featureAbility.startAbility end`); + console.info(`FMS_acquireForm_1800_Temp1 end`); + } + + function delPublishCallBack_Temp2() { + console.info("!!!====>FMS_acquireForm_1800 delPublishCallBack_Temp2====>"); + setTimeout(function () { + console.info('FMS_acquireForm_1800 delPublishCallBack_Temp2 end'); + console.info(`FMS_acquireForm_1800 end`); + done(); + }, 500); + } + function onAcquiredCallBack_Temp2(err, data) { + console.info("!!!====>FMS_acquireForm_1800 onAcquiredCallBack_Temp2 data:====>" + JSON.stringify(data)); + expect(data.event).assertEqual("FMS_FormOnAcquired_commonEvent"); + commonEvent.unsubscribe(subscriberOnAcquired, unSubscribeOnAcquiredCallBack_Temp2) + var commonEventPublishData = { + bundleName: "com.ohos.st.formsystemhostb", + data: data.data + }; + commonEvent.publish(deleteForm_Event, commonEventPublishData, delPublishCallBack_Temp2); + } + function unSubscribeOnAcquiredCallBack_Temp2() { + console.info("====>FMS_acquireForm_1800 unSubscribeOnAcquiredCallBack_Temp2====>"); + } + + function FMS_acquireForm_1800_Temp2() { + console.info(`FMS_acquireForm_1800_Temp2 start`); + commonEvent.createSubscriber(onAcquiredForm_Event).then(async (data) => { + console.info("====>FMS_acquireForm_1800_Temp2 Create OnAcquired Subscriber====>"); + subscriberOnAcquired = data; + await commonEvent.subscribe(subscriberOnAcquired, onAcquiredCallBack_Temp2); + }); + + console.info(`FMS_acquireForm_1800_Temp2 featureAbility.startAbility start`); + featureAbility.startAbility({ + want: { + bundleName: "com.ohos.st.formsystemhostb", + abilityName: "com.ohos.st.formsystemhostb.MainAbility", + + parameters: { + "formId": "0", + "name": "Form_Js001", + "bundle": "com.form.formsystemtestservicea.hmservice", + "ability": "com.form.formsystemtestservicea.hmservice.FormAbility", + "moduleName": "entry", + "temporary": true, + "isCreate": true + } + } + }).then((res: any) => { + console.info(`FMS_acquireForm_1800_Temp2 featureAbility.startAbilityhost res: ${JSON.stringify(res)}`); + }).catch((err: any) => { + console.info(`FMS_acquireForm_1800_Temp2 featureAbility.startAbilityhost error: ${JSON.stringify(err)}`); + }); + + console.info(`FMS_acquireForm_1800_Temp2 featureAbility.startAbility end`); + console.info(`FMS_acquireForm_1800_Temp2 end`); + } + + FMS_acquireForm_1800_normal1(); + }); + /** + * @tc.number: FMS_acquireForm_1900 + * @tc.name: Add a temporary form when the formId is set to 0. + * @tc.desc: When the verification formId is set to 0, the temporary form is created successfully. + */ + it(`FMS_acquireForm_1900`, 0, async (done) => { + console.info(`FMS_acquireForm_1900 start`); + let subscriberOnAcquired; + let subscriberSupply; + let formId1; + let formId2; + + function delPublishCallBack() { + console.info("!!!====>FMS_acquireForm_1900 delPublishCallBack====>"); + setTimeout(function () { + console.info('FMS_acquireForm_1900 delPublishCallBack end'); + console.info(`FMS_acquireForm_1900 end`); + done(); + }, 500); + } + function onAcquiredCallBack(err, data) { + console.info("!!!====>FMS_acquireForm_1900 onAcquiredCallBack data:====>" + JSON.stringify(data)); + expect(data.event).assertEqual("FMS_FormOnAcquired_commonEvent"); + commonEvent.unsubscribe(subscriberOnAcquired, unSubscribeOnAcquiredCallBack) + formId1 = data.data; + + if (formId1 && formId2) { + expect(formId1).assertEqual(formId2); + let commonEventPublishData = { + data: formId1 + }; + commonEvent.publish(deleteForm_Event, commonEventPublishData, delPublishCallBack); + } + } + function unSubscribeOnAcquiredCallBack() { + console.info("====>FMS_acquireForm_1900 unSubscribeOnAcquiredCallBack====>"); + } + + commonEvent.createSubscriber(onAcquiredForm_Event).then(async (data) => { + console.info("====>FMS_acquireForm_1900 Create OnAcquired Subscriber====>"); + subscriberOnAcquired = data; + await commonEvent.subscribe(subscriberOnAcquired, onAcquiredCallBack); + }); + + function onSupplyCallBack(err, data) { + if (data.parameters.kind == "onCreate") { + console.info("====>FMS_acquireForm_1900 onSupplyCallBack====>" + JSON.stringify(data)); + commonEvent.unsubscribe(subscriberSupply, unSubscribeSupplyCallback); + let retData = JSON.parse(data.parameters.parameters); + + let bundleName = retData.bundleName; + expect(bundleName).assertEqual("com.form.formsystemtestservicea.hmservice"); + let abilityName = retData.abilityName; + expect(abilityName).assertEqual("com.form.formsystemtestservicea.hmservice.FormAbility"); + let moduleName = retData.parameters['ohos.extra.param.key.module_name']; + expect(moduleName).assertEqual("entry"); + let formName = retData.parameters['ohos.extra.param.key.form_name']; + expect(formName).assertEqual("Form_Js001"); + let formDimension = retData.parameters['ohos.extra.param.key.form_dimension']; + expect(formDimension).assertEqual(1); + let tempFormFlag = retData.parameters['ohos.extra.param.key.form_temporary']; + expect(tempFormFlag).assertEqual(true); + formId2 = retData.parameters['ohos.extra.param.key.form_identity']; + console.info("!!!====>FMS_acquireForm_1900 onAcquiredCallBack formId2:====>" + formId2); + if (formId1 && formId2) { + expect(formId1).assertEqual(formId2); + let commonEventPublishData = { + data: formId1 + }; + commonEvent.publish(deleteForm_Event, commonEventPublishData, delPublishCallBack); + } + } + } + function unSubscribeSupplyCallback() { + console.info("====>FMS_acquireForm_1900 unSubscribeSupplyCallback====>"); + } + + commonEvent.createSubscriber(onSupplyEvent).then(async (data) => { + console.info("====>FMS_acquireForm_1900 onSupplyEvent Subscriber====>"); + subscriberSupply = data; + await commonEvent.subscribe(subscriberSupply, onSupplyCallBack); + }); + + console.info(`FMS_acquireForm_1900 featureAbility.startAbility start`); + featureAbility.startAbility({ + want: { + bundleName: "com.ohos.st.formsystemhost", + abilityName: "com.ohos.st.formsystemhost.MainAbility", + parameters: { + "formId": "0", + "name": "Form_Js001", + "bundle": "com.form.formsystemtestservicea.hmservice", + "ability": "com.form.formsystemtestservicea.hmservice.FormAbility", + "moduleName": "entry", + "temporary": true, + "isCreate": true + } + } + }).then((res: any) => { + console.info(`FMS_acquireForm_1900 featureAbility.startAbilityhost res: ${JSON.stringify(res)}`); + }).catch((err: any) => { + console.info(`FMS_acquireForm_1900 featureAbility.startAbilityhost error: ${JSON.stringify(err)}`); + }); + + console.info(`FMS_acquireForm_1900 featureAbility.startAbility end`); + }); + /** + * @tc.number: FMS_acquireForm_2100 + * @tc.name: When creating a temporary form, the formId is specified as the created normal formId. + * @tc.desc: Failed to create a temporary form when verifying that the formId is set to create a normal formId. + */ + it(`FMS_acquireForm_2100`, 0, async (done) => { + console.info(`FMS_acquireForm_2100 start`); + var subscriberOnAcquired; + var subscriberOnError; + var formId; + + function delPublishCallBack() { + console.info("!!!====>FMS_acquireForm_2100 delPublishCallBack====>"); + setTimeout(function () { + console.info('FMS_acquireForm_2100 delPublishCallBack end'); + console.info(`FMS_acquireForm_2100 end`); + done(); + }, 1000) + } + function onErrorCallBack(err, data) { + console.info("!!!====>FMS_acquireForm_2100 onErrorCallBack data:====>" + JSON.stringify(data)); + expect(data.event).assertEqual("FMS_FormOnError_commonEvent"); + expect(data.data).assertEqual("invalid params received on operating form."); + commonEvent.unsubscribe(subscriberOnError, unSubscribeOnErrorCallBackCache); + var commonEventPublishData = { + data: formId + }; + commonEvent.publish(deleteForm_Event, commonEventPublishData, delPublishCallBack); + } + function unSubscribeOnErrorCallBackCache() { + console.info("====>FMS_acquireForm_2100 unSubscribeOnErrorCallBackCache CallBack====>"); + } + function onAcquiredCallBack(err, data) { + console.info("!!!====>FMS_acquireForm_2100 onAcquiredCallBack data:====>" + JSON.stringify(data)); + expect(data.event).assertEqual("FMS_FormOnAcquired_commonEvent"); + commonEvent.unsubscribe(subscriberOnAcquired, unSubscribeOnAcquiredCallback) + formId = data.data; + // add cache form + commonEvent.createSubscriber(onErrorForm_Event).then(async (data1) => { + console.info("====>FMS_acquireForm_2100 onErrorForm_Event Subscriber====>"); + subscriberOnError = data1; + await commonEvent.subscribe(subscriberOnError, onErrorCallBack); + }); + console.info(`FMS_acquireForm_2100 featureAbility.startAbility again start`); + featureAbility.startAbility({ + want: { + bundleName: "com.ohos.st.formsystemhost", + abilityName: "com.ohos.st.formsystemhost.MainAbility", + parameters: { + "formId": data.data, + "name": "Form_Js001", + "bundle": "com.form.formsystemtestservicea.hmservice", + "ability": "com.form.formsystemtestservicea.hmservice.FormAbility", + "moduleName": "entry", + "temporary": true, + "isCreate": true + } + } + }).then((res: any) => { + console.info(`FMS_acquireForm_2100 featureAbility.startAbilityhost res: ${JSON.stringify(res)}`); + }).catch((err: any) => { + console.info(`FMS_acquireForm_2100 featureAbility.startAbilityhost error: ${JSON.stringify(err)}`); + }); + console.info(`FMS_acquireForm_2100 featureAbility.startAbility again end`); + } + function unSubscribeOnAcquiredCallback() { + console.info("====>FMS_acquireForm_2100 unSubscribeOnAcquiredCallback====>"); + } + + commonEvent.createSubscriber(onAcquiredForm_Event).then(async (data) => { + console.info("====>FMS_acquireForm_2100 onAcquiredForm_Event Subscriber====>"); + subscriberOnAcquired = data; + await commonEvent.subscribe(subscriberOnAcquired, onAcquiredCallBack); + }); + + console.info(`FMS_acquireForm_2100 featureAbility.startAbility start`); + await featureAbility.startAbility({ + want: { + bundleName: "com.ohos.st.formsystemhost", + abilityName: "com.ohos.st.formsystemhost.MainAbility", + parameters: { + "formId": "0", + "name": "Form_Js001", + "bundle": "com.form.formsystemtestservicea.hmservice", + "ability": "com.form.formsystemtestservicea.hmservice.FormAbility", + "moduleName": "entry", + "temporary": false, + "isCreate": true + } + } + }).then((res: any) => { + console.info(`FMS_acquireForm_2100 featureAbility.startAbilityhost res: ${JSON.stringify(res)}`); + }).catch((err: any) => { + console.info(`FMS_acquireForm_2100 featureAbility.startAbilityhost error: ${JSON.stringify(err)}`); + }); + console.info(`FMS_acquireForm_2100 featureAbility.startAbility end`); + }); + /** + * @tc.number: FMS_acquireForm_2200 + * @tc.name: Cast to normal form when the temporary formId is set to negative. + * @tc.desc: Failed to Cast to normal form when the temporary formId is set to negative + */ + it(`FMS_acquireForm_2200`, 0, async (done) => { + console.info(`FMS_acquireForm_2200 start`); + var subscriberCast; + var subscriberOnError; + var formId; + + function delPublishCallBack() { + console.info("!!!====>FMS_acquireForm_2200 delPublishCallBack====>"); + setTimeout(function () { + console.info('FMS_acquireForm_2200 delPublishCallBack end'); + console.info(`FMS_acquireForm_2200 end`); + done(); + }, 1000) + } + + function onCastCallBack(err, data) { + console.info("!!!====>FMS_acquireForm_2200 onCastCallBack data:====>" + JSON.stringify(data)); + expect(data.event).assertEqual("FMS_FormCast_commonEvent"); + expect(data.data != "0").assertEqual(true); + commonEvent.unsubscribe(subscriberCast, unSubscribeOnCastCallback) + var commonEventPublishData = { + data: data.parameters.formId + }; + commonEvent.publish(deleteForm_Event, commonEventPublishData, delPublishCallBack); + } + function unSubscribeOnCastCallback() { + console.info("====>FMS_acquireForm_2200 unSubscribeOnCastCallback====>"); + } + + commonEvent.createSubscriber(subscriberFormCastEvent).then(async (data) => { + console.info("====>FMS_acquireForm_2200 subscriberFormCastEvent Subscriber====>"); + subscriberCast = data; + await commonEvent.subscribe(subscriberCast, onCastCallBack); + }); + + console.info(`FMS_acquireForm_2200 featureAbility.startAbility start`); + await featureAbility.startAbility({ + want: { + bundleName: "com.ohos.st.formsystemhost", + abilityName: "com.ohos.st.formsystemhost.MainAbility", + parameters: { + "formId": "0", + "name": "Form_Js001", + "bundle": "com.form.formsystemtestservicea.hmservice", + "ability": "com.form.formsystemtestservicea.hmservice.FormAbility", + "moduleName": "entry", + "temporary": true, + "temporaryId": "-1", + "castForm": true, + "isCreate": true + } + } + }).then((res: any) => { + console.info(`FMS_acquireForm_2200 featureAbility.startAbilityhost res: ${JSON.stringify(res)}`); + }).catch((err: any) => { + console.info(`FMS_acquireForm_2200 featureAbility.startAbilityhost error: ${JSON.stringify(err)}`); + }); + console.info(`FMS_acquireForm_2200 featureAbility.startAbility end`); + }); + /** + * @tc.number: FMS_acquireForm_2300 + * @tc.name: Cast to normal form when the temporary formIdis set to 0. + * @tc.desc: Failed to convert to normal form when verifying that the temporary formIdis set to 0 + */ + it(`FMS_acquireForm_2300`, 0, async (done) => { + console.info(`FMS_acquireForm_2300 start`); + var subscriberCast; + var formId; + + function delPublishCallBack() { + console.info("!!!====>FMS_acquireForm_2300 delPublishCallBack====>"); + setTimeout(function () { + console.info('FMS_acquireForm_2300 delPublishCallBack end'); + console.info(`FMS_acquireForm_2300 end`); + done(); + }, 1000) + } + + function onCastCallBack(err, data) { + console.info("!!!====>FMS_acquireForm_2300 onCastCallBack data:====>" + JSON.stringify(data)); + expect(data.event).assertEqual("FMS_FormCast_commonEvent"); + expect(data.data != "0").assertEqual(true); + commonEvent.unsubscribe(subscriberCast, unSubscribeOnCastCallback) + var commonEventPublishData = { + data: data.parameters.formId + }; + commonEvent.publish(deleteForm_Event, commonEventPublishData, delPublishCallBack); + } + function unSubscribeOnCastCallback() { + console.info("====>FMS_acquireForm_2300 unSubscribeOnCastCallback====>"); + } + + commonEvent.createSubscriber(subscriberFormCastEvent).then(async (data) => { + console.info("====>FMS_acquireForm_2300 subscriberFormCastEvent Subscriber====>"); + subscriberCast = data; + await commonEvent.subscribe(subscriberCast, onCastCallBack); + }); + + console.info(`FMS_acquireForm_2300 featureAbility.startAbility start`); + await featureAbility.startAbility({ + want: { + bundleName: "com.ohos.st.formsystemhost", + abilityName: "com.ohos.st.formsystemhost.MainAbility", + parameters: { + "formId": "0", + "name": "Form_Js001", + "bundle": "com.form.formsystemtestservicea.hmservice", + "ability": "com.form.formsystemtestservicea.hmservice.FormAbility", + "moduleName": "entry", + "temporary": true, + "temporaryId": "0", + "castForm": true, + "isCreate": true + } + } + }).then((res: any) => { + console.info(`FMS_acquireForm_2300 featureAbility.startAbilityhost res: ${JSON.stringify(res)}`); + }).catch((err: any) => { + console.info(`FMS_acquireForm_2300 featureAbility.startAbilityhost error: ${JSON.stringify(err)}`); + }); + console.info(`FMS_acquireForm_2300 featureAbility.startAbility end`); + }); + /** + * @tc.number: FMS_acquireForm_2400 + * @tc.name: Non affiliated temporary form ID to normal form. + * @tc.desc: Failed to convert non affiliated temporary form ID to normal form. + */ + it(`FMS_acquireForm_2400`, 0, async (done) => { + console.info(`FMS_acquireForm_2400 start`); + var subscriberOnAcquired; + var subscriberCast; + + function delPublishCallBack() { + console.info("!!!====>FMS_acquireForm_2400 delPublishCallBack====>"); + setTimeout(function () { + console.info('FMS_acquireForm_2400 delPublishCallBack end'); + console.info(`FMS_acquireForm_2400 end`); + done(); + }, 1000) + } + + function onCastCallBack(err, data) { + console.info("!!!====>FMS_acquireForm_2400 onCastCallBack data:====>" + JSON.stringify(data)); + expect(data.event).assertEqual("FMS_FormCast_commonEvent"); + expect(data.data != "0").assertEqual(true); + commonEvent.unsubscribe(subscriberCast, unSubscribeOnCastCallback) + var commonEventPublishData = { + data: data.parameters.formId + }; + commonEvent.publish(deleteForm_Event, commonEventPublishData, delPublishCallBack); + } + function unSubscribeOnCastCallback() { + console.info("====>FMS_acquireForm_2400 unSubscribeOnCastCallback====>"); + } + function onAcquiredCallBack(err, data) { + console.info("!!!====>FMS_acquireForm_2400 onAcquiredCallBack data:====>" + JSON.stringify(data)); + expect(data.event).assertEqual("FMS_FormOnAcquired_commonEvent"); + commonEvent.unsubscribe(subscriberOnAcquired, unSubscribeOnAcquiredCallback) + + commonEvent.createSubscriber(subscriberFormCastEvent).then(async (data) => { + console.info("====>FMS_acquireForm_2400 subscriberFormCastEvent Subscriber====>"); + subscriberCast = data; + await commonEvent.subscribe(subscriberCast, onCastCallBack); + }); + + console.info(`FMS_acquireForm_2400 featureAbility.startAbility again start`); + featureAbility.startAbility({ + want: { + bundleName: "com.ohos.st.formsystemhostb", + abilityName: "com.ohos.st.formsystemhostb.MainAbility", + parameters: { + "formId": "0", + "name": "Form_Js001", + "bundle": "com.form.formsystemtestservicea.hmservice", + "ability": "com.form.formsystemtestservicea.hmservice.FormAbility", + "moduleName": "entry", + "temporary": false, + "temporaryId": data.data, + "castForm": true, + "isCreate": true + } + } + }).then((res: any) => { + console.info(`FMS_acquireForm_2400 featureAbility.startAbilityhost res: ${JSON.stringify(res)}`); + }).catch((err: any) => { + console.info(`FMS_acquireForm_2400 featureAbility.startAbilityhost error: ${JSON.stringify(err)}`); + }); + console.info(`FMS_acquireForm_2400 featureAbility.startAbility again end`); + } + function unSubscribeOnAcquiredCallback() { + console.info("====>FMS_acquireForm_2400 OnAcquired UnSubscribe CallBack====>"); + } + + commonEvent.createSubscriber(onAcquiredForm_Event).then(async (data) => { + console.info("====>FMS_acquireForm_2400 Create OnAcquired Subscriber====>"); + subscriberOnAcquired = data; + await commonEvent.subscribe(subscriberOnAcquired, onAcquiredCallBack); + }); + + console.info(`FMS_acquireForm_2400 featureAbility.startAbility start`); + await featureAbility.startAbility({ + want: { + bundleName: "com.ohos.st.formsystemhost", + abilityName: "com.ohos.st.formsystemhost.MainAbility", + parameters: { + "formId": "0", + "name": "Form_Js001", + "bundle": "com.form.formsystemtestservicea.hmservice", + "ability": "com.form.formsystemtestservicea.hmservice.FormAbility", + "moduleName": "entry", + "temporary": true, + "isCreate": true + } + } + }).then((res: any) => { + console.info(`FMS_acquireForm_2400 featureAbility.startAbilityhost res: ${JSON.stringify(res)}`); + }).catch((err: any) => { + console.info(`FMS_acquireForm_2400 featureAbility.startAbilityhost error: ${JSON.stringify(err)}`); + }); + console.info(`FMS_acquireForm_2400 featureAbility.startAbility end`); + }); + /** + * @tc.number: FMS_acquireForm_2500 + * @tc.name: cast non-existent temporary formId to normal form. + * @tc.desc: Failed to verify that the temporary formId that does not exist is casted to normal form. + */ + it(`FMS_acquireForm_2500`, 0, async (done) => { + console.info(`FMS_acquireForm_2500 start`); + var subscriberCast; + var formId; + + function delPublishCallBack() { + console.info("!!!====>FMS_acquireForm_2500 delPublishCallBack====>"); + setTimeout(function () { + console.info('FMS_acquireForm_2500 delPublishCallBack end'); + console.info(`FMS_acquireForm_2500 end`); + done(); + }, 1000) + } + + function onCastCallBack(err, data) { + console.info("!!!====>FMS_acquireForm_2500 onCastCallBack data:====>" + JSON.stringify(data)); + expect(data.event).assertEqual("FMS_FormCast_commonEvent"); + expect(data.data != "0").assertEqual(true); + commonEvent.unsubscribe(subscriberCast, unSubscribeOnCastCallback) + var commonEventPublishData = { + data: data.parameters.formId + }; + commonEvent.publish(deleteForm_Event, commonEventPublishData, delPublishCallBack); + } + function unSubscribeOnCastCallback() { + console.info("====>FMS_acquireForm_2500 unSubscribeOnCastCallback====>"); + } + + commonEvent.createSubscriber(subscriberFormCastEvent).then(async (data) => { + console.info("====>FMS_acquireForm_2500 subscriberFormCastEvent Subscriber====>"); + subscriberCast = data; + await commonEvent.subscribe(subscriberCast, onCastCallBack); + }); + + console.info(`FMS_acquireForm_2500 featureAbility.startAbility start`); + await featureAbility.startAbility({ + want: { + bundleName: "com.ohos.st.formsystemhost", + abilityName: "com.ohos.st.formsystemhost.MainAbility", + parameters: { + "formId": "0", + "name": "Form_Js001", + "bundle": "com.form.formsystemtestservicea.hmservice", + "ability": "com.form.formsystemtestservicea.hmservice.FormAbility", + "moduleName": "entry", + "temporary": true, + "temporaryId": "123456789", + "castForm": true, + "isCreate": true + } + } + }).then((res: any) => { + console.info(`FMS_acquireForm_2500 featureAbility.startAbilityhost res: ${JSON.stringify(res)}`); + }).catch((err: any) => { + console.info(`FMS_acquireForm_2500 featureAbility.startAbilityhost error: ${JSON.stringify(err)}`); + }); + console.info(`FMS_acquireForm_2500 featureAbility.startAbility end`); + }); + /** + * @tc.number: FMS_acquireForm_2600 + * @tc.name: When the normal form does not reach the maximum value created by the form, the temporary form changes to the normal form. + * @tc.desc: Verify that when the normal form does not reach the maximum value created by the form. + * the temporary form can be successfully casted to the normal form. + */ + it(`FMS_acquireForm_2600`, 0, async (done) => { + console.info(`FMS_acquireForm_2600 start`); + let subscriberOnAcquired; + let subscriberCast; + let subscriberSupply; + let formId1; + let formId2; + + function delPublishCallBack() { + console.info("!!!====>FMS_acquireForm_2600 delPublishCallBack====>"); + setTimeout(function () { + console.info('FMS_acquireForm_2600 delPublishCallBack end'); + console.info(`FMS_acquireForm_2600 end`); + done(); + }, 1000) + } + + function onCastCallBack(err, data) { + console.info("!!!====>FMS_acquireForm_2600 onCastCallBack data:====>" + JSON.stringify(data)); + expect(data.event).assertEqual("FMS_FormCast_commonEvent"); + expect(data.data).assertEqual("0"); + commonEvent.unsubscribe(subscriberCast, unSubscribeOnCastCallback) + formId1 = data.parameters.formId; + if (formId1 && formId2) { + expect(formId1).assertEqual(formId2); + let commonEventPublishData = { + data: formId1 + }; + commonEvent.publish(deleteForm_Event, commonEventPublishData, delPublishCallBack); + } + } + function unSubscribeOnCastCallback() { + console.info("====>FMS_acquireForm_2600 unSubscribeOnCastCallback====>"); + } + + function onAcquiredCallBack(err, data) { + console.info("!!!====>FMS_acquireForm_2600 onAcquiredCallBack data:====>" + JSON.stringify(data)); + expect(data.event).assertEqual("FMS_FormOnAcquired_commonEvent"); + commonEvent.unsubscribe(subscriberOnAcquired, unSubscribeOnAcquiredCallback) + + console.info(`FMS_acquireForm_2600 featureAbility.startAbility again start`); + featureAbility.startAbility({ + want: { + bundleName: "com.ohos.st.formsystemhost", + abilityName: "com.ohos.st.formsystemhost.MainAbility", + parameters: { + "formId": "0", + "name": "Form_Js001", + "bundle": "com.form.formsystemtestservicea.hmservice", + "ability": "com.form.formsystemtestservicea.hmservice.FormAbility", + "moduleName": "entry", + "temporary": false, + "temporaryId": data.data, + "castForm": true, + "isCreate": false + } + } + }).then((res: any) => { + console.info(`FMS_acquireForm_2600 featureAbility.startAbilityhost res: ${JSON.stringify(res)}`); + }).catch((err: any) => { + console.info(`FMS_acquireForm_2600 featureAbility.startAbilityhost error: ${JSON.stringify(err)}`); + }); + console.info(`FMS_acquireForm_2600 featureAbility.startAbility again end`); + } + function unSubscribeOnAcquiredCallback() { + console.info("====>FMS_acquireForm_2600 OnAcquired UnSubscribe CallBack====>"); + } + + function onSupplyCallBack(err, data) { + if (data.parameters.kind == "onCastToNormal") { + console.info("====>FMS_acquireForm_2600 onSupplyCallBack====>" + JSON.stringify(data)); + commonEvent.unsubscribe(subscriberSupply, unSubscribeSupplyCallback); + formId2 = data.parameters.parameters; + + if (formId1 && formId2) { + expect(formId1).assertEqual(formId2); + let commonEventPublishData = { + data: formId1 + }; + commonEvent.publish(deleteForm_Event, commonEventPublishData, delPublishCallBack); + } + } + } + function unSubscribeSupplyCallback() { + console.info("====>FMS_acquireForm_2600 unSubscribeSupplyCallback====>"); + } + + commonEvent.createSubscriber(onAcquiredForm_Event).then(async (data) => { + console.info("====>FMS_acquireForm_2600 Create OnAcquired Subscriber====>"); + subscriberOnAcquired = data; + await commonEvent.subscribe(subscriberOnAcquired, onAcquiredCallBack); + }); + commonEvent.createSubscriber(subscriberFormCastEvent).then(async (data) => { + console.info("====>FMS_acquireForm_2600 subscriberFormCastEvent Subscriber====>"); + subscriberCast = data; + await commonEvent.subscribe(subscriberCast, onCastCallBack); + }); + commonEvent.createSubscriber(onSupplyEvent).then(async (data) => { + console.info("====>FMS_acquireForm_2600 onSupplyEvent Subscriber====>"); + subscriberSupply = data; + await commonEvent.subscribe(subscriberSupply, onSupplyCallBack); + }); + + console.info(`FMS_acquireForm_2600 featureAbility.startAbility start`); + await featureAbility.startAbility({ + want: { + bundleName: "com.ohos.st.formsystemhost", + abilityName: "com.ohos.st.formsystemhost.MainAbility", + parameters: { + "formId": "0", + "name": "Form_Js001", + "bundle": "com.form.formsystemtestservicea.hmservice", + "ability": "com.form.formsystemtestservicea.hmservice.FormAbility", + "moduleName": "entry", + "temporary": true, + "isCreate": true + } + } + }).then((res: any) => { + console.info(`FMS_acquireForm_2600 featureAbility.startAbilityhost res: ${JSON.stringify(res)}`); + }).catch((err: any) => { + console.info(`FMS_acquireForm_2600 featureAbility.startAbilityhost error: ${JSON.stringify(err)}`); + }); + console.info(`FMS_acquireForm_2600 featureAbility.startAbility end`); + }); + }); +} diff --git a/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formacquiretest/entry/src/main/ets/MainAbility/test/List.test.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formacquiretest/entry/src/main/ets/MainAbility/test/List.test.ets new file mode 100644 index 0000000000000000000000000000000000000000..28b70bdb4cd8c8f5eb6f39497e30c774ba96b475 --- /dev/null +++ b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formacquiretest/entry/src/main/ets/MainAbility/test/List.test.ets @@ -0,0 +1,19 @@ +/* + * 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. + */ +import test from './FmsAcquireForm.test.ets'; + +export default function testsuite() { + test(); +} \ No newline at end of file diff --git a/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formacquiretest/entry/src/main/resources/base/element/string.json b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formacquiretest/entry/src/main/resources/base/element/string.json new file mode 100644 index 0000000000000000000000000000000000000000..f018e8c97b8fe45599ad59c5432fe8453a37f252 --- /dev/null +++ b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formacquiretest/entry/src/main/resources/base/element/string.json @@ -0,0 +1,12 @@ +{ + "string": [ + { + "name": "entry_MainAbility", + "value": "formacquiretest" + }, + { + "name": "description_mainability", + "value": "ETS_Empty Ability" + } + ] +} \ No newline at end of file diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formswithoutpermtest/entry/src/main/resources/base/media/icon.png b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formacquiretest/entry/src/main/resources/base/media/icon.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formswithoutpermtest/entry/src/main/resources/base/media/icon.png rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formacquiretest/entry/src/main/resources/base/media/icon.png diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formfuzztest/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formacquiretest/signature/openharmony_sx.p7b similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formfuzztest/signature/openharmony_sx.p7b rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formacquiretest/signature/openharmony_sx.p7b diff --git a/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formacquiretest2/BUILD.gn b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formacquiretest2/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..bfa63f3db8bda2875e5b6d695ca620b22f697299 --- /dev/null +++ b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formacquiretest2/BUILD.gn @@ -0,0 +1,32 @@ +# 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. + +import("//test/xts/tools/build/suite.gni") + +ohos_js_hap_suite("FormAcquireTest2") { + hap_profile = "./entry/src/main/config.json" + deps = [ + ":hjs_demo_js_assets", + ":hjs_demo_resources", + ] + ets2abc = true + certificate_profile = "./signature/openharmony_sx.p7b" + hap_name = "FormAcquireTest2" +} +ohos_js_assets("hjs_demo_js_assets") { + source_dir = "./entry/src/main/ets/MainAbility" +} +ohos_resources("hjs_demo_resources") { + sources = [ "./entry/src/main/resources" ] + hap_profile = "./entry/src/main/config.json" +} diff --git a/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formacquiretest2/Test.json b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formacquiretest2/Test.json new file mode 100644 index 0000000000000000000000000000000000000000..cc064c0aaa28622de5af0d2c9ad7843de085a7cc --- /dev/null +++ b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formacquiretest2/Test.json @@ -0,0 +1,23 @@ +{ + "description": "Configuration for hjunit demo Tests", + "driver": { + "type": "JSUnitTest", + "test-timeout": "300000", + "package": "com.ohos.st.formacquiretest2", + "shell-timeout": "60000" + }, + "kits": [ + { + "test-file-name": [ + "FormAcquireTest2.hap", + "FormSystemHost.hap", + "FormSystemHostI.hap", + "FormSystemHostJ.hap", + "FormSystemHostNoPerm.hap", + "FormSupplyAppA.hap" + ], + "type": "AppInstallKit", + "cleanup-apps": true + } + ] +} diff --git a/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formacquiretest2/entry/src/main/config.json b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formacquiretest2/entry/src/main/config.json new file mode 100644 index 0000000000000000000000000000000000000000..1b87c0033c03042a6c340ba507577eae41c206c9 --- /dev/null +++ b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formacquiretest2/entry/src/main/config.json @@ -0,0 +1,141 @@ +{ + "app": { + "bundleName": "com.ohos.st.formacquiretest2", + "vendor": "ohos", + "version": { + "code": 1000000, + "name": "1.0.0" + }, + "apiVersion": { + "compatible": 7, + "releaseType": "Release", + "target": 7 + } + }, + "deviceConfig": {}, + "module": { + "package": "com.ohos.st.formacquiretest2", + "name": ".FormAcquire2STApp", + "mainAbility": ".MainAbility", + "deviceType": [ + "phone" + ], + "distro": { + "deliveryWithInstall": true, + "moduleName": "entry", + "moduleType": "entry", + "installationFree": false + }, + "abilities": [ + { + "skills": [ + { + "entities": [ + "entity.system.home" + ], + "actions": [ + "action.system.home" + ] + } + ], + "visible": true, + "name": ".MainAbility", + "srcLanguage": "ets", + "icon": "$media:icon", + "description": "$string:description_mainability", + "label": "$string:entry_MainAbility", + "type": "page", + "launchType": "standard" + } + ], + "defPermissions": [ + { + "availableScope": [], + "grantMode": "system_grant", + "name": "FMS_FormDelete_commonEvent" + }, + { + "availableScope": [], + "grantMode": "system_grant", + "name": "FMS_FormOnAcquired_commonEvent" + }, + { + "availableScope": [], + "grantMode": "system_grant", + "name": "FMS_FormOnError_commonEvent" + }, + { + "availableScope": [], + "grantMode": "system_grant", + "name": "FMS_FormCast_commonEvent" + }, + { + "availableScope": [], + "grantMode": "system_grant", + "name": "FMS_FormSupply_commonEvent" + } + ], + "reqPermissions": [ + { + "name": "FMS_FormOnAcquired_commonEvent", + "reason": "need use onAcquired commonEvent" + }, + { + "name": "FMS_FormDelete_commonEvent", + "reason": "need use delete commonEvent" + }, + { + "name": "FMS_FormOnError_commonEvent", + "reason": "need use OnError commonEvent" + }, + { + "name": "FMS_FormCast_commonEvent", + "reason": "need use castFrom commonEvent" + }, + { + "name": "FMS_FormSupply_commonEvent", + "reason": "need use FormSupply commonEvent" + }, + { + "name": "ohos.permission.INSTALL_BUNDLE", + "reason": "need use ohos.permission.INSTALL_BUNDLE" + }, + { + "name":"ohos.permission.GET_BUNDLE_INFO_PRIVILEGED", + "reason":"need use ohos.permission.GET_BUNDLE_INFO_PRIVILEGED" + }, + { + "name":"ohos.permission.CHANGE_ABILITY_ENABLED_STATE", + "reason":"need use ohos.permission.CHANGE_ABILITY_ENABLED_STATE" + }, + { + "name":"ohos.permission.REMOVE_CACHE_FILES", + "reason":"need use ohos.permission.REMOVE_CACHE_FILES" + }, + { + "name":"ohos.permission.LISTEN_BUNDLE_CHANGE", + "reason":"need use ohos.permission.LISTEN_BUNDLE_CHANGE" + }, + { + "name":"ohos.permission.CLEAN_BACKGROUND_PROCESSES", + "reason":"need use ohos.permission.CLEAN_BACKGROUND_PROCESSES" + } + ], + "js": [ + { + "mode": { + "syntax": "ets", + "type": "pageAbility" + }, + "pages": [ + "pages/index" + ], + "name": ".MainAbility", + "window": { + "designWidth": 720, + "autoDesignWidth": false + } + } + ] + } +} \ No newline at end of file diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formhostdeathrecipienttest/entry/src/main/ets/MainAbility/app.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formacquiretest2/entry/src/main/ets/MainAbility/app.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formhostdeathrecipienttest/entry/src/main/ets/MainAbility/app.ets rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formacquiretest2/entry/src/main/ets/MainAbility/app.ets diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_disable/entry/src/main/ets/MainAbility/model/FormViewModel.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formacquiretest2/entry/src/main/ets/MainAbility/model/FormViewModel.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_disable/entry/src/main/ets/MainAbility/model/FormViewModel.ets rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formacquiretest2/entry/src/main/ets/MainAbility/model/FormViewModel.ets diff --git a/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formacquiretest2/entry/src/main/ets/MainAbility/pages/index.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formacquiretest2/entry/src/main/ets/MainAbility/pages/index.ets new file mode 100644 index 0000000000000000000000000000000000000000..d14aada15706ea711e0ca80b2b3d6387bed6fe1f --- /dev/null +++ b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formacquiretest2/entry/src/main/ets/MainAbility/pages/index.ets @@ -0,0 +1,68 @@ +/* + * 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. + */ + +// @ts-nocheck +import featureAbility from "@ohos.ability.featureAbility"; +import file from '@system.file'; +import { Core, ExpectExtend, ReportExtend } from "deccjsunit/index.ets"; +import testsuite from "../test/List.test.ets"; + +@Entry +@Component +struct Index { + + aboutToAppear() { + + console.info("[FormComponent] start run testcase!!!!"); + + featureAbility.getWant() + .then((want: any) => { + console.info('[FormComponent] Operation successful. Data: ' + JSON.stringify(want)); + const core = Core.getInstance(); + const expectExtend = new ExpectExtend({ + 'id': 'extend' + }); + core.addService('expect', expectExtend); + const reportExtend = new ReportExtend(file); + core.addService('report', reportExtend); + core.init(); + core.subscribeEvent('task', reportExtend); + const configService = core.getDefaultService('config'); + want.parameters['timeout'] = 40000; + console.info('[FormComponent] parameters---->' + JSON.stringify(want.parameters)); + configService.setConfig(want.parameters); + testsuite(); + core.execute(); + }) + .catch((error: any) => { + console.error('[FormComponent] Operation failed. Cause: ' + JSON.stringify(error)); + }) + } + + build() { + Flex({ + direction: FlexDirection.Column, + alignItems: ItemAlign.Center, + justifyContent: FlexAlign.Center + }) { + Text('Fms Main Ability Test') + .fontSize(50) + .fontWeight(FontWeight.Bold) + } + .width('100%') + .height('100%') + } +} + diff --git a/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formacquiretest2/entry/src/main/ets/MainAbility/test/FmsAcquireForm2.test.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formacquiretest2/entry/src/main/ets/MainAbility/test/FmsAcquireForm2.test.ets new file mode 100644 index 0000000000000000000000000000000000000000..9e7c28fea2d9ae27813286b0b7d5a38a510516a9 --- /dev/null +++ b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formacquiretest2/entry/src/main/ets/MainAbility/test/FmsAcquireForm2.test.ets @@ -0,0 +1,576 @@ +/* + * 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. + */ + +import featureAbility from "@ohos.ability.featureAbility"; +import commonEvent from '@ohos.commonEvent'; +import { describe, expect, it } from "deccjsunit/index.ets"; + +var onErrorForm_Event = { + events: ["FMS_FormOnError_commonEvent"], +}; +var onAcquiredForm_Event = { + events: ["FMS_FormOnAcquired_commonEvent"], +}; +var subscriberFormCastEvent = { + events: ["FMS_FormCast_commonEvent"], +}; +var onSupplyEvent = { + events: ["FMS_FormSupply_commonEvent"], +}; + +var deleteForm_Event = "FMS_FormDelete_commonEvent"; + +export default function test() { + describe(`FmsAcquiredFormTest2`, () => { + + /** + * @tc.number: FMS_acquireForm_3800 + * @tc.name: Failed to add form when parameter ability is wrong. + * @tc.desc: Failed to create form when verifying that the parameter (formId) of creating form is wrong. + */ + it(`FMS_acquireForm_3800`, 0, async (done) => { + console.info(`FMS_acquireForm_3800 start`); + var subscriberOnError; + function onErrorCallBack(err, data) { + console.info("!!!====>FMS_acquireForm_3800 onErrorCallBack data:====>" + JSON.stringify(data)); + expect(data.event).assertEqual("FMS_FormOnError_commonEvent"); + expect(data.data).assertEqual("invalid params received on operating form."); + commonEvent.unsubscribe(subscriberOnError, unSubscribeOnErrorCallback); + console.info(`FMS_acquireForm_3800 end`); + done(); + } + function unSubscribeOnErrorCallback() { + console.info("====>FMS_acquireForm_3800 unSubscribeOnErrorCallback CallBack====>"); + } + commonEvent.createSubscriber(onErrorForm_Event).then(async (data) => { + console.info("====>FMS_acquireForm_3800 onErrorForm_Event Subscriber====>"); + subscriberOnError = data; + await commonEvent.subscribe(subscriberOnError, onErrorCallBack); + }); + console.info(`FMS_acquireForm_3800 featureAbility.startAbility start`); + await featureAbility.startAbility({ + want: { + bundleName: "com.ohos.st.formsystemhost", + abilityName: "com.ohos.st.formsystemhost.MainAbility", + parameters: { + "formId": "0", + "name": "Form_Js001", + "bundle": "com.form.formsystemtestservicea.hmservice", + "ability": "", + "moduleName": "entry", + "temporary": false, + "isCreate": true + } + } + }).then((res: any) => { + console.info(`FMS_acquireForm_3800 featureAbility.startAbilityhost res: ${JSON.stringify(res)}`); + }).catch((err: any) => { + console.info(`FMS_acquireForm_3800 featureAbility.startAbilityhost error: ${JSON.stringify(err)}`); + }); + console.info(`FMS_acquireForm_3800 featureAbility.startAbility end`); + }); + /** + * @tc.number: FMS_acquireForm_3900 + * @tc.name: Failed to add form when parameter bundleName is wrong. + * @tc.desc: Failed to create form when verifying that the parameter (bundleName) of creating form is wrong. + */ + it(`FMS_acquireForm_3900`, 0, async (done) => { + console.info(`FMS_acquireForm_3900 start`); + var subscriberOnError; + function onErrorCallBack(err, data) { + console.info("!!!====>FMS_acquireForm_3900 onErrorCallBack data:====>" + JSON.stringify(data)); + expect(data.event).assertEqual("FMS_FormOnError_commonEvent"); + expect(data.data).assertEqual("invalid params received on operating form."); + commonEvent.unsubscribe(subscriberOnError, unSubscribeOnErrorCallback); + console.info(`FMS_acquireForm_3900 end`); + done(); + } + function unSubscribeOnErrorCallback() { + console.info("====>FMS_acquireForm_3900 unSubscribeOnErrorCallback CallBack====>"); + } + commonEvent.createSubscriber(onErrorForm_Event).then(async (data) => { + console.info("====>FMS_acquireForm_3900 onErrorForm_Event Subscriber====>"); + subscriberOnError = data; + await commonEvent.subscribe(subscriberOnError, onErrorCallBack); + }); + console.info(`FMS_acquireForm_3900 featureAbility.startAbility start`); + await featureAbility.startAbility({ + want: { + bundleName: "com.ohos.st.formsystemhost", + abilityName: "com.ohos.st.formsystemhost.MainAbility", + parameters: { + "formId": "0", + "name": "Form_Js001", + "bundle": "", + "ability": "com.form.formsystemtestservicea.hmservice.FormAbility", + "moduleName": "entry", + "temporary": false, + "isCreate": true + } + } + }).then((res: any) => { + console.info(`FMS_acquireForm_3900 featureAbility.startAbilityhost res: ${JSON.stringify(res)}`); + }).catch((err: any) => { + console.info(`FMS_acquireForm_3900 featureAbility.startAbilityhost error: ${JSON.stringify(err)}`); + }); + console.info(`FMS_acquireForm_3900 featureAbility.startAbility end`); + }); + + /** + * @tc.number: FMS_acquireForm_4000 + * @tc.name: When the form specifications are inconsistent, creating the cached form fails. + * @tc.desc: Return failed. + */ + it(`FMS_acquireForm_4000`, 0, async (done) => { + console.info(`FMS_acquireForm_4000 start`); + var subscriberOnAcquired; + var subscriberOnError; + var formId; + + function delPublishCallBack() { + console.info("!!!====>FMS_acquireForm_4000 delPublishCallBack====>"); + setTimeout(function () { + console.info('FMS_acquireForm_4000 delPublishCallBack end'); + console.info(`FMS_acquireForm_4000 end`); + done(); + }, 1000) + } + function unSubscribeOnErrorCallback() { + console.info("!!!====>FMS_acquireForm_4000 unSubscribeOnErrorCallback====>"); + } + function onErrorCallBack(err, data) { + console.info("!!!====>FMS_acquireForm_4000 onErrorCallBack data:====>" + JSON.stringify(data)); + expect(data.event).assertEqual("FMS_FormOnError_commonEvent"); + commonEvent.unsubscribe(subscriberOnError, unSubscribeOnErrorCallback); + expect(data.data).assertEqual("the form id and form config are not matched."); + + console.info(`FMS_acquireForm_4000 end`); + var commonEventPublishData = { + data: formId + }; + commonEvent.publish(deleteForm_Event, commonEventPublishData, delPublishCallBack); + } + function onAcquiredCallBack(err, data) { + console.info("!!!====>FMS_acquireForm_4000 onAcquiredCallBack data:====>" + JSON.stringify(data)); + expect(data.event).assertEqual("FMS_FormOnAcquired_commonEvent"); + commonEvent.unsubscribe(subscriberOnAcquired, unSubscribeOnAcquiredCallback) + formId = data.data; + + commonEvent.createSubscriber(onErrorForm_Event).then(async (data) => { + console.info("====>FMS_acquireForm_4000 onErrorForm_Event Subscriber====>"); + subscriberOnError = data; + await commonEvent.subscribe(subscriberOnError, onErrorCallBack); + }); + + console.info(`FMS_acquireForm_4000 featureAbility.startAbility again start`); + featureAbility.startAbility({ + want: { + bundleName: "com.ohos.st.formsystemhost", + abilityName: "com.ohos.st.formsystemhost.MainAbility", + parameters: { + "formId": data.data, + "name": "Form_Js001", + "bundle": "com.form.formsystemtestservicea.hmservice", + "ability": "com.form.formsystemtestservicea.hmservice.FormAbility", + "moduleName": "entry", + "dimension": "2", + "temporary": false, + "isCreate": true + } + } + }).then((res: any) => { + console.info(`FMS_acquireForm_4000 featureAbility.startAbilityhost res: ${JSON.stringify(res)}`); + }).catch((err: any) => { + console.info(`FMS_acquireForm_4000 featureAbility.startAbilityhost error: ${JSON.stringify(err)}`); + }); + console.info(`FMS_acquireForm_4000 featureAbility.startAbility again end`); + } + function unSubscribeOnAcquiredCallback() { + console.info("====>FMS_acquireForm_4000 OnAcquired UnSubscribe CallBack====>"); + } + + commonEvent.createSubscriber(onAcquiredForm_Event).then(async (data) => { + console.info("====>FMS_acquireForm_4000 Create OnAcquired Subscriber====>"); + subscriberOnAcquired = data; + await commonEvent.subscribe(subscriberOnAcquired, onAcquiredCallBack); + }); + + console.info(`FMS_acquireForm_4000 featureAbility.startAbility start`); + await featureAbility.startAbility({ + want: { + bundleName: "com.ohos.st.formsystemhost", + abilityName: "com.ohos.st.formsystemhost.MainAbility", + parameters: { + "formId": "0", + "name": "Form_Js001", + "bundle": "com.form.formsystemtestservicea.hmservice", + "ability": "com.form.formsystemtestservicea.hmservice.FormAbility", + "moduleName": "entry", + "dimension": "1", + "temporary": false, + "isCreate": true + } + } + }).then((res: any) => { + console.info(`FMS_acquireForm_4000 featureAbility.startAbilityhost res: ${JSON.stringify(res)}`); + }).catch((err: any) => { + console.info(`FMS_acquireForm_4000 featureAbility.startAbilityhost error: ${JSON.stringify(err)}`); + }); + console.info(`FMS_acquireForm_4000 featureAbility.startAbility end`); + }); + + /** + * @tc.number: FMS_acquireForm_4100 + * @tc.name: Failed to add form when parameter moduleName is wrong. + * @tc.desc: Failed to create form when verifying that the parameter (moduleName) of creating form is wrong. + */ + it(`FMS_acquireForm_4100`, 0, async (done) => { + console.info(`FMS_acquireForm_4100 start`); + var subscriberOnError; + function onErrorCallBack(err, data) { + console.info("!!!====>FMS_acquireForm_4100 onErrorCallBack data:====>" + JSON.stringify(data)); + expect(data.event).assertEqual("FMS_FormOnError_commonEvent"); + expect(data.data).assertEqual("invalid params received on operating form."); + commonEvent.unsubscribe(subscriberOnError, unSubscribeOnErrorCallback); + console.info(`FMS_acquireForm_4100 end`); + done(); + } + function unSubscribeOnErrorCallback() { + console.info("====>FMS_acquireForm_4100 unSubscribeOnErrorCallback CallBack====>"); + } + commonEvent.createSubscriber(onErrorForm_Event).then(async (data) => { + console.info("====>FMS_acquireForm_4100 onErrorForm_Event Subscriber====>"); + subscriberOnError = data; + await commonEvent.subscribe(subscriberOnError, onErrorCallBack); + }); + console.info(`FMS_acquireForm_4100 featureAbility.startAbility start`); + await featureAbility.startAbility({ + want: { + bundleName: "com.ohos.st.formsystemhostj", + abilityName: "com.ohos.st.formsystemhostj.MainAbility", + parameters: { + "formId": "0", + "name": "Form_Js001", + "bundle": "com.form.formsystemtestservicea.hmservice", + "ability": "com.form.formsystemtestservicea.hmservice.FormAbility", + "moduleName": "", + "temporary": false, + "isCreate": true + } + } + }).then((res: any) => { + console.info(`FMS_acquireForm_4100 featureAbility.startAbilityhost res: ${JSON.stringify(res)}`); + }).catch((err: any) => { + console.info(`FMS_acquireForm_4100 featureAbility.startAbilityhost error: ${JSON.stringify(err)}`); + }); + console.info(`FMS_acquireForm_4100 featureAbility.startAbility end`); + }); + + + /** + * @tc.number: FMS_acquireForm_4200 + * @tc.name: Success to add form when parameter formName is blank. + * @tc.desc: Success to create form when verifying that the parameter (formName) of creating form is success. + */ + it(`FMS_acquireForm_4200`, 0, async (done) => { + console.info(`FMS_acquireForm_4200 start`); + let subscriberOnAcquired; + let subscriberSupply; + let formId1; + let formId2; + + function delPublishCallBack() { + console.info("!!!====>FMS_acquireForm_4200 delPublishCallBack====>"); + setTimeout(function () { + console.info('FMS_acquireForm_4200 delPublishCallBack end'); + console.info(`FMS_acquireForm_4200 end`); + done(); + }, 500); + } + function onAcquiredCallBack(err, data) { + console.info("!!!====>FMS_acquireForm_4200 onAcquiredCallBack data:====>" + JSON.stringify(data)); + expect(data.event).assertEqual("FMS_FormOnAcquired_commonEvent"); + commonEvent.unsubscribe(subscriberOnAcquired, unSubscribeOnAcquiredCallBack) + formId1 = data.data; + + if (formId1 && formId2) { + expect(formId1).assertEqual(formId2); + let commonEventPublishData = { + data: formId1 + }; + commonEvent.publish(deleteForm_Event, commonEventPublishData, delPublishCallBack); + } + } + function unSubscribeOnAcquiredCallBack() { + console.info("====>FMS_acquireForm_4200 unSubscribeOnAcquiredCallBack====>"); + } + + commonEvent.createSubscriber(onAcquiredForm_Event).then(async (data) => { + console.info("====>FMS_acquireForm_4200 Create OnAcquired Subscriber====>"); + subscriberOnAcquired = data; + await commonEvent.subscribe(subscriberOnAcquired, onAcquiredCallBack); + }); + + function onSupplyCallBack(err, data) { + if (data.parameters.kind == "onCreate") { + console.info("====>FMS_acquireForm_4200 onSupplyCallBack====>" + JSON.stringify(data)); + commonEvent.unsubscribe(subscriberSupply, unSubscribeSupplyCallback); + let retData = JSON.parse(data.parameters.parameters); + + let formName = retData.parameters['ohos.extra.param.key.form_name']; + expect(formName).assertEqual("Form_Js001"); + formId2 = retData.parameters['ohos.extra.param.key.form_identity']; + console.info("!!!====>FMS_acquireForm_4200 onAcquiredCallBack formId2:====>" + formId2); + if (formId1 && formId2) { + expect(formId1).assertEqual(formId2); + let commonEventPublishData = { + data: formId1 + }; + commonEvent.publish(deleteForm_Event, commonEventPublishData, delPublishCallBack); + } + } + } + function unSubscribeSupplyCallback() { + console.info("====>FMS_acquireForm_4200 unSubscribeSupplyCallback====>"); + } + + commonEvent.createSubscriber(onSupplyEvent).then(async (data) => { + console.info("====>FMS_acquireForm_4200 onSupplyEvent Subscriber====>"); + subscriberSupply = data; + await commonEvent.subscribe(subscriberSupply, onSupplyCallBack); + }); + + console.info(`FMS_acquireForm_4200 featureAbility.startAbility start`); + featureAbility.startAbility({ + want: { + bundleName: "com.ohos.st.formsystemhost", + abilityName: "com.ohos.st.formsystemhost.MainAbility", + parameters: { + "formId": "0", + "name": "", + "bundle": "com.form.formsystemtestservicea.hmservice", + "ability": "com.form.formsystemtestservicea.hmservice.FormAbility", + "moduleName": "entry", + "temporary": false, + "isCreate": true + } + } + }).then((res: any) => { + console.info(`FMS_acquireForm_4200 featureAbility.startAbilityhost res: ${JSON.stringify(res)}`); + }).catch((err: any) => { + console.info(`FMS_acquireForm_4200 featureAbility.startAbilityhost error: ${JSON.stringify(err)}`); + }); + + console.info(`FMS_acquireForm_4200 featureAbility.startAbility end`); + }); + + /** + * @tc.number: FMS_acquireForm_4300 + * @tc.name: Success to add form when parameter dimension is passed. + * @tc.desc: Success to create form when verifying that the parameter (dimension) of creating form. + */ + it(`FMS_acquireForm_4300`, 0, async (done) => { + console.info(`FMS_acquireForm_4300 start`); + let subscriberOnAcquired; + function onAcquiredCallBack(err, data) { + console.info("!!!====>FMS_acquireForm_4300 onAcquiredCallBack data:====>" + JSON.stringify(data)); + expect(data.event).assertEqual("FMS_FormOnAcquired_commonEvent"); + expect(data.data != "0").assertEqual(true); + commonEvent.unsubscribe(subscriberOnAcquired, unSubscribeOnAcquiredCallBack); + console.info(`FMS_acquireForm_4300 end`); + done(); + } + function unSubscribeOnAcquiredCallBack() { + console.info("====>FMS_acquireForm_4300 unSubscribeOnAcquiredCallBack CallBack====>"); + } + commonEvent.createSubscriber(onAcquiredForm_Event).then(async (data) => { + console.info("====>FMS_acquireForm_4300 onAcquiredForm_Event Subscriber====>"); + subscriberOnAcquired = data; + await commonEvent.subscribe(subscriberOnAcquired, onAcquiredCallBack); + }); + console.info(`FMS_acquireForm_4300 featureAbility.startAbility start`); + await featureAbility.startAbility({ + want: { + bundleName: "com.ohos.st.formsystemhosti", + abilityName: "com.ohos.st.formsystemhosti.MainAbility", + parameters: { + "formId": "0", + "name": "Form_Js001", + "bundle": "com.form.formsystemtestservicea.hmservice", + "ability": "com.form.formsystemtestservicea.hmservice.FormAbility", + "moduleName": "entry", + "temporary": false, + "isCreate": true + } + } + }).then((res: any) => { + console.info(`FMS_acquireForm_4300 featureAbility.startAbilityhost res: ${JSON.stringify(res)}`); + }).catch((err: any) => { + console.info(`FMS_acquireForm_4300 featureAbility.startAbilityhost error: ${JSON.stringify(err)}`); + }); + console.info(`FMS_acquireForm_4300 featureAbility.startAbility end`); + }); + + /** + * @tc.number: FMS_acquireForm_4400 + * @tc.name: Failed to add form when parameter dimension is not exist. + * @tc.desc: Failed to create form when verifying that the parameter (dimension) of creating form is wrong. + */ + it(`FMS_acquireForm_4400`, 0, async (done) => { + console.info(`FMS_acquireForm_4400 start`); + var subscriberOnError; + function onErrorCallBack(err, data) { + console.info("!!!====>FMS_acquireForm_4400 onErrorCallBack data:====>" + JSON.stringify(data)); + expect(data.event).assertEqual("FMS_FormOnError_commonEvent"); + commonEvent.unsubscribe(subscriberOnError, unSubscribeOnErrorCallback); + expect(data.data).assertEqual("the dimension not exist in the form."); + + console.info(`FMS_acquireForm_4400 end`); + done(); + } + function unSubscribeOnErrorCallback() { + console.info("====>FMS_acquireForm_4400 unSubscribeOnErrorCallback CallBack====>"); + } + commonEvent.createSubscriber(onErrorForm_Event).then(async (data) => { + console.info("====>FMS_acquireForm_4400 onErrorForm_Event Subscriber====>"); + subscriberOnError = data; + await commonEvent.subscribe(subscriberOnError, onErrorCallBack); + }); + console.info(`FMS_acquireForm_4400 featureAbility.startAbility start`); + await featureAbility.startAbility({ + want: { + bundleName: "com.ohos.st.formsystemhosti", + abilityName: "com.ohos.st.formsystemhosti.MainAbility", + parameters: { + "formId": "0", + "name": "Form_Js001", + "bundle": "com.form.formsystemtestservicea.hmservice", + "ability": "com.form.formsystemtestservicea.hmservice.FormAbility", + "moduleName": "entry", + "dimension": "6", + "temporary": false, + "isCreate": true + } + } + }).then((res: any) => { + console.info(`FMS_acquireForm_4400 featureAbility.startAbilityhost res: ${JSON.stringify(res)}`); + }).catch((err: any) => { + console.info(`FMS_acquireForm_4400 featureAbility.startAbilityhost error: ${JSON.stringify(err)}`); + }); + console.info(`FMS_acquireForm_4400 featureAbility.startAbility end`); + }); + + /** + * @tc.number: FMS_acquireForm_4900 + * @tc.name: Cast temp form when the formId is created formId. + * @tc.desc: When the verification formId is set to 0, the form is created failed. + */ + it(`FMS_acquireForm_4900`, 0, async (done) => { + console.info(`FMS_acquireForm_4900 start`); + var subscriberOnAcquired; + var subscriberCast; + + function delPublishCallBack() { + console.info("!!!====>FMS_acquireForm_4900 delPublishCallBack====>"); + setTimeout(function () { + console.info('FMS_acquireForm_4900 delPublishCallBack end'); + console.info(`FMS_acquireForm_4900 end`); + done(); + }, 1000) + } + + function onCastCallBack(err, data) { + console.info("!!!====>FMS_acquireForm_4900 onCastCallBack data:====>" + JSON.stringify(data)); + expect(data.event).assertEqual("FMS_FormCast_commonEvent"); + expect(data.data).assertEqual("9"); + commonEvent.unsubscribe(subscriberCast, unSubscribeOnCastCallback) + var commonEventPublishData = { + data: data.parameters.formId + }; + commonEvent.publish(deleteForm_Event, commonEventPublishData, delPublishCallBack); + } + function unSubscribeOnCastCallback() { + console.info("====>FMS_acquireForm_4900 unSubscribeOnCastCallback====>"); + } + function onAcquiredCallBack(err, data) { + console.info("!!!====>FMS_acquireForm_4900 onAcquiredCallBack data:====>" + JSON.stringify(data)); + expect(data.event).assertEqual("FMS_FormOnAcquired_commonEvent"); + commonEvent.unsubscribe(subscriberOnAcquired, unSubscribeOnAcquiredCallback) + + commonEvent.createSubscriber(subscriberFormCastEvent).then(async (data) => { + console.info("====>FMS_acquireForm_4900 subscriberFormCastEvent Subscriber====>"); + subscriberCast = data; + await commonEvent.subscribe(subscriberCast, onCastCallBack); + }); + + console.info(`FMS_acquireForm_4900 featureAbility.startAbility again start`); + featureAbility.startAbility({ + want: { + bundleName: "com.ohos.st.formsystemhost", + abilityName: "com.ohos.st.formsystemhost.MainAbility", + parameters: { + "formId": "0", + "name": "Form_Js001", + "bundle": "com.form.formsystemtestservicea.hmservice", + "ability": "com.form.formsystemtestservicea.hmservice.FormAbility", + "moduleName": "entry", + "temporary": false, + "temporaryId": data.data, + "castForm": true, + "isCreate": false + } + } + }).then((res: any) => { + console.info(`FMS_acquireForm_4900 featureAbility.startAbilityhost res: ${JSON.stringify(res)}`); + }).catch((err: any) => { + console.info(`FMS_acquireForm_4900 featureAbility.startAbilityhost error: ${JSON.stringify(err)}`); + }); + console.info(`FMS_acquireForm_4900 featureAbility.startAbility again end`); + } + function unSubscribeOnAcquiredCallback() { + console.info("====>FMS_acquireForm_4900 OnAcquired UnSubscribe CallBack====>"); + } + + commonEvent.createSubscriber(onAcquiredForm_Event).then(async (data) => { + console.info("====>FMS_acquireForm_4900 Create OnAcquired Subscriber====>"); + subscriberOnAcquired = data; + await commonEvent.subscribe(subscriberOnAcquired, onAcquiredCallBack); + }); + + console.info(`FMS_acquireForm_4900 featureAbility.startAbility start`); + await featureAbility.startAbility({ + want: { + bundleName: "com.ohos.st.formsystemhost", + abilityName: "com.ohos.st.formsystemhost.MainAbility", + parameters: { + "formId": "0", + "name": "Form_Js001", + "bundle": "com.form.formsystemtestservicea.hmservice", + "ability": "com.form.formsystemtestservicea.hmservice.FormAbility", + "moduleName": "entry", + "temporary": false, + "isCreate": true + } + } + }).then((res: any) => { + console.info(`FMS_acquireForm_4900 featureAbility.startAbilityhost res: ${JSON.stringify(res)}`); + }).catch((err: any) => { + console.info(`FMS_acquireForm_4900 featureAbility.startAbilityhost error: ${JSON.stringify(err)}`); + }); + console.info(`FMS_acquireForm_4900 featureAbility.startAbility end`); + }); + + }); +} diff --git a/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formacquiretest2/entry/src/main/ets/MainAbility/test/List.test.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formacquiretest2/entry/src/main/ets/MainAbility/test/List.test.ets new file mode 100644 index 0000000000000000000000000000000000000000..3c27a80d1372a250a7948748d1204fa62591f7d0 --- /dev/null +++ b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formacquiretest2/entry/src/main/ets/MainAbility/test/List.test.ets @@ -0,0 +1,19 @@ +/* + * 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. + */ +import test from './FmsAcquireForm2.test.ets'; + +export default function testsuite() { + test(); +} \ No newline at end of file diff --git a/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formacquiretest2/entry/src/main/resources/base/element/string.json b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formacquiretest2/entry/src/main/resources/base/element/string.json new file mode 100644 index 0000000000000000000000000000000000000000..bc47049debb9999f8680ebda66323e5c9adb4d82 --- /dev/null +++ b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formacquiretest2/entry/src/main/resources/base/element/string.json @@ -0,0 +1,12 @@ +{ + "string": [ + { + "name": "entry_MainAbility", + "value": "formacquiretest2" + }, + { + "name": "description_mainability", + "value": "ETS_Empty Ability" + } + ] +} \ No newline at end of file diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formszerotest/entry/src/main/resources/base/media/icon.png b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formacquiretest2/entry/src/main/resources/base/media/icon.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formszerotest/entry/src/main/resources/base/media/icon.png rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formacquiretest2/entry/src/main/resources/base/media/icon.png diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formsoneandonetest/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formacquiretest2/signature/openharmony_sx.p7b similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formsoneandonetest/signature/openharmony_sx.p7b rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formacquiretest2/signature/openharmony_sx.p7b diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formfuzztest/BUILD.gn b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formfuzztest/BUILD.gn similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formfuzztest/BUILD.gn rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formfuzztest/BUILD.gn diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formfuzztest/Test.json b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formfuzztest/Test.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formfuzztest/Test.json rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formfuzztest/Test.json diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formfuzztest/entry/src/main/config.json b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formfuzztest/entry/src/main/config.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formfuzztest/entry/src/main/config.json rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formfuzztest/entry/src/main/config.json diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formfuzztest/entry/src/main/ets/MainAbility/app.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formfuzztest/entry/src/main/ets/MainAbility/app.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formfuzztest/entry/src/main/ets/MainAbility/app.ets rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formfuzztest/entry/src/main/ets/MainAbility/app.ets diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formfuzztest/entry/src/main/ets/MainAbility/pages/index.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formfuzztest/entry/src/main/ets/MainAbility/pages/index.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formfuzztest/entry/src/main/ets/MainAbility/pages/index.ets rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formfuzztest/entry/src/main/ets/MainAbility/pages/index.ets diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formfuzztest/entry/src/main/ets/MainAbility/test/CastTempFormFuzz.test.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formfuzztest/entry/src/main/ets/MainAbility/test/CastTempFormFuzz.test.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formfuzztest/entry/src/main/ets/MainAbility/test/CastTempFormFuzz.test.ets rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formfuzztest/entry/src/main/ets/MainAbility/test/CastTempFormFuzz.test.ets diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formfuzztest/entry/src/main/ets/MainAbility/test/DeleteFormFuzz.test.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formfuzztest/entry/src/main/ets/MainAbility/test/DeleteFormFuzz.test.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formfuzztest/entry/src/main/ets/MainAbility/test/DeleteFormFuzz.test.ets rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formfuzztest/entry/src/main/ets/MainAbility/test/DeleteFormFuzz.test.ets diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formfuzztest/entry/src/main/ets/MainAbility/test/DisableFormsUpdateFuzz.test.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formfuzztest/entry/src/main/ets/MainAbility/test/DisableFormsUpdateFuzz.test.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formfuzztest/entry/src/main/ets/MainAbility/test/DisableFormsUpdateFuzz.test.ets rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formfuzztest/entry/src/main/ets/MainAbility/test/DisableFormsUpdateFuzz.test.ets diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formfuzztest/entry/src/main/ets/MainAbility/test/EnableFormsUpdateFuzz.test.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formfuzztest/entry/src/main/ets/MainAbility/test/EnableFormsUpdateFuzz.test.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formfuzztest/entry/src/main/ets/MainAbility/test/EnableFormsUpdateFuzz.test.ets rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formfuzztest/entry/src/main/ets/MainAbility/test/EnableFormsUpdateFuzz.test.ets diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formfuzztest/entry/src/main/ets/MainAbility/test/GetFormsInfoFuzz.test.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formfuzztest/entry/src/main/ets/MainAbility/test/GetFormsInfoFuzz.test.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formfuzztest/entry/src/main/ets/MainAbility/test/GetFormsInfoFuzz.test.ets rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formfuzztest/entry/src/main/ets/MainAbility/test/GetFormsInfoFuzz.test.ets diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formfuzztest/entry/src/main/ets/MainAbility/test/List.test.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formfuzztest/entry/src/main/ets/MainAbility/test/List.test.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formfuzztest/entry/src/main/ets/MainAbility/test/List.test.ets rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formfuzztest/entry/src/main/ets/MainAbility/test/List.test.ets diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formfuzztest/entry/src/main/ets/MainAbility/test/NotifyInvisibleFormsFuzz.test.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formfuzztest/entry/src/main/ets/MainAbility/test/NotifyInvisibleFormsFuzz.test.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formfuzztest/entry/src/main/ets/MainAbility/test/NotifyInvisibleFormsFuzz.test.ets rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formfuzztest/entry/src/main/ets/MainAbility/test/NotifyInvisibleFormsFuzz.test.ets diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formfuzztest/entry/src/main/ets/MainAbility/test/NotifyVisibleFormsFuzz.test.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formfuzztest/entry/src/main/ets/MainAbility/test/NotifyVisibleFormsFuzz.test.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formfuzztest/entry/src/main/ets/MainAbility/test/NotifyVisibleFormsFuzz.test.ets rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formfuzztest/entry/src/main/ets/MainAbility/test/NotifyVisibleFormsFuzz.test.ets diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formfuzztest/entry/src/main/ets/MainAbility/test/ReleaseFormFuzz.test.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formfuzztest/entry/src/main/ets/MainAbility/test/ReleaseFormFuzz.test.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formfuzztest/entry/src/main/ets/MainAbility/test/ReleaseFormFuzz.test.ets rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formfuzztest/entry/src/main/ets/MainAbility/test/ReleaseFormFuzz.test.ets diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formfuzztest/entry/src/main/ets/MainAbility/test/RequestFormFuzz.test.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formfuzztest/entry/src/main/ets/MainAbility/test/RequestFormFuzz.test.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formfuzztest/entry/src/main/ets/MainAbility/test/RequestFormFuzz.test.ets rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formfuzztest/entry/src/main/ets/MainAbility/test/RequestFormFuzz.test.ets diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formfuzztest/entry/src/main/ets/MainAbility/test/SetFormNextRefreshTimeFuzz.test.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formfuzztest/entry/src/main/ets/MainAbility/test/SetFormNextRefreshTimeFuzz.test.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formfuzztest/entry/src/main/ets/MainAbility/test/SetFormNextRefreshTimeFuzz.test.ets rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formfuzztest/entry/src/main/ets/MainAbility/test/SetFormNextRefreshTimeFuzz.test.ets diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formfuzztest/entry/src/main/ets/MainAbility/test/UpdateFormFuzz.test.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formfuzztest/entry/src/main/ets/MainAbility/test/UpdateFormFuzz.test.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formfuzztest/entry/src/main/ets/MainAbility/test/UpdateFormFuzz.test.ets rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formfuzztest/entry/src/main/ets/MainAbility/test/UpdateFormFuzz.test.ets diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formfuzztest/entry/src/main/ets/MainAbility/test/getParam.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formfuzztest/entry/src/main/ets/MainAbility/test/getParam.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formfuzztest/entry/src/main/ets/MainAbility/test/getParam.ets rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formfuzztest/entry/src/main/ets/MainAbility/test/getParam.ets diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formfuzztest/entry/src/main/resources/base/element/string.json b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formfuzztest/entry/src/main/resources/base/element/string.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formfuzztest/entry/src/main/resources/base/element/string.json rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formfuzztest/entry/src/main/resources/base/element/string.json diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formhostdeathrecipienttest/entry/src/main/resources/base/media/icon.png b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formfuzztest/entry/src/main/resources/base/media/icon.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formhostdeathrecipienttest/entry/src/main/resources/base/media/icon.png rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formfuzztest/entry/src/main/resources/base/media/icon.png diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formsoneandtwotest/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formfuzztest/signature/openharmony_sx.p7b similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formsoneandtwotest/signature/openharmony_sx.p7b rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formfuzztest/signature/openharmony_sx.p7b diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formsoneandonetest/BUILD.gn b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandonetest/BUILD.gn similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formsoneandonetest/BUILD.gn rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandonetest/BUILD.gn diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formsoneandonetest/Test.json b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandonetest/Test.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formsoneandonetest/Test.json rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandonetest/Test.json diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formsoneandonetest/entry/src/main/config.json b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandonetest/entry/src/main/config.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formsoneandonetest/entry/src/main/config.json rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandonetest/entry/src/main/config.json diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formsoneandonetest/entry/src/main/ets/MainAbility/app.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandonetest/entry/src/main/ets/MainAbility/app.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formsoneandonetest/entry/src/main/ets/MainAbility/app.ets rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandonetest/entry/src/main/ets/MainAbility/app.ets diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formsoneandonetest/entry/src/main/ets/MainAbility/pages/index.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandonetest/entry/src/main/ets/MainAbility/pages/index.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formsoneandonetest/entry/src/main/ets/MainAbility/pages/index.ets rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandonetest/entry/src/main/ets/MainAbility/pages/index.ets diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formsoneandonetest/entry/src/main/ets/MainAbility/test/GetAllFormsInfo.test.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandonetest/entry/src/main/ets/MainAbility/test/GetAllFormsInfo.test.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formsoneandonetest/entry/src/main/ets/MainAbility/test/GetAllFormsInfo.test.ets rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandonetest/entry/src/main/ets/MainAbility/test/GetAllFormsInfo.test.ets diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formsoneandonetest/entry/src/main/ets/MainAbility/test/GetFormsInfo.test.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandonetest/entry/src/main/ets/MainAbility/test/GetFormsInfo.test.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formsoneandonetest/entry/src/main/ets/MainAbility/test/GetFormsInfo.test.ets rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandonetest/entry/src/main/ets/MainAbility/test/GetFormsInfo.test.ets diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formsoneandonetest/entry/src/main/ets/MainAbility/test/List.test.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandonetest/entry/src/main/ets/MainAbility/test/List.test.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formsoneandonetest/entry/src/main/ets/MainAbility/test/List.test.ets rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandonetest/entry/src/main/ets/MainAbility/test/List.test.ets diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formsoneandonetest/entry/src/main/resources/base/element/string.json b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandonetest/entry/src/main/resources/base/element/string.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formsoneandonetest/entry/src/main/resources/base/element/string.json rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandonetest/entry/src/main/resources/base/element/string.json diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formperformancetest/entry/src/main/resources/base/media/icon.png b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandonetest/entry/src/main/resources/base/media/icon.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formperformancetest/entry/src/main/resources/base/media/icon.png rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandonetest/entry/src/main/resources/base/media/icon.png diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formsoneandzerotest/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandonetest/signature/openharmony_sx.p7b similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formsoneandzerotest/signature/openharmony_sx.p7b rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandonetest/signature/openharmony_sx.p7b diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formsoneandtwotest/BUILD.gn b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandtwotest/BUILD.gn similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formsoneandtwotest/BUILD.gn rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandtwotest/BUILD.gn diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formsoneandtwotest/Test.json b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandtwotest/Test.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formsoneandtwotest/Test.json rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandtwotest/Test.json diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formsoneandtwotest/entry/src/main/config.json b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandtwotest/entry/src/main/config.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formsoneandtwotest/entry/src/main/config.json rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandtwotest/entry/src/main/config.json diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formsoneandtwotest/entry/src/main/ets/MainAbility/app.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandtwotest/entry/src/main/ets/MainAbility/app.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formsoneandtwotest/entry/src/main/ets/MainAbility/app.ets rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandtwotest/entry/src/main/ets/MainAbility/app.ets diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formsoneandtwotest/entry/src/main/ets/MainAbility/pages/index.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandtwotest/entry/src/main/ets/MainAbility/pages/index.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formsoneandtwotest/entry/src/main/ets/MainAbility/pages/index.ets rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandtwotest/entry/src/main/ets/MainAbility/pages/index.ets diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formsoneandtwotest/entry/src/main/ets/MainAbility/test/GetAllFormsInfo.test.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandtwotest/entry/src/main/ets/MainAbility/test/GetAllFormsInfo.test.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formsoneandtwotest/entry/src/main/ets/MainAbility/test/GetAllFormsInfo.test.ets rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandtwotest/entry/src/main/ets/MainAbility/test/GetAllFormsInfo.test.ets diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formsoneandtwotest/entry/src/main/ets/MainAbility/test/List.test.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandtwotest/entry/src/main/ets/MainAbility/test/List.test.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formsoneandtwotest/entry/src/main/ets/MainAbility/test/List.test.ets rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandtwotest/entry/src/main/ets/MainAbility/test/List.test.ets diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formsoneandtwotest/entry/src/main/resources/base/element/string.json b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandtwotest/entry/src/main/resources/base/element/string.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formsoneandtwotest/entry/src/main/resources/base/element/string.json rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandtwotest/entry/src/main/resources/base/element/string.json diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_disable/entry/src/main/resources/base/media/icon.png b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandtwotest/entry/src/main/resources/base/media/icon.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_disable/entry/src/main/resources/base/media/icon.png rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandtwotest/entry/src/main/resources/base/media/icon.png diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formswithoutpermtest/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandtwotest/signature/openharmony_sx.p7b similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formswithoutpermtest/signature/openharmony_sx.p7b rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandtwotest/signature/openharmony_sx.p7b diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formsoneandzerotest/BUILD.gn b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandzerotest/BUILD.gn similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formsoneandzerotest/BUILD.gn rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandzerotest/BUILD.gn diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formsoneandzerotest/Test.json b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandzerotest/Test.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formsoneandzerotest/Test.json rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandzerotest/Test.json diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formsoneandzerotest/entry/src/main/config.json b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandzerotest/entry/src/main/config.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formsoneandzerotest/entry/src/main/config.json rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandzerotest/entry/src/main/config.json diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formsoneandzerotest/entry/src/main/ets/MainAbility/app.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandzerotest/entry/src/main/ets/MainAbility/app.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formsoneandzerotest/entry/src/main/ets/MainAbility/app.ets rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandzerotest/entry/src/main/ets/MainAbility/app.ets diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formsoneandzerotest/entry/src/main/ets/MainAbility/pages/index.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandzerotest/entry/src/main/ets/MainAbility/pages/index.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formsoneandzerotest/entry/src/main/ets/MainAbility/pages/index.ets rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandzerotest/entry/src/main/ets/MainAbility/pages/index.ets diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formsoneandzerotest/entry/src/main/ets/MainAbility/test/GetAllFormsInfo.test.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandzerotest/entry/src/main/ets/MainAbility/test/GetAllFormsInfo.test.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formsoneandzerotest/entry/src/main/ets/MainAbility/test/GetAllFormsInfo.test.ets rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandzerotest/entry/src/main/ets/MainAbility/test/GetAllFormsInfo.test.ets diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formsoneandzerotest/entry/src/main/ets/MainAbility/test/List.test.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandzerotest/entry/src/main/ets/MainAbility/test/List.test.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formsoneandzerotest/entry/src/main/ets/MainAbility/test/List.test.ets rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandzerotest/entry/src/main/ets/MainAbility/test/List.test.ets diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formsoneandzerotest/entry/src/main/resources/base/element/string.json b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandzerotest/entry/src/main/resources/base/element/string.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formsoneandzerotest/entry/src/main/resources/base/element/string.json rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandzerotest/entry/src/main/resources/base/element/string.json diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_enable/entry/src/main/resources/base/media/icon.png b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandzerotest/entry/src/main/resources/base/media/icon.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_enable/entry/src/main/resources/base/media/icon.png rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandzerotest/entry/src/main/resources/base/media/icon.png diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formszerotest/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandzerotest/signature/openharmony_sx.p7b similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formszerotest/signature/openharmony_sx.p7b rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formsoneandzerotest/signature/openharmony_sx.p7b diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formswithoutpermtest/BUILD.gn b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formswithoutpermtest/BUILD.gn similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formswithoutpermtest/BUILD.gn rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formswithoutpermtest/BUILD.gn diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formswithoutpermtest/Test.json b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formswithoutpermtest/Test.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formswithoutpermtest/Test.json rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formswithoutpermtest/Test.json diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formswithoutpermtest/entry/src/main/config.json b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formswithoutpermtest/entry/src/main/config.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formswithoutpermtest/entry/src/main/config.json rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formswithoutpermtest/entry/src/main/config.json diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formswithoutpermtest/entry/src/main/ets/MainAbility/app.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formswithoutpermtest/entry/src/main/ets/MainAbility/app.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formswithoutpermtest/entry/src/main/ets/MainAbility/app.ets rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formswithoutpermtest/entry/src/main/ets/MainAbility/app.ets diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formswithoutpermtest/entry/src/main/ets/MainAbility/pages/index.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formswithoutpermtest/entry/src/main/ets/MainAbility/pages/index.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formswithoutpermtest/entry/src/main/ets/MainAbility/pages/index.ets rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formswithoutpermtest/entry/src/main/ets/MainAbility/pages/index.ets diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formswithoutpermtest/entry/src/main/ets/MainAbility/test/GetAllFormsInfo.test.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formswithoutpermtest/entry/src/main/ets/MainAbility/test/GetAllFormsInfo.test.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formswithoutpermtest/entry/src/main/ets/MainAbility/test/GetAllFormsInfo.test.ets rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formswithoutpermtest/entry/src/main/ets/MainAbility/test/GetAllFormsInfo.test.ets diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formswithoutpermtest/entry/src/main/ets/MainAbility/test/GetFormsInfo.test.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formswithoutpermtest/entry/src/main/ets/MainAbility/test/GetFormsInfo.test.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formswithoutpermtest/entry/src/main/ets/MainAbility/test/GetFormsInfo.test.ets rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formswithoutpermtest/entry/src/main/ets/MainAbility/test/GetFormsInfo.test.ets diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formswithoutpermtest/entry/src/main/ets/MainAbility/test/List.test.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formswithoutpermtest/entry/src/main/ets/MainAbility/test/List.test.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formswithoutpermtest/entry/src/main/ets/MainAbility/test/List.test.ets rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formswithoutpermtest/entry/src/main/ets/MainAbility/test/List.test.ets diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formswithoutpermtest/entry/src/main/resources/base/element/string.json b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formswithoutpermtest/entry/src/main/resources/base/element/string.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formswithoutpermtest/entry/src/main/resources/base/element/string.json rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formswithoutpermtest/entry/src/main/resources/base/element/string.json diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_notifyinvisible/entry/src/main/resources/base/media/icon.png b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formswithoutpermtest/entry/src/main/resources/base/media/icon.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_notifyinvisible/entry/src/main/resources/base/media/icon.png rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formswithoutpermtest/entry/src/main/resources/base/media/icon.png diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formhostdeathrecipienttest/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formswithoutpermtest/signature/openharmony_sx.p7b similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formhostdeathrecipienttest/signature/openharmony_sx.p7b rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formswithoutpermtest/signature/openharmony_sx.p7b diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formszerotest/BUILD.gn b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formszerotest/BUILD.gn similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formszerotest/BUILD.gn rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formszerotest/BUILD.gn diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formszerotest/Test.json b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formszerotest/Test.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formszerotest/Test.json rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formszerotest/Test.json diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formszerotest/entry/src/main/config.json b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formszerotest/entry/src/main/config.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formszerotest/entry/src/main/config.json rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formszerotest/entry/src/main/config.json diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formszerotest/entry/src/main/ets/MainAbility/app.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formszerotest/entry/src/main/ets/MainAbility/app.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formszerotest/entry/src/main/ets/MainAbility/app.ets rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formszerotest/entry/src/main/ets/MainAbility/app.ets diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formszerotest/entry/src/main/ets/MainAbility/pages/index.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formszerotest/entry/src/main/ets/MainAbility/pages/index.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formszerotest/entry/src/main/ets/MainAbility/pages/index.ets rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formszerotest/entry/src/main/ets/MainAbility/pages/index.ets diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formszerotest/entry/src/main/ets/MainAbility/test/GetAllFormsInfo.test.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formszerotest/entry/src/main/ets/MainAbility/test/GetAllFormsInfo.test.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formszerotest/entry/src/main/ets/MainAbility/test/GetAllFormsInfo.test.ets rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formszerotest/entry/src/main/ets/MainAbility/test/GetAllFormsInfo.test.ets diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formszerotest/entry/src/main/ets/MainAbility/test/List.test.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formszerotest/entry/src/main/ets/MainAbility/test/List.test.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formszerotest/entry/src/main/ets/MainAbility/test/List.test.ets rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formszerotest/entry/src/main/ets/MainAbility/test/List.test.ets diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formszerotest/entry/src/main/resources/base/element/string.json b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formszerotest/entry/src/main/resources/base/element/string.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formgetformsinfotest/formszerotest/entry/src/main/resources/base/element/string.json rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formszerotest/entry/src/main/resources/base/element/string.json diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_notifyinvisible2/entry/src/main/resources/base/media/icon.png b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formszerotest/entry/src/main/resources/base/media/icon.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_notifyinvisible2/entry/src/main/resources/base/media/icon.png rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formszerotest/entry/src/main/resources/base/media/icon.png diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formperformancetest/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formszerotest/signature/openharmony_sx.p7b similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formperformancetest/signature/openharmony_sx.p7b rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formgetformsinfotest/formszerotest/signature/openharmony_sx.p7b diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formhostdeathrecipienttest/BUILD.gn b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formhostdeathrecipienttest/BUILD.gn similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formhostdeathrecipienttest/BUILD.gn rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formhostdeathrecipienttest/BUILD.gn diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formhostdeathrecipienttest/Test.json b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formhostdeathrecipienttest/Test.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formhostdeathrecipienttest/Test.json rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formhostdeathrecipienttest/Test.json diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formhostdeathrecipienttest/entry/src/main/config.json b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formhostdeathrecipienttest/entry/src/main/config.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formhostdeathrecipienttest/entry/src/main/config.json rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formhostdeathrecipienttest/entry/src/main/config.json diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_disable/entry/src/main/ets/MainAbility/app.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formhostdeathrecipienttest/entry/src/main/ets/MainAbility/app.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_disable/entry/src/main/ets/MainAbility/app.ets rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formhostdeathrecipienttest/entry/src/main/ets/MainAbility/app.ets diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formhostdeathrecipienttest/entry/src/main/ets/MainAbility/pages/index.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formhostdeathrecipienttest/entry/src/main/ets/MainAbility/pages/index.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formhostdeathrecipienttest/entry/src/main/ets/MainAbility/pages/index.ets rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formhostdeathrecipienttest/entry/src/main/ets/MainAbility/pages/index.ets diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formhostdeathrecipienttest/entry/src/main/ets/MainAbility/test/FmsHostDeathRecipient.test.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formhostdeathrecipienttest/entry/src/main/ets/MainAbility/test/FmsHostDeathRecipient.test.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formhostdeathrecipienttest/entry/src/main/ets/MainAbility/test/FmsHostDeathRecipient.test.ets rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formhostdeathrecipienttest/entry/src/main/ets/MainAbility/test/FmsHostDeathRecipient.test.ets diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formhostdeathrecipienttest/entry/src/main/ets/MainAbility/test/List.test.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formhostdeathrecipienttest/entry/src/main/ets/MainAbility/test/List.test.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formhostdeathrecipienttest/entry/src/main/ets/MainAbility/test/List.test.ets rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formhostdeathrecipienttest/entry/src/main/ets/MainAbility/test/List.test.ets diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formhostdeathrecipienttest/entry/src/main/resources/base/element/string.json b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formhostdeathrecipienttest/entry/src/main/resources/base/element/string.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formhostdeathrecipienttest/entry/src/main/resources/base/element/string.json rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formhostdeathrecipienttest/entry/src/main/resources/base/element/string.json diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_notifyvisible/entry/src/main/resources/base/media/icon.png b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formhostdeathrecipienttest/entry/src/main/resources/base/media/icon.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_notifyvisible/entry/src/main/resources/base/media/icon.png rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formhostdeathrecipienttest/entry/src/main/resources/base/media/icon.png diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_disable/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formhostdeathrecipienttest/signature/openharmony_sx.p7b similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_disable/signature/openharmony_sx.p7b rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formhostdeathrecipienttest/signature/openharmony_sx.p7b diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formperformancetest/BUILD.gn b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formperformancetest/BUILD.gn similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formperformancetest/BUILD.gn rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formperformancetest/BUILD.gn diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formperformancetest/Test.json b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formperformancetest/Test.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formperformancetest/Test.json rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formperformancetest/Test.json diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formperformancetest/entry/src/main/config.json b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formperformancetest/entry/src/main/config.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formperformancetest/entry/src/main/config.json rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formperformancetest/entry/src/main/config.json diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formperformancetest/entry/src/main/ets/MainAbility/app.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formperformancetest/entry/src/main/ets/MainAbility/app.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formperformancetest/entry/src/main/ets/MainAbility/app.ets rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formperformancetest/entry/src/main/ets/MainAbility/app.ets diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formperformancetest/entry/src/main/ets/MainAbility/pages/index.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formperformancetest/entry/src/main/ets/MainAbility/pages/index.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formperformancetest/entry/src/main/ets/MainAbility/pages/index.ets rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formperformancetest/entry/src/main/ets/MainAbility/pages/index.ets diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formperformancetest/entry/src/main/ets/MainAbility/test/FmsPerformanceTest.test.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formperformancetest/entry/src/main/ets/MainAbility/test/FmsPerformanceTest.test.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formperformancetest/entry/src/main/ets/MainAbility/test/FmsPerformanceTest.test.ets rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formperformancetest/entry/src/main/ets/MainAbility/test/FmsPerformanceTest.test.ets diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formperformancetest/entry/src/main/ets/MainAbility/test/List.test.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formperformancetest/entry/src/main/ets/MainAbility/test/List.test.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formperformancetest/entry/src/main/ets/MainAbility/test/List.test.ets rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formperformancetest/entry/src/main/ets/MainAbility/test/List.test.ets diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formperformancetest/entry/src/main/resources/base/element/string.json b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formperformancetest/entry/src/main/resources/base/element/string.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formperformancetest/entry/src/main/resources/base/element/string.json rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formperformancetest/entry/src/main/resources/base/element/string.json diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstresstest/entry/src/main/resources/base/media/icon.png b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formperformancetest/entry/src/main/resources/base/media/icon.png similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstresstest/entry/src/main/resources/base/media/icon.png rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formperformancetest/entry/src/main/resources/base/media/icon.png diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_enable/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formperformancetest/signature/openharmony_sx.p7b similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_enable/signature/openharmony_sx.p7b rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formperformancetest/signature/openharmony_sx.p7b diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_disable/BUILD.gn b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_disable/BUILD.gn similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_disable/BUILD.gn rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_disable/BUILD.gn diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_disable/Test.json b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_disable/Test.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_disable/Test.json rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_disable/Test.json diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_disable/entry/src/main/config.json b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_disable/entry/src/main/config.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_disable/entry/src/main/config.json rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_disable/entry/src/main/config.json diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_enable/entry/src/main/ets/MainAbility/app.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_disable/entry/src/main/ets/MainAbility/app.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_enable/entry/src/main/ets/MainAbility/app.ets rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_disable/entry/src/main/ets/MainAbility/app.ets diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_enable/entry/src/main/ets/MainAbility/model/FormViewModel.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_disable/entry/src/main/ets/MainAbility/model/FormViewModel.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_enable/entry/src/main/ets/MainAbility/model/FormViewModel.ets rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_disable/entry/src/main/ets/MainAbility/model/FormViewModel.ets diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_disable/entry/src/main/ets/MainAbility/pages/index.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_disable/entry/src/main/ets/MainAbility/pages/index.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_disable/entry/src/main/ets/MainAbility/pages/index.ets rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_disable/entry/src/main/ets/MainAbility/pages/index.ets diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_disable/entry/src/main/ets/MainAbility/test/FmsFormStateDisable.test.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_disable/entry/src/main/ets/MainAbility/test/FmsFormStateDisable.test.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_disable/entry/src/main/ets/MainAbility/test/FmsFormStateDisable.test.ets rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_disable/entry/src/main/ets/MainAbility/test/FmsFormStateDisable.test.ets diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_disable/entry/src/main/ets/MainAbility/test/List.test.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_disable/entry/src/main/ets/MainAbility/test/List.test.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_disable/entry/src/main/ets/MainAbility/test/List.test.ets rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_disable/entry/src/main/ets/MainAbility/test/List.test.ets diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_disable/entry/src/main/resources/base/element/string.json b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_disable/entry/src/main/resources/base/element/string.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_disable/entry/src/main/resources/base/element/string.json rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_disable/entry/src/main/resources/base/element/string.json diff --git a/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_disable/entry/src/main/resources/base/media/icon.png b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_disable/entry/src/main/resources/base/media/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ce307a8827bd75456441ceb57d530e4c8d45d36c Binary files /dev/null and b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_disable/entry/src/main/resources/base/media/icon.png differ diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_notifyinvisible/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_disable/signature/openharmony_sx.p7b similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_notifyinvisible/signature/openharmony_sx.p7b rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_disable/signature/openharmony_sx.p7b diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_enable/BUILD.gn b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_enable/BUILD.gn similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_enable/BUILD.gn rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_enable/BUILD.gn diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_enable/Test.json b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_enable/Test.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_enable/Test.json rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_enable/Test.json diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_enable/entry/src/main/config.json b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_enable/entry/src/main/config.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_enable/entry/src/main/config.json rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_enable/entry/src/main/config.json diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_notifyinvisible/entry/src/main/ets/MainAbility/app.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_enable/entry/src/main/ets/MainAbility/app.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_notifyinvisible/entry/src/main/ets/MainAbility/app.ets rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_enable/entry/src/main/ets/MainAbility/app.ets diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_notifyinvisible/entry/src/main/ets/MainAbility/model/FormViewModel.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_enable/entry/src/main/ets/MainAbility/model/FormViewModel.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_notifyinvisible/entry/src/main/ets/MainAbility/model/FormViewModel.ets rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_enable/entry/src/main/ets/MainAbility/model/FormViewModel.ets diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_enable/entry/src/main/ets/MainAbility/pages/index.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_enable/entry/src/main/ets/MainAbility/pages/index.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_enable/entry/src/main/ets/MainAbility/pages/index.ets rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_enable/entry/src/main/ets/MainAbility/pages/index.ets diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_enable/entry/src/main/ets/MainAbility/test/FmsFormStateEnable.test.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_enable/entry/src/main/ets/MainAbility/test/FmsFormStateEnable.test.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_enable/entry/src/main/ets/MainAbility/test/FmsFormStateEnable.test.ets rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_enable/entry/src/main/ets/MainAbility/test/FmsFormStateEnable.test.ets diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_enable/entry/src/main/ets/MainAbility/test/List.test.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_enable/entry/src/main/ets/MainAbility/test/List.test.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_enable/entry/src/main/ets/MainAbility/test/List.test.ets rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_enable/entry/src/main/ets/MainAbility/test/List.test.ets diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_enable/entry/src/main/resources/base/element/string.json b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_enable/entry/src/main/resources/base/element/string.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_enable/entry/src/main/resources/base/element/string.json rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_enable/entry/src/main/resources/base/element/string.json diff --git a/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_enable/entry/src/main/resources/base/media/icon.png b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_enable/entry/src/main/resources/base/media/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ce307a8827bd75456441ceb57d530e4c8d45d36c Binary files /dev/null and b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_enable/entry/src/main/resources/base/media/icon.png differ diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_notifyinvisible2/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_enable/signature/openharmony_sx.p7b similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_notifyinvisible2/signature/openharmony_sx.p7b rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_enable/signature/openharmony_sx.p7b diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_notifyinvisible/BUILD.gn b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_notifyinvisible/BUILD.gn similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_notifyinvisible/BUILD.gn rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_notifyinvisible/BUILD.gn diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_notifyinvisible/Test.json b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_notifyinvisible/Test.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_notifyinvisible/Test.json rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_notifyinvisible/Test.json diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_notifyinvisible/entry/src/main/config.json b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_notifyinvisible/entry/src/main/config.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_notifyinvisible/entry/src/main/config.json rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_notifyinvisible/entry/src/main/config.json diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_notifyinvisible2/entry/src/main/ets/MainAbility/app.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_notifyinvisible/entry/src/main/ets/MainAbility/app.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_notifyinvisible2/entry/src/main/ets/MainAbility/app.ets rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_notifyinvisible/entry/src/main/ets/MainAbility/app.ets diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_notifyinvisible2/entry/src/main/ets/MainAbility/model/FormViewModel.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_notifyinvisible/entry/src/main/ets/MainAbility/model/FormViewModel.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_notifyinvisible2/entry/src/main/ets/MainAbility/model/FormViewModel.ets rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_notifyinvisible/entry/src/main/ets/MainAbility/model/FormViewModel.ets diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_notifyinvisible/entry/src/main/ets/MainAbility/pages/index.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_notifyinvisible/entry/src/main/ets/MainAbility/pages/index.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_notifyinvisible/entry/src/main/ets/MainAbility/pages/index.ets rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_notifyinvisible/entry/src/main/ets/MainAbility/pages/index.ets diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_notifyinvisible/entry/src/main/ets/MainAbility/test/FmsFormStateNotifyInvisible.test.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_notifyinvisible/entry/src/main/ets/MainAbility/test/FmsFormStateNotifyInvisible.test.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_notifyinvisible/entry/src/main/ets/MainAbility/test/FmsFormStateNotifyInvisible.test.ets rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_notifyinvisible/entry/src/main/ets/MainAbility/test/FmsFormStateNotifyInvisible.test.ets diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_notifyinvisible/entry/src/main/ets/MainAbility/test/List.test.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_notifyinvisible/entry/src/main/ets/MainAbility/test/List.test.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_notifyinvisible/entry/src/main/ets/MainAbility/test/List.test.ets rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_notifyinvisible/entry/src/main/ets/MainAbility/test/List.test.ets diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_notifyinvisible/entry/src/main/resources/base/element/string.json b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_notifyinvisible/entry/src/main/resources/base/element/string.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_notifyinvisible/entry/src/main/resources/base/element/string.json rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_notifyinvisible/entry/src/main/resources/base/element/string.json diff --git a/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_notifyinvisible/entry/src/main/resources/base/media/icon.png b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_notifyinvisible/entry/src/main/resources/base/media/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ce307a8827bd75456441ceb57d530e4c8d45d36c Binary files /dev/null and b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_notifyinvisible/entry/src/main/resources/base/media/icon.png differ diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_notifyvisible/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_notifyinvisible/signature/openharmony_sx.p7b similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_notifyvisible/signature/openharmony_sx.p7b rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_notifyinvisible/signature/openharmony_sx.p7b diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_notifyinvisible2/BUILD.gn b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_notifyinvisible2/BUILD.gn similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_notifyinvisible2/BUILD.gn rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_notifyinvisible2/BUILD.gn diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_notifyinvisible2/Test.json b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_notifyinvisible2/Test.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_notifyinvisible2/Test.json rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_notifyinvisible2/Test.json diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_notifyinvisible2/entry/src/main/config.json b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_notifyinvisible2/entry/src/main/config.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_notifyinvisible2/entry/src/main/config.json rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_notifyinvisible2/entry/src/main/config.json diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_notifyvisible/entry/src/main/ets/MainAbility/app.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_notifyinvisible2/entry/src/main/ets/MainAbility/app.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_notifyvisible/entry/src/main/ets/MainAbility/app.ets rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_notifyinvisible2/entry/src/main/ets/MainAbility/app.ets diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_notifyvisible/entry/src/main/ets/MainAbility/model/FormViewModel.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_notifyinvisible2/entry/src/main/ets/MainAbility/model/FormViewModel.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_notifyvisible/entry/src/main/ets/MainAbility/model/FormViewModel.ets rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_notifyinvisible2/entry/src/main/ets/MainAbility/model/FormViewModel.ets diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_notifyinvisible2/entry/src/main/ets/MainAbility/pages/index.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_notifyinvisible2/entry/src/main/ets/MainAbility/pages/index.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_notifyinvisible2/entry/src/main/ets/MainAbility/pages/index.ets rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_notifyinvisible2/entry/src/main/ets/MainAbility/pages/index.ets diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_notifyinvisible2/entry/src/main/ets/MainAbility/test/FmsFormStateNotifyInvisible2.test.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_notifyinvisible2/entry/src/main/ets/MainAbility/test/FmsFormStateNotifyInvisible2.test.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_notifyinvisible2/entry/src/main/ets/MainAbility/test/FmsFormStateNotifyInvisible2.test.ets rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_notifyinvisible2/entry/src/main/ets/MainAbility/test/FmsFormStateNotifyInvisible2.test.ets diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_notifyinvisible2/entry/src/main/ets/MainAbility/test/List.test.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_notifyinvisible2/entry/src/main/ets/MainAbility/test/List.test.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_notifyinvisible2/entry/src/main/ets/MainAbility/test/List.test.ets rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_notifyinvisible2/entry/src/main/ets/MainAbility/test/List.test.ets diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_notifyinvisible2/entry/src/main/resources/base/element/string.json b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_notifyinvisible2/entry/src/main/resources/base/element/string.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_notifyinvisible2/entry/src/main/resources/base/element/string.json rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_notifyinvisible2/entry/src/main/resources/base/element/string.json diff --git a/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_notifyinvisible2/entry/src/main/resources/base/media/icon.png b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_notifyinvisible2/entry/src/main/resources/base/media/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ce307a8827bd75456441ceb57d530e4c8d45d36c Binary files /dev/null and b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_notifyinvisible2/entry/src/main/resources/base/media/icon.png differ diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstresstest/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_notifyinvisible2/signature/openharmony_sx.p7b similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstresstest/signature/openharmony_sx.p7b rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_notifyinvisible2/signature/openharmony_sx.p7b diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_notifyvisible/BUILD.gn b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_notifyvisible/BUILD.gn similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_notifyvisible/BUILD.gn rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_notifyvisible/BUILD.gn diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_notifyvisible/Test.json b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_notifyvisible/Test.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_notifyvisible/Test.json rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_notifyvisible/Test.json diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_notifyvisible/entry/src/main/config.json b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_notifyvisible/entry/src/main/config.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_notifyvisible/entry/src/main/config.json rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_notifyvisible/entry/src/main/config.json diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstresstest/entry/src/main/ets/MainAbility/app.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_notifyvisible/entry/src/main/ets/MainAbility/app.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstresstest/entry/src/main/ets/MainAbility/app.ets rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_notifyvisible/entry/src/main/ets/MainAbility/app.ets diff --git a/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_notifyvisible/entry/src/main/ets/MainAbility/model/FormViewModel.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_notifyvisible/entry/src/main/ets/MainAbility/model/FormViewModel.ets new file mode 100644 index 0000000000000000000000000000000000000000..462affde744956c2f7db057285fb6356d3fd475e --- /dev/null +++ b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_notifyvisible/entry/src/main/ets/MainAbility/model/FormViewModel.ets @@ -0,0 +1,131 @@ +/* + * 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. + */ + +import formManager from '@ohos.ability.formmanager'; +import bundleManager from '@ohos.bundle'; + +export default class FormViewModel { + private static sFormViewModel: FormViewModel = null; + + public static getInstance(): FormViewModel { + if (FormViewModel.sFormViewModel == null) { + FormViewModel.sFormViewModel = new FormViewModel(); + } + return FormViewModel.sFormViewModel; + } + + public async requestForm(formId: string) { + formManager.requestForm(formId) + .then((data) => { + console.info( '[FormComponent] requestForm result:' + data); + }); + } + + public async deleteCard(formId: string) { + formManager.deleteForm(formId) + .then((data) => { + console.info('[FormComponent] deleteForm result:' + data); + }); + } + + public async releaseCard(formId: string) { + formManager.releaseForm(formId) + .then((data) => { + console.info('[FormComponent] releaseForm result:' + data); + }); + } + + public async castTempToNormal(formId: string) { + formManager.castTempForm(formId) + .then((data) => { + console.info('[FormComponent] castTempToNormal result:' + data); + }); + } + + public async enableCard(formId: string) { + formManager.enableFormsUpdate([formId]) + .then((data) => { + console.info('[FormComponent] enableFormsUpdate result:' + data); + }); + } + + public async disableCard(formId: string) { + formManager.disableFormsUpdate([formId]) + .then((data) => { + console.info('[FormComponent] disableCard result:' + data); + }); + } + + public async changeCardVisible(formId: string, isVisible: boolean) { + if (isVisible) { + formManager.notifyVisibleForms([formId]) + .then((data) => { + console.info('[FormComponent] changeCardVisible result:' + data + ', isVisible:' + isVisible); + }); + } else { + formManager.notifyInvisibleForms([formId]) + .then((data) => { + console.info('[FormComponent] changeCardVisible result:' + data + ', isVisible:' + isVisible); + }); + } + } + + public async isFmsReady() { + formManager.isSystemReady() + .then((data) => { + console.info('[FormComponent] isFmsReady result:' + data); + }); + } + + public async getAllFormsInfo() { + console.info("[FormComponent] getAllFormsInfo start"); + formManager.getAllFormsInfo() + .then((data) => { + console.info('[FormComponent] getAllFormsInfo result:' + JSON.stringify(data)); + }) + .catch((err) => { + console.info('[FormComponent] getAllFormsInfo error:' + JSON.stringify(err)); + }); + console.info("[FormComponent] getAllFormsInfo end"); + } + + public async getFormsInfoByApp(bundle: string) { + formManager.getFormsInfo(bundle) + .then((data) => { + console.info('[FormComponent] getFormsInfoByApp result:' + JSON.stringify(data)); + }); + } + + public async getFormsInfoByModule(bundle: string, moduleName: string) { + formManager.getFormsInfo(bundle, moduleName) + .then((data) => { + console.info('[FormComponent] getFormsInfoByModule result:' + JSON.stringify(data)); + }); + } + + public async clearFormUserCache() { + bundleManager.cleanBundleCacheFiles('com.ohos.myapplicationform') + .then((data) => { + console.info('[FormComponent] cleanBundleCacheFiles result:' + JSON.stringify(data)); + }); + } + + public async clearFormProviderCache(bundle: string) { + bundleManager.cleanBundleCacheFiles(bundle) + .then((data) => { + console.info('[FormComponent] cleanBundleCacheFiles result:' + JSON.stringify(data)); + }); + } +} \ No newline at end of file diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_notifyvisible/entry/src/main/ets/MainAbility/pages/index.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_notifyvisible/entry/src/main/ets/MainAbility/pages/index.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_notifyvisible/entry/src/main/ets/MainAbility/pages/index.ets rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_notifyvisible/entry/src/main/ets/MainAbility/pages/index.ets diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_notifyvisible/entry/src/main/ets/MainAbility/test/FmsFormStateNotifyVisible.test.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_notifyvisible/entry/src/main/ets/MainAbility/test/FmsFormStateNotifyVisible.test.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_notifyvisible/entry/src/main/ets/MainAbility/test/FmsFormStateNotifyVisible.test.ets rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_notifyvisible/entry/src/main/ets/MainAbility/test/FmsFormStateNotifyVisible.test.ets diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_notifyvisible/entry/src/main/ets/MainAbility/test/List.test.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_notifyvisible/entry/src/main/ets/MainAbility/test/List.test.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_notifyvisible/entry/src/main/ets/MainAbility/test/List.test.ets rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_notifyvisible/entry/src/main/ets/MainAbility/test/List.test.ets diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_notifyvisible/entry/src/main/resources/base/element/string.json b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_notifyvisible/entry/src/main/resources/base/element/string.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstatetest_notifyvisible/entry/src/main/resources/base/element/string.json rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_notifyvisible/entry/src/main/resources/base/element/string.json diff --git a/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_notifyvisible/entry/src/main/resources/base/media/icon.png b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_notifyvisible/entry/src/main/resources/base/media/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ce307a8827bd75456441ceb57d530e4c8d45d36c Binary files /dev/null and b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_notifyvisible/entry/src/main/resources/base/media/icon.png differ diff --git a/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_notifyvisible/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_notifyvisible/signature/openharmony_sx.p7b new file mode 100644 index 0000000000000000000000000000000000000000..66b4457a8a81fb8d3356cf46d67226c850944858 Binary files /dev/null and b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstatetest_notifyvisible/signature/openharmony_sx.p7b differ diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstresstest/BUILD.gn b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstresstest/BUILD.gn similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstresstest/BUILD.gn rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstresstest/BUILD.gn diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstresstest/Test.json b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstresstest/Test.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstresstest/Test.json rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstresstest/Test.json diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstresstest/entry/src/main/config.json b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstresstest/entry/src/main/config.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstresstest/entry/src/main/config.json rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstresstest/entry/src/main/config.json diff --git a/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstresstest/entry/src/main/ets/MainAbility/app.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstresstest/entry/src/main/ets/MainAbility/app.ets new file mode 100644 index 0000000000000000000000000000000000000000..83dd3d4f89d10e36cf17e9a1f7dba026f14c088b --- /dev/null +++ b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstresstest/entry/src/main/ets/MainAbility/app.ets @@ -0,0 +1,23 @@ +/* + * 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. + */ + +export default { + onCreate() { + console.info('[FormComponent] Application onCreate') + }, + onDestroy() { + console.info('[FormComponent] Application onDestroy') + }, +} \ No newline at end of file diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstresstest/entry/src/main/ets/MainAbility/pages/index.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstresstest/entry/src/main/ets/MainAbility/pages/index.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstresstest/entry/src/main/ets/MainAbility/pages/index.ets rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstresstest/entry/src/main/ets/MainAbility/pages/index.ets diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstresstest/entry/src/main/ets/MainAbility/test/FmsStress.test.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstresstest/entry/src/main/ets/MainAbility/test/FmsStress.test.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstresstest/entry/src/main/ets/MainAbility/test/FmsStress.test.ets rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstresstest/entry/src/main/ets/MainAbility/test/FmsStress.test.ets diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstresstest/entry/src/main/ets/MainAbility/test/List.test.ets b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstresstest/entry/src/main/ets/MainAbility/test/List.test.ets similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstresstest/entry/src/main/ets/MainAbility/test/List.test.ets rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstresstest/entry/src/main/ets/MainAbility/test/List.test.ets diff --git a/aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstresstest/entry/src/main/resources/base/element/string.json b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstresstest/entry/src/main/resources/base/element/string.json similarity index 100% rename from aafwk/aafwk_standard/formmanager/formsystemtest_ets/formstresstest/entry/src/main/resources/base/element/string.json rename to aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstresstest/entry/src/main/resources/base/element/string.json diff --git a/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstresstest/entry/src/main/resources/base/media/icon.png b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstresstest/entry/src/main/resources/base/media/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..ce307a8827bd75456441ceb57d530e4c8d45d36c Binary files /dev/null and b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstresstest/entry/src/main/resources/base/media/icon.png differ diff --git a/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstresstest/signature/openharmony_sx.p7b b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstresstest/signature/openharmony_sx.p7b new file mode 100644 index 0000000000000000000000000000000000000000..66b4457a8a81fb8d3356cf46d67226c850944858 Binary files /dev/null and b/aafwk/aafwk_standard/formmanager/fa/formsystemtest_ets/formstresstest/signature/openharmony_sx.p7b differ