diff --git a/aafwk/aafwk_standard/ActsDataAbilityJsTest/entry/src/main/js/test/ActsDataAbilityJsTest.test.js b/aafwk/aafwk_standard/ActsDataAbilityJsTest/entry/src/main/js/test/ActsDataAbilityJsTest.test.js index 01e2bfe05765e82f99e9105fa24807692a2d6f0e..c0880a187dab1b4ed91940bf8d0cad36d69e9762 100644 --- a/aafwk/aafwk_standard/ActsDataAbilityJsTest/entry/src/main/js/test/ActsDataAbilityJsTest.test.js +++ b/aafwk/aafwk_standard/ActsDataAbilityJsTest/entry/src/main/js/test/ActsDataAbilityJsTest.test.js @@ -14,7 +14,7 @@ */ import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from "deccjsunit/index" import featureAbility from '@ohos.ability.featureAbility' -import ohosDataAbility from '@ohos.data.dataability' +import ohosDataAbility from '@ohos.data.dataAbility' describe('ActsDataAbilityJsTest', function () { let dataAbilityUri = ("dataability:///com.example.myapplication.DataAbility"); diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/images/swipeDirection.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/images/swipeDirection.ets old mode 100755 new mode 100644 index 705f1293ab2f99534d1bc1b18f054817c301900f..40553dc9833e320801125e80b694ea99cdea2011 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/images/swipeDirection.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/images/swipeDirection.ets @@ -14,7 +14,7 @@ * limitations under the License. */ -import events_emitter from '@ohos.emitter' +import events_emitter from '@ohos.events.emitter' @Entry @Component struct PanGestureExample { diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/NavigatorCode.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/NavigatorCode.ets index c5ea4fbe4ec02b71a035b9719f5c8b9a1afa8881..bd380f3151701729b0bebeb151ecab8a6bad276b 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/NavigatorCode.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/NavigatorCode.ets @@ -14,7 +14,7 @@ * limitations under the License. */ -import events_emitter from '@ohos.emitter'; +import events_emitter from '@ohos.events.emitter'; @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/PieceCode.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/PieceCode.ets index af569b0f0029e745053a88eb1c6af3a7edc967b9..270f8ad30d1aec85b5e4e596e6f85aa90ab14ad2 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/PieceCode.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/PieceCode.ets @@ -14,7 +14,7 @@ * limitations under the License. */ -import events_emitter from '@ohos.emitter'; +import events_emitter from '@ohos.events.emitter'; @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/QrCode.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/QrCode.ets index ddfd5a7d9e417205fa8fdf2965d8078cf519728f..cf602a258c0aebf3d5f01113c2b1fc723ffa83c2 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/QrCode.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/QrCode.ets @@ -14,7 +14,7 @@ * limitations under the License. */ -import events_emitter from '@ohos.emitter'; +import events_emitter from '@ohos.events.emitter'; @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/aboutToDisappear.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/aboutToDisappear.ets index f31e5203b873dc73d5fc01dee05591cfaa29bd93..50ff7694c9570ce6ada6f470a322d9dbbbf9acaa 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/aboutToDisappear.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/aboutToDisappear.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter' +import events_emitter from '@ohos.events.emitter' @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/alphabetIndexer.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/alphabetIndexer.ets index d96f5f370253c412d044561d14899d5ae135f924..0f1b4eb0538c28f9cb3faac7bccb362a0580fdbf 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/alphabetIndexer.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/alphabetIndexer.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter'; +import events_emitter from '@ohos.events.emitter'; @Entry @Component struct AlphabetIndexerSample { diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/animate.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/animate.ets index b5d618a2db40355e62a816ea5cc41c355ac62391..7e6e18a2e2f9f8cdc2ee67c8cb0f991ccdfa10d8 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/animate.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/animate.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter' +import events_emitter from '@ohos.events.emitter' @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/animationStatus.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/animationStatus.ets index b1dfd8caaef476aefc50b0cc39aeba8cbe430a85..619e85b5799441d9ecc2722d8c905bfb80140d26 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/animationStatus.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/animationStatus.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter'; +import events_emitter from '@ohos.events.emitter'; @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/appStorage.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/appStorage.ets index 604ac2863f5f7a93a5f9fbf12374f095f3ec2331..cb5bef924d63123981d0a3da9bdaf1a7e4964e04 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/appStorage.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/appStorage.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter'; +import events_emitter from '@ohos.events.emitter'; @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/appear.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/appear.ets index 6ed544298ec1701d88caf2114605a9e715eb3db5..e646a392cd5dce7c899acaf17291d3ab1d4a0a02 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/appear.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/appear.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter' +import events_emitter from '@ohos.events.emitter' import prompt from '@system.prompt' @Entry diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/areaChange.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/areaChange.ets index 554dd94cf209bed0336bba204a44ef7428a2265e..d55db9e246cd2114cf2f1365b1ad695c12927789 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/areaChange.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/areaChange.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter'; +import events_emitter from '@ohos.events.emitter'; @Entry @Component struct AreaExample { diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/badge.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/badge.ets index f31804155647dc2492686f610b1cf630b3e7eb14..fe2bc5b659ded22c99cf89a42c12d31b4baf483a 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/badge.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/badge.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter'; +import events_emitter from '@ohos.events.emitter'; @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/barState.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/barState.ets index 6b3a71b83d04a0647e1c8cd0c006a18281756757..d515b1321656eb92bcae10126ab2639a23cc1dd5 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/barState.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/barState.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter'; +import events_emitter from '@ohos.events.emitter'; @Entry @Component struct ScrollBarExample { diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/bindMenu.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/bindMenu.ets index 3ce33b16bcd2193f38bcb614c7894d597c924757..55695c662fd246b83af2affddb9a54ebbee63f8c 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/bindMenu.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/bindMenu.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter' +import events_emitter from '@ohos.events.emitter' @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/bindPopup.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/bindPopup.ets index be2fc5fee5906e7c6e765d641c63a4a8c943151e..72d274eea44ded48f9dcfca005cbe3238aeb9862 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/bindPopup.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/bindPopup.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter' +import events_emitter from '@ohos.events.emitter' @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/blank.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/blank.ets index 387be78fa07140e635c94d6c32c501802cc59d01..e2789eba8b45d0c129a3fc7e7b281b66ceaa6029 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/blank.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/blank.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter'; +import events_emitter from '@ohos.events.emitter'; @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/button.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/button.ets index 5ced5f62ea84541b7f5e587fa62992381917a9c5..72991790544ef4477876d2ef0e829caa7f5fbf6f 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/button.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/button.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter'; +import events_emitter from '@ohos.events.emitter'; @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/canvas.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/canvas.ets index 451f0e9eac093ff9d95160a777e0c0d2e6199ccf..d342b09be2f72364b514c64ef2c29fbf37e8fc8f 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/canvas.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/canvas.ets @@ -13,7 +13,7 @@ * limitations under the License. */ -import events_emitter from '@ohos.emitter' +import events_emitter from '@ohos.events.emitter' @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/canvas2.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/canvas2.ets index f50b17fc6701f5304c53026c113e1d2e9c193f7b..81636715974dec07cfd9b7c54fba3d1182ab78d5 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/canvas2.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/canvas2.ets @@ -13,7 +13,7 @@ * limitations under the License. */ -import events_emitter from '@ohos.emitter' +import events_emitter from '@ohos.events.emitter' @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/checkbox.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/checkbox.ets index c446a49b86a9b44042dc766d0eeb06c0d60ce778..3aee96e4af8aa2968006ed632798af99430ea399 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/checkbox.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/checkbox.ets @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter' +import events_emitter from '@ohos.events.emitter' @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/checkboxGroup.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/checkboxGroup.ets index 881bbd477c6841fe63eae6296a77b3550a8f5bbd..d4ee65ceadaa60aa65cf2a63553c5a49b6cd0f1c 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/checkboxGroup.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/checkboxGroup.ets @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter' +import events_emitter from '@ohos.events.emitter' @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/circle.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/circle.ets index 418fc3c6f15ab00ccdb8ff16b2df78590b315878..364aa0e4ba301af16d95727d174941b2f5e28ad1 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/circle.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/circle.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter'; +import events_emitter from '@ohos.events.emitter'; @Entry @Component struct CircleExample { diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/configuration.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/configuration.ets index c34f4b9600740a2e55c731714d4ec78e884f7b66..f69ea4a04811020332c02fd5b0aa14bec69b1e10 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/configuration.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/configuration.ets @@ -14,7 +14,7 @@ * limitations under the License. */ import Configuration from '@system.configuration'; -import events_emitter from '@ohos.emitter'; +import events_emitter from '@ohos.events.emitter'; @Entry @Component struct promptExample { diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/curves.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/curves.ets index b62012d41e0670ad8364a94ea524a7575600e296..43911d0991d6ea52249b092b902920afee34db19 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/curves.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/curves.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter'; +import events_emitter from '@ohos.events.emitter'; import Curves from '@ohos.curves' @Entry diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/customDialogController.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/customDialogController.ets index dabd3f770a3f1443dfa3efc5831184a6d5701380..50383253cfeda9afc96d976c0f781703abb00718 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/customDialogController.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/customDialogController.ets @@ -13,7 +13,7 @@ * limitations under the License. */ -import events_emitter from '@ohos.emitter' +import events_emitter from '@ohos.events.emitter' @CustomDialog struct CustomDialogExample { diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/datePicker.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/datePicker.ets index 3ef5b1b0e720333e7ff3b11b06b087f8241d72be..54819de512b8a984cdd5df53f608081a4e857394 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/datePicker.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/datePicker.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter'; +import events_emitter from '@ohos.events.emitter'; @Entry @Component struct DatePickerExample01 { diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/direction.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/direction.ets index 0511f6585555230106e2990a1c34f6bd0f0fcb0e..1ca26cf3f2d46ed907b77f08fb9c519b4b127c5d 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/direction.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/direction.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter'; +import events_emitter from '@ohos.events.emitter'; @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/direction2.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/direction2.ets index af2b57262a441da71c2d8c384d168bddc5544b57..c4d0aad3c4386498f0afc4ba9fc3afa269dc0d1b 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/direction2.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/direction2.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter'; +import events_emitter from '@ohos.events.emitter'; @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/divider.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/divider.ets index 9478afdcfa8bcdf456f4c2604a932714d8cd8508..8dcc3ad0a36bdcb5f8b084e849f00b265906e7d6 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/divider.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/divider.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter'; +import events_emitter from '@ohos.events.emitter'; @Entry @Component struct DividerExample { diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/edgeEffect.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/edgeEffect.ets index e8d824960c622822d1ca670fe23cedaa89006f79..89290280b5e33dbcbf0762f9ba4adad173f7332c 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/edgeEffect.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/edgeEffect.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter'; +import events_emitter from '@ohos.events.emitter'; @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/ellipse.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/ellipse.ets index 28f182812ac984070139cfa39f2b782f2f0e37f8..af2ae7740a679d46bd6d723c6f80b014d7a9da9e 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/ellipse.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/ellipse.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter'; +import events_emitter from '@ohos.events.emitter'; @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/enable.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/enable.ets index 8225655897f7cd6472ebaba928c76d48fc4590f6..6567eefda9975b9fc5c268b05135b0c34e75c9b0 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/enable.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/enable.ets @@ -13,7 +13,7 @@ * limitations under the License. */ -import events_emitter from '@ohos.emitter' +import events_emitter from '@ohos.events.emitter' @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/enumsFlexAlign.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/enumsFlexAlign.ets index dd0b9b82a988aa96c8cba34ebeeb7196a9ea6d3a..80da6b45b5212ff86a459d04e50062bfa4edc062 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/enumsFlexAlign.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/enumsFlexAlign.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter' +import events_emitter from '@ohos.events.emitter' @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/enumsHorizontalAlign.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/enumsHorizontalAlign.ets index b85803ebd16005f0d20631d448aa6727b4b8f8d6..218fb62c3d46a074ba6872351211b5874c9a8506 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/enumsHorizontalAlign.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/enumsHorizontalAlign.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter' +import events_emitter from '@ohos.events.emitter' @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/enumsImage.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/enumsImage.ets index 8285bbc43185e356cf97734cceaa84335c4537bd..84de880c27e3ccdb1e58c4960f320587dc8ff0f7 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/enumsImage.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/enumsImage.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter' +import events_emitter from '@ohos.events.emitter' @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/enumsItemAlign.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/enumsItemAlign.ets index 82318e0db8d64929dc7258dd52d57b7956d0c66f..81d63ad8df7fa29745b816487379516c4d6956f7 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/enumsItemAlign.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/enumsItemAlign.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter' +import events_emitter from '@ohos.events.emitter' @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/enumsLineCapStyle.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/enumsLineCapStyle.ets index 30b58839d22f5ec266aef8f9ac850eb9807ca2d5..c38cf02ec3dee958716cc1d3b84cb9dce43d885e 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/enumsLineCapStyle.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/enumsLineCapStyle.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter' +import events_emitter from '@ohos.events.emitter' @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/enumsVerticalAlign.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/enumsVerticalAlign.ets index 3fb9d4d3b9a75a8a7378e225a76d5891c0d8cae8..d574b433f8f32214fe71d84a3de951bc5e0ae1a6 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/enumsVerticalAlign.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/enumsVerticalAlign.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter' +import events_emitter from '@ohos.events.emitter' @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/fillMode.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/fillMode.ets index b10d525f6c612209c9fb03823eae00f7ba7348f7..bdcad9499235c3153d60fcdc2a4da5adcf78eabf 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/fillMode.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/fillMode.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter' +import events_emitter from '@ohos.events.emitter' @Entry @Component struct fillModeExample { diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/flexDirection.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/flexDirection.ets index c7c9e9f5294911afe725f29eba1989358c4de0e1..062bd4aa204eeb3e02054e0461330c6930c84816 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/flexDirection.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/flexDirection.ets @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter' +import events_emitter from '@ohos.events.emitter' @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/flexWrap.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/flexWrap.ets index a2ade0fe4f99c55acb5dab66e82557f6e61a52d8..6ba3026fca4b651d035ecadfd7548e8acf0c81d5 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/flexWrap.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/flexWrap.ets @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter' +import events_emitter from '@ohos.events.emitter' @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/fontWeight.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/fontWeight.ets index 3cbb0034ce87c09a4ca98f9df367860e1a530fd3..4d657bf2ba446b09b077ce82c45d68aa80b284ba 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/fontWeight.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/fontWeight.ets @@ -14,7 +14,7 @@ * limitations under the License. */ -import events_emitter from '@ohos.emitter' +import events_emitter from '@ohos.events.emitter' @Entry @Component struct ContentTable { diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/gauge.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/gauge.ets index 0ceaaa43a4e0939b6d4ac9c325b3ee4237c24e59..49fd9f4f25531e7c6be09d175da3fe0f8a0ebec0 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/gauge.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/gauge.ets @@ -1,76 +1,76 @@ -// @ts-nocheck -/** - * 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 events_emitter from '@ohos.emitter'; - -@Entry -@Component -struct GaugeExample { - @State gaugeValue: string = 50; - @State strokeWidthValue: string = 20; - @State startAngleValue: string = 210; - @State endAngleValue: string = 150; - @State colorValues: Array = [[0x317AF7, 1], [0x5BA854, 1], [0xE08C3A, 1], [0x9C554B, 1], [0xD94838, 1]]; - - private stateChangCallBack = (eventData) => { - if (eventData != null) { - console.info("gauge page state change called:" + JSON.stringify(eventData)); - if(eventData.data.gaugeValue != null) { - this.gaugeValue = eventData.data.gaugeValue; - } - if(eventData.data.strokeWidthValue != null) { - this.strokeWidthValue = eventData.data.strokeWidthValue; - } - if(eventData.data.startAngleValue != null) { - this.startAngleValue = eventData.data.startAngleValue; - } - if(eventData.data.endAngleValue != null) { - this.endAngleValue = eventData.data.endAngleValue; - } - if(eventData.data.colorValues != null) { - this.colorValues = JSON.parse(eventData.data.colorValues); - } - } - } - - onPageShow() { - console.info('gauge page show called'); - var stateChangeEvent = { - eventId: 1, - priority: events_emitter.EventPriority.LOW - } - events_emitter.on(stateChangeEvent, this.stateChangCallBack); - - var stateChangeEventTwo = { - eventId: 2, - priority: events_emitter.EventPriority.LOW - } - events_emitter.on(stateChangeEventTwo, this.stateChangCallBack); - } - - build() { - Column() { - Gauge({ value: 0, min: 0, max: 100 }) - .key("gauge") - .value(`${this.gaugeValue}`) - .startAngle(`${this.startAngleValue}`) - .endAngle(`${this.endAngleValue}`) - .colors(this.colorValues) - .strokeWidth(`${this.strokeWidthValue}`) - .width(200).height(200) - }.width('100%').margin({ top: 300 }) - } -} - +// @ts-nocheck +/** + * 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 events_emitter from '@ohos.events.emitter'; + +@Entry +@Component +struct GaugeExample { + @State gaugeValue: string = 50; + @State strokeWidthValue: string = 20; + @State startAngleValue: string = 210; + @State endAngleValue: string = 150; + @State colorValues: Array = [[0x317AF7, 1], [0x5BA854, 1], [0xE08C3A, 1], [0x9C554B, 1], [0xD94838, 1]]; + + private stateChangCallBack = (eventData) => { + if (eventData != null) { + console.info("gauge page state change called:" + JSON.stringify(eventData)); + if(eventData.data.gaugeValue != null) { + this.gaugeValue = eventData.data.gaugeValue; + } + if(eventData.data.strokeWidthValue != null) { + this.strokeWidthValue = eventData.data.strokeWidthValue; + } + if(eventData.data.startAngleValue != null) { + this.startAngleValue = eventData.data.startAngleValue; + } + if(eventData.data.endAngleValue != null) { + this.endAngleValue = eventData.data.endAngleValue; + } + if(eventData.data.colorValues != null) { + this.colorValues = JSON.parse(eventData.data.colorValues); + } + } + } + + onPageShow() { + console.info('gauge page show called'); + var stateChangeEvent = { + eventId: 1, + priority: events_emitter.EventPriority.LOW + } + events_emitter.on(stateChangeEvent, this.stateChangCallBack); + + var stateChangeEventTwo = { + eventId: 2, + priority: events_emitter.EventPriority.LOW + } + events_emitter.on(stateChangeEventTwo, this.stateChangCallBack); + } + + build() { + Column() { + Gauge({ value: 0, min: 0, max: 100 }) + .key("gauge") + .value(`${this.gaugeValue}`) + .startAngle(`${this.startAngleValue}`) + .endAngle(`${this.endAngleValue}`) + .colors(this.colorValues) + .strokeWidth(`${this.strokeWidthValue}`) + .width(200).height(200) + }.width('100%').margin({ top: 300 }) + } +} + diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/general-properties/PanGesture.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/general-properties/PanGesture.ets index c275265c1213e6dc0dbc95603c2c9131b356360b..2b8f0ae3ba3b5f2dfb4f4ccfcd892adfb5754193 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/general-properties/PanGesture.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/general-properties/PanGesture.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter'; +import events_emitter from '@ohos.events.emitter'; @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/general-properties/ResponseRegion.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/general-properties/ResponseRegion.ets index 530360711b919a28e3751d2ddebfa3aa280c028f..c3928f78aed14216ec66048fe49c4beb7fbe48b5 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/general-properties/ResponseRegion.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/general-properties/ResponseRegion.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter'; +import events_emitter from '@ohos.events.emitter'; @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/general-properties/background.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/general-properties/background.ets index 879a843e49f4689a712de3e61ce68cbfa3383c6a..cbd67fb8b9cd1c23f92d90bf57f950c87ead55d9 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/general-properties/background.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/general-properties/background.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter' +import events_emitter from '@ohos.events.emitter' @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/general-properties/border.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/general-properties/border.ets index 94166478850fe30d1f1d9b6363ae7e4a6038877a..1914a589cd5b300bdb76d62b6d581264e474af3a 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/general-properties/border.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/general-properties/border.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter' +import events_emitter from '@ohos.events.emitter' @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/general-properties/clickEvent.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/general-properties/clickEvent.ets index 1182d03d9572de1f5da108fdaa6cb442b2e2c13c..55938a183a0531d2b3dfa6be11ea1fed9864ed3f 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/general-properties/clickEvent.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/general-properties/clickEvent.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter'; +import events_emitter from '@ohos.events.emitter'; @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/general-properties/colorGradient.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/general-properties/colorGradient.ets index 8e4ddb80f62d10a3c558bb158a72261e06ac9b26..b9bbf47ae8b0ace7687d452ef7527824fef3e2a6 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/general-properties/colorGradient.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/general-properties/colorGradient.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter'; +import events_emitter from '@ohos.events.emitter'; @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/general-properties/flex.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/general-properties/flex.ets index a003153a0da4c27904465834eab0cd20695f64de..ef2858bdb8d2670e837e25c49406b73e5c244495 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/general-properties/flex.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/general-properties/flex.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter' +import events_emitter from '@ohos.events.emitter' @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/general-properties/gridSettings.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/general-properties/gridSettings.ets index 925824670976d2e7eeba8debe6a100d6e0db0d97..650a889413607c7d981da21ac20f7901dafc629a 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/general-properties/gridSettings.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/general-properties/gridSettings.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter' +import events_emitter from '@ohos.events.emitter' @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/general-properties/imageEffects.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/general-properties/imageEffects.ets index 39432be916094be6c507af8dae8d626d12e56518..0bbacea16d3b4f8c617b28f66216b6e39e329ba8 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/general-properties/imageEffects.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/general-properties/imageEffects.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter' +import events_emitter from '@ohos.events.emitter' @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/general-properties/layoutConstraints.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/general-properties/layoutConstraints.ets index 135cf0a4d3f19e0d6171c19a9201d03cafa372da..2cd75c55eafaed748ce49cada8b0eda115ca6230 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/general-properties/layoutConstraints.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/general-properties/layoutConstraints.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter'; +import events_emitter from '@ohos.events.emitter'; class ContainerInfo { label : string = '' diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/general-properties/opacitySetting.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/general-properties/opacitySetting.ets index 4bf2f93fc61c742548cdd701110578fe993d91a8..f5c34431e5f4d81b7166e1715e433c3d2b9d2a2f 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/general-properties/opacitySetting.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/general-properties/opacitySetting.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter'; +import events_emitter from '@ohos.events.emitter'; @Entry @Component struct OpacityExample { diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/general-properties/positionSetting.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/general-properties/positionSetting.ets index c32fe2ab788121052dbd78ae756b365a7e490792..8a39b1fedceafab4576ed0721fecf150bac4f507 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/general-properties/positionSetting.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/general-properties/positionSetting.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter'; +import events_emitter from '@ohos.events.emitter'; @Entry @Component struct PositionSetting { diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/general-properties/shapeClipping.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/general-properties/shapeClipping.ets index 2e402ecd16cc1ada5f9191597c246c01dc0e5a1c..e6723de8d3d496f9963f01aca9860266f49a92ad 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/general-properties/shapeClipping.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/general-properties/shapeClipping.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter'; +import events_emitter from '@ohos.events.emitter'; @Entry @Component struct ClipAndMaskExample { diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/general-properties/sizeSetting.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/general-properties/sizeSetting.ets index 2b2ae055475c50ab210eaea4c05fa31412b5f136..6497468ba749ce6bb5a471d3624eb46937bb0621 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/general-properties/sizeSetting.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/general-properties/sizeSetting.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter'; +import events_emitter from '@ohos.events.emitter'; @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/general-properties/textStyle.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/general-properties/textStyle.ets index cb4d847391305d0d1008937d6a186ea423cfd64e..beb0ca9738e55f93a1923b7eb02cf345051deb52 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/general-properties/textStyle.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/general-properties/textStyle.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter'; +import events_emitter from '@ohos.events.emitter'; @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/general-properties/touch.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/general-properties/touch.ets index dd7209fe7e734becfae525e646bb6195ab0938bf..91498affb50102c0f1b6f239cdc797bf9ce71c0b 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/general-properties/touch.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/general-properties/touch.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter' +import events_emitter from '@ohos.events.emitter' @Entry @Preview diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/general-properties/touchAble.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/general-properties/touchAble.ets index 087d9067b5fe7613d8ad10432d27333e4c88f241..1a53693849e0a0a91edb68135ae707dca582d74d 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/general-properties/touchAble.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/general-properties/touchAble.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter'; +import events_emitter from '@ohos.events.emitter'; @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/general-properties/transForm.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/general-properties/transForm.ets index 388955aeb005045256b54f04f746927efecfba25..9d847095d0a89c6a1d47354a83692dd58400592e 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/general-properties/transForm.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/general-properties/transForm.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter' +import events_emitter from '@ohos.events.emitter' import Matrix4 from '@ohos.matrix4' @Entry diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/general-properties/visibility.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/general-properties/visibility.ets index cc2ba4ca85408aa82c64b42c8872a4723db2974a..f0efb90faafcc8c9741f1bebc363ae7937d1f94d 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/general-properties/visibility.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/general-properties/visibility.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter'; +import events_emitter from '@ohos.events.emitter'; @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/geometryTransition.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/geometryTransition.ets index 583112d24548ce0854207bf94e60815829c96e66..9baa590cdc797adbf91ccb385014590d428e1b8b 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/geometryTransition.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/geometryTransition.ets @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter' +import events_emitter from '@ohos.events.emitter' @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/gestureMode.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/gestureMode.ets index 92a8bb8bce60bfe9a815151f220c50efb5d53e47..0af198407b4ccfc2b78d4c1472cad678b86f9db0 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/gestureMode.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/gestureMode.ets @@ -14,7 +14,7 @@ * limitations under the License. */ -import events_emitter from '@ohos.emitter' +import events_emitter from '@ohos.events.emitter' @Entry @Component struct GestureGroupExample { diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/gradientDirection.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/gradientDirection.ets index 47eb8c5cae1d5d1d4270121083850625435d8705..ef7316fb149aee6caa718286ed63f8dd0a029358 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/gradientDirection.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/gradientDirection.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter'; +import events_emitter from '@ohos.events.emitter'; @Entry @Component struct linearGradientExample { diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/grid.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/grid.ets index 9161a7d038b272d4be9a9c6bfee3688e6bc812cd..e58a67687568144cf2bf897b10d3b8460de17474 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/grid.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/grid.ets @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter' +import events_emitter from '@ohos.events.emitter' @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/gridContainer.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/gridContainer.ets index 7d9ff8456fd8f5959886d0e317ee5cad157184b0..4077f6540e88b4c1714400a8983a43168fc4ada0 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/gridContainer.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/gridContainer.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter' +import events_emitter from '@ohos.events.emitter' @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/gridPage.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/gridPage.ets index 946cae6aa6c330e7753c72b50f015cac27518160..d39141a797870bf93924dd858e4792a4b34ddff2 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/gridPage.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/gridPage.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter' +import events_emitter from '@ohos.events.emitter' @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/imageAnimator.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/imageAnimator.ets index dcf9adecf4346731d96bb00c87684e2c54a99dd4..98fb9ad91d2fd175e914b65955db39348ac6cde9 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/imageAnimator.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/imageAnimator.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter' +import events_emitter from '@ohos.events.emitter' @Entry @Component struct ImageAnimatorExample { diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/imageFit.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/imageFit.ets index 741808c14e83b83349207072e064e367d3c6085a..f659b4dc57d122bb5f39eb861e36740a15ce639d 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/imageFit.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/imageFit.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter' +import events_emitter from '@ohos.events.emitter' @Entry @Component struct ImageExample1 { diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/keyEvent.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/keyEvent.ets index 69147194f2d38f04438150ed557ee66e1f33e547..a5f16dafcdb6561b8e8a2859e6b4fbf9e752d1c0 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/keyEvent.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/keyEvent.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter'; +import events_emitter from '@ohos.events.emitter'; @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/lifecycle.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/lifecycle.ets index 8d8f1ea1e5fce57dceb5fa620ff3e280e29ece18..3f9a5e681d2758db56d1720f064728193d7bda12 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/lifecycle.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/lifecycle.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter'; +import events_emitter from '@ohos.events.emitter'; @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/line.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/line.ets index 0c6a52fb59e298d21a8b6183073ec445b786b3f8..ca32685ae7a6029569c16d964d2a834108fa55f3 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/line.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/line.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter' +import events_emitter from '@ohos.events.emitter' @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/list.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/list.ets index b3b2350ef471aab6a0202ebfe6958a3ca84f5fc7..91c7239b387e3ca170e56b78a1bd8d044718634b 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/list.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/list.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter'; +import events_emitter from '@ohos.events.emitter'; @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/listItem.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/listItem.ets index 11419b8fe2e873c95d23d36c9766e4c90887c552..554080a60a2011aa802f8ac6a9e34b0f3e32958c 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/listItem.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/listItem.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter'; +import events_emitter from '@ohos.events.emitter'; @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/loadingProgress.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/loadingProgress.ets index 0cd364c7b1d17393903a940207444d070dcd03ea..e515e3338b60969508297192374239675bb20e05 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/loadingProgress.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/loadingProgress.ets @@ -13,7 +13,7 @@ * limitations under the License. */ -import events_emitter from '@ohos.emitter' +import events_emitter from '@ohos.events.emitter' @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/longPressGesture.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/longPressGesture.ets index 191dbcf359b13fe3ad77e885be0e9d0c102a1223..647bd32e210b162a80303834293b0f54d902f498 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/longPressGesture.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/longPressGesture.ets @@ -13,7 +13,7 @@ * limitations under the License. */ -import events_emitter from '@ohos.emitter' +import events_emitter from '@ohos.events.emitter' @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/marquee.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/marquee.ets index b2e1be54d91afd35c22d8123353d294d8b289fea..ecec05bc7316dcb4647913ec09169a0c733cc476 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/marquee.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/marquee.ets @@ -13,7 +13,7 @@ * limitations under the License. */ -import events_emitter from '@ohos.emitter' +import events_emitter from '@ohos.events.emitter' @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/motionPath.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/motionPath.ets index 4f05c9681f306e1a7b48c6081b32809e39b016f4..18ae81be9b4e335d1c2644929a14c9154af796fe 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/motionPath.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/motionPath.ets @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter' +import events_emitter from '@ohos.events.emitter' @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/mouseEvent.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/mouseEvent.ets index f8e30e3d15f2c2304174cf6eaf485f6ddba3dfc0..44b1c81dac5bc1507b11ac13a4cb039859e966ce 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/mouseEvent.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/mouseEvent.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter' +import events_emitter from '@ohos.events.emitter' @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/navigation.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/navigation.ets index a52380206f4d79e574d8d49eb8edf089b94f6c4c..de22da3e6cb9fc6a6e96010090998671574ca47b 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/navigation.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/navigation.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter'; +import events_emitter from '@ohos.events.emitter'; @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/ohosMatrix4.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/ohosMatrix4.ets index a9e76ade7ba1b0849bb89a9110685038c28a98a3..2a4065dfb7b1c804b15beb5349e039a48f5f5245 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/ohosMatrix4.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/ohosMatrix4.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter' +import events_emitter from '@ohos.events.emitter' import Matrix4 from '@ohos.matrix4' import prompt from '@system.prompt' diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/ohosPrompt.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/ohosPrompt.ets index f3a53affc5624d18e65f8fad5605475c0c75078b..2f6a024acb88caf7e9f9b35fd5ef4eaa4503da65 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/ohosPrompt.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/ohosPrompt.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter' +import events_emitter from '@ohos.events.emitter' import prompt from '@ohos.prompt' @Entry diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/ohosRouterB.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/ohosRouterB.ets index 1281ec1a2d7c4203b17ed7cb4ab1c4f40c2cdec7..8cca7ea66475e0245a45a3c747333affb2bf3e24 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/ohosRouterB.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/ohosRouterB.ets @@ -13,7 +13,7 @@ * limitations under the License. */ import router from '@system.router'; -import events_emitter from '@ohos.emitter'; +import events_emitter from '@ohos.events.emitter'; @Entry @Component struct OhosRouterB { diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/overlay.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/overlay.ets index b545a3a47fab2dd2fb24222a28bf44bc5ba6c954..e35277bf4bdbcb73845040f8f5d80502861cec49 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/overlay.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/overlay.ets @@ -13,7 +13,7 @@ * limitations under the License. */ -import events_emitter from '@ohos.emitter' +import events_emitter from '@ohos.events.emitter' @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/pageTransition.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/pageTransition.ets index 0cb6713b2218596daddee6cce0457bb3ffc32c1f..d9693f2ba2d33a1413f1baaba4dc75632e4f436c 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/pageTransition.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/pageTransition.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter' +import events_emitter from '@ohos.events.emitter' @Entry @Component struct PageTransitionExample1 { diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/pageTransition2.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/pageTransition2.ets index e2251bb15b6af9c6c919a43c79b47b00991a917f..a16c291aed45f29ff4cadc9de0993239b5ece134 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/pageTransition2.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/pageTransition2.ets @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter' +import events_emitter from '@ohos.events.emitter' @Entry @Component struct AExample { diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/panDirection.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/panDirection.ets index de54bc426ada3541b71a1400a7b150f8fa9f9050..20d18d81f52aba8a4ef90f79046a1d285d368013 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/panDirection.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/panDirection.ets @@ -14,7 +14,7 @@ * limitations under the License. */ -import events_emitter from '@ohos.emitter' +import events_emitter from '@ohos.events.emitter' @Entry @Component struct PanGestureExample { diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/panel.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/panel.ets index c52af08b3b02e61895ec5a2cf6b491a04c95c211..415a7fe7286236df9dec2c1acbcc2dcab7789e0e 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/panel.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/panel.ets @@ -13,7 +13,7 @@ * limitations under the License. */ -import events_emitter from '@ohos.emitter' +import events_emitter from '@ohos.events.emitter' @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/parallelGesture.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/parallelGesture.ets index b1519513d8ddf07aeb9091230a1df47355fb60e9..0e4de743f78d77f686ee2b53f23d315366094311 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/parallelGesture.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/parallelGesture.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter' +import events_emitter from '@ohos.events.emitter' @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/path.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/path.ets index 20344889f8534da41c9d9579a27f00d3698048ca..5c7b0e91a9e78b64b10ecf8483941579c54a7e91 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/path.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/path.ets @@ -13,7 +13,7 @@ * limitations under the License. */ -import events_emitter from '@ohos.emitter' +import events_emitter from '@ohos.events.emitter' @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/patternLock.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/patternLock.ets index 53e12e9b82f1adf8a9e68d6efa58bae1fcef5534..03b81a88dd2c6edcb2d33f87c709c4eb1fab436b 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/patternLock.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/patternLock.ets @@ -14,7 +14,7 @@ * limitations under the License. */ -import events_emitter from '@ohos.emitter'; +import events_emitter from '@ohos.events.emitter'; @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/placement.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/placement.ets index ec471be9fef0ce49d54047bbe88794f757b225f6..a9b2b9572806a4b2de9dcbdc15db80c59776259c 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/placement.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/placement.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter' +import events_emitter from '@ohos.events.emitter' @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/playMode.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/playMode.ets index 3a9678d76e48ace31b63ab9d9247a945c058f000..1d2c4c4ea5020c74df54ab6dd9121f45546190b2 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/playMode.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/playMode.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter' +import events_emitter from '@ohos.events.emitter' @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/priorityGesture.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/priorityGesture.ets index 43267f8fed97daedaa629cce5d83b7c0a93f5356..c37975d2ffe196464b89a29e7c80b6999e5d5f3e 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/priorityGesture.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/priorityGesture.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter' +import events_emitter from '@ohos.events.emitter' @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/progress.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/progress.ets index 5b8dc1545bb39586d41a7a0c3b980a74ff6ff922..8b18e95fce4faef4a8e20e56e5f5fddae347b54c 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/progress.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/progress.ets @@ -13,7 +13,7 @@ * limitations under the License. */ -import events_emitter from '@ohos.emitter' +import events_emitter from '@ohos.events.emitter' @Entry diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/rating.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/rating.ets index bf2ae193863861ffaa72332357d508e13df09235..3537f959838d472277fe898eee9e556d494a1aab 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/rating.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/rating.ets @@ -13,7 +13,7 @@ * limitations under the License. */ -import events_emitter from '@ohos.emitter' +import events_emitter from '@ohos.events.emitter' @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/refresh.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/refresh.ets index 5b4492c0e26ee488cf1bf8ce188b9a407f8a01e1..5ac154ce1e825750fe35696a59462baf7372e9a6 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/refresh.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/refresh.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import eventsEmitter from '@ohos.emitter'; +import eventsEmitter from '@ohos.events.emitter'; @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/richText.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/richText.ets index a22f5b6c0adf73e8c986939ba1823cec658d047a..5193854ac1d4e6fbcd714ac6de1f929425a69b47 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/richText.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/richText.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import eventsEmitter from '@ohos.emitter'; +import eventsEmitter from '@ohos.events.emitter'; @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/row.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/row.ets index 87c87845548011ba6e2b58d04b78715fe64382df..a9717066846224312c2c21cf705513cc79defa67 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/row.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/row.ets @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter' +import events_emitter from '@ohos.events.emitter' @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/scrollBar.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/scrollBar.ets index 0e5061d780c975694539a6a50439b227875cf7ff..b9e418387b71dc255bd13a870e78b28cb6b88895 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/scrollBar.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/scrollBar.ets @@ -14,7 +14,7 @@ * limitations under the License. */ -import events_emitter from '@ohos.emitter'; +import events_emitter from '@ohos.events.emitter'; @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/scrollCode.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/scrollCode.ets index 2f7c798212ac69d7e178afd453ead5012030fc88..b835c9f936fb546d4d0c46e31e15f83c15401cd6 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/scrollCode.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/scrollCode.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter'; +import events_emitter from '@ohos.events.emitter'; @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/search.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/search.ets index aa2490cbb9f09be6ef327210f29f5ce8a4a07616..7fcfe767a9345d1c40da7b2865c7a4d5c2e4abea 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/search.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/search.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter' +import events_emitter from '@ohos.events.emitter' @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/select.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/select.ets index a33ad13b8d64693b776664194f177ad903ce9a05..b58caf3309a6230d8753920a73df3581e2f00111 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/select.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/select.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter' +import events_emitter from '@ohos.events.emitter' @Entry @Component struct SliderExample { diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/shape.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/shape.ets index aa8844283969bfb6fd1fe3248238f163e532e2ad..95ac6e2f15ad8692e93c64967ad3faf120defe41 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/shape.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/shape.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter' +import events_emitter from '@ohos.events.emitter' @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/sharedTransition.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/sharedTransition.ets index bda6e37b962305303bcbc73f47ba7d5f60426203..3a31b9ad26643f85b66017677212edba829f7114 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/sharedTransition.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/sharedTransition.ets @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter' +import events_emitter from '@ohos.events.emitter' @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/sharedTransition2.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/sharedTransition2.ets index 7b2dd8ef9cfdb53fc201e8b8f71e6ba894aa0098..88253ee621004879f268499ed557ac2d97238b5b 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/sharedTransition2.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/sharedTransition2.ets @@ -13,7 +13,7 @@ * limitations under the License. */ -import events_emitter from '@ohos.emitter' +import events_emitter from '@ohos.events.emitter' @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/sideBar.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/sideBar.ets index 64e3273ed70d5cb6e26fa271ff7ebe22014cf1e9..5ef92e0fbc789c3069b9e1b6a3fb0bd2c7a6f351 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/sideBar.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/sideBar.ets @@ -14,7 +14,7 @@ * limitations under the License. */ -import events_emitter from '@ohos.emitter' +import events_emitter from '@ohos.events.emitter' @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/slider.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/slider.ets index 5b6c06b25b157790092df71e27abe1053924b581..9ffc4d846f2fb4d3e386f7075a3a6995c22f9519 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/slider.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/slider.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter' +import events_emitter from '@ohos.events.emitter' @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/sourceType.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/sourceType.ets index af7184c185eb7200e3efb6e44c76d976d06648ec..29636c5c27b4de9fa4ecd1411b528e331e7159ee 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/sourceType.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/sourceType.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter'; +import events_emitter from '@ohos.events.emitter'; @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/span.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/span.ets index e24548fbdf983282630dfee716ae801b58cc842c..d4d1159abf9e383d06d4f796b1347a1da8f8baa0 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/span.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/span.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter' +import events_emitter from '@ohos.events.emitter' @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/stateStyle.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/stateStyle.ets index 0d0ccea5356cef78e1992c783de4a1c5db8a7f48..0d3855cb125ec9295cf1bdcfee4e98043e14cde4 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/stateStyle.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/stateStyle.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter' +import events_emitter from '@ohos.events.emitter' @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/stepper.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/stepper.ets index f3090524ab4750d81f589dd14999198f070d78e6..01c2c797db62e0a3ac306ff6dda0078ea5a8aaf8 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/stepper.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/stepper.ets @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter' +import events_emitter from '@ohos.events.emitter' @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/swipeDirection.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/swipeDirection.ets index 705f1293ab2f99534d1bc1b18f054817c301900f..40553dc9833e320801125e80b694ea99cdea2011 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/swipeDirection.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/swipeDirection.ets @@ -14,7 +14,7 @@ * limitations under the License. */ -import events_emitter from '@ohos.emitter' +import events_emitter from '@ohos.events.emitter' @Entry @Component struct PanGestureExample { diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/swiper.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/swiper.ets index 6627945f0372b54d473c35ae2bdc28208a636d4d..e6457971bae2f4fdd14b520102d1eaf06f9a7377 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/swiper.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/swiper.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter' +import events_emitter from '@ohos.events.emitter' class MyDataSource implements IDataSource { private list: number[] = [] diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/systemPrompt.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/systemPrompt.ets index 4e39fb548674a5aae1ab460d227168501b6b803a..7d0e30787a652b6e81c823183e86085187de1de4 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/systemPrompt.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/systemPrompt.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter'; +import events_emitter from '@ohos.events.emitter'; import prompt from '@system.prompt'; @Entry diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/systemRouterB.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/systemRouterB.ets index db64b56d4d3655cf11ae70c81c1d0f771067d69a..ea8ecd06237f28c16d952f99cfcdac650329bbdf 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/systemRouterB.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/systemRouterB.ets @@ -14,7 +14,7 @@ */ import router from '@system.router'; -import events_emitter from '@ohos.emitter'; +import events_emitter from '@ohos.events.emitter'; @Entry diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/tabs.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/tabs.ets index 2fdba77e8420948ecc6c608c73d5c32201a969ad..de1b62789d04a7bbcd275625a41e223841cb3a67 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/tabs.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/tabs.ets @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter' +import events_emitter from '@ohos.events.emitter' @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/tapGesture.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/tapGesture.ets index f927c536dce96b84a68059107eccce01f5d3cacf..b57f0113e1656946ba26cfa38776616082d82a89 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/tapGesture.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/tapGesture.ets @@ -13,7 +13,7 @@ * limitations under the License. */ -import events_emitter from '@ohos.emitter' +import events_emitter from '@ohos.events.emitter' @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/text.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/text.ets index 6e17fc7d573c1ca584483220a545cede756a7127..fc4612abcadd8c819d06d9c4307cbe900ebb3b71 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/text.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/text.ets @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter' +import events_emitter from '@ohos.events.emitter' @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/textArea.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/textArea.ets index 7599ccc068de335cf13ce520d350f34023649ff5..07d04e19ac625fae944c8d4b02b193c4829a5c2a 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/textArea.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/textArea.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter'; +import events_emitter from '@ohos.events.emitter'; @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/textClock.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/textClock.ets index eea01df8b65a8626aa69fa4b03d282bc574abfeb..066613dc55d6a7501c31b845981914fc36878ffb 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/textClock.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/textClock.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter'; +import events_emitter from '@ohos.events.emitter'; @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/textInput.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/textInput.ets index cfbef58044ad315eb13682512a7541595cb4e6a6..3fce754051dcbb1b246f38e1688f05c5f5a2751f 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/textInput.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/textInput.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter'; +import events_emitter from '@ohos.events.emitter'; @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/textPickerDialog.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/textPickerDialog.ets index 2678132c71c4dcc75bff7db962e6c596bcdd08d4..9f0be8d3f54c503e9efd9eec8dbd2c87cd0eeace 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/textPickerDialog.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/textPickerDialog.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter'; +import events_emitter from '@ohos.events.emitter'; @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/textTimer.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/textTimer.ets index fd78092a63abcfce0d69ea7b7ee00faee6ae5a27..b2093fca5cc762ef6a803c534c485679fa7a545e 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/textTimer.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/textTimer.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter'; +import events_emitter from '@ohos.events.emitter'; @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/timeStamp.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/timeStamp.ets index 272156b7d7de2b622c87ff0f80906c3489ac379d..8eda4ca7702f73fa0891c54c325220a532ebb8a9 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/timeStamp.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/timeStamp.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter' +import events_emitter from '@ohos.events.emitter' @Entry @Component struct ClickExample { diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/toggle.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/toggle.ets index 4f7ffc0361c22adb17148fea44343e80b8e5dc93..a15d440a2b0e0656bf90c3b23e3fe9021a5b71a0 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/toggle.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/toggle.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter'; +import events_emitter from '@ohos.events.emitter'; @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/transition.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/transition.ets index a32258b429ba15f263069044619291e30ba6cd22..5ba4b35356ec70ee11494e9c4f8c6b7edd0b199c 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/transition.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/transition.ets @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import events_emitter from '@ohos.emitter' +import events_emitter from '@ohos.events.emitter' @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/video.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/video.ets index 1d6c58470156c49465a1887353c9a42673973e30..a5f9a41aa15eb1c5505fe0806faf8bbb0c81007d 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/video.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/video.ets @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import eventsEmitter from '@ohos.emitter'; +import eventsEmitter from '@ohos.events.emitter'; @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/zIndex.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/zIndex.ets index a31ecaa14697b0d9e596177e5e0e600e8d5de3e9..888c6083008e4fa297d2aad2d12b46672c5ca4a1 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/zIndex.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/zIndex.ets @@ -13,7 +13,7 @@ * limitations under the License. */ -import events_emitter from '@ohos.emitter' +import events_emitter from '@ohos.events.emitter' @Entry @Component diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/test/SharedTransitionJsunit.test.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/test/SharedTransitionJsunit.test.ets old mode 100755 new mode 100644 index dbc2f2a9ad6011e674575250d13ad055407284cc..74f10806995706b5726908b5c4a492a69f3e0953 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/test/SharedTransitionJsunit.test.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/test/SharedTransitionJsunit.test.ets @@ -15,7 +15,7 @@ */ import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from "deccjsunit/index.ets" import router from '@system.router'; -import events_emitter from '@ohos.emitter' +import events_emitter from '@ohos.events.emitter' import Utils from './Utils'; export default function sharedTransitionJsunit() { diff --git a/telephony/telephonyjstest/contact_function/entry/src/main/ets/MainAbility/test/List.test.ets b/telephony/telephonyjstest/contact_function/entry/src/main/ets/MainAbility/test/List.test.ets index 0da9c54105c1cdd0a4120940982c7f065f00f911..590531a74b8d3f814b6154751d985d5d9dafb08d 100644 --- a/telephony/telephonyjstest/contact_function/entry/src/main/ets/MainAbility/test/List.test.ets +++ b/telephony/telephonyjstest/contact_function/entry/src/main/ets/MainAbility/test/List.test.ets @@ -18,7 +18,7 @@ import CalllogTest from './contact/Calllog_test.js' import ContactCardTest from './contact/ContactCard_test.js' import ContactsTest from './contact/Contacts_test.js' import GroupsTest from './contact/Groups_test.js' -import ObjectInterfaceTest from './contact/ObjectInterface_test.js' +#import ObjectInterfaceTest from './contact/ObjectInterface_test.js' import RecoveryTest from './contact/recovery_test.js' import VoicemailTest from './contact/Voicemail_test.js' import ContactClassTest from './contact/ContactClass_test.js'