From 3dfd09ec555ca4dabf78fcfe2732bd7b118638ec Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Thu, 17 Nov 2022 09:16:52 +0800
Subject: [PATCH 1/2] =?UTF-8?q?api=E9=97=AE=E9=A2=98=E6=95=B4=E6=94=B9&sup?=
 =?UTF-8?q?portKeys=E6=8E=A5=E5=8F=A3=E5=9B=9E=E8=B0=83=E6=94=B9=E4=B8=BAA?=
 =?UTF-8?q?syncCallback?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: I83451a84130799d4018d2bd3b358ada5cdc747b8
---
 api/@ohos.multimodalInput.inputConsumer.d.ts    |  1 -
 api/@ohos.multimodalInput.inputDevice.d.ts      | 15 +++++++--------
 api/@ohos.multimodalInput.inputEvent.d.ts       |  1 -
 api/@ohos.multimodalInput.inputEventClient.d.ts |  1 -
 api/@ohos.multimodalInput.inputMonitor.d.ts     |  1 -
 api/@ohos.multimodalInput.keyCode.d.ts          |  1 -
 api/@ohos.multimodalInput.keyEvent.d.ts         |  3 ---
 api/@ohos.multimodalInput.mouseEvent.d.ts       |  5 -----
 api/@ohos.multimodalInput.pointer.d.ts          | 12 ++++++------
 api/@ohos.multimodalInput.touchEvent.d.ts       |  5 -----
 10 files changed, 13 insertions(+), 32 deletions(-)

diff --git a/api/@ohos.multimodalInput.inputConsumer.d.ts b/api/@ohos.multimodalInput.inputConsumer.d.ts
index b7e0d8f3c9..bd0666174c 100644
--- a/api/@ohos.multimodalInput.inputConsumer.d.ts
+++ b/api/@ohos.multimodalInput.inputConsumer.d.ts
@@ -20,7 +20,6 @@ import { Callback } from './basic';
  *
  * @since 8
  * @syscap SystemCapability.MultimodalInput.Input.InputConsumer
- * @import import inputConsumer from '@ohos.multimodalInput.inputConsumer';
  * @systemapi hide for inner use
  */
 
diff --git a/api/@ohos.multimodalInput.inputDevice.d.ts b/api/@ohos.multimodalInput.inputDevice.d.ts
index 2d3cc32091..01b85fda5a 100755
--- a/api/@ohos.multimodalInput.inputDevice.d.ts
+++ b/api/@ohos.multimodalInput.inputDevice.d.ts
@@ -21,7 +21,6 @@ import { KeyCode } from "./@ohos.multimodalInput.keyCode"
  *
  * @since 8
  * @syscap SystemCapability.MultimodalInput.Input.InputDevice
