From c14039f54b87feb13c8f34cc015b070070d02e03 Mon Sep 17 00:00:00 2001 From: r00447448 Date: Sat, 9 Sep 2023 10:23:21 +0800 Subject: [PATCH] =?UTF-8?q?*=20=E6=89=8B=E5=8A=BF=E8=AF=86=E5=88=AB?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=8B=E5=8A=BFID=20Signed-off-by:=20ranzh?= =?UTF-8?q?iqiang=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/include/accessibility_def.h | 18 +++++++++++++ ...ication.AccessibilityExtensionAbility.d.ts | 8 +++++- .../napi/src/napi_accessibility_utils.cpp | 25 ++++++++++++++++++- 3 files changed, 49 insertions(+), 2 deletions(-) diff --git a/interfaces/innerkits/common/include/accessibility_def.h b/interfaces/innerkits/common/include/accessibility_def.h index ab45dbb2..ba047dcf 100644 --- a/interfaces/innerkits/common/include/accessibility_def.h +++ b/interfaces/innerkits/common/include/accessibility_def.h @@ -284,6 +284,24 @@ enum GestureType : uint32_t { GESTURE_TWO_FINGER_DOUBLE_TAP_AND_HOLD = 0x001B, GESTURE_TWO_FINGER_TRIPLE_TAP = 0x001C, GESTURE_TWO_FINGER_TRIPLE_TAP_AND_HOLD = 0x001D, + GESTURE_THREE_FINGER_SINGLE_TAP = 0x001E, + GESTURE_THREE_FINGER_DOUBLE_TAP = 0x001F, + GESTURE_THREE_FINGER_DOUBLE_TAP_AND_HOLD = 0x0020, + GESTURE_THREE_FINGER_TRIPLE_TAP = 0x0021, + GESTURE_THREE_FINGER_TRIPLE_TAP_AND_HOLD = 0x0022, + GESTURE_FOUR_FINGER_SINGLE_TAP = 0x0023, + GESTURE_FOUR_FINGER_DOUBLE_TAP = 0x0024, + GESTURE_FOUR_FINGER_DOUBLE_TAP_AND_HOLD = 0x0025, + GESTURE_FOUR_FINGER_TRIPLE_TAP = 0x0026, + GESTURE_FOUR_FINGER_TRIPLE_TAP_AND_HOLD = 0x0027, + GESTURE_THREE_FINGER_SWIPE_UP = 0x0028, + GESTURE_THREE_FINGER_SWIPE_DOWN = 0x0029, + GESTURE_THREE_FINGER_SWIPE_LEFT = 0x002A, + GESTURE_THREE_FINGER_SWIPE_RIGHT = 0x002B, + GESTURE_FOUR_FINGER_SWIPE_UP = 0x002C, + GESTURE_FOUR_FINGER_SWIPE_DOWN = 0x002D, + GESTURE_FOUR_FINGER_SWIPE_LEFT = 0x002E, + GESTURE_FOUR_FINGER_SWIPE_RIGHT = 0x002F, GESTURE_GESTURE_ALL = 0xFFFFFFFF }; diff --git a/interfaces/kits/js/@ohos.application.AccessibilityExtensionAbility.d.ts b/interfaces/kits/js/@ohos.application.AccessibilityExtensionAbility.d.ts index ec6ee8a1..30285de8 100644 --- a/interfaces/kits/js/@ohos.application.AccessibilityExtensionAbility.d.ts +++ b/interfaces/kits/js/@ohos.application.AccessibilityExtensionAbility.d.ts @@ -92,7 +92,13 @@ declare interface AccessibilityEvent { type GestureType = 'left' | 'leftThenRight' | 'leftThenUp' | 'leftThenDown' | 'right' | 'rightThenLeft' | 'rightThenUp' | 'rightThenDown' | 'up' | 'upThenLeft' | 'upThenRight' | 'upThenDown' | - 'down' | 'downThenLeft' | 'downThenRight' | 'downThenUp'; + 'down' | 'downThenLeft' | 'downThenRight' | 'downThenUp' | + 'twoFingerSingleTap' | 'twoFingerDoubleTap' | 'twoFingerDoubleTapAndHold' | 'twoFingerTripleTap' | + 'twoFingerTripleTapAndHold' | 'threeFingerSingleTap' | 'threeFingerDoubleTap' | 'threeFingerDoubleTapAndHold' | + 'threeFingerTripleTap' | 'threeFingerTripleTapAndHold' | 'fourFingerSingleTap' | 'fourFingerDoubleTap' | + 'fourFingerDoubleTapAndHold' | 'fourFingerTripleTap' | 'fourFingerTripleTapAndHold' | + 'threeFingerSwipeUp' | 'threeFingerSwipeDown' | 'threeFingerSwipeLeft' | 'threeFingerSwipeRight' | + 'fourFingerSwipeUp' | 'fourFingerSwipeDown' | 'fourFingerSwipeLeft' | 'fourFingerSwipeRight'; /** * Indicates the page update type. diff --git a/interfaces/kits/napi/src/napi_accessibility_utils.cpp b/interfaces/kits/napi/src/napi_accessibility_utils.cpp index 4f38de15..7bfa6f59 100644 --- a/interfaces/kits/napi/src/napi_accessibility_utils.cpp +++ b/interfaces/kits/napi/src/napi_accessibility_utils.cpp @@ -493,7 +493,30 @@ std::string CoverGestureTypeToString(GestureType type) {GestureType::GESTURE_SWIPE_DOWN, "down"}, {GestureType::GESTURE_SWIPE_DOWN_THEN_LEFT, "downThenLeft"}, {GestureType::GESTURE_SWIPE_DOWN_THEN_RIGHT, "downThenRight"}, - {GestureType::GESTURE_SWIPE_DOWN_THEN_UP, "downThenUp"} + {GestureType::GESTURE_SWIPE_DOWN_THEN_UP, "downThenUp"}, + {GestureType::GESTURE_TWO_FINGER_SINGLE_TAP, "twoFingerSingleTap"}, + {GestureType::GESTURE_TWO_FINGER_DOUBLE_TAP, "twoFingerDoubleTap"}, + {GestureType::GESTURE_TWO_FINGER_DOUBLE_TAP_AND_HOLD, "twoFingerDoubleTapAndHold"}, + {GestureType::GESTURE_TWO_FINGER_TRIPLE_TAP, "twoFingerTripleTap"}, + {GestureType::GESTURE_TWO_FINGER_TRIPLE_TAP_AND_HOLD, "twoFingerTripleTapAndHold"}, + {GestureType::GESTURE_THREE_FINGER_SINGLE_TAP, "threeFingerSingleTap"}, + {GestureType::GESTURE_THREE_FINGER_DOUBLE_TAP, "threeFingerDoubleTap"}, + {GestureType::GESTURE_THREE_FINGER_DOUBLE_TAP_AND_HOLD, "threeFingerDoubleTapAndHold"}, + {GestureType::GESTURE_THREE_FINGER_TRIPLE_TAP, "threeFingerTripleTap"}, + {GestureType::GESTURE_THREE_FINGER_TRIPLE_TAP_AND_HOLD, "threeFingerTripleTapAndHold"}, + {GestureType::GESTURE_FOUR_FINGER_SINGLE_TAP, "fourFingerSingleTap"}, + {GestureType::GESTURE_FOUR_FINGER_DOUBLE_TAP, "fourFingerDoubleTap"}, + {GestureType::GESTURE_FOUR_FINGER_DOUBLE_TAP_AND_HOLD, "fourFingerDoubleTapAndHold"}, + {GestureType::GESTURE_FOUR_FINGER_TRIPLE_TAP, "fourFingerTripleTap"}, + {GestureType::GESTURE_FOUR_FINGER_TRIPLE_TAP_AND_HOLD, "fourFingerTripleTapAndHold"}, + {GestureType::GESTURE_THREE_FINGER_SWIPE_UP, "threeFingerSwipeUp"}, + {GestureType::GESTURE_THREE_FINGER_SWIPE_DOWN, "threeFingerSwipeDown"}, + {GestureType::GESTURE_THREE_FINGER_SWIPE_LEFT, "threeFingerSwipeLeft"}, + {GestureType::GESTURE_THREE_FINGER_SWIPE_RIGHT, "threeFingerSwipeRight"}, + {GestureType::GESTURE_FOUR_FINGER_SWIPE_UP, "fourFingerSwipeUp"}, + {GestureType::GESTURE_FOUR_FINGER_SWIPE_DOWN, "fourFingerSwipeDown"}, + {GestureType::GESTURE_FOUR_FINGER_SWIPE_LEFT, "fourFingerSwipeLeft"}, + {GestureType::GESTURE_FOUR_FINGER_SWIPE_RIGHT, "fourFingerSwipeRight"} }; if (gestureTypeTable.find(type) == gestureTypeTable.end()) { -- Gitee