!2547 modified api

Merge pull request !2547 from jiyong/local-950306

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");

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 {

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

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

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

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

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 {

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

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

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

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

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 {

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

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 {

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

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

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

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

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

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

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

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

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 {

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 {

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

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 {

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 {

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

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

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 {

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

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

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

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

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

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

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

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

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

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 {

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

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

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 {

ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/gauge.ets

-// @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 })
+  }
+}
+

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

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

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

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

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

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

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

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

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

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 = ''

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 {

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 {

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 {

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

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

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

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

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

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

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

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 {

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 {

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

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

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

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 {

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 {

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

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

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

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

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

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

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

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

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

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

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

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'
 

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

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 {

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

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 {

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 {

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 {

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

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

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

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

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

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

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

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

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

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

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