- * @import import inputDevice from '@ohos.multimodalInput.inputDevice';
  */
 declare namespace inputDevice {
   /**
@@ -93,7 +92,7 @@ declare namespace inputDevice {
    * @since 9
    * @syscap SystemCapability.MultimodalInput.Input.InputDevice
    * @param type Type of the input device event, which is **change**.
-   * @return Callback for the input device event.
+   * @returns Callback for the input device event.
    * @throws {BusinessError} 401 - Parameter error.
    */
   function on(type: "change", listener: Callback<DeviceListener>): void;
@@ -104,7 +103,7 @@ declare namespace inputDevice {
    * @since 9
    * @syscap SystemCapability.MultimodalInput.Input.InputDevice
    * @param type Type of the input device event, which is **change**.
-   * @return Callback for the input device event.
+   * @returns Callback for the input device event.
    * @throws {BusinessError} 401 - Parameter error.
    */
   function off(type: "change", listener?: Callback<DeviceListener>): void;
@@ -318,10 +317,10 @@ declare namespace inputDevice {
    * @syscap SystemCapability.MultimodalInput.Input.InputDevice
    * @param deviceId ID of the input device.
    * @param keys Key codes of the input device, You can query a maximum of five key codes at a time.
-   * @return Returns a result indicating whether the specified key codes are supported.
+   * @returns Returns a result indicating whether the specified key codes are supported.
    * @throws {BusinessError} 401 - Parameter error.
    */
-  function supportKeys(deviceId: number, keys: Array<KeyCode>, callback: Callback<Array<boolean>>): void;
+  function supportKeys(deviceId: number, keys: Array<KeyCode>, callback: AsyncCallback<Array<boolean>>): void;
 
   /**
    * Checks whether the specified key codes of an input device are supported.
@@ -330,7 +329,7 @@ declare namespace inputDevice {
    * @syscap SystemCapability.MultimodalInput.Input.InputDevice
    * @param deviceId ID of the input device.
    * @param keys Key codes of the input device, You can query a maximum of five key codes at a time.
-   * @return Returns a result indicating whether the specified key codes are supported.
+   * @returns Returns a result indicating whether the specified key codes are supported.
    * @throws {BusinessError} 401 - Parameter error.
    */
   function supportKeys(deviceId: number, keys: Array<KeyCode>): Promise<Array<boolean>>;
@@ -341,7 +340,7 @@ declare namespace inputDevice {
    * @since 9
    * @syscap SystemCapability.MultimodalInput.Input.InputDevice
    * @param deviceId ID of the specified input device.
-   * @return Returns the keyboard type.
+   * @returns Returns the keyboard type.
    * @throws {BusinessError} 401 - Parameter error.
    */
   function getKeyboardType(deviceId: number, callback: AsyncCallback<KeyboardType>): void;
@@ -352,7 +351,7 @@ declare namespace inputDevice {
    * @since 9
    * @syscap SystemCapability.MultimodalInput.Input.InputDevice
    * @param deviceId ID of the specified input device.
-   * @return Returns the keyboard type.
+   * @returns Returns the keyboard type.
    * @throws {BusinessError} 401 - Parameter error.
    */
   function getKeyboardType(deviceId: number): Promise<KeyboardType>;
diff --git a/api/@ohos.multimodalInput.inputEvent.d.ts b/api/@ohos.multimodalInput.inputEvent.d.ts
index a335447db2..79de5c4193 100755
--- a/api/@ohos.multimodalInput.inputEvent.d.ts
+++ b/api/@ohos.multimodalInput.inputEvent.d.ts
@@ -18,7 +18,6 @@
  *
  * @since 9
  * @syscap SystemCapability.MultimodalInput.Input.Core
- * @import import InputEvent from '@ohos.multimodalInput.inputEvent';
  */
 export declare interface InputEvent {
   /**
diff --git a/api/@ohos.multimodalInput.inputEventClient.d.ts b/api/@ohos.multimodalInput.inputEventClient.d.ts
index 589bb0c18c..39b5a50717 100644
--- a/api/@ohos.multimodalInput.inputEventClient.d.ts
+++ b/api/@ohos.multimodalInput.inputEventClient.d.ts
@@ -18,7 +18,6 @@
  *
  * @since 8
  * @syscap SystemCapability.MultimodalInput.Input.InputSimulator
- * @import import inputEventClient from '@ohos.multimodalInput.inputEventClient';
  * @systemapi hide for inner use
  */
 
diff --git a/api/@ohos.multimodalInput.inputMonitor.d.ts b/api/@ohos.multimodalInput.inputMonitor.d.ts
index f61123da73..92ed7013d7 100644
--- a/api/@ohos.multimodalInput.inputMonitor.d.ts
+++ b/api/@ohos.multimodalInput.inputMonitor.d.ts
@@ -21,7 +21,6 @@ import { MouseEvent } from './@ohos.multimodalInput.mouseEvent';
  * System API, available only to system processes
  * @since 7
  * @syscap SystemCapability.MultimodalInput.Input.InputMonitor
- * @import import inputMonitor from '@ohos.multimodalInput.inputMonitor';
  * @permission ohos.permission.INPUT_MONITORING
  * @systemapi hide for inner use
  */
diff --git a/api/@ohos.multimodalInput.keyCode.d.ts b/api/@ohos.multimodalInput.keyCode.d.ts
index 7da279b403..f25638ee7d 100644
--- a/api/@ohos.multimodalInput.keyCode.d.ts
+++ b/api/@ohos.multimodalInput.keyCode.d.ts
@@ -18,7 +18,6 @@
 *
 * @since 9
 * @syscap SystemCapability.MultimodalInput.Input.Core
-* @import import {KeyCode} from '@ohos.multimodalInput.keyCode',
 */
 
 export declare enum KeyCode {
diff --git a/api/@ohos.multimodalInput.keyEvent.d.ts b/api/@ohos.multimodalInput.keyEvent.d.ts
index af0acb4ad4..d51cf1af58 100755
--- a/api/@ohos.multimodalInput.keyEvent.d.ts
+++ b/api/@ohos.multimodalInput.keyEvent.d.ts
@@ -19,7 +19,6 @@ import { KeyCode } from "./@ohos.multimodalInput.keyCode"
 *
 * @since 9
 * @syscap SystemCapability.MultimodalInput.Input.Core
-* @import import {Action} from '@ohos.multimodalInput.keyEvent';
 */
 export declare enum Action {
   /**
@@ -43,7 +42,6 @@ export declare enum Action {
 *
 * @since 9
 * @syscap SystemCapability.MultimodalInput.Input.Core
-* @import import {Key} from '@ohos.multimodalInput.keyEvent';
 */
 export declare interface Key {
   /**
@@ -67,7 +65,6 @@ export declare interface Key {
 *
 * @since 9
 * @syscap SystemCapability.MultimodalInput.Input.Core
-* @import import {KeyEvent} from '@ohos.multimodalInput.keyEvent';
 */
 export declare interface KeyEvent extends InputEvent {
   /**
diff --git a/api/@ohos.multimodalInput.mouseEvent.d.ts b/api/@ohos.multimodalInput.mouseEvent.d.ts
index 8598db12bf..7828872e9c 100755
--- a/api/@ohos.multimodalInput.mouseEvent.d.ts
+++ b/api/@ohos.multimodalInput.mouseEvent.d.ts
@@ -20,7 +20,6 @@ import { KeyCode } from "./@ohos.multimodalInput.keyCode"
  *
  * @since 9
  * @syscap SystemCapability.MultimodalInput.Input.Core
- * @import import {Action} from '@ohos.multimodalInput.mouseEvent';
  */
 export declare enum Action {
   /**
@@ -64,7 +63,6 @@ export declare enum Action {
  *
  * @since 9
  * @syscap SystemCapability.MultimodalInput.Input.Core
- * @import import {Button} from '@ohos.multimodalInput.mouseEvent';
  */
 export declare enum Button {
   /**
@@ -113,7 +111,6 @@ export declare enum Button {
  *
  * @since 9
  * @syscap SystemCapability.MultimodalInput.Input.Core
- * @import import {Axis} from '@ohos.multimodalInput.mouseEvent';
  */
 export declare enum Axis {
   /**
@@ -137,7 +134,6 @@ export declare enum Axis {
  *
  * @since 9
  * @syscap SystemCapability.MultimodalInput.Input.Core
- * @import import {AxisValue} from '@ohos.multimodalInput.mouseEvent';
  */
 export declare interface AxisValue {
   /**
@@ -156,7 +152,6 @@ export declare interface AxisValue {
  *
  * @since 9
  * @syscap SystemCapability.MultimodalInput.Input.Core
- * @import import {MouseEvent} from '@ohos.multimodalInput.mouseEvent';
  */
 export declare interface MouseEvent extends InputEvent {
   /**
diff --git a/api/@ohos.multimodalInput.pointer.d.ts b/api/@ohos.multimodalInput.pointer.d.ts
index 55fa1863b6..b3943c2735 100644
--- a/api/@ohos.multimodalInput.pointer.d.ts
+++ b/api/@ohos.multimodalInput.pointer.d.ts
@@ -242,7 +242,7 @@ declare namespace pointer {
    * @syscap SystemCapability.MultimodalInput.Input.Pointer
    * @systemapi hide for inner use
    * @param speed Pointer moving speed.
-   * @return Returns the result through a promise.
+   * @returns Returns the result through a promise.
    * @throws {BusinessError} 401 - Parameter error.
    */
   function setPointerSpeed(speed: number): Promise<void>;
@@ -262,7 +262,7 @@ declare namespace pointer {
    * @since 9
    * @syscap SystemCapability.MultimodalInput.Input.Pointer
    * @systemapi hide for inner use
-   * @return Returns the result through a promise.
+   * @returns Returns the result through a promise.
    */
   function getPointerSpeed(): Promise<number>;
 
@@ -283,7 +283,7 @@ declare namespace pointer {
    * @syscap SystemCapability.MultimodalInput.Input.Pointer
    * @param windowId Window ID.
    * @param pointerStyle Pointer style.
-   * @return Returns the result through a promise.
+   * @returns Returns the result through a promise.
    * @throws {BusinessError} 401 - Parameter error.
    */
   function setPointerStyle(windowId: number, pointerStyle: PointerStyle): Promise<void>;
@@ -303,7 +303,7 @@ declare namespace pointer {
    * @since 9
    * @syscap SystemCapability.MultimodalInput.Input.Pointer
    * @param windowId Window ID.
-   * @return Returns the result through a promise.
+   * @returns Returns the result through a promise.
    * @throws {BusinessError} 401 - Parameter error.
    */
   function getPointerStyle(windowId: number): Promise<PointerStyle>;
@@ -335,7 +335,7 @@ declare namespace pointer {
    *
    * @since 9
    * @syscap SystemCapability.MultimodalInput.Input.Pointer
-   * @return Returns <b>true</b> if the pointer icon is visible; returns <b>false</b> otherwise.
+   * @returns Returns <b>true</b> if the pointer icon is visible; returns <b>false</b> otherwise.
    * @throws {BusinessError} 401 - Parameter error.
    */
   function isPointerVisible(callback: AsyncCallback<boolean>): void;
@@ -345,7 +345,7 @@ declare namespace pointer {
    *
    * @since 9
    * @syscap SystemCapability.MultimodalInput.Input.Pointer
-   * @return Returns <b>true</b> if the pointer icon is visible; returns <b>false</b> otherwise.
+   * @returns Returns <b>true</b> if the pointer icon is visible; returns <b>false</b> otherwise.
    */
   function isPointerVisible(): Promise<boolean>;
 }
diff --git a/api/@ohos.multimodalInput.touchEvent.d.ts b/api/@ohos.multimodalInput.touchEvent.d.ts
index bf637da06e..5748890333 100755
--- a/api/@ohos.multimodalInput.touchEvent.d.ts
+++ b/api/@ohos.multimodalInput.touchEvent.d.ts
@@ -19,7 +19,6 @@ import { InputEvent } from './@ohos.multimodalInput.inputEvent'
  *
  * @since 9
  * @syscap SystemCapability.MultimodalInput.Input.Core
- * @import import {Action} from '@ohos.multimodalInput.touchEvent';
  */
 export declare enum Action {
   /**
@@ -48,7 +47,6 @@ export declare enum Action {
  *
  * @since 9
  * @syscap SystemCapability.MultimodalInput.Input.Core
- * @import import {ToolType} from '@ohos.multimodalInput.touchEvent';
  */
 export declare enum ToolType {
   /**
@@ -94,7 +92,6 @@ export declare enum ToolType {
  *
  * @since 9
  * @syscap SystemCapability.MultimodalInput.Input.Core
- * @import import {SourceType} from '@ohos.multimodalInput.touchEvent';
  */
 export declare enum SourceType {
   /**
@@ -118,7 +115,6 @@ export declare enum SourceType {
  *
  * @since 9
  * @syscap SystemCapability.MultimodalInput.Input.Core
- * @import import {Touch} from '@ohos.multimodalInput.touchEvent';
  */
 export declare interface Touch {
   /**
@@ -217,7 +213,6 @@ export declare interface Touch {
  *
  * @since 9
  * @syscap SystemCapability.MultimodalInput.Input.Core
- * @import import {TouchEvent} from '@ohos.multimodalInput.touchEvent';
  */
 export declare interface TouchEvent extends InputEvent {
   /**
-- 
Gitee


From 5e20d4844b92a2aa25b6506ed16b6d594916989e Mon Sep 17 00:00:00 2001
From: mayunteng_1 <mayunteng@huawei.com>
Date: Thu, 17 Nov 2022 09:21:12 +0800
Subject: [PATCH 2/2] =?UTF-8?q?api=E9=97=AE=E9=A2=98=E6=95=B4=E6=94=B9&sup?=
 =?UTF-8?q?portKeys=E6=8E=A5=E5=8F=A3=E5=9B=9E=E8=B0=83=E6=94=B9=E4=B8=BAA?=
 =?UTF-8?q?syncCallback?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: mayunteng_1 <mayunteng@huawei.com>
Change-Id: I2a33a9e0a9b7d55a691c3cdca2c31b173b76df6b
---
 api/@ohos.multimodalInput.inputMonitor.d.ts | 4 ++--
 api/@ohos.multimodalInput.pointer.d.ts      | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/api/@ohos.multimodalInput.inputMonitor.d.ts b/api/@ohos.multimodalInput.inputMonitor.d.ts
index 92ed7013d7..3d16252a71 100644
--- a/api/@ohos.multimodalInput.inputMonitor.d.ts
+++ b/api/@ohos.multimodalInput.inputMonitor.d.ts
@@ -62,7 +62,7 @@ declare namespace inputMonitor {
     function on(type:"mouse", receiver:Callback<MouseEvent>):void;
 
     /**
-     * Cancels listening for touch input events.
+     * Cancel listening for touch input events.
      * @since 7
      * @syscap SystemCapability.MultimodalInput.Input.InputMonitor
      * @systemapi hide for inner use
@@ -75,7 +75,7 @@ declare namespace inputMonitor {
     function off(type:"touch", receiver?:TouchEventReceiver):void;
 
     /**
-     * Cancels listening for mouse input events.
+     * Cancel listening for mouse input events.
      * @since 9
      * @syscap SystemCapability.MultimodalInput.Input.InputMonitor
      * @systemapi hide for inner use
diff --git a/api/@ohos.multimodalInput.pointer.d.ts b/api/@ohos.multimodalInput.pointer.d.ts
index b3943c2735..195b6d098f 100644
--- a/api/@ohos.multimodalInput.pointer.d.ts
+++ b/api/@ohos.multimodalInput.pointer.d.ts
@@ -20,7 +20,6 @@ import { AsyncCallback } from "./basic";
  *
  * @since 9
  * @syscap SystemCapability.MultimodalInput.Input.Pointer
- * @import import pointer from '@ohos.multimodalInput.pointer';
  */
 declare namespace pointer {
   /**
-- 
Gitee