@react-native-ohos/react-native-haptic-feedback 2.2.2-rc.1 → 2.3.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.OpenSource +2 -2
- package/README.md +2 -2
- package/RNReactNativeHapticFeedback.podspec +5 -16
- package/harmony/haptic_feedback/BuildProfile.ets +17 -0
- package/harmony/haptic_feedback/index.ets +24 -2
- package/harmony/haptic_feedback/oh-package-lock.json5 +31 -0
- package/harmony/haptic_feedback/oh-package.json5 +2 -2
- package/harmony/haptic_feedback/src/main/cpp/CMakeLists.txt +2 -4
- package/harmony/haptic_feedback/src/main/cpp/RNHapticFeedback.cpp +21 -0
- package/harmony/haptic_feedback/src/main/cpp/RNHapticFeedback.h +21 -0
- package/harmony/haptic_feedback/src/main/cpp/RNHapticFeedbackPackage.h +37 -0
- package/harmony/haptic_feedback/src/main/ets/Logger.ts +1 -1
- package/harmony/haptic_feedback/src/main/ets/{RNHapticFeedbackPackage.ets → RNHapticFeedbackPackage.ts} +4 -5
- package/harmony/haptic_feedback/src/main/ets/RNHapticFeedbackTurboModule.ts +6 -4
- package/harmony/haptic_feedback/src/main/ets/generated/components/ts.ts +4 -1
- package/harmony/haptic_feedback/src/main/ets/generated/index.ets +4 -1
- package/harmony/haptic_feedback/src/main/ets/generated/ts.ts +4 -1
- package/harmony/haptic_feedback/src/main/ets/generated/turboModules/RNHapticFeedback.ts +16 -0
- package/harmony/haptic_feedback/src/main/ets/generated/turboModules/ts.ts +5 -2
- package/harmony/haptic_feedback/{ts.ets → ts.ts} +1 -1
- package/harmony/haptic_feedback.har +0 -0
- package/lib/commonjs/{NativeHapticFeedback.js → codegenSpec/NativeHapticFeedback.js} +1 -1
- package/lib/commonjs/codegenSpec/NativeHapticFeedback.js.map +1 -0
- package/lib/commonjs/index.js +18 -24
- package/lib/commonjs/index.js.map +1 -1
- package/lib/commonjs/package.json +1 -0
- package/lib/commonjs/types.js.map +1 -1
- package/lib/module/codegenSpec/NativeHapticFeedback.js +5 -0
- package/lib/module/codegenSpec/NativeHapticFeedback.js.map +1 -0
- package/lib/module/index.js +19 -25
- package/lib/module/index.js.map +1 -1
- package/lib/module/package.json +1 -0
- package/lib/module/types.js +2 -0
- package/lib/module/types.js.map +1 -1
- package/lib/typescript/{src → codegenSpec}/NativeHapticFeedback.d.ts +1 -1
- package/lib/typescript/codegenSpec/NativeHapticFeedback.d.ts.map +1 -0
- package/lib/typescript/index.d.ts +9 -0
- package/lib/typescript/index.d.ts.map +1 -0
- package/lib/typescript/types.d.ts.map +1 -0
- package/package.json +62 -37
- package/src/{NativeHapticFeedback.ts → codegenSpec/NativeHapticFeedback.ts} +2 -2
- package/src/index.ts +17 -34
- package/.gitattributes +0 -1
- package/.prettierrc +0 -8
- package/COMMITTERS.md +0 -11
- package/OAT.xml +0 -73
- package/harmony/haptic_feedback/src/main/cpp/HapticFeedbackPackage.h +0 -36
- package/harmony/haptic_feedback/src/main/cpp/generated/RNOH/generated/BaseReactNativeHapticFeedbackPackage.h +0 -65
- package/harmony/haptic_feedback/src/main/cpp/generated/RNOH/generated/turbo_modules/HapticFeedbackNativeModule.cpp +0 -16
- package/harmony/haptic_feedback/src/main/cpp/generated/RNOH/generated/turbo_modules/HapticFeedbackNativeModule.h +0 -16
- package/harmony/haptic_feedback/src/main/ets/generated/turboModules/HapticFeedbackNativeModule.ts +0 -14
- package/harmony/haptic_feedback/src/mock/mock-config.json5 +0 -2
- package/harmony/haptic_feedback/src/ohosTest/ets/test/Ability.test.ets +0 -35
- package/harmony/haptic_feedback/src/ohosTest/ets/test/List.test.ets +0 -5
- package/harmony/haptic_feedback/src/ohosTest/ets/testability/TestAbility.ets +0 -47
- package/harmony/haptic_feedback/src/ohosTest/ets/testability/pages/Index.ets +0 -17
- package/harmony/haptic_feedback/src/ohosTest/ets/testrunner/OpenHarmonyTestRunner.ets +0 -90
- package/harmony/haptic_feedback/src/ohosTest/module.json5 +0 -38
- package/harmony/haptic_feedback/src/ohosTest/resources/base/element/color.json +0 -8
- package/harmony/haptic_feedback/src/ohosTest/resources/base/element/string.json +0 -16
- package/harmony/haptic_feedback/src/ohosTest/resources/base/media/icon.png +0 -0
- package/harmony/haptic_feedback/src/ohosTest/resources/base/profile/test_pages.json +0 -5
- package/harmony/haptic_feedback/src/test/List.test.ets +0 -5
- package/harmony/haptic_feedback/src/test/LocalUnit.test.ets +0 -33
- package/lib/commonjs/NativeHapticFeedback.js.map +0 -1
- package/lib/module/NativeHapticFeedback.js +0 -3
- package/lib/module/NativeHapticFeedback.js.map +0 -1
- package/lib/typescript/lib/commonjs/NativeHapticFeedback.d.ts +0 -5
- package/lib/typescript/lib/commonjs/NativeHapticFeedback.d.ts.map +0 -1
- package/lib/typescript/lib/commonjs/index.d.ts +0 -7
- package/lib/typescript/lib/commonjs/index.d.ts.map +0 -1
- package/lib/typescript/lib/commonjs/types.d.ts +0 -3
- package/lib/typescript/lib/commonjs/types.d.ts.map +0 -1
- package/lib/typescript/lib/module/NativeHapticFeedback.d.ts +0 -3
- package/lib/typescript/lib/module/NativeHapticFeedback.d.ts.map +0 -1
- package/lib/typescript/lib/module/index.d.ts +0 -7
- package/lib/typescript/lib/module/index.d.ts.map +0 -1
- package/lib/typescript/lib/module/types.d.ts +0 -2
- package/lib/typescript/lib/module/types.d.ts.map +0 -1
- package/lib/typescript/src/NativeHapticFeedback.d.ts.map +0 -1
- package/lib/typescript/src/index.d.ts +0 -9
- package/lib/typescript/src/index.d.ts.map +0 -1
- package/lib/typescript/src/types.d.ts.map +0 -1
- package/tsconfig.build.json +0 -4
- package/tsconfig.json +0 -36
- /package/lib/typescript/{src/types.d.ts → types.d.ts} +0 -0
package/README.OpenSource
CHANGED
|
@@ -3,9 +3,9 @@
|
|
|
3
3
|
"Name": "react-native-haptic-feedback",
|
|
4
4
|
"License": "MIT License",
|
|
5
5
|
"License File": "https://github.com/mkuczera/react-native-haptic-feedback/blob/master/LICENSE",
|
|
6
|
-
"Version Number": "2.
|
|
6
|
+
"Version Number": "2.3.3",
|
|
7
7
|
"Owner" : "xiafeng@huawei.com",
|
|
8
8
|
"Upstream URL": "https://github.com/mkuczera/react-native-haptic-feedback",
|
|
9
|
-
"Description": "
|
|
9
|
+
"Description": "React-Native Haptic Feedback for iOS with Android similar behaviour."
|
|
10
10
|
}
|
|
11
11
|
]
|
package/README.md
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
# @react-native-
|
|
1
|
+
# @react-native-ohos/react-native-haptic-feedback
|
|
2
2
|
|
|
3
|
-
This project is based on [react-native-haptic-feedback@2.
|
|
3
|
+
This project is based on [react-native-haptic-feedback@2.3.3](https://github.com/mkuczera/react-native-haptic-feedback/tree/v2.3.3)
|
|
4
4
|
|
|
5
5
|
## Documentation
|
|
6
6
|
|
|
@@ -13,27 +13,16 @@ Pod::Spec.new do |s|
|
|
|
13
13
|
# s.license = { :type => "MIT", :file => "FILE_LICENSE" }
|
|
14
14
|
s.author = { "author" => "m.kuczera@gmail.com" }
|
|
15
15
|
s.platform = :ios, "12.4"
|
|
16
|
-
s.source = { :git => "https://github.com/mkuczera/react-native-haptic-feedback.git", :tag => "
|
|
16
|
+
s.source = { :git => "https://github.com/mkuczera/react-native-haptic-feedback.git", :tag => "v#{s.version.to_s}" }
|
|
17
17
|
s.source_files = "ios/**/*.{h,m,mm}"
|
|
18
18
|
s.requires_arc = true
|
|
19
19
|
|
|
20
|
-
s.dependency 'React-Core'
|
|
21
20
|
|
|
22
21
|
# This guard prevent to install the dependencies when we run `pod install` in the old architecture.
|
|
23
|
-
if
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
s.
|
|
27
|
-
s.pod_target_xcconfig = {
|
|
28
|
-
"HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\"",
|
|
29
|
-
"CLANG_CXX_LANGUAGE_STANDARD" => "c++17"
|
|
30
|
-
}
|
|
31
|
-
|
|
32
|
-
s.dependency "React-Codegen"
|
|
33
|
-
s.dependency "RCT-Folly"
|
|
34
|
-
s.dependency "RCTRequired"
|
|
35
|
-
s.dependency "RCTTypeSafety"
|
|
36
|
-
s.dependency "ReactCommon/turbomodule/core"
|
|
22
|
+
if defined?(install_modules_dependencies()) != nil
|
|
23
|
+
install_modules_dependencies(s)
|
|
24
|
+
else
|
|
25
|
+
s.dependency 'React-Core'
|
|
37
26
|
end
|
|
38
27
|
end
|
|
39
28
|
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Use these variables when you tailor your ArkTS code. They must be of the const type.
|
|
3
|
+
*/
|
|
4
|
+
export const HAR_VERSION = '2.3.4-rc.1';
|
|
5
|
+
export const BUILD_MODE_NAME = 'debug';
|
|
6
|
+
export const DEBUG = true;
|
|
7
|
+
export const TARGET_NAME = 'default';
|
|
8
|
+
|
|
9
|
+
/**
|
|
10
|
+
* BuildProfile Class is used only for compatibility purposes.
|
|
11
|
+
*/
|
|
12
|
+
export default class BuildProfile {
|
|
13
|
+
static readonly HAR_VERSION = HAR_VERSION;
|
|
14
|
+
static readonly BUILD_MODE_NAME = BUILD_MODE_NAME;
|
|
15
|
+
static readonly DEBUG = DEBUG;
|
|
16
|
+
static readonly TARGET_NAME = TARGET_NAME;
|
|
17
|
+
}
|
|
@@ -1,3 +1,25 @@
|
|
|
1
|
-
|
|
1
|
+
/**
|
|
2
|
+
* MIT License
|
|
3
|
+
*
|
|
4
|
+
* Copyright (C) 2025 Huawei Device Co., Ltd.
|
|
5
|
+
*
|
|
6
|
+
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
7
|
+
* of this software and associated documentation files (the "Software"), to deal
|
|
8
|
+
* in the Software without restriction, including without limitation the rights
|
|
9
|
+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
10
|
+
* copies of the Software, and to permit persons to whom the Software is
|
|
11
|
+
* furnished to do so, subject to the following conditions:
|
|
12
|
+
*
|
|
13
|
+
* The above copyright notice and this permission notice shall be included in all
|
|
14
|
+
* copies or substantial portions of the Software.
|
|
15
|
+
*
|
|
16
|
+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
17
|
+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
18
|
+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
19
|
+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
20
|
+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
21
|
+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
22
|
+
* SOFTWARE.
|
|
23
|
+
*/
|
|
24
|
+
|
|
2
25
|
export * from "./ts";
|
|
3
|
-
export default HapticFeedbackPackage;
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
{
|
|
2
|
+
"meta": {
|
|
3
|
+
"stableOrder": true,
|
|
4
|
+
"enableUnifiedLockfile": false
|
|
5
|
+
},
|
|
6
|
+
"lockfileVersion": 3,
|
|
7
|
+
"ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.",
|
|
8
|
+
"specifiers": {
|
|
9
|
+
"@ohos/materialprogressbar@2.1.3-rc.0": "@ohos/materialprogressbar@2.1.3-rc.0",
|
|
10
|
+
"@ppd/ffrt@1.1.5": "@ppd/ffrt@1.1.5",
|
|
11
|
+
"@rnoh/react-native-openharmony@../../../../tester/25P4/harmony/react_native_openharmony-6.0.0.202.har": "@rnoh/react-native-openharmony@../../../../tester/25P4/harmony/react_native_openharmony-6.0.0.202.har"
|
|
12
|
+
},
|
|
13
|
+
"packages": {
|
|
14
|
+
"@ppd/ffrt@1.1.5": {
|
|
15
|
+
"name": "@ppd/ffrt",
|
|
16
|
+
"version": "1.1.5",
|
|
17
|
+
"integrity": "sha512-MbXdRqeNHQQv4ALTGdosvOCQI+xH8nt0+E2/aFLS4UuGJ5541MAeenRCDOrgIG05k7SnSJ4WngsCfjj3FbTCQg==",
|
|
18
|
+
"resolved": "https://ohpm.openharmony.cn/ohpm/@ppd/ffrt/-/ffrt-1.1.5.har",
|
|
19
|
+
"registryType": "ohpm"
|
|
20
|
+
},
|
|
21
|
+
"@rnoh/react-native-openharmony@../../../../tester/25P4/harmony/react_native_openharmony-6.0.0.202.har": {
|
|
22
|
+
"name": "@rnoh/react-native-openharmony",
|
|
23
|
+
"version": "0.77.56",
|
|
24
|
+
"resolved": "../../../../tester/25P4/harmony/react_native_openharmony-6.0.0.202.har",
|
|
25
|
+
"registryType": "local",
|
|
26
|
+
"dependencies": {
|
|
27
|
+
"@ppd/ffrt": "1.1.5"
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@react-native-ohos/react-native-haptic-feedback",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.3.4",
|
|
4
4
|
"description": "Please describe the basic information.",
|
|
5
5
|
"main": "index.ets",
|
|
6
6
|
"author": "",
|
|
7
7
|
"license": "Apache-2.0",
|
|
8
8
|
"dependencies": {
|
|
9
|
-
"@rnoh/react-native-openharmony": 'file
|
|
9
|
+
"@rnoh/react-native-openharmony": 'file:../../node_modules/react-native-harmony/harmony/react_native_openharmony.har'
|
|
10
10
|
}
|
|
11
11
|
}
|
|
12
12
|
|
|
@@ -1,9 +1,7 @@
|
|
|
1
1
|
cmake_minimum_required(VERSION 3.13)
|
|
2
2
|
set(CMAKE_VERBOSE_MAKEFILE on)
|
|
3
3
|
|
|
4
|
-
set(rnoh_haptic_feedback_generated_dir "${CMAKE_CURRENT_SOURCE_DIR}/generated")
|
|
5
|
-
file(GLOB_RECURSE rnoh_haptic_feedback_generated_SRC "${rnoh_haptic_feedback_generated_dir}/**/*.cpp")
|
|
6
4
|
file(GLOB rnoh_haptic_feedback_SRC CONFIGURE_DEPENDS *.cpp)
|
|
7
|
-
add_library(rnoh_haptic_feedback SHARED ${rnoh_haptic_feedback_SRC}
|
|
8
|
-
target_include_directories(rnoh_haptic_feedback PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
|
|
5
|
+
add_library(rnoh_haptic_feedback SHARED ${rnoh_haptic_feedback_SRC})
|
|
6
|
+
target_include_directories(rnoh_haptic_feedback PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
|
|
9
7
|
target_link_libraries(rnoh_haptic_feedback PUBLIC rnoh)
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* This code was generated by "react-native codegen-harmony"
|
|
3
|
+
*
|
|
4
|
+
* Do not edit this file as changes may cause incorrect behavior and will be
|
|
5
|
+
* lost once the code is regenerated.
|
|
6
|
+
*
|
|
7
|
+
* @generatorVersion: 1
|
|
8
|
+
*/
|
|
9
|
+
|
|
10
|
+
#include "RNHapticFeedback.h"
|
|
11
|
+
|
|
12
|
+
namespace rnoh {
|
|
13
|
+
using namespace facebook;
|
|
14
|
+
|
|
15
|
+
RNHapticFeedback::RNHapticFeedback(const ArkTSTurboModule::Context ctx, const std::string name) : ArkTSTurboModule(ctx, name) {
|
|
16
|
+
methodMap_ = {
|
|
17
|
+
ARK_METHOD_METADATA(trigger, 2),
|
|
18
|
+
};
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
} // namespace rnoh
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* This code was generated by "react-native codegen-harmony"
|
|
3
|
+
*
|
|
4
|
+
* Do not edit this file as changes may cause incorrect behavior and will be
|
|
5
|
+
* lost once the code is regenerated.
|
|
6
|
+
*
|
|
7
|
+
* @generatorVersion: 1
|
|
8
|
+
*/
|
|
9
|
+
|
|
10
|
+
#pragma once
|
|
11
|
+
|
|
12
|
+
#include "RNOH/ArkTSTurboModule.h"
|
|
13
|
+
|
|
14
|
+
namespace rnoh {
|
|
15
|
+
|
|
16
|
+
class JSI_EXPORT RNHapticFeedback : public ArkTSTurboModule {
|
|
17
|
+
public:
|
|
18
|
+
RNHapticFeedback(const ArkTSTurboModule::Context ctx, const std::string name);
|
|
19
|
+
};
|
|
20
|
+
|
|
21
|
+
} // namespace rnoh
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* This code was generated by "react-native codegen-harmony"
|
|
3
|
+
*
|
|
4
|
+
* Do not edit this file as changes may cause incorrect behavior and will be
|
|
5
|
+
* lost once the code is regenerated.
|
|
6
|
+
*
|
|
7
|
+
* @generatorVersion: 1
|
|
8
|
+
*/
|
|
9
|
+
|
|
10
|
+
#pragma once
|
|
11
|
+
|
|
12
|
+
#include "RNOH/Package.h"
|
|
13
|
+
#include "RNOH/ArkTSTurboModule.h"
|
|
14
|
+
#include "RNHapticFeedback.h"
|
|
15
|
+
|
|
16
|
+
namespace rnoh {
|
|
17
|
+
|
|
18
|
+
class RNHapticFeedbackPackageTurboModuleFactoryDelegate : public TurboModuleFactoryDelegate {
|
|
19
|
+
public:
|
|
20
|
+
SharedTurboModule createTurboModule(Context ctx, const std::string &name) const override {
|
|
21
|
+
if (name == "RNHapticFeedback") {
|
|
22
|
+
return std::make_shared<RNHapticFeedback>(ctx, name);
|
|
23
|
+
}
|
|
24
|
+
return nullptr;
|
|
25
|
+
};
|
|
26
|
+
};
|
|
27
|
+
|
|
28
|
+
class RNHapticFeedbackPackage : public Package {
|
|
29
|
+
public:
|
|
30
|
+
RNHapticFeedbackPackage(Package::Context ctx) : Package(ctx){};
|
|
31
|
+
|
|
32
|
+
std::unique_ptr<TurboModuleFactoryDelegate> createTurboModuleFactoryDelegate() override {
|
|
33
|
+
return std::make_unique<RNHapticFeedbackPackageTurboModuleFactoryDelegate>();
|
|
34
|
+
}
|
|
35
|
+
};
|
|
36
|
+
|
|
37
|
+
} // namespace rnoh
|
|
@@ -1,13 +1,12 @@
|
|
|
1
1
|
/*
|
|
2
|
-
* Copyright (c)
|
|
2
|
+
* Copyright (c) 2025 Huawei Device Co., Ltd. All rights reserved
|
|
3
3
|
* Use of this source code is governed by a MIT license that can be
|
|
4
4
|
* found in the LICENSE file.
|
|
5
5
|
*/
|
|
6
6
|
|
|
7
7
|
import { RNPackage, TurboModulesFactory } from '@rnoh/react-native-openharmony/ts';
|
|
8
8
|
import type { TurboModule, TurboModuleContext } from '@rnoh/react-native-openharmony/ts';
|
|
9
|
-
import {
|
|
10
|
-
import { TM } from './generated/ts';
|
|
9
|
+
import { TM } from "./generated/ts";
|
|
11
10
|
import { RNHapticFeedbackTurboModule } from './RNHapticFeedbackTurboModule';
|
|
12
11
|
|
|
13
12
|
class RNHapticFeedbackTurboModuleFactory extends TurboModulesFactory {
|
|
@@ -19,11 +18,11 @@ class RNHapticFeedbackTurboModuleFactory extends TurboModulesFactory {
|
|
|
19
18
|
}
|
|
20
19
|
|
|
21
20
|
hasTurboModule(name: string): boolean {
|
|
22
|
-
return name === TM.
|
|
21
|
+
return name === TM.RNHapticFeedback.NAME;
|
|
23
22
|
}
|
|
24
23
|
}
|
|
25
24
|
|
|
26
|
-
export class RNHapticFeedbackPackage extends
|
|
25
|
+
export class RNHapticFeedbackPackage extends RNPackage {
|
|
27
26
|
createTurboModulesFactory(ctx: TurboModuleContext): TurboModulesFactory {
|
|
28
27
|
return new RNHapticFeedbackTurboModuleFactory(ctx);
|
|
29
28
|
}
|
|
@@ -1,16 +1,18 @@
|
|
|
1
1
|
/*
|
|
2
|
-
* Copyright (c)
|
|
2
|
+
* Copyright (c) 2025 Huawei Device Co., Ltd. All rights reserved
|
|
3
3
|
* Use of this source code is governed by a MIT license that can be
|
|
4
4
|
* found in the LICENSE file.
|
|
5
5
|
*/
|
|
6
|
+
|
|
6
7
|
import { TurboModule, TurboModuleContext } from '@rnoh/react-native-openharmony/ts';
|
|
7
|
-
import { TM } from
|
|
8
|
+
import { TM } from "./generated/ts";
|
|
8
9
|
import Logger from './Logger';
|
|
9
10
|
import vibrator from '@ohos.vibrator';
|
|
10
11
|
import audio from '@ohos.multimedia.audio';
|
|
11
12
|
import { BusinessError } from '@ohos.base';
|
|
12
13
|
import common from '@ohos.app.ability.common';
|
|
13
|
-
|
|
14
|
+
|
|
15
|
+
export class RNHapticFeedbackTurboModule extends TurboModule implements TM.RNHapticFeedback.Spec {
|
|
14
16
|
private context: common.UIAbilityContext
|
|
15
17
|
constructor(ctx: TurboModuleContext) {
|
|
16
18
|
super(ctx);
|
|
@@ -146,4 +148,4 @@ export class RNHapticFeedbackTurboModule extends TurboModule implements TM.Hapti
|
|
|
146
148
|
Logger.error(`Failed to get audioVolumeGroupManager, error: ${error}`);
|
|
147
149
|
}
|
|
148
150
|
}
|
|
149
|
-
}
|
|
151
|
+
}
|
|
@@ -1,5 +1,8 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* This code was generated by "react-native codegen-
|
|
2
|
+
* This code was generated by "react-native codegen-harmony"
|
|
3
|
+
*
|
|
4
|
+
* Do not edit this file as changes may cause incorrect behavior and will be
|
|
5
|
+
* lost once the code is regenerated.
|
|
3
6
|
*/
|
|
4
7
|
|
|
5
8
|
export * from "./ts"
|
|
@@ -1,5 +1,8 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* This code was generated by "react-native codegen-
|
|
2
|
+
* This code was generated by "react-native codegen-harmony"
|
|
3
|
+
*
|
|
4
|
+
* Do not edit this file as changes may cause incorrect behavior and will be
|
|
5
|
+
* lost once the code is regenerated.
|
|
3
6
|
*/
|
|
4
7
|
|
|
5
8
|
export * as RNC from "./components/ts"
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* This code was generated by "react-native codegen-harmony"
|
|
3
|
+
*
|
|
4
|
+
* Do not edit this file as changes may cause incorrect behavior and will be
|
|
5
|
+
* lost once the code is regenerated.
|
|
6
|
+
*
|
|
7
|
+
* @generatorVersion: 1
|
|
8
|
+
*/
|
|
9
|
+
|
|
10
|
+
export namespace RNHapticFeedback {
|
|
11
|
+
export const NAME = 'RNHapticFeedback' as const
|
|
12
|
+
|
|
13
|
+
export interface Spec {
|
|
14
|
+
trigger(type: string, options: {enableVibrateFallback?: boolean, ignoreAndroidSystemSettings?: boolean}): void;
|
|
15
|
+
}
|
|
16
|
+
}
|
|
@@ -1,5 +1,8 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* This code was generated by "react-native codegen-
|
|
2
|
+
* This code was generated by "react-native codegen-harmony"
|
|
3
|
+
*
|
|
4
|
+
* Do not edit this file as changes may cause incorrect behavior and will be
|
|
5
|
+
* lost once the code is regenerated.
|
|
3
6
|
*/
|
|
4
7
|
|
|
5
|
-
export * from "./
|
|
8
|
+
export * from "./RNHapticFeedback"
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* MIT License
|
|
3
3
|
*
|
|
4
|
-
* Copyright (C)
|
|
4
|
+
* Copyright (C) 2025 Huawei Device Co., Ltd.
|
|
5
5
|
*
|
|
6
6
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
7
7
|
* of this software and associated documentation files (the "Software"), to deal
|
|
Binary file
|
|
@@ -5,5 +5,5 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
});
|
|
6
6
|
exports.default = void 0;
|
|
7
7
|
var _reactNative = require("react-native");
|
|
8
|
-
var _default = exports.default = _reactNative.TurboModuleRegistry.
|
|
8
|
+
var _default = exports.default = _reactNative.TurboModuleRegistry.getEnforcing("RNHapticFeedback");
|
|
9
9
|
//# sourceMappingURL=NativeHapticFeedback.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"names":["_reactNative","require","_default","exports","default","TurboModuleRegistry","getEnforcing"],"sourceRoot":"..\\..\\..\\src","sources":["codegenSpec/NativeHapticFeedback.ts"],"mappings":";;;;;;AACA,IAAAA,YAAA,GAAAC,OAAA;AAAmD,IAAAC,QAAA,GAAAC,OAAA,CAAAC,OAAA,GAYpCC,gCAAmB,CAACC,YAAY,CAAO,kBAAkB,CAAC","ignoreList":[]}
|
package/lib/commonjs/index.js
CHANGED
|
@@ -7,7 +7,7 @@ var _exportNames = {
|
|
|
7
7
|
trigger: true
|
|
8
8
|
};
|
|
9
9
|
exports.trigger = exports.default = void 0;
|
|
10
|
-
var
|
|
10
|
+
var _NativeHapticFeedback = _interopRequireDefault(require("./codegenSpec/NativeHapticFeedback"));
|
|
11
11
|
var _types = require("./types");
|
|
12
12
|
Object.keys(_types).forEach(function (key) {
|
|
13
13
|
if (key === "default" || key === "__esModule") return;
|
|
@@ -20,36 +20,30 @@ Object.keys(_types).forEach(function (key) {
|
|
|
20
20
|
}
|
|
21
21
|
});
|
|
22
22
|
});
|
|
23
|
+
function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
|
|
23
24
|
const defaultOptions = {
|
|
24
25
|
enableVibrateFallback: false,
|
|
25
26
|
ignoreAndroidSystemSettings: false
|
|
26
27
|
};
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
const triggerOptions = createTriggerOptions(options);
|
|
28
|
+
const RNHapticFeedback = {
|
|
29
|
+
trigger(type = _types.HapticFeedbackTypes.selection, options = {}) {
|
|
30
30
|
try {
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
31
|
+
if (_NativeHapticFeedback.default) {
|
|
32
|
+
_NativeHapticFeedback.default.trigger(type, {
|
|
33
|
+
...defaultOptions,
|
|
34
|
+
...options
|
|
35
|
+
});
|
|
36
|
+
} else {
|
|
37
|
+
console.warn("RNReactNativeHapticFeedback is null");
|
|
38
|
+
}
|
|
39
|
+
} catch {
|
|
35
40
|
console.warn("RNReactNativeHapticFeedback is not available");
|
|
36
41
|
}
|
|
37
|
-
};
|
|
38
|
-
}
|
|
39
|
-
const createTriggerOptions = options => {
|
|
40
|
-
// if options is a boolean we're using an api <=1.6 and we should pass use it to set the enableVibrateFallback option
|
|
41
|
-
if (typeof options === "boolean") {
|
|
42
|
-
return {
|
|
43
|
-
...defaultOptions,
|
|
44
|
-
enableVibrateFallback: options
|
|
45
|
-
};
|
|
46
|
-
} else {
|
|
47
|
-
return {
|
|
48
|
-
...defaultOptions,
|
|
49
|
-
...options
|
|
50
|
-
};
|
|
51
42
|
}
|
|
52
43
|
};
|
|
53
|
-
const
|
|
54
|
-
|
|
44
|
+
const {
|
|
45
|
+
trigger
|
|
46
|
+
} = RNHapticFeedback;
|
|
47
|
+
exports.trigger = trigger;
|
|
48
|
+
var _default = exports.default = RNHapticFeedback;
|
|
55
49
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["
|
|
1
|
+
{"version":3,"names":["_NativeHapticFeedback","_interopRequireDefault","require","_types","Object","keys","forEach","key","prototype","hasOwnProperty","call","_exportNames","exports","defineProperty","enumerable","get","e","__esModule","default","defaultOptions","enableVibrateFallback","ignoreAndroidSystemSettings","RNHapticFeedback","trigger","type","HapticFeedbackTypes","selection","options","NativeHapticFeedback","console","warn","_default"],"sourceRoot":"..\\..\\src","sources":["index.ts"],"mappings":";;;;;;;;;AAAA,IAAAA,qBAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,MAAA,GAAAD,OAAA;AA2BAE,MAAA,CAAAC,IAAA,CAAAF,MAAA,EAAAG,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAC,YAAA,EAAAJ,GAAA;EAAA,IAAAA,GAAA,IAAAK,OAAA,IAAAA,OAAA,CAAAL,GAAA,MAAAJ,MAAA,CAAAI,GAAA;EAAAH,MAAA,CAAAS,cAAA,CAAAD,OAAA,EAAAL,GAAA;IAAAO,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAZ,MAAA,CAAAI,GAAA;IAAA;EAAA;AAAA;AAAwB,SAAAN,uBAAAe,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAxBxB,MAAMG,cAAc,GAAG;EACrBC,qBAAqB,EAAE,KAAK;EAC5BC,2BAA2B,EAAE;AAC/B,CAAC;AAED,MAAMC,gBAAgB,GAAG;EACvBC,OAAOA,CACLC,IAEuB,GAAGC,0BAAmB,CAACC,SAAS,EACvDC,OAAsB,GAAG,CAAC,CAAC,EAC3B;IACA,IAAI;MACF,IAAIC,6BAAoB,EAAE;QACxBA,6BAAoB,CAACL,OAAO,CAACC,IAAI,EAAE;UAAE,GAAGL,cAAc;UAAE,GAAGQ;QAAQ,CAAC,CAAC;MACvE,CAAC,MAAM;QACLE,OAAO,CAACC,IAAI,CAAC,qCAAqC,CAAC;MACrD;IACF,CAAC,CAAC,MAAM;MACND,OAAO,CAACC,IAAI,CAAC,8CAA8C,CAAC;IAC9D;EACF;AACF,CAAC;AAGM,MAAM;EAAEP;AAAQ,CAAC,GAAGD,gBAAgB;AAACV,OAAA,CAAAW,OAAA,GAAAA,OAAA;AAAA,IAAAQ,QAAA,GAAAnB,OAAA,CAAAM,OAAA,GAC7BI,gBAAgB","ignoreList":[]}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"type":"commonjs"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["HapticFeedbackTypes","exports"],"sourceRoot":"..\\..\\src","sources":["types.ts"],"mappings":";;;;;;IAAYA,mBAAmB,GAAAC,OAAA,CAAAD,mBAAA,0BAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAA,OAAnBA,mBAAmB;AAAA","ignoreList":[]}
|
|
1
|
+
{"version":3,"names":["HapticFeedbackTypes","exports"],"sourceRoot":"..\\..\\src","sources":["types.ts"],"mappings":";;;;;;IAAYA,mBAAmB,GAAAC,OAAA,CAAAD,mBAAA,0BAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAA,OAAnBA,mBAAmB;AAAA","ignoreList":[]}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"names":["TurboModuleRegistry","getEnforcing"],"sourceRoot":"..\\..\\..\\src","sources":["codegenSpec/NativeHapticFeedback.ts"],"mappings":";;AACA,SAASA,mBAAmB,QAAQ,cAAc;AAYlD,eAAeA,mBAAmB,CAACC,YAAY,CAAO,kBAAkB,CAAC","ignoreList":[]}
|
package/lib/module/index.js
CHANGED
|
@@ -1,36 +1,30 @@
|
|
|
1
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
import NativeHapticFeedback from './codegenSpec/NativeHapticFeedback';
|
|
2
4
|
import { HapticFeedbackTypes } from "./types";
|
|
3
|
-
export * from "./types";
|
|
4
5
|
const defaultOptions = {
|
|
5
6
|
enableVibrateFallback: false,
|
|
6
7
|
ignoreAndroidSystemSettings: false
|
|
7
8
|
};
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
const triggerOptions = createTriggerOptions(options);
|
|
9
|
+
const RNHapticFeedback = {
|
|
10
|
+
trigger(type = HapticFeedbackTypes.selection, options = {}) {
|
|
11
11
|
try {
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
12
|
+
if (NativeHapticFeedback) {
|
|
13
|
+
NativeHapticFeedback.trigger(type, {
|
|
14
|
+
...defaultOptions,
|
|
15
|
+
...options
|
|
16
|
+
});
|
|
17
|
+
} else {
|
|
18
|
+
console.warn("RNReactNativeHapticFeedback is null");
|
|
19
|
+
}
|
|
20
|
+
} catch {
|
|
16
21
|
console.warn("RNReactNativeHapticFeedback is not available");
|
|
17
22
|
}
|
|
18
|
-
};
|
|
19
|
-
}
|
|
20
|
-
const createTriggerOptions = options => {
|
|
21
|
-
// if options is a boolean we're using an api <=1.6 and we should pass use it to set the enableVibrateFallback option
|
|
22
|
-
if (typeof options === "boolean") {
|
|
23
|
-
return {
|
|
24
|
-
...defaultOptions,
|
|
25
|
-
enableVibrateFallback: options
|
|
26
|
-
};
|
|
27
|
-
} else {
|
|
28
|
-
return {
|
|
29
|
-
...defaultOptions,
|
|
30
|
-
...options
|
|
31
|
-
};
|
|
32
23
|
}
|
|
33
24
|
};
|
|
34
|
-
export
|
|
35
|
-
export
|
|
25
|
+
export * from "./types";
|
|
26
|
+
export const {
|
|
27
|
+
trigger
|
|
28
|
+
} = RNHapticFeedback;
|
|
29
|
+
export default RNHapticFeedback;
|
|
36
30
|
//# sourceMappingURL=index.js.map
|
package/lib/module/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["
|
|
1
|
+
{"version":3,"names":["NativeHapticFeedback","HapticFeedbackTypes","defaultOptions","enableVibrateFallback","ignoreAndroidSystemSettings","RNHapticFeedback","trigger","type","selection","options","console","warn"],"sourceRoot":"..\\..\\src","sources":["index.ts"],"mappings":";;AAAA,OAAOA,oBAAoB,MAAM,oCAAoC;AACrE,SAASC,mBAAmB,QAAQ,SAAS;AAG7C,MAAMC,cAAc,GAAG;EACrBC,qBAAqB,EAAE,KAAK;EAC5BC,2BAA2B,EAAE;AAC/B,CAAC;AAED,MAAMC,gBAAgB,GAAG;EACvBC,OAAOA,CACLC,IAEuB,GAAGN,mBAAmB,CAACO,SAAS,EACvDC,OAAsB,GAAG,CAAC,CAAC,EAC3B;IACA,IAAI;MACF,IAAIT,oBAAoB,EAAE;QACxBA,oBAAoB,CAACM,OAAO,CAACC,IAAI,EAAE;UAAE,GAAGL,cAAc;UAAE,GAAGO;QAAQ,CAAC,CAAC;MACvE,CAAC,MAAM;QACLC,OAAO,CAACC,IAAI,CAAC,qCAAqC,CAAC;MACrD;IACF,CAAC,CAAC,MAAM;MACND,OAAO,CAACC,IAAI,CAAC,8CAA8C,CAAC;IAC9D;EACF;AACF,CAAC;AAED,cAAc,SAAS;AACvB,OAAO,MAAM;EAAEL;AAAQ,CAAC,GAAGD,gBAAgB;AAC3C,eAAeA,gBAAgB","ignoreList":[]}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"type":"module"}
|
package/lib/module/types.js
CHANGED
package/lib/module/types.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["HapticFeedbackTypes"],"sourceRoot":"..\\..\\src","sources":["types.ts"],"mappings":"AAAA,WAAYA,mBAAmB,0BAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAA,OAAnBA,mBAAmB;AAAA","ignoreList":[]}
|
|
1
|
+
{"version":3,"names":["HapticFeedbackTypes"],"sourceRoot":"..\\..\\src","sources":["types.ts"],"mappings":";;AAAA,WAAYA,mBAAmB,0BAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAA,OAAnBA,mBAAmB;AAAA","ignoreList":[]}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"NativeHapticFeedback.d.ts","sourceRoot":"","sources":["../../../src/codegenSpec/NativeHapticFeedback.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAGhD,MAAM,WAAW,IAAK,SAAQ,WAAW;IAEvC,OAAO,CACL,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE;QACR,qBAAqB,CAAC,EAAE,OAAO,CAAC;QAChC,2BAA2B,CAAC,EAAE,OAAO,CAAC;KACvC,GACA,IAAI,CAAC;CACT;wBAC4E,IAAI,GAAG,IAAI;AAAxF,wBAAyF"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { HapticFeedbackTypes } from "./types";
|
|
2
|
+
import type { HapticOptions } from "./types";
|
|
3
|
+
declare const RNHapticFeedback: {
|
|
4
|
+
trigger(type?: keyof typeof HapticFeedbackTypes | HapticFeedbackTypes, options?: HapticOptions): void;
|
|
5
|
+
};
|
|
6
|
+
export * from "./types";
|
|
7
|
+
export declare const trigger: (type?: keyof typeof HapticFeedbackTypes | HapticFeedbackTypes, options?: HapticOptions) => void;
|
|
8
|
+
export default RNHapticFeedback;
|
|
9
|
+
//# sourceMappingURL=index.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAC9C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAO7C,QAAA,MAAM,gBAAgB;mBAGd,MAAM,OAAO,mBAAmB,GAChC,mBAAmB,YACd,aAAa;CAYzB,CAAA;AAED,cAAc,SAAS,CAAC;AACxB,eAAO,MAAQ,OAAO,UAjBd,MAAM,OAAO,mBAAmB,GAChC,mBAAmB,YACd,aAAa,SAeiB,CAAC;AAC5C,eAAe,gBAAgB,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"AAAA,oBAAY,mBAAmB;IAC7B,SAAS,cAAc;IACvB,WAAW,gBAAgB;IAC3B,YAAY,iBAAiB;IAC7B,WAAW,gBAAgB;IAC3B,KAAK,UAAU;IACf,IAAI,SAAS;IACb,mBAAmB,wBAAwB;IAC3C,mBAAmB,wBAAwB;IAC3C,iBAAiB,sBAAsB;IACvC,SAAS,cAAc;IACvB,YAAY,iBAAiB;IAC7B,aAAa,kBAAkB;IAC/B,eAAe,oBAAoB;IACnC,WAAW,gBAAgB;IAC3B,SAAS,cAAc;IACvB,cAAc,mBAAmB;IACjC,UAAU,eAAe;IACzB,iBAAiB,sBAAsB;IACvC,WAAW,gBAAgB;IAC3B,iBAAiB,sBAAsB;IACvC,gBAAgB,qBAAqB;IACrC,UAAU,eAAe;CAC1B;AAED,MAAM,WAAW,aAAa;IAC5B,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,2BAA2B,CAAC,EAAE,OAAO,CAAC;CACvC"}
